diff --git a/modular_citadel/sound/footstep/hull1.ogg b/modular_citadel/sound/footstep/hull1.ogg
deleted file mode 100644
index 615df6c550..0000000000
Binary files a/modular_citadel/sound/footstep/hull1.ogg and /dev/null differ
diff --git a/modular_citadel/sound/footstep/hull2.ogg b/modular_citadel/sound/footstep/hull2.ogg
deleted file mode 100644
index 3aecb743f7..0000000000
Binary files a/modular_citadel/sound/footstep/hull2.ogg and /dev/null differ
diff --git a/modular_citadel/sound/footstep/hull3.ogg b/modular_citadel/sound/footstep/hull3.ogg
deleted file mode 100644
index 03339131f6..0000000000
Binary files a/modular_citadel/sound/footstep/hull3.ogg and /dev/null differ
diff --git a/modular_citadel/sound/footstep/hull4.ogg b/modular_citadel/sound/footstep/hull4.ogg
deleted file mode 100644
index 2fba89d318..0000000000
Binary files a/modular_citadel/sound/footstep/hull4.ogg and /dev/null differ
diff --git a/modular_citadel/sound/footstep/hull5.ogg b/modular_citadel/sound/footstep/hull5.ogg
deleted file mode 100644
index 10c5912b97..0000000000
Binary files a/modular_citadel/sound/footstep/hull5.ogg and /dev/null differ
diff --git a/sound/creatures/bee.ogg b/sound/creatures/bee.ogg
new file mode 100644
index 0000000000..cd2779f834
Binary files /dev/null and b/sound/creatures/bee.ogg differ
diff --git a/sound/effects/beepskyspinsabre.ogg b/sound/effects/beepskyspinsabre.ogg
new file mode 100644
index 0000000000..87be7dae79
Binary files /dev/null and b/sound/effects/beepskyspinsabre.ogg differ
diff --git a/modular_citadel/sound/footstep/asteroid1.ogg b/sound/effects/footstep/asteroid1.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/asteroid1.ogg
rename to sound/effects/footstep/asteroid1.ogg
diff --git a/modular_citadel/sound/footstep/asteroid2.ogg b/sound/effects/footstep/asteroid2.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/asteroid2.ogg
rename to sound/effects/footstep/asteroid2.ogg
diff --git a/modular_citadel/sound/footstep/asteroid3.ogg b/sound/effects/footstep/asteroid3.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/asteroid3.ogg
rename to sound/effects/footstep/asteroid3.ogg
diff --git a/modular_citadel/sound/footstep/asteroid4.ogg b/sound/effects/footstep/asteroid4.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/asteroid4.ogg
rename to sound/effects/footstep/asteroid4.ogg
diff --git a/modular_citadel/sound/footstep/asteroid5.ogg b/sound/effects/footstep/asteroid5.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/asteroid5.ogg
rename to sound/effects/footstep/asteroid5.ogg
diff --git a/modular_citadel/sound/footstep/carpet1.ogg b/sound/effects/footstep/carpet1.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/carpet1.ogg
rename to sound/effects/footstep/carpet1.ogg
diff --git a/modular_citadel/sound/footstep/carpet2.ogg b/sound/effects/footstep/carpet2.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/carpet2.ogg
rename to sound/effects/footstep/carpet2.ogg
diff --git a/modular_citadel/sound/footstep/carpet3.ogg b/sound/effects/footstep/carpet3.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/carpet3.ogg
rename to sound/effects/footstep/carpet3.ogg
diff --git a/modular_citadel/sound/footstep/carpet4.ogg b/sound/effects/footstep/carpet4.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/carpet4.ogg
rename to sound/effects/footstep/carpet4.ogg
diff --git a/modular_citadel/sound/footstep/carpet5.ogg b/sound/effects/footstep/carpet5.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/carpet5.ogg
rename to sound/effects/footstep/carpet5.ogg
diff --git a/modular_citadel/sound/footstep/catwalk1.ogg b/sound/effects/footstep/catwalk1.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/catwalk1.ogg
rename to sound/effects/footstep/catwalk1.ogg
diff --git a/modular_citadel/sound/footstep/catwalk2.ogg b/sound/effects/footstep/catwalk2.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/catwalk2.ogg
rename to sound/effects/footstep/catwalk2.ogg
diff --git a/modular_citadel/sound/footstep/catwalk3.ogg b/sound/effects/footstep/catwalk3.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/catwalk3.ogg
rename to sound/effects/footstep/catwalk3.ogg
diff --git a/modular_citadel/sound/footstep/catwalk4.ogg b/sound/effects/footstep/catwalk4.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/catwalk4.ogg
rename to sound/effects/footstep/catwalk4.ogg
diff --git a/modular_citadel/sound/footstep/catwalk5.ogg b/sound/effects/footstep/catwalk5.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/catwalk5.ogg
rename to sound/effects/footstep/catwalk5.ogg
diff --git a/modular_citadel/sound/footstep/floor1.ogg b/sound/effects/footstep/floor1.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/floor1.ogg
rename to sound/effects/footstep/floor1.ogg
diff --git a/modular_citadel/sound/footstep/floor2.ogg b/sound/effects/footstep/floor2.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/floor2.ogg
rename to sound/effects/footstep/floor2.ogg
diff --git a/modular_citadel/sound/footstep/floor3.ogg b/sound/effects/footstep/floor3.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/floor3.ogg
rename to sound/effects/footstep/floor3.ogg
diff --git a/modular_citadel/sound/footstep/floor4.ogg b/sound/effects/footstep/floor4.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/floor4.ogg
rename to sound/effects/footstep/floor4.ogg
diff --git a/modular_citadel/sound/footstep/floor5.ogg b/sound/effects/footstep/floor5.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/floor5.ogg
rename to sound/effects/footstep/floor5.ogg
diff --git a/sound/effects/footstep/grass1.ogg b/sound/effects/footstep/grass1.ogg
new file mode 100644
index 0000000000..357547cd77
Binary files /dev/null and b/sound/effects/footstep/grass1.ogg differ
diff --git a/sound/effects/footstep/grass2.ogg b/sound/effects/footstep/grass2.ogg
new file mode 100644
index 0000000000..75bf8657e8
Binary files /dev/null and b/sound/effects/footstep/grass2.ogg differ
diff --git a/sound/effects/footstep/grass3.ogg b/sound/effects/footstep/grass3.ogg
new file mode 100644
index 0000000000..04f82872b1
Binary files /dev/null and b/sound/effects/footstep/grass3.ogg differ
diff --git a/sound/effects/footstep/grass4.ogg b/sound/effects/footstep/grass4.ogg
new file mode 100644
index 0000000000..6d736f2fb2
Binary files /dev/null and b/sound/effects/footstep/grass4.ogg differ
diff --git a/sound/effects/footstep/lava1.ogg b/sound/effects/footstep/lava1.ogg
new file mode 100644
index 0000000000..e26dbaf8bd
Binary files /dev/null and b/sound/effects/footstep/lava1.ogg differ
diff --git a/sound/effects/footstep/lava2.ogg b/sound/effects/footstep/lava2.ogg
new file mode 100644
index 0000000000..90b73f840b
Binary files /dev/null and b/sound/effects/footstep/lava2.ogg differ
diff --git a/sound/effects/footstep/lava3.ogg b/sound/effects/footstep/lava3.ogg
new file mode 100644
index 0000000000..3436381510
Binary files /dev/null and b/sound/effects/footstep/lava3.ogg differ
diff --git a/modular_citadel/sound/footstep/plating1.ogg b/sound/effects/footstep/plating1.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/plating1.ogg
rename to sound/effects/footstep/plating1.ogg
diff --git a/modular_citadel/sound/footstep/plating2.ogg b/sound/effects/footstep/plating2.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/plating2.ogg
rename to sound/effects/footstep/plating2.ogg
diff --git a/modular_citadel/sound/footstep/plating3.ogg b/sound/effects/footstep/plating3.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/plating3.ogg
rename to sound/effects/footstep/plating3.ogg
diff --git a/modular_citadel/sound/footstep/plating4.ogg b/sound/effects/footstep/plating4.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/plating4.ogg
rename to sound/effects/footstep/plating4.ogg
diff --git a/modular_citadel/sound/footstep/plating5.ogg b/sound/effects/footstep/plating5.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/plating5.ogg
rename to sound/effects/footstep/plating5.ogg
diff --git a/sound/effects/footstep/water1.ogg b/sound/effects/footstep/water1.ogg
new file mode 100644
index 0000000000..f22cbf2848
Binary files /dev/null and b/sound/effects/footstep/water1.ogg differ
diff --git a/sound/effects/footstep/water2.ogg b/sound/effects/footstep/water2.ogg
new file mode 100644
index 0000000000..e2a47650c6
Binary files /dev/null and b/sound/effects/footstep/water2.ogg differ
diff --git a/sound/effects/footstep/water3.ogg b/sound/effects/footstep/water3.ogg
new file mode 100644
index 0000000000..97ce152a5c
Binary files /dev/null and b/sound/effects/footstep/water3.ogg differ
diff --git a/sound/effects/footstep/water4.ogg b/sound/effects/footstep/water4.ogg
new file mode 100644
index 0000000000..5778a52560
Binary files /dev/null and b/sound/effects/footstep/water4.ogg differ
diff --git a/modular_citadel/sound/footstep/wood1.ogg b/sound/effects/footstep/wood1.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/wood1.ogg
rename to sound/effects/footstep/wood1.ogg
diff --git a/modular_citadel/sound/footstep/wood2.ogg b/sound/effects/footstep/wood2.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/wood2.ogg
rename to sound/effects/footstep/wood2.ogg
diff --git a/modular_citadel/sound/footstep/wood3.ogg b/sound/effects/footstep/wood3.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/wood3.ogg
rename to sound/effects/footstep/wood3.ogg
diff --git a/modular_citadel/sound/footstep/wood4.ogg b/sound/effects/footstep/wood4.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/wood4.ogg
rename to sound/effects/footstep/wood4.ogg
diff --git a/modular_citadel/sound/footstep/wood5.ogg b/sound/effects/footstep/wood5.ogg
similarity index 100%
rename from modular_citadel/sound/footstep/wood5.ogg
rename to sound/effects/footstep/wood5.ogg
diff --git a/sound/effects/gib_step.ogg b/sound/effects/gib_step.ogg
new file mode 100644
index 0000000000..01592651ab
Binary files /dev/null and b/sound/effects/gib_step.ogg differ
diff --git a/sound/effects/rustle1.ogg b/sound/effects/rustle1.ogg
index 8e94aada89..fe8da05a62 100644
Binary files a/sound/effects/rustle1.ogg and b/sound/effects/rustle1.ogg differ
diff --git a/sound/roundend/gondolabridge.ogg b/sound/roundend/gondolabridge.ogg
new file mode 100644
index 0000000000..949fb53d58
Binary files /dev/null and b/sound/roundend/gondolabridge.ogg differ
diff --git a/sound/vehicles/carrev.ogg b/sound/vehicles/carrev.ogg
new file mode 100644
index 0000000000..ef03830d32
Binary files /dev/null and b/sound/vehicles/carrev.ogg differ
diff --git a/sound/vehicles/clowncar_crash1.ogg b/sound/vehicles/clowncar_crash1.ogg
new file mode 100644
index 0000000000..34a6c0c7c7
Binary files /dev/null and b/sound/vehicles/clowncar_crash1.ogg differ
diff --git a/sound/vehicles/clowncar_crash2.ogg b/sound/vehicles/clowncar_crash2.ogg
new file mode 100644
index 0000000000..5bcbd32610
Binary files /dev/null and b/sound/vehicles/clowncar_crash2.ogg differ
diff --git a/sound/vehicles/clowncar_crashpins.ogg b/sound/vehicles/clowncar_crashpins.ogg
new file mode 100644
index 0000000000..7503c8caf2
Binary files /dev/null and b/sound/vehicles/clowncar_crashpins.ogg differ
diff --git a/sound/vehicles/clowncar_fart.ogg b/sound/vehicles/clowncar_fart.ogg
new file mode 100644
index 0000000000..05d9d54638
Binary files /dev/null and b/sound/vehicles/clowncar_fart.ogg differ
diff --git a/sound/vehicles/clowncar_load1.ogg b/sound/vehicles/clowncar_load1.ogg
new file mode 100644
index 0000000000..2adb41129f
Binary files /dev/null and b/sound/vehicles/clowncar_load1.ogg differ
diff --git a/sound/vehicles/clowncar_load2.ogg b/sound/vehicles/clowncar_load2.ogg
new file mode 100644
index 0000000000..5315e1f3b3
Binary files /dev/null and b/sound/vehicles/clowncar_load2.ogg differ
diff --git a/sound/vehicles/clowncar_ram1.ogg b/sound/vehicles/clowncar_ram1.ogg
new file mode 100644
index 0000000000..86e0653a2d
Binary files /dev/null and b/sound/vehicles/clowncar_ram1.ogg differ
diff --git a/sound/vehicles/clowncar_ram2.ogg b/sound/vehicles/clowncar_ram2.ogg
new file mode 100644
index 0000000000..88b5415585
Binary files /dev/null and b/sound/vehicles/clowncar_ram2.ogg differ
diff --git a/sound/vehicles/clowncar_ram3.ogg b/sound/vehicles/clowncar_ram3.ogg
new file mode 100644
index 0000000000..a19bda8a4c
Binary files /dev/null and b/sound/vehicles/clowncar_ram3.ogg differ
diff --git a/sound/voice/bcreep.ogg b/sound/voice/beepsky/creep.ogg
similarity index 100%
rename from sound/voice/bcreep.ogg
rename to sound/voice/beepsky/creep.ogg
diff --git a/sound/voice/bcriminal.ogg b/sound/voice/beepsky/criminal.ogg
similarity index 100%
rename from sound/voice/bcriminal.ogg
rename to sound/voice/beepsky/criminal.ogg
diff --git a/sound/voice/bfreeze.ogg b/sound/voice/beepsky/freeze.ogg
similarity index 100%
rename from sound/voice/bfreeze.ogg
rename to sound/voice/beepsky/freeze.ogg
diff --git a/sound/voice/bgod.ogg b/sound/voice/beepsky/god.ogg
similarity index 100%
rename from sound/voice/bgod.ogg
rename to sound/voice/beepsky/god.ogg
diff --git a/sound/voice/biamthelaw.ogg b/sound/voice/beepsky/iamthelaw.ogg
similarity index 100%
rename from sound/voice/biamthelaw.ogg
rename to sound/voice/beepsky/iamthelaw.ogg
diff --git a/sound/voice/binsult.ogg b/sound/voice/beepsky/insult.ogg
similarity index 100%
rename from sound/voice/binsult.ogg
rename to sound/voice/beepsky/insult.ogg
diff --git a/sound/voice/bjustice.ogg b/sound/voice/beepsky/justice.ogg
similarity index 100%
rename from sound/voice/bjustice.ogg
rename to sound/voice/beepsky/justice.ogg
diff --git a/sound/voice/bradio.ogg b/sound/voice/beepsky/radio.ogg
similarity index 100%
rename from sound/voice/bradio.ogg
rename to sound/voice/beepsky/radio.ogg
diff --git a/sound/voice/bsecureday.ogg b/sound/voice/beepsky/secureday.ogg
similarity index 100%
rename from sound/voice/bsecureday.ogg
rename to sound/voice/beepsky/secureday.ogg
diff --git a/sound/voice/mapple.ogg b/sound/voice/medbot/apple.ogg
similarity index 100%
rename from sound/voice/mapple.ogg
rename to sound/voice/medbot/apple.ogg
diff --git a/sound/voice/mcatch.ogg b/sound/voice/medbot/catch.ogg
similarity index 100%
rename from sound/voice/mcatch.ogg
rename to sound/voice/medbot/catch.ogg
diff --git a/sound/voice/mcoming.ogg b/sound/voice/medbot/coming.ogg
similarity index 100%
rename from sound/voice/mcoming.ogg
rename to sound/voice/medbot/coming.ogg
diff --git a/sound/voice/mdelicious.ogg b/sound/voice/medbot/delicious.ogg
similarity index 100%
rename from sound/voice/mdelicious.ogg
rename to sound/voice/medbot/delicious.ogg
diff --git a/sound/voice/mfeelbetter.ogg b/sound/voice/medbot/feelbetter.ogg
similarity index 100%
rename from sound/voice/mfeelbetter.ogg
rename to sound/voice/medbot/feelbetter.ogg
diff --git a/sound/voice/mflies.ogg b/sound/voice/medbot/flies.ogg
similarity index 100%
rename from sound/voice/mflies.ogg
rename to sound/voice/medbot/flies.ogg
diff --git a/sound/voice/mhelp.ogg b/sound/voice/medbot/help.ogg
similarity index 100%
rename from sound/voice/mhelp.ogg
rename to sound/voice/medbot/help.ogg
diff --git a/sound/voice/minjured.ogg b/sound/voice/medbot/injured.ogg
similarity index 100%
rename from sound/voice/minjured.ogg
rename to sound/voice/medbot/injured.ogg
diff --git a/sound/voice/minsult.ogg b/sound/voice/medbot/insult.ogg
similarity index 100%
rename from sound/voice/minsult.ogg
rename to sound/voice/medbot/insult.ogg
diff --git a/sound/voice/mlive.ogg b/sound/voice/medbot/live.ogg
similarity index 100%
rename from sound/voice/mlive.ogg
rename to sound/voice/medbot/live.ogg
diff --git a/sound/voice/mlost.ogg b/sound/voice/medbot/lost.ogg
similarity index 100%
rename from sound/voice/mlost.ogg
rename to sound/voice/medbot/lost.ogg
diff --git a/sound/voice/mno.ogg b/sound/voice/medbot/no.ogg
similarity index 100%
rename from sound/voice/mno.ogg
rename to sound/voice/medbot/no.ogg
diff --git a/sound/voice/medbot/patchedup.ogg b/sound/voice/medbot/patchedup.ogg
new file mode 100644
index 0000000000..1314f6ee47
Binary files /dev/null and b/sound/voice/medbot/patchedup.ogg differ
diff --git a/sound/voice/medbot/radar.ogg b/sound/voice/medbot/radar.ogg
new file mode 100644
index 0000000000..ad347a6d89
Binary files /dev/null and b/sound/voice/medbot/radar.ogg differ
diff --git a/sound/voice/medbot/surgeon.ogg b/sound/voice/medbot/surgeon.ogg
new file mode 100644
index 0000000000..a300ee57ef
Binary files /dev/null and b/sound/voice/medbot/surgeon.ogg differ
diff --git a/sound/weapons/whip.ogg b/sound/weapons/whip.ogg
new file mode 100644
index 0000000000..9bc0d45610
Binary files /dev/null and b/sound/weapons/whip.ogg differ