diff --git a/ogg/activities_b2f8d932/blackdwarf_981379c9/beambroken.ogg_02d6bde6 b/ogg/activities/blackdwarf/beambroken.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/blackdwarf_981379c9/beambroken.ogg_02d6bde6
rename to ogg/activities/blackdwarf/beambroken.ogg
diff --git a/ogg/activities_b2f8d932/blackdwarf_981379c9/beampower.ogg_1e72c54c b/ogg/activities/blackdwarf/beampower.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/blackdwarf_981379c9/beampower.ogg_1e72c54c
rename to ogg/activities/blackdwarf/beampower.ogg
diff --git a/ogg/activities_b2f8d932/blackdwarf_981379c9/beamretract.ogg_4dd45164 b/ogg/activities/blackdwarf/beamretract.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/blackdwarf_981379c9/beamretract.ogg_4dd45164
rename to ogg/activities/blackdwarf/beamretract.ogg
diff --git a/ogg/activities_b2f8d932/blackdwarf_981379c9/beamstart.ogg_62799764 b/ogg/activities/blackdwarf/beamstart.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/blackdwarf_981379c9/beamstart.ogg_62799764
rename to ogg/activities/blackdwarf/beamstart.ogg
diff --git a/ogg/activities_b2f8d932/blackdwarf_981379c9/button.ogg_3825e580 b/ogg/activities/blackdwarf/button.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/blackdwarf_981379c9/button.ogg_3825e580
rename to ogg/activities/blackdwarf/button.ogg
diff --git a/ogg/activities_b2f8d932/blackdwarf_981379c9/explosion.ogg_ab7329ce b/ogg/activities/blackdwarf/explosion.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/blackdwarf_981379c9/explosion.ogg_ab7329ce
rename to ogg/activities/blackdwarf/explosion.ogg
diff --git a/ogg/activities_b2f8d932/dark matter mining_85516dd0/attack.ogg_ba89ce4b b/ogg/activities/dark matter mining/attack.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dark matter mining_85516dd0/attack.ogg_ba89ce4b
rename to ogg/activities/dark matter mining/attack.ogg
diff --git a/ogg/activities_b2f8d932/dark matter mining_85516dd0/bleep.ogg_cedb0f60 b/ogg/activities/dark matter mining/bleep.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dark matter mining_85516dd0/bleep.ogg_cedb0f60
rename to ogg/activities/dark matter mining/bleep.ogg
diff --git a/ogg/activities_b2f8d932/dark matter mining_85516dd0/cheer.ogg_75bacb72 b/ogg/activities/dark matter mining/cheer.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dark matter mining_85516dd0/cheer.ogg_75bacb72
rename to ogg/activities/dark matter mining/cheer.ogg
diff --git a/ogg/activities_b2f8d932/dark matter mining_85516dd0/denter.ogg_53661558 b/ogg/activities/dark matter mining/denter.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dark matter mining_85516dd0/denter.ogg_53661558
rename to ogg/activities/dark matter mining/denter.ogg
diff --git a/ogg/activities_b2f8d932/dark matter mining_85516dd0/dexit.ogg_5e98c980 b/ogg/activities/dark matter mining/dexit.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dark matter mining_85516dd0/dexit.ogg_5e98c980
rename to ogg/activities/dark matter mining/dexit.ogg
diff --git a/ogg/activities_b2f8d932/dark matter mining_85516dd0/dload.ogg_7108fbdd b/ogg/activities/dark matter mining/dload.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dark matter mining_85516dd0/dload.ogg_7108fbdd
rename to ogg/activities/dark matter mining/dload.ogg
diff --git a/ogg/activities_b2f8d932/dark matter mining_85516dd0/drill.ogg_b41dca0d b/ogg/activities/dark matter mining/drill.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dark matter mining_85516dd0/drill.ogg_b41dca0d
rename to ogg/activities/dark matter mining/drill.ogg
diff --git a/ogg/activities_b2f8d932/dark matter mining_85516dd0/dronereturn.ogg_db264054 b/ogg/activities/dark matter mining/dronereturn.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dark matter mining_85516dd0/dronereturn.ogg_db264054
rename to ogg/activities/dark matter mining/dronereturn.ogg
diff --git a/ogg/activities_b2f8d932/dark matter mining_85516dd0/dronescuff.ogg_246546c3 b/ogg/activities/dark matter mining/dronescuff.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dark matter mining_85516dd0/dronescuff.ogg_246546c3
rename to ogg/activities/dark matter mining/dronescuff.ogg
diff --git a/ogg/activities_b2f8d932/dark matter mining_85516dd0/explode.ogg_48356e7f b/ogg/activities/dark matter mining/explode.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dark matter mining_85516dd0/explode.ogg_48356e7f
rename to ogg/activities/dark matter mining/explode.ogg
diff --git a/ogg/activities_b2f8d932/dark matter mining_85516dd0/grind.ogg_00f65612 b/ogg/activities/dark matter mining/grind.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dark matter mining_85516dd0/grind.ogg_00f65612
rename to ogg/activities/dark matter mining/grind.ogg
diff --git a/ogg/activities_b2f8d932/dark matter mining_85516dd0/hammer.ogg_377b547c b/ogg/activities/dark matter mining/hammer.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dark matter mining_85516dd0/hammer.ogg_377b547c
rename to ogg/activities/dark matter mining/hammer.ogg
diff --git a/ogg/activities_b2f8d932/dark matter mining_85516dd0/keyboard1.ogg_e956ead2 b/ogg/activities/dark matter mining/keyboard1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dark matter mining_85516dd0/keyboard1.ogg_e956ead2
rename to ogg/activities/dark matter mining/keyboard1.ogg
diff --git a/ogg/activities_b2f8d932/dark matter mining_85516dd0/miningdronesreturn.ogg_3e9a0f58 b/ogg/activities/dark matter mining/miningdronesreturn.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dark matter mining_85516dd0/miningdronesreturn.ogg_3e9a0f58
rename to ogg/activities/dark matter mining/miningdronesreturn.ogg
diff --git a/ogg/activities_b2f8d932/dark matter mining_85516dd0/report.ogg_9ebe22f4 b/ogg/activities/dark matter mining/report.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dark matter mining_85516dd0/report.ogg_9ebe22f4
rename to ogg/activities/dark matter mining/report.ogg
diff --git a/ogg/activities_b2f8d932/dark matter mining_85516dd0/trumpet.ogg_fe1f9741 b/ogg/activities/dark matter mining/trumpet.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dark matter mining_85516dd0/trumpet.ogg_fe1f9741
rename to ogg/activities/dark matter mining/trumpet.ogg
diff --git a/ogg/activities_b2f8d932/dust analyzing_a525efbd/alaser.ogg_62a1371b b/ogg/activities/dust analyzing/alaser.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dust analyzing_a525efbd/alaser.ogg_62a1371b
rename to ogg/activities/dust analyzing/alaser.ogg
diff --git a/ogg/activities_b2f8d932/dust analyzing_a525efbd/apowerdown.ogg_3f863b01 b/ogg/activities/dust analyzing/apowerdown.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dust analyzing_a525efbd/apowerdown.ogg_3f863b01
rename to ogg/activities/dust analyzing/apowerdown.ogg
diff --git a/ogg/activities_b2f8d932/dust analyzing_a525efbd/apoweron.ogg_caa4f532 b/ogg/activities/dust analyzing/apoweron.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/dust analyzing_a525efbd/apoweron.ogg_caa4f532
rename to ogg/activities/dust analyzing/apoweron.ogg
diff --git a/ogg/activities_b2f8d932/farming_c729fd81/build1.ogg_3196d076 b/ogg/activities/farming/build1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/farming_c729fd81/build1.ogg_3196d076
rename to ogg/activities/farming/build1.ogg
diff --git a/ogg/activities_b2f8d932/farming_c729fd81/chickens.ogg_7c7d48aa b/ogg/activities/farming/chickens.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/farming_c729fd81/chickens.ogg_7c7d48aa
rename to ogg/activities/farming/chickens.ogg
diff --git a/ogg/activities_b2f8d932/farming_c729fd81/close.ogg_46be7047 b/ogg/activities/farming/close.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/farming_c729fd81/close.ogg_46be7047
rename to ogg/activities/farming/close.ogg
diff --git a/ogg/activities_b2f8d932/farming_c729fd81/cow.ogg_03660fa5 b/ogg/activities/farming/cow.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/farming_c729fd81/cow.ogg_03660fa5
rename to ogg/activities/farming/cow.ogg
diff --git a/ogg/activities_b2f8d932/farming_c729fd81/cowbarn.ogg_ea449a8c b/ogg/activities/farming/cowbarn.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/farming_c729fd81/cowbarn.ogg_ea449a8c
rename to ogg/activities/farming/cowbarn.ogg
diff --git a/ogg/activities_b2f8d932/farming_c729fd81/enter.ogg_341f8196 b/ogg/activities/farming/enter.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/farming_c729fd81/enter.ogg_341f8196
rename to ogg/activities/farming/enter.ogg
diff --git a/ogg/activities_b2f8d932/farming_c729fd81/exit.ogg_0409eb51 b/ogg/activities/farming/exit.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/farming_c729fd81/exit.ogg_0409eb51
rename to ogg/activities/farming/exit.ogg
diff --git a/ogg/activities_b2f8d932/farming_c729fd81/goat.ogg_9ae7ad6c b/ogg/activities/farming/goat.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/farming_c729fd81/goat.ogg_9ae7ad6c
rename to ogg/activities/farming/goat.ogg
diff --git a/ogg/activities_b2f8d932/farming_c729fd81/goats.ogg_067069e4 b/ogg/activities/farming/goats.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/farming_c729fd81/goats.ogg_067069e4
rename to ogg/activities/farming/goats.ogg
diff --git a/ogg/activities_b2f8d932/farming_c729fd81/hammer.ogg_33f1f7f5 b/ogg/activities/farming/hammer.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/farming_c729fd81/hammer.ogg_33f1f7f5
rename to ogg/activities/farming/hammer.ogg
diff --git a/ogg/activities_b2f8d932/farming_c729fd81/horse.ogg_6f25c389 b/ogg/activities/farming/horse.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/farming_c729fd81/horse.ogg_6f25c389
rename to ogg/activities/farming/horse.ogg
diff --git a/ogg/activities_b2f8d932/farming_c729fd81/horses.ogg_e059a038 b/ogg/activities/farming/horses.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/farming_c729fd81/horses.ogg_e059a038
rename to ogg/activities/farming/horses.ogg
diff --git a/ogg/activities_b2f8d932/farming_c729fd81/house.ogg_00834746 b/ogg/activities/farming/house.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/farming_c729fd81/house.ogg_00834746
rename to ogg/activities/farming/house.ogg
diff --git a/ogg/activities_b2f8d932/farming_c729fd81/open.ogg_d212cdaf b/ogg/activities/farming/open.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/farming_c729fd81/open.ogg_d212cdaf
rename to ogg/activities/farming/open.ogg
diff --git a/ogg/activities_b2f8d932/farming_c729fd81/pod.ogg_7d96348b b/ogg/activities/farming/pod.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/farming_c729fd81/pod.ogg_7d96348b
rename to ogg/activities/farming/pod.ogg
diff --git a/ogg/activities_b2f8d932/farming_c729fd81/pump.ogg_30743471 b/ogg/activities/farming/pump.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/farming_c729fd81/pump.ogg_30743471
rename to ogg/activities/farming/pump.ogg
diff --git a/ogg/activities_b2f8d932/farming_c729fd81/sheep.ogg_a32cb44e b/ogg/activities/farming/sheep.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/farming_c729fd81/sheep.ogg_a32cb44e
rename to ogg/activities/farming/sheep.ogg
diff --git a/ogg/activities_b2f8d932/farming_c729fd81/sheeppen.ogg_2ac52279 b/ogg/activities/farming/sheeppen.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/farming_c729fd81/sheeppen.ogg_2ac52279
rename to ogg/activities/farming/sheeppen.ogg
diff --git a/ogg/activities_b2f8d932/fishing_efd988e1/fishbite.ogg_7885eeef b/ogg/activities/fishing/fishbite.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/fishing_efd988e1/fishbite.ogg_7885eeef
rename to ogg/activities/fishing/fishbite.ogg
diff --git a/ogg/activities_b2f8d932/fishing_efd988e1/fishcast.ogg_d4ad1b41 b/ogg/activities/fishing/fishcast.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/fishing_efd988e1/fishcast.ogg_d4ad1b41
rename to ogg/activities/fishing/fishcast.ogg
diff --git a/ogg/activities_b2f8d932/fishing_efd988e1/fishcatch.ogg_ad8c6763 b/ogg/activities/fishing/fishcatch.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/fishing_efd988e1/fishcatch.ogg_ad8c6763
rename to ogg/activities/fishing/fishcatch.ogg
diff --git a/ogg/activities_b2f8d932/fishing_efd988e1/fishline1.ogg_f3a3119b b/ogg/activities/fishing/fishline1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/fishing_efd988e1/fishline1.ogg_f3a3119b
rename to ogg/activities/fishing/fishline1.ogg
diff --git a/ogg/activities_b2f8d932/fishing_efd988e1/fishline2.ogg_9dbfec9e b/ogg/activities/fishing/fishline2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/fishing_efd988e1/fishline2.ogg_9dbfec9e
rename to ogg/activities/fishing/fishline2.ogg
diff --git a/ogg/activities_b2f8d932/fishing_efd988e1/fishline3.ogg_ab2bbdf7 b/ogg/activities/fishing/fishline3.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/fishing_efd988e1/fishline3.ogg_ab2bbdf7
rename to ogg/activities/fishing/fishline3.ogg
diff --git a/ogg/activities_b2f8d932/fishing_efd988e1/fishreel.ogg_d50bf2dc b/ogg/activities/fishing/fishreel.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/fishing_efd988e1/fishreel.ogg_d50bf2dc
rename to ogg/activities/fishing/fishreel.ogg
diff --git a/ogg/activities_b2f8d932/fishing_efd988e1/fishreelin.ogg_76a0b55d b/ogg/activities/fishing/fishreelin.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/fishing_efd988e1/fishreelin.ogg_76a0b55d
rename to ogg/activities/fishing/fishreelin.ogg
diff --git a/ogg/activities_b2f8d932/fishing_efd988e1/hook.ogg_5315aa70 b/ogg/activities/fishing/hook.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/fishing_efd988e1/hook.ogg_5315aa70
rename to ogg/activities/fishing/hook.ogg
diff --git a/ogg/activities_b2f8d932/fishing_efd988e1/hookin.ogg_03dfe3fa b/ogg/activities/fishing/hookin.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/fishing_efd988e1/hookin.ogg_03dfe3fa
rename to ogg/activities/fishing/hookin.ogg
diff --git a/ogg/activities_b2f8d932/fishing_efd988e1/loading.ogg_d4bc87ca b/ogg/activities/fishing/loading.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/fishing_efd988e1/loading.ogg_d4bc87ca
rename to ogg/activities/fishing/loading.ogg
diff --git a/ogg/activities_b2f8d932/fishing_efd988e1/misscatch.ogg_3d494e4c b/ogg/activities/fishing/misscatch.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/fishing_efd988e1/misscatch.ogg_3d494e4c
rename to ogg/activities/fishing/misscatch.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/acid.ogg_f438c9b5 b/ogg/activities/hand mining/acid.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/acid.ogg_f438c9b5
rename to ogg/activities/hand mining/acid.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/candig.ogg_ee84fc2d b/ogg/activities/hand mining/candig.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/candig.ogg_ee84fc2d
rename to ogg/activities/hand mining/candig.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/cuttingtool.ogg_4105e022 b/ogg/activities/hand mining/cuttingtool.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/cuttingtool.ogg_4105e022
rename to ogg/activities/hand mining/cuttingtool.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/cuttingtoolfail.ogg_6e03148b b/ogg/activities/hand mining/cuttingtoolfail.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/cuttingtoolfail.ogg_6e03148b
rename to ogg/activities/hand mining/cuttingtoolfail.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/dig1.ogg_f1ad621c b/ogg/activities/hand mining/dig1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/dig1.ogg_f1ad621c
rename to ogg/activities/hand mining/dig1.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/dig2.ogg_55911975 b/ogg/activities/hand mining/dig2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/dig2.ogg_55911975
rename to ogg/activities/hand mining/dig2.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/dirt.ogg_485712a2 b/ogg/activities/hand mining/dirt.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/dirt.ogg_485712a2
rename to ogg/activities/hand mining/dirt.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/dissolve.ogg_a4cb3a2d b/ogg/activities/hand mining/dissolve.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/dissolve.ogg_a4cb3a2d
rename to ogg/activities/hand mining/dissolve.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/dry.ogg_be8fa788 b/ogg/activities/hand mining/dry.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/dry.ogg_be8fa788
rename to ogg/activities/hand mining/dry.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/drytool.ogg_f21fbb77 b/ogg/activities/hand mining/drytool.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/drytool.ogg_f21fbb77
rename to ogg/activities/hand mining/drytool.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/erupt.ogg_1449ed37 b/ogg/activities/hand mining/erupt.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/erupt.ogg_1449ed37
rename to ogg/activities/hand mining/erupt.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/find.ogg_2cd0e311 b/ogg/activities/hand mining/find.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/find.ogg_2cd0e311
rename to ogg/activities/hand mining/find.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/findbreak.ogg_880aa714 b/ogg/activities/hand mining/findbreak.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/findbreak.ogg_880aa714
rename to ogg/activities/hand mining/findbreak.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/grindnothing.ogg_8f858cde b/ogg/activities/hand mining/grindnothing.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/grindnothing.ogg_8f858cde
rename to ogg/activities/hand mining/grindnothing.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/laser.ogg_181f6a09 b/ogg/activities/hand mining/laser.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/laser.ogg_181f6a09
rename to ogg/activities/hand mining/laser.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/manblock.ogg_c99ad73a b/ogg/activities/hand mining/manblock.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/manblock.ogg_c99ad73a
rename to ogg/activities/hand mining/manblock.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/mancome.ogg_65d60250 b/ogg/activities/hand mining/mancome.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/mancome.ogg_65d60250
rename to ogg/activities/hand mining/mancome.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/mandie.ogg_ddd276cf b/ogg/activities/hand mining/mandie.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/mandie.ogg_ddd276cf
rename to ogg/activities/hand mining/mandie.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/mankillyou.ogg_311e1559 b/ogg/activities/hand mining/mankillyou.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/mankillyou.ogg_311e1559
rename to ogg/activities/hand mining/mankillyou.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/manscare.ogg_afefce34 b/ogg/activities/hand mining/manscare.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/manscare.ogg_afefce34
rename to ogg/activities/hand mining/manscare.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/reveal.ogg_b75f0da9 b/ogg/activities/hand mining/reveal.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/reveal.ogg_b75f0da9
rename to ogg/activities/hand mining/reveal.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/scan.ogg_249dcf37 b/ogg/activities/hand mining/scan.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/scan.ogg_249dcf37
rename to ogg/activities/hand mining/scan.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/shovelclean.ogg_2e51b31d b/ogg/activities/hand mining/shovelclean.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/shovelclean.ogg_2e51b31d
rename to ogg/activities/hand mining/shovelclean.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/shovelswing.ogg_dc53d1bf b/ogg/activities/hand mining/shovelswing.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/shovelswing.ogg_dc53d1bf
rename to ogg/activities/hand mining/shovelswing.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/sweep.ogg_c85ad02f b/ogg/activities/hand mining/sweep.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/sweep.ogg_c85ad02f
rename to ogg/activities/hand mining/sweep.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/waterfind.ogg_f8237f9b b/ogg/activities/hand mining/waterfind.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/waterfind.ogg_f8237f9b
rename to ogg/activities/hand mining/waterfind.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/wet1.ogg_49754c5a b/ogg/activities/hand mining/wet1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/wet1.ogg_49754c5a
rename to ogg/activities/hand mining/wet1.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/wet2.ogg_59d1efde b/ogg/activities/hand mining/wet2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/wet2.ogg_59d1efde
rename to ogg/activities/hand mining/wet2.ogg
diff --git a/ogg/activities_b2f8d932/hand mining_d1e16059/wetshovel.ogg_efca93bb b/ogg/activities/hand mining/wetshovel.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hand mining_d1e16059/wetshovel.ogg_efca93bb
rename to ogg/activities/hand mining/wetshovel.ogg
diff --git a/ogg/activities_b2f8d932/hunt_81e1a945/branch.ogg_af999b27 b/ogg/activities/hunt/branch.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hunt_81e1a945/branch.ogg_af999b27
rename to ogg/activities/hunt/branch.ogg
diff --git a/ogg/activities_b2f8d932/hunt_81e1a945/cantwalk.ogg_1554d0a5 b/ogg/activities/hunt/cantwalk.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hunt_81e1a945/cantwalk.ogg_1554d0a5
rename to ogg/activities/hunt/cantwalk.ogg
diff --git a/ogg/activities_b2f8d932/hunt_81e1a945/chop.ogg_cd8c0bf3 b/ogg/activities/hunt/chop.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hunt_81e1a945/chop.ogg_cd8c0bf3
rename to ogg/activities/hunt/chop.ogg
diff --git a/ogg/activities_b2f8d932/hunt_81e1a945/done.ogg_fbebb7dc b/ogg/activities/hunt/done.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hunt_81e1a945/done.ogg_fbebb7dc
rename to ogg/activities/hunt/done.ogg
diff --git a/ogg/activities_b2f8d932/hunt_81e1a945/failjump.ogg_8318ede4 b/ogg/activities/hunt/failjump.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hunt_81e1a945/failjump.ogg_8318ede4
rename to ogg/activities/hunt/failjump.ogg
diff --git a/ogg/activities_b2f8d932/hunt_81e1a945/fox.ogg_fab1b642 b/ogg/activities/hunt/fox.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hunt_81e1a945/fox.ogg_fab1b642
rename to ogg/activities/hunt/fox.ogg
diff --git a/ogg/activities_b2f8d932/hunt_81e1a945/foxdie.ogg_2b1ee681 b/ogg/activities/hunt/foxdie.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hunt_81e1a945/foxdie.ogg_2b1ee681
rename to ogg/activities/hunt/foxdie.ogg
diff --git a/ogg/activities_b2f8d932/hunt_81e1a945/foxhole.ogg_d08506be b/ogg/activities/hunt/foxhole.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hunt_81e1a945/foxhole.ogg_d08506be
rename to ogg/activities/hunt/foxhole.ogg
diff --git a/ogg/activities_b2f8d932/hunt_81e1a945/foxpanic.ogg_e6ebd114 b/ogg/activities/hunt/foxpanic.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hunt_81e1a945/foxpanic.ogg_e6ebd114
rename to ogg/activities/hunt/foxpanic.ogg
diff --git a/ogg/activities_b2f8d932/hunt_81e1a945/foxshock.ogg_70e0c697 b/ogg/activities/hunt/foxshock.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hunt_81e1a945/foxshock.ogg_70e0c697
rename to ogg/activities/hunt/foxshock.ogg
diff --git a/ogg/activities_b2f8d932/hunt_81e1a945/inc.ogg_71425d3f b/ogg/activities/hunt/inc.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hunt_81e1a945/inc.ogg_71425d3f
rename to ogg/activities/hunt/inc.ogg
diff --git a/ogg/activities_b2f8d932/hunt_81e1a945/incdie.ogg_ab83a9bd b/ogg/activities/hunt/incdie.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hunt_81e1a945/incdie.ogg_ab83a9bd
rename to ogg/activities/hunt/incdie.ogg
diff --git a/ogg/activities_b2f8d932/hunt_81e1a945/jump.ogg_a60493c6 b/ogg/activities/hunt/jump.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hunt_81e1a945/jump.ogg_a60493c6
rename to ogg/activities/hunt/jump.ogg
diff --git a/ogg/activities_b2f8d932/hunt_81e1a945/run.ogg_91c34ff3 b/ogg/activities/hunt/run.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hunt_81e1a945/run.ogg_91c34ff3
rename to ogg/activities/hunt/run.ogg
diff --git a/ogg/activities_b2f8d932/hunt_81e1a945/sale.ogg_36e8210a b/ogg/activities/hunt/sale.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hunt_81e1a945/sale.ogg_36e8210a
rename to ogg/activities/hunt/sale.ogg
diff --git a/ogg/activities_b2f8d932/hunt_81e1a945/strip.ogg_0706527c b/ogg/activities/hunt/strip.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hunt_81e1a945/strip.ogg_0706527c
rename to ogg/activities/hunt/strip.ogg
diff --git a/ogg/activities_b2f8d932/hunt_81e1a945/tree.ogg_d74db829 b/ogg/activities/hunt/tree.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hunt_81e1a945/tree.ogg_d74db829
rename to ogg/activities/hunt/tree.ogg
diff --git a/ogg/activities_b2f8d932/hunt_81e1a945/wrap.ogg_059324c0 b/ogg/activities/hunt/wrap.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/hunt_81e1a945/wrap.ogg_059324c0
rename to ogg/activities/hunt/wrap.ogg
diff --git a/ogg/activities_b2f8d932/mechanicalmining_bba470ab/arm.ogg_f54ab3e8 b/ogg/activities/mechanicalmining/arm.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/mechanicalmining_bba470ab/arm.ogg_f54ab3e8
rename to ogg/activities/mechanicalmining/arm.ogg
diff --git a/ogg/activities_b2f8d932/mechanicalmining_bba470ab/digging.ogg_ac332a20 b/ogg/activities/mechanicalmining/digging.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/mechanicalmining_bba470ab/digging.ogg_ac332a20
rename to ogg/activities/mechanicalmining/digging.ogg
diff --git a/ogg/activities_b2f8d932/mechanicalmining_bba470ab/laser1.ogg_54bf5526 b/ogg/activities/mechanicalmining/laser1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/mechanicalmining_bba470ab/laser1.ogg_54bf5526
rename to ogg/activities/mechanicalmining/laser1.ogg
diff --git a/ogg/activities_b2f8d932/mechanicalmining_bba470ab/laser2.ogg_8b9c55ca b/ogg/activities/mechanicalmining/laser2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/mechanicalmining_bba470ab/laser2.ogg_8b9c55ca
rename to ogg/activities/mechanicalmining/laser2.ogg
diff --git a/ogg/activities_b2f8d932/mechanicalmining_bba470ab/slam.ogg_8fe73bc4 b/ogg/activities/mechanicalmining/slam.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/mechanicalmining_bba470ab/slam.ogg_8fe73bc4
rename to ogg/activities/mechanicalmining/slam.ogg
diff --git a/ogg/activities_b2f8d932/mechanicalmining_bba470ab/sort1.ogg_e0417cf5 b/ogg/activities/mechanicalmining/sort1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/mechanicalmining_bba470ab/sort1.ogg_e0417cf5
rename to ogg/activities/mechanicalmining/sort1.ogg
diff --git a/ogg/activities_b2f8d932/mechanicalmining_bba470ab/sortlower.ogg_42377667 b/ogg/activities/mechanicalmining/sortlower.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/mechanicalmining_bba470ab/sortlower.ogg_42377667
rename to ogg/activities/mechanicalmining/sortlower.ogg
diff --git a/ogg/activities_b2f8d932/mechanicalmining_bba470ab/thunk.ogg_6ca0541d b/ogg/activities/mechanicalmining/thunk.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/mechanicalmining_bba470ab/thunk.ogg_6ca0541d
rename to ogg/activities/mechanicalmining/thunk.ogg
diff --git a/ogg/activities_b2f8d932/mechanicalmining_bba470ab/whirling.ogg_5ad76588 b/ogg/activities/mechanicalmining/whirling.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/mechanicalmining_bba470ab/whirling.ogg_5ad76588
rename to ogg/activities/mechanicalmining/whirling.ogg
diff --git a/ogg/activities_b2f8d932/mechanicalmining_bba470ab/wine.ogg_71f4d36a b/ogg/activities/mechanicalmining/wine.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/mechanicalmining_bba470ab/wine.ogg_71f4d36a
rename to ogg/activities/mechanicalmining/wine.ogg
diff --git a/ogg/activities_b2f8d932/medevac_bcffe1fa/larkan1.ogg_d1d874a3 b/ogg/activities/medevac/larkan1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/medevac_bcffe1fa/larkan1.ogg_d1d874a3
rename to ogg/activities/medevac/larkan1.ogg
diff --git a/ogg/activities_b2f8d932/medevac_bcffe1fa/larkan2.ogg_b9a90785 b/ogg/activities/medevac/larkan2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/medevac_bcffe1fa/larkan2.ogg_b9a90785
rename to ogg/activities/medevac/larkan2.ogg
diff --git a/ogg/activities_b2f8d932/moon_e7619180/construction.ogg_ed1bf02e b/ogg/activities/moon/construction.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moon_e7619180/construction.ogg_ed1bf02e
rename to ogg/activities/moon/construction.ogg
diff --git a/ogg/activities_b2f8d932/moon_e7619180/drill.ogg_2db0560b b/ogg/activities/moon/drill.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moon_e7619180/drill.ogg_2db0560b
rename to ogg/activities/moon/drill.ogg
diff --git a/ogg/activities_b2f8d932/moon_e7619180/grind.ogg_668dd1c1 b/ogg/activities/moon/grind.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moon_e7619180/grind.ogg_668dd1c1
rename to ogg/activities/moon/grind.ogg
diff --git a/ogg/activities_b2f8d932/moon_e7619180/harvesterretract.ogg_d5351beb b/ogg/activities/moon/harvesterretract.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moon_e7619180/harvesterretract.ogg_d5351beb
rename to ogg/activities/moon/harvesterretract.ogg
diff --git a/ogg/activities_b2f8d932/moon_e7619180/moonextend.ogg_0c476a17 b/ogg/activities/moon/moonextend.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moon_e7619180/moonextend.ogg_0c476a17
rename to ogg/activities/moon/moonextend.ogg
diff --git a/ogg/activities_b2f8d932/moon_e7619180/moonscanner.ogg_36b5f176 b/ogg/activities/moon/moonscanner.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moon_e7619180/moonscanner.ogg_36b5f176
rename to ogg/activities/moon/moonscanner.ogg
diff --git a/ogg/activities_b2f8d932/moon_e7619180/sbegin.ogg_9ee94107 b/ogg/activities/moon/sbegin.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moon_e7619180/sbegin.ogg_9ee94107
rename to ogg/activities/moon/sbegin.ogg
diff --git a/ogg/activities_b2f8d932/moon_e7619180/sdestroy.ogg_37c5896e b/ogg/activities/moon/sdestroy.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moon_e7619180/sdestroy.ogg_37c5896e
rename to ogg/activities/moon/sdestroy.ogg
diff --git a/ogg/activities_b2f8d932/moon_e7619180/slaser.ogg_34333543 b/ogg/activities/moon/slaser.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moon_e7619180/slaser.ogg_34333543
rename to ogg/activities/moon/slaser.ogg
diff --git a/ogg/activities_b2f8d932/moon_e7619180/sloop.ogg_1d780656 b/ogg/activities/moon/sloop.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moon_e7619180/sloop.ogg_1d780656
rename to ogg/activities/moon/sloop.ogg
diff --git a/ogg/activities_b2f8d932/moon_e7619180/sshutdown.ogg_804269cb b/ogg/activities/moon/sshutdown.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moon_e7619180/sshutdown.ogg_804269cb
rename to ogg/activities/moon/sshutdown.ogg
diff --git a/ogg/activities_b2f8d932/moon_e7619180/stuck.ogg_23f79ad9 b/ogg/activities/moon/stuck.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moon_e7619180/stuck.ogg_23f79ad9
rename to ogg/activities/moon/stuck.ogg
diff --git a/ogg/activities_b2f8d932/moon_e7619180/whir.ogg_bdc0b7c8 b/ogg/activities/moon/whir.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moon_e7619180/whir.ogg_bdc0b7c8
rename to ogg/activities/moon/whir.ogg
diff --git a/ogg/activities_b2f8d932/moon_e7619180/whirring.ogg_1e619aec b/ogg/activities/moon/whirring.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moon_e7619180/whirring.ogg_1e619aec
rename to ogg/activities/moon/whirring.ogg
diff --git a/ogg/activities_b2f8d932/moonbase_e1e6d50f/construct.ogg_d925d68e b/ogg/activities/moonbase/construct.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moonbase_e1e6d50f/construct.ogg_d925d68e
rename to ogg/activities/moonbase/construct.ogg
diff --git a/ogg/activities_b2f8d932/moonbase_e1e6d50f/jammed.ogg_324dc7cd b/ogg/activities/moonbase/jammed.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moonbase_e1e6d50f/jammed.ogg_324dc7cd
rename to ogg/activities/moonbase/jammed.ogg
diff --git a/ogg/activities_b2f8d932/moonbase_e1e6d50f/land.ogg_6f6c1731 b/ogg/activities/moonbase/land.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moonbase_e1e6d50f/land.ogg_6f6c1731
rename to ogg/activities/moonbase/land.ogg
diff --git a/ogg/activities_b2f8d932/moonbase_e1e6d50f/launch.ogg_dc2451c5 b/ogg/activities/moonbase/launch.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moonbase_e1e6d50f/launch.ogg_dc2451c5
rename to ogg/activities/moonbase/launch.ogg
diff --git a/ogg/activities_b2f8d932/moonbase_e1e6d50f/lever.ogg_78b50da3 b/ogg/activities/moonbase/lever.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moonbase_e1e6d50f/lever.ogg_78b50da3
rename to ogg/activities/moonbase/lever.ogg
diff --git a/ogg/activities_b2f8d932/moonbase_e1e6d50f/lever2.ogg_66b7d257 b/ogg/activities/moonbase/lever2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moonbase_e1e6d50f/lever2.ogg_66b7d257
rename to ogg/activities/moonbase/lever2.ogg
diff --git a/ogg/activities_b2f8d932/moonbase_e1e6d50f/moontruckwork1.ogg_c2251480 b/ogg/activities/moonbase/moontruckwork1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moonbase_e1e6d50f/moontruckwork1.ogg_c2251480
rename to ogg/activities/moonbase/moontruckwork1.ogg
diff --git a/ogg/activities_b2f8d932/moonbase_e1e6d50f/moontruckwork2.ogg_b96f4509 b/ogg/activities/moonbase/moontruckwork2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moonbase_e1e6d50f/moontruckwork2.ogg_b96f4509
rename to ogg/activities/moonbase/moontruckwork2.ogg
diff --git a/ogg/activities_b2f8d932/moonbase_e1e6d50f/process.ogg_7d96f8a9 b/ogg/activities/moonbase/process.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moonbase_e1e6d50f/process.ogg_7d96f8a9
rename to ogg/activities/moonbase/process.ogg
diff --git a/ogg/activities_b2f8d932/moonbase_e1e6d50f/process1.ogg_1c4637af b/ogg/activities/moonbase/process1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/moonbase_e1e6d50f/process1.ogg_1c4637af
rename to ogg/activities/moonbase/process1.ogg
diff --git a/ogg/activities_b2f8d932/nebula_be65a6d9/activate.ogg_adbac971 b/ogg/activities/nebula/activate.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/nebula_be65a6d9/activate.ogg_adbac971
rename to ogg/activities/nebula/activate.ogg
diff --git a/ogg/activities_b2f8d932/nebula_be65a6d9/beep.ogg_9663e420 b/ogg/activities/nebula/beep.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/nebula_be65a6d9/beep.ogg_9663e420
rename to ogg/activities/nebula/beep.ogg
diff --git a/ogg/activities_b2f8d932/nebula_be65a6d9/boost.ogg_7b41832e b/ogg/activities/nebula/boost.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/nebula_be65a6d9/boost.ogg_7b41832e
rename to ogg/activities/nebula/boost.ogg
diff --git a/ogg/activities_b2f8d932/nebula_be65a6d9/click.ogg_7bdcb71e b/ogg/activities/nebula/click.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/nebula_be65a6d9/click.ogg_7bdcb71e
rename to ogg/activities/nebula/click.ogg
diff --git a/ogg/activities_b2f8d932/nebula_be65a6d9/deactivate.ogg_de9561a9 b/ogg/activities/nebula/deactivate.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/nebula_be65a6d9/deactivate.ogg_de9561a9
rename to ogg/activities/nebula/deactivate.ogg
diff --git a/ogg/activities_b2f8d932/nebula_be65a6d9/lock1.ogg_70ee03a2 b/ogg/activities/nebula/lock1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/nebula_be65a6d9/lock1.ogg_70ee03a2
rename to ogg/activities/nebula/lock1.ogg
diff --git a/ogg/activities_b2f8d932/nebula_be65a6d9/lock2.ogg_27d59903 b/ogg/activities/nebula/lock2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/nebula_be65a6d9/lock2.ogg_27d59903
rename to ogg/activities/nebula/lock2.ogg
diff --git a/ogg/activities_b2f8d932/nebula_be65a6d9/loop.ogg_5fc4d436 b/ogg/activities/nebula/loop.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/nebula_be65a6d9/loop.ogg_5fc4d436
rename to ogg/activities/nebula/loop.ogg
diff --git a/ogg/activities_b2f8d932/nebula_be65a6d9/rodextend.ogg_6fec44d3 b/ogg/activities/nebula/rodextend.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/nebula_be65a6d9/rodextend.ogg_6fec44d3
rename to ogg/activities/nebula/rodextend.ogg
diff --git a/ogg/activities_b2f8d932/nebula_be65a6d9/rodextend2.ogg_41768bcc b/ogg/activities/nebula/rodextend2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/nebula_be65a6d9/rodextend2.ogg_41768bcc
rename to ogg/activities/nebula/rodextend2.ogg
diff --git a/ogg/activities_b2f8d932/nebula_be65a6d9/rodharv.ogg_319d4c77 b/ogg/activities/nebula/rodharv.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/nebula_be65a6d9/rodharv.ogg_319d4c77
rename to ogg/activities/nebula/rodharv.ogg
diff --git a/ogg/activities_b2f8d932/nebula_be65a6d9/rodharv2.ogg_3db94a5d b/ogg/activities/nebula/rodharv2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/nebula_be65a6d9/rodharv2.ogg_3db94a5d
rename to ogg/activities/nebula/rodharv2.ogg
diff --git a/ogg/activities_b2f8d932/nebula_be65a6d9/rodretract.ogg_693fda49 b/ogg/activities/nebula/rodretract.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/nebula_be65a6d9/rodretract.ogg_693fda49
rename to ogg/activities/nebula/rodretract.ogg
diff --git a/ogg/activities_b2f8d932/nebula_be65a6d9/rodretract2.ogg_ba8ec0aa b/ogg/activities/nebula/rodretract2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/nebula_be65a6d9/rodretract2.ogg_ba8ec0aa
rename to ogg/activities/nebula/rodretract2.ogg
diff --git a/ogg/activities_b2f8d932/nebula_be65a6d9/warning.ogg_e92a8a3f b/ogg/activities/nebula/warning.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/nebula_be65a6d9/warning.ogg_e92a8a3f
rename to ogg/activities/nebula/warning.ogg
diff --git a/ogg/activities_b2f8d932/planetchunks_cc0be33f/atmosphericgenerator.ogg_8332f1f5 b/ogg/activities/planetchunks/atmosphericgenerator.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetchunks_cc0be33f/atmosphericgenerator.ogg_8332f1f5
rename to ogg/activities/planetchunks/atmosphericgenerator.ogg
diff --git a/ogg/activities_b2f8d932/planetchunks_cc0be33f/connectingwires.ogg_3d255b35 b/ogg/activities/planetchunks/connectingwires.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetchunks_cc0be33f/connectingwires.ogg_3d255b35
rename to ogg/activities/planetchunks/connectingwires.ogg
diff --git a/ogg/activities_b2f8d932/planetchunks_cc0be33f/explode.ogg_a4c8d229 b/ogg/activities/planetchunks/explode.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetchunks_cc0be33f/explode.ogg_a4c8d229
rename to ogg/activities/planetchunks/explode.ogg
diff --git a/ogg/activities_b2f8d932/planetchunks_cc0be33f/generaterwarning.ogg_548d5f69 b/ogg/activities/planetchunks/generaterwarning.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetchunks_cc0be33f/generaterwarning.ogg_548d5f69
rename to ogg/activities/planetchunks/generaterwarning.ogg
diff --git a/ogg/activities_b2f8d932/planetchunks_cc0be33f/land.ogg_9d8612d7 b/ogg/activities/planetchunks/land.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetchunks_cc0be33f/land.ogg_9d8612d7
rename to ogg/activities/planetchunks/land.ogg
diff --git a/ogg/activities_b2f8d932/planetchunks_cc0be33f/launch.ogg_c691ca4f b/ogg/activities/planetchunks/launch.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetchunks_cc0be33f/launch.ogg_c691ca4f
rename to ogg/activities/planetchunks/launch.ogg
diff --git a/ogg/activities_b2f8d932/planetchunks_cc0be33f/timeleft.ogg_a287714a b/ogg/activities/planetchunks/timeleft.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetchunks_cc0be33f/timeleft.ogg_a287714a
rename to ogg/activities/planetchunks/timeleft.ogg
diff --git a/ogg/activities_b2f8d932/planetchunks_cc0be33f/warning.ogg_3231f19d b/ogg/activities/planetchunks/warning.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetchunks_cc0be33f/warning.ogg_3231f19d
rename to ogg/activities/planetchunks/warning.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/air.ogg_f45cbd8c b/ogg/activities/planetoid/air.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/air.ogg_f45cbd8c
rename to ogg/activities/planetoid/air.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/beamcannon.ogg_7871fa91 b/ogg/activities/planetoid/beamcannon.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/beamcannon.ogg_7871fa91
rename to ogg/activities/planetoid/beamcannon.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/beep.ogg_e73ee98c b/ogg/activities/planetoid/beep.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/beep.ogg_e73ee98c
rename to ogg/activities/planetoid/beep.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/bluezone_bc0231_metal_texture_021.ogg_29f5d205 b/ogg/activities/planetoid/bluezone_bc0231_metal_texture_021.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/bluezone_bc0231_metal_texture_021.ogg_29f5d205
rename to ogg/activities/planetoid/bluezone_bc0231_metal_texture_021.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/boom.ogg_2aa6dd9d b/ogg/activities/planetoid/boom.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/boom.ogg_2aa6dd9d
rename to ogg/activities/planetoid/boom.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/break.ogg_a1bb84f1 b/ogg/activities/planetoid/break.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/break.ogg_a1bb84f1
rename to ogg/activities/planetoid/break.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/breakingglass1.ogg_4aa346ce b/ogg/activities/planetoid/breakingglass1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/breakingglass1.ogg_4aa346ce
rename to ogg/activities/planetoid/breakingglass1.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/breakingglass2.ogg_c67c86d8 b/ogg/activities/planetoid/breakingglass2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/breakingglass2.ogg_c67c86d8
rename to ogg/activities/planetoid/breakingglass2.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/breakingglass3.ogg_fdff671e b/ogg/activities/planetoid/breakingglass3.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/breakingglass3.ogg_fdff671e
rename to ogg/activities/planetoid/breakingglass3.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/cargoice.ogg_87b25bc2 b/ogg/activities/planetoid/cargoice.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/cargoice.ogg_87b25bc2
rename to ogg/activities/planetoid/cargoice.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/cargorepair.ogg_e64a0ef4 b/ogg/activities/planetoid/cargorepair.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/cargorepair.ogg_e64a0ef4
rename to ogg/activities/planetoid/cargorepair.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/clunk.ogg_2520d247 b/ogg/activities/planetoid/clunk.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/clunk.ogg_2520d247
rename to ogg/activities/planetoid/clunk.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/crack.ogg_fb12832f b/ogg/activities/planetoid/crack.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/crack.ogg_fb12832f
rename to ogg/activities/planetoid/crack.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/down.ogg_d8ff861c b/ogg/activities/planetoid/down.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/down.ogg_d8ff861c
rename to ogg/activities/planetoid/down.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/dull roar.ogg_6bb1aed9 b/ogg/activities/planetoid/dull roar.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/dull roar.ogg_6bb1aed9
rename to ogg/activities/planetoid/dull roar.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/gas.ogg_213e404f b/ogg/activities/planetoid/gas.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/gas.ogg_213e404f
rename to ogg/activities/planetoid/gas.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/grind.ogg_b77a6a7f b/ogg/activities/planetoid/grind.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/grind.ogg_b77a6a7f
rename to ogg/activities/planetoid/grind.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/gust.ogg_210b19fd b/ogg/activities/planetoid/gust.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/gust.ogg_210b19fd
rename to ogg/activities/planetoid/gust.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/handlewind.ogg_6f7cd804 b/ogg/activities/planetoid/handlewind.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/handlewind.ogg_6f7cd804
rename to ogg/activities/planetoid/handlewind.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/hum.ogg_a1ea644c b/ogg/activities/planetoid/hum.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/hum.ogg_a1ea644c
rename to ogg/activities/planetoid/hum.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/iceload.ogg_e52595c4 b/ogg/activities/planetoid/iceload.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/iceload.ogg_e52595c4
rename to ogg/activities/planetoid/iceload.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/iceunload.ogg_3b1a69c4 b/ogg/activities/planetoid/iceunload.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/iceunload.ogg_3b1a69c4
rename to ogg/activities/planetoid/iceunload.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/impact.ogg_f8444cb0 b/ogg/activities/planetoid/impact.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/impact.ogg_f8444cb0
rename to ogg/activities/planetoid/impact.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/investigate.ogg_548e83c6 b/ogg/activities/planetoid/investigate.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/investigate.ogg_548e83c6
rename to ogg/activities/planetoid/investigate.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/low hum.ogg_1d65623e b/ogg/activities/planetoid/low hum.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/low hum.ogg_1d65623e
rename to ogg/activities/planetoid/low hum.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/manipulatedrone.ogg_c917df8e b/ogg/activities/planetoid/manipulatedrone.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/manipulatedrone.ogg_c917df8e
rename to ogg/activities/planetoid/manipulatedrone.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/mineralscoop.ogg_2a200b1d b/ogg/activities/planetoid/mineralscoop.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/mineralscoop.ogg_2a200b1d
rename to ogg/activities/planetoid/mineralscoop.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/pdd.ogg_eed25c5a b/ogg/activities/planetoid/pdd.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/pdd.ogg_eed25c5a
rename to ogg/activities/planetoid/pdd.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/plunger.ogg_18e7a052 b/ogg/activities/planetoid/plunger.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/plunger.ogg_18e7a052
rename to ogg/activities/planetoid/plunger.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/propellers.ogg_9289bc17 b/ogg/activities/planetoid/propellers.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/propellers.ogg_9289bc17
rename to ogg/activities/planetoid/propellers.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/propellersrepair.ogg_bcab4227 b/ogg/activities/planetoid/propellersrepair.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/propellersrepair.ogg_bcab4227
rename to ogg/activities/planetoid/propellersrepair.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/propellersscreetch.ogg_a247e5de b/ogg/activities/planetoid/propellersscreetch.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/propellersscreetch.ogg_a247e5de
rename to ogg/activities/planetoid/propellersscreetch.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/propellersstart.ogg_da9ca918 b/ogg/activities/planetoid/propellersstart.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/propellersstart.ogg_da9ca918
rename to ogg/activities/planetoid/propellersstart.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/propellersstop.ogg_bc222637 b/ogg/activities/planetoid/propellersstop.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/propellersstop.ogg_bc222637
rename to ogg/activities/planetoid/propellersstop.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/pullfree.ogg_b0d4ce13 b/ogg/activities/planetoid/pullfree.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/pullfree.ogg_b0d4ce13
rename to ogg/activities/planetoid/pullfree.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/push.ogg_0639f1bc b/ogg/activities/planetoid/push.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/push.ogg_0639f1bc
rename to ogg/activities/planetoid/push.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/scrape.ogg_a7b7bbd7 b/ogg/activities/planetoid/scrape.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/scrape.ogg_a7b7bbd7
rename to ogg/activities/planetoid/scrape.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/scrape1.ogg_5d60d036 b/ogg/activities/planetoid/scrape1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/scrape1.ogg_5d60d036
rename to ogg/activities/planetoid/scrape1.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/scrape2.ogg_de2429f8 b/ogg/activities/planetoid/scrape2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/scrape2.ogg_de2429f8
rename to ogg/activities/planetoid/scrape2.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/scrape3.ogg_e678b51f b/ogg/activities/planetoid/scrape3.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/scrape3.ogg_e678b51f
rename to ogg/activities/planetoid/scrape3.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/scrape4.ogg_a48ff320 b/ogg/activities/planetoid/scrape4.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/scrape4.ogg_a48ff320
rename to ogg/activities/planetoid/scrape4.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/siren.ogg_274de81c b/ogg/activities/planetoid/siren.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/siren.ogg_274de81c
rename to ogg/activities/planetoid/siren.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/sound.ogg_b42d50a9 b/ogg/activities/planetoid/sound.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/sound.ogg_b42d50a9
rename to ogg/activities/planetoid/sound.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/stop.ogg_c5a96d3b b/ogg/activities/planetoid/stop.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/stop.ogg_c5a96d3b
rename to ogg/activities/planetoid/stop.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/stuck.ogg_fe1fbef8 b/ogg/activities/planetoid/stuck.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/stuck.ogg_fe1fbef8
rename to ogg/activities/planetoid/stuck.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/tremble.ogg_5d8dab0a b/ogg/activities/planetoid/tremble.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/tremble.ogg_5d8dab0a
rename to ogg/activities/planetoid/tremble.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/tug.ogg_90cfa4e9 b/ogg/activities/planetoid/tug.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/tug.ogg_90cfa4e9
rename to ogg/activities/planetoid/tug.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/unlock.ogg_10121fdd b/ogg/activities/planetoid/unlock.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/unlock.ogg_10121fdd
rename to ogg/activities/planetoid/unlock.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/unwind.ogg_86e8277a b/ogg/activities/planetoid/unwind.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/unwind.ogg_86e8277a
rename to ogg/activities/planetoid/unwind.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/up.ogg_292b7f3f b/ogg/activities/planetoid/up.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/up.ogg_292b7f3f
rename to ogg/activities/planetoid/up.ogg
diff --git a/ogg/activities_b2f8d932/planetoid_78c771c5/wind.ogg_51882a71 b/ogg/activities/planetoid/wind.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/planetoid_78c771c5/wind.ogg_51882a71
rename to ogg/activities/planetoid/wind.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/aim.ogg_fd1c6ee6 b/ogg/activities/pol/aim.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/aim.ogg_fd1c6ee6
rename to ogg/activities/pol/aim.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/deploy.ogg_dc98f4c8 b/ogg/activities/pol/deploy.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/deploy.ogg_dc98f4c8
rename to ogg/activities/pol/deploy.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/here.ogg_494a4ddb b/ogg/activities/pol/here.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/here.ogg_494a4ddb
rename to ogg/activities/pol/here.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/land.ogg_fca569d7 b/ogg/activities/pol/land.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/land.ogg_fca569d7
rename to ogg/activities/pol/land.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/laser.ogg_2ea5976a b/ogg/activities/pol/laser.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/laser.ogg_2ea5976a
rename to ogg/activities/pol/laser.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/loop.ogg_0ea1da79 b/ogg/activities/pol/loop.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/loop.ogg_0ea1da79
rename to ogg/activities/pol/loop.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/magn.ogg_035f3d2b b/ogg/activities/pol/magn.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/magn.ogg_035f3d2b
rename to ogg/activities/pol/magn.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/move1.ogg_d026e2e5 b/ogg/activities/pol/move1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/move1.ogg_d026e2e5
rename to ogg/activities/pol/move1.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/move2.ogg_d47b8298 b/ogg/activities/pol/move2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/move2.ogg_d47b8298
rename to ogg/activities/pol/move2.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/move3.ogg_68dd46ef b/ogg/activities/pol/move3.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/move3.ogg_68dd46ef
rename to ogg/activities/pol/move3.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/move4.ogg_51713628 b/ogg/activities/pol/move4.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/move4.ogg_51713628
rename to ogg/activities/pol/move4.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/poof.ogg_2d380aa3 b/ogg/activities/pol/poof.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/poof.ogg_2d380aa3
rename to ogg/activities/pol/poof.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/pump.ogg_ca558b9b b/ogg/activities/pol/pump.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/pump.ogg_ca558b9b
rename to ogg/activities/pol/pump.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/red.ogg_7aabbc80 b/ogg/activities/pol/red.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/red.ogg_7aabbc80
rename to ogg/activities/pol/red.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/salv.ogg_9a31c2ac b/ogg/activities/pol/salv.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/salv.ogg_9a31c2ac
rename to ogg/activities/pol/salv.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/split.ogg_04411021 b/ogg/activities/pol/split.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/split.ogg_04411021
rename to ogg/activities/pol/split.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/sta1.ogg_5b8bbdbe b/ogg/activities/pol/sta1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/sta1.ogg_5b8bbdbe
rename to ogg/activities/pol/sta1.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/sta2.ogg_c6eabdec b/ogg/activities/pol/sta2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/sta2.ogg_c6eabdec
rename to ogg/activities/pol/sta2.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/staloop.ogg_e99c5f9a b/ogg/activities/pol/staloop.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/staloop.ogg_e99c5f9a
rename to ogg/activities/pol/staloop.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/start.ogg_8c6b29dc b/ogg/activities/pol/start.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/start.ogg_8c6b29dc
rename to ogg/activities/pol/start.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/stop.ogg_72f17bb1 b/ogg/activities/pol/stop.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/stop.ogg_72f17bb1
rename to ogg/activities/pol/stop.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/storage.ogg_e9b52136 b/ogg/activities/pol/storage.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/storage.ogg_e9b52136
rename to ogg/activities/pol/storage.ogg
diff --git a/ogg/activities_b2f8d932/pol_bb784373/takeoff.ogg_e9302f52 b/ogg/activities/pol/takeoff.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/pol_bb784373/takeoff.ogg_e9302f52
rename to ogg/activities/pol/takeoff.ogg
diff --git a/ogg/activities_b2f8d932/sbe_22eb1945/display1.ogg_7d6a5084 b/ogg/activities/sbe/display1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/sbe_22eb1945/display1.ogg_7d6a5084
rename to ogg/activities/sbe/display1.ogg
diff --git a/ogg/activities_b2f8d932/sbe_22eb1945/display2.ogg_6938c1c1 b/ogg/activities/sbe/display2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/sbe_22eb1945/display2.ogg_6938c1c1
rename to ogg/activities/sbe/display2.ogg
diff --git a/ogg/activities_b2f8d932/sbe_22eb1945/display3.ogg_a5502716 b/ogg/activities/sbe/display3.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/sbe_22eb1945/display3.ogg_a5502716
rename to ogg/activities/sbe/display3.ogg
diff --git a/ogg/activities_b2f8d932/sbe_22eb1945/message1.ogg_eff328df b/ogg/activities/sbe/message1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/sbe_22eb1945/message1.ogg_eff328df
rename to ogg/activities/sbe/message1.ogg
diff --git a/ogg/activities_b2f8d932/sbe_22eb1945/message2.ogg_9b885630 b/ogg/activities/sbe/message2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/sbe_22eb1945/message2.ogg_9b885630
rename to ogg/activities/sbe/message2.ogg
diff --git a/ogg/activities_b2f8d932/sbe_22eb1945/message3.ogg_d9f7fd8c b/ogg/activities/sbe/message3.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/sbe_22eb1945/message3.ogg_d9f7fd8c
rename to ogg/activities/sbe/message3.ogg
diff --git a/ogg/activities_b2f8d932/sbe_22eb1945/ping.ogg_481217b9 b/ogg/activities/sbe/ping.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/sbe_22eb1945/ping.ogg_481217b9
rename to ogg/activities/sbe/ping.ogg
diff --git a/ogg/activities_b2f8d932/sbe_22eb1945/ping2.ogg_1b3e89e8 b/ogg/activities/sbe/ping2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/sbe_22eb1945/ping2.ogg_1b3e89e8
rename to ogg/activities/sbe/ping2.ogg
diff --git a/ogg/activities_b2f8d932/sbe_22eb1945/popup.ogg_b2b331cd b/ogg/activities/sbe/popup.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/sbe_22eb1945/popup.ogg_b2b331cd
rename to ogg/activities/sbe/popup.ogg
diff --git a/ogg/activities_b2f8d932/sbe_22eb1945/tokens.ogg_496d6049 b/ogg/activities/sbe/tokens.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/sbe_22eb1945/tokens.ogg_496d6049
rename to ogg/activities/sbe/tokens.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/almostperfect.ogg_fb90d277 b/ogg/activities/star cores/almostperfect.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/almostperfect.ogg_fb90d277
rename to ogg/activities/star cores/almostperfect.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/core1.ogg_9ec24c69 b/ogg/activities/star cores/core1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/core1.ogg_9ec24c69
rename to ogg/activities/star cores/core1.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/core2.ogg_e0a6596f b/ogg/activities/star cores/core2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/core2.ogg_e0a6596f
rename to ogg/activities/star cores/core2.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/core3.ogg_d8a1e3dc b/ogg/activities/star cores/core3.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/core3.ogg_d8a1e3dc
rename to ogg/activities/star cores/core3.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/core4.ogg_2f5c527b b/ogg/activities/star cores/core4.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/core4.ogg_2f5c527b
rename to ogg/activities/star cores/core4.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/core5.ogg_a9afd1a9 b/ogg/activities/star cores/core5.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/core5.ogg_a9afd1a9
rename to ogg/activities/star cores/core5.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/corelocklaser.ogg_d3490ddb b/ogg/activities/star cores/corelocklaser.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/corelocklaser.ogg_d3490ddb
rename to ogg/activities/star cores/corelocklaser.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/corestart.ogg_9838847b b/ogg/activities/star cores/corestart.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/corestart.ogg_9838847b
rename to ogg/activities/star cores/corestart.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/damage.ogg_3b4c1795 b/ogg/activities/star cores/damage.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/damage.ogg_3b4c1795
rename to ogg/activities/star cores/damage.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/explode.ogg_d13b4663 b/ogg/activities/star cores/explode.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/explode.ogg_d13b4663
rename to ogg/activities/star cores/explode.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/input1.ogg_e3bcc995 b/ogg/activities/star cores/input1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/input1.ogg_e3bcc995
rename to ogg/activities/star cores/input1.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/input2.ogg_4f82161e b/ogg/activities/star cores/input2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/input2.ogg_4f82161e
rename to ogg/activities/star cores/input2.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/laser.ogg_4feb5119 b/ogg/activities/star cores/laser.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/laser.ogg_4feb5119
rename to ogg/activities/star cores/laser.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/powerdown.ogg_799349c7 b/ogg/activities/star cores/powerdown.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/powerdown.ogg_799349c7
rename to ogg/activities/star cores/powerdown.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/print.ogg_07ebe96f b/ogg/activities/star cores/print.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/print.ogg_07ebe96f
rename to ogg/activities/star cores/print.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/return.ogg_869effea b/ogg/activities/star cores/return.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/return.ogg_869effea
rename to ogg/activities/star cores/return.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/scanner.ogg_74b38a01 b/ogg/activities/star cores/scanner.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/scanner.ogg_74b38a01
rename to ogg/activities/star cores/scanner.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/scrape.ogg_ce8bbe51 b/ogg/activities/star cores/scrape.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/scrape.ogg_ce8bbe51
rename to ogg/activities/star cores/scrape.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/sensor.ogg_bf45afd8 b/ogg/activities/star cores/sensor.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/sensor.ogg_bf45afd8
rename to ogg/activities/star cores/sensor.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/tanksfilled.ogg_a351a7d0 b/ogg/activities/star cores/tanksfilled.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/tanksfilled.ogg_a351a7d0
rename to ogg/activities/star cores/tanksfilled.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/unclear.ogg_a01959ca b/ogg/activities/star cores/unclear.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/unclear.ogg_a01959ca
rename to ogg/activities/star cores/unclear.ogg
diff --git a/ogg/activities_b2f8d932/star cores_1917bb7e/vibrate.ogg_a08579d3 b/ogg/activities/star cores/vibrate.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star cores_1917bb7e/vibrate.ogg_a08579d3
rename to ogg/activities/star cores/vibrate.ogg
diff --git a/ogg/activities_b2f8d932/star study_f73e689f/gravbattle.ogg_31842617 b/ogg/activities/star study/gravbattle.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star study_f73e689f/gravbattle.ogg_31842617
rename to ogg/activities/star study/gravbattle.ogg
diff --git a/ogg/activities_b2f8d932/star study_f73e689f/lasers.ogg_1d5ab203 b/ogg/activities/star study/lasers.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star study_f73e689f/lasers.ogg_1d5ab203
rename to ogg/activities/star study/lasers.ogg
diff --git a/ogg/activities_b2f8d932/star study_f73e689f/lockingon.ogg_63b6d584 b/ogg/activities/star study/lockingon.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star study_f73e689f/lockingon.ogg_63b6d584
rename to ogg/activities/star study/lockingon.ogg
diff --git a/ogg/activities_b2f8d932/star study_f73e689f/probelost.ogg_49adcd01 b/ogg/activities/star study/probelost.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star study_f73e689f/probelost.ogg_49adcd01
rename to ogg/activities/star study/probelost.ogg
diff --git a/ogg/activities_b2f8d932/star study_f73e689f/probereturn.ogg_93e6a36e b/ogg/activities/star study/probereturn.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star study_f73e689f/probereturn.ogg_93e6a36e
rename to ogg/activities/star study/probereturn.ogg
diff --git a/ogg/activities_b2f8d932/star study_f73e689f/solarenergy.ogg_b516467f b/ogg/activities/star study/solarenergy.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star study_f73e689f/solarenergy.ogg_b516467f
rename to ogg/activities/star study/solarenergy.ogg
diff --git a/ogg/activities_b2f8d932/star study_f73e689f/srd.ogg_be3d93ed b/ogg/activities/star study/srd.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star study_f73e689f/srd.ogg_be3d93ed
rename to ogg/activities/star study/srd.ogg
diff --git a/ogg/activities_b2f8d932/star study_f73e689f/srr.ogg_5dc231d7 b/ogg/activities/star study/srr.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star study_f73e689f/srr.ogg_5dc231d7
rename to ogg/activities/star study/srr.ogg
diff --git a/ogg/activities_b2f8d932/star study_f73e689f/starprobelaunch.ogg_b4ada455 b/ogg/activities/star study/starprobelaunch.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star study_f73e689f/starprobelaunch.ogg_b4ada455
rename to ogg/activities/star study/starprobelaunch.ogg
diff --git a/ogg/activities_b2f8d932/star study_f73e689f/transfercomplete.ogg_c546aadb b/ogg/activities/star study/transfercomplete.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star study_f73e689f/transfercomplete.ogg_c546aadb
rename to ogg/activities/star study/transfercomplete.ogg
diff --git a/ogg/activities_b2f8d932/star study_f73e689f/transferstardata.ogg_66930019 b/ogg/activities/star study/transferstardata.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/star study_f73e689f/transferstardata.ogg_66930019
rename to ogg/activities/star study/transferstardata.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/aprbegin.ogg_1d8031ba b/ogg/activities/starres/aprbegin.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/aprbegin.ogg_1d8031ba
rename to ogg/activities/starres/aprbegin.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/aprloop.ogg_0dea59db b/ogg/activities/starres/aprloop.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/aprloop.ogg_0dea59db
rename to ogg/activities/starres/aprloop.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/aprstop.ogg_477a1d06 b/ogg/activities/starres/aprstop.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/aprstop.ogg_477a1d06
rename to ogg/activities/starres/aprstop.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/clamp.ogg_20d08254 b/ogg/activities/starres/clamp.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/clamp.ogg_20d08254
rename to ogg/activities/starres/clamp.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/code.ogg_ab9b3221 b/ogg/activities/starres/code.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/code.ogg_ab9b3221
rename to ogg/activities/starres/code.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/coredone.ogg_07bfc6f6 b/ogg/activities/starres/coredone.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/coredone.ogg_07bfc6f6
rename to ogg/activities/starres/coredone.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/coretrue.ogg_f8b50ac3 b/ogg/activities/starres/coretrue.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/coretrue.ogg_f8b50ac3
rename to ogg/activities/starres/coretrue.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/croud.ogg_f4306a49 b/ogg/activities/starres/croud.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/croud.ogg_f4306a49
rename to ogg/activities/starres/croud.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/disk.ogg_c46884ac b/ogg/activities/starres/disk.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/disk.ogg_c46884ac
rename to ogg/activities/starres/disk.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/dock.ogg_5928ebcb b/ogg/activities/starres/dock.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/dock.ogg_5928ebcb
rename to ogg/activities/starres/dock.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/finish.ogg_770af37c b/ogg/activities/starres/finish.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/finish.ogg_770af37c
rename to ogg/activities/starres/finish.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/gearleft.ogg_3152b639 b/ogg/activities/starres/gearleft.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/gearleft.ogg_3152b639
rename to ogg/activities/starres/gearleft.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/gearright.ogg_2097b72c b/ogg/activities/starres/gearright.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/gearright.ogg_2097b72c
rename to ogg/activities/starres/gearright.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/gearup.ogg_ca7fdc8f b/ogg/activities/starres/gearup.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/gearup.ogg_ca7fdc8f
rename to ogg/activities/starres/gearup.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/heat.ogg_82afa554 b/ogg/activities/starres/heat.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/heat.ogg_82afa554
rename to ogg/activities/starres/heat.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/poddie.ogg_73947d7d b/ogg/activities/starres/poddie.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/poddie.ogg_73947d7d
rename to ogg/activities/starres/poddie.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/vacus.ogg_4d41053d b/ogg/activities/starres/vacus.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/vacus.ogg_4d41053d
rename to ogg/activities/starres/vacus.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/vacusdie.ogg_7faf920e b/ogg/activities/starres/vacusdie.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/vacusdie.ogg_7faf920e
rename to ogg/activities/starres/vacusdie.ogg
diff --git a/ogg/activities_b2f8d932/starres_895fa94d/warning.ogg_6d686614 b/ogg/activities/starres/warning.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/starres_895fa94d/warning.ogg_6d686614
rename to ogg/activities/starres/warning.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/announce1.ogg_69edb8f8 b/ogg/activities/trash collection/announce1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/announce1.ogg_69edb8f8
rename to ogg/activities/trash collection/announce1.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/announce2.ogg_3db4ee6a b/ogg/activities/trash collection/announce2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/announce2.ogg_3db4ee6a
rename to ogg/activities/trash collection/announce2.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/announce3.ogg_08d62812 b/ogg/activities/trash collection/announce3.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/announce3.ogg_08d62812
rename to ogg/activities/trash collection/announce3.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/announce4.ogg_a5661532 b/ogg/activities/trash collection/announce4.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/announce4.ogg_a5661532
rename to ogg/activities/trash collection/announce4.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/bayclose.ogg_04aceb06 b/ogg/activities/trash collection/bayclose.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/bayclose.ogg_04aceb06
rename to ogg/activities/trash collection/bayclose.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/bayopen.ogg_53f854a2 b/ogg/activities/trash collection/bayopen.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/bayopen.ogg_53f854a2
rename to ogg/activities/trash collection/bayopen.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/crunch.ogg_a7d60dc1 b/ogg/activities/trash collection/crunch.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/crunch.ogg_a7d60dc1
rename to ogg/activities/trash collection/crunch.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/display.ogg_8479c33c b/ogg/activities/trash collection/display.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/display.ogg_8479c33c
rename to ogg/activities/trash collection/display.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/display1.ogg_4d4c09ec b/ogg/activities/trash collection/display1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/display1.ogg_4d4c09ec
rename to ogg/activities/trash collection/display1.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/display2.ogg_11e03c26 b/ogg/activities/trash collection/display2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/display2.ogg_11e03c26
rename to ogg/activities/trash collection/display2.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/display3.ogg_66300272 b/ogg/activities/trash collection/display3.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/display3.ogg_66300272
rename to ogg/activities/trash collection/display3.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/display4.ogg_a242aa0e b/ogg/activities/trash collection/display4.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/display4.ogg_a242aa0e
rename to ogg/activities/trash collection/display4.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/dronegets.ogg_6d3061b5 b/ogg/activities/trash collection/dronegets.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/dronegets.ogg_6d3061b5
rename to ogg/activities/trash collection/dronegets.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/dronereturn.ogg_1c06d082 b/ogg/activities/trash collection/dronereturn.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/dronereturn.ogg_1c06d082
rename to ogg/activities/trash collection/dronereturn.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/dronesmash.ogg_7747ee37 b/ogg/activities/trash collection/dronesmash.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/dronesmash.ogg_7747ee37
rename to ogg/activities/trash collection/dronesmash.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/extend.ogg_c1e8bd77 b/ogg/activities/trash collection/extend.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/extend.ogg_c1e8bd77
rename to ogg/activities/trash collection/extend.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/fly1.ogg_5c8b8f03 b/ogg/activities/trash collection/fly1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/fly1.ogg_5c8b8f03
rename to ogg/activities/trash collection/fly1.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/fly2.ogg_405f7325 b/ogg/activities/trash collection/fly2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/fly2.ogg_405f7325
rename to ogg/activities/trash collection/fly2.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/fly3.ogg_02601683 b/ogg/activities/trash collection/fly3.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/fly3.ogg_02601683
rename to ogg/activities/trash collection/fly3.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/flydie.ogg_1ab4395b b/ogg/activities/trash collection/flydie.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/flydie.ogg_1ab4395b
rename to ogg/activities/trash collection/flydie.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/flygo.ogg_010b0330 b/ogg/activities/trash collection/flygo.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/flygo.ogg_010b0330
rename to ogg/activities/trash collection/flygo.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/flymut.ogg_02c11ba6 b/ogg/activities/trash collection/flymut.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/flymut.ogg_02c11ba6
rename to ogg/activities/trash collection/flymut.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/fryfly.ogg_926c5163 b/ogg/activities/trash collection/fryfly.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/fryfly.ogg_926c5163
rename to ogg/activities/trash collection/fryfly.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/grind.ogg_41ca031d b/ogg/activities/trash collection/grind.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/grind.ogg_41ca031d
rename to ogg/activities/trash collection/grind.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/investigate.ogg_545fa816 b/ogg/activities/trash collection/investigate.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/investigate.ogg_545fa816
rename to ogg/activities/trash collection/investigate.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/keyboard1.ogg_e4d1b51a b/ogg/activities/trash collection/keyboard1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/keyboard1.ogg_e4d1b51a
rename to ogg/activities/trash collection/keyboard1.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/keyboard2.ogg_28287476 b/ogg/activities/trash collection/keyboard2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/keyboard2.ogg_28287476
rename to ogg/activities/trash collection/keyboard2.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/keyboard3.ogg_dcb3b52f b/ogg/activities/trash collection/keyboard3.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/keyboard3.ogg_dcb3b52f
rename to ogg/activities/trash collection/keyboard3.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/keyboard4.ogg_06d1e50d b/ogg/activities/trash collection/keyboard4.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/keyboard4.ogg_06d1e50d
rename to ogg/activities/trash collection/keyboard4.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/keyboard5.ogg_c190e3a0 b/ogg/activities/trash collection/keyboard5.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/keyboard5.ogg_c190e3a0
rename to ogg/activities/trash collection/keyboard5.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/keyboard6.ogg_248e4de0 b/ogg/activities/trash collection/keyboard6.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/keyboard6.ogg_248e4de0
rename to ogg/activities/trash collection/keyboard6.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/keyboard7.ogg_182fb068 b/ogg/activities/trash collection/keyboard7.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/keyboard7.ogg_182fb068
rename to ogg/activities/trash collection/keyboard7.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/keypress1.ogg_b966d97c b/ogg/activities/trash collection/keypress1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/keypress1.ogg_b966d97c
rename to ogg/activities/trash collection/keypress1.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/keypress2.ogg_1e7d33b9 b/ogg/activities/trash collection/keypress2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/keypress2.ogg_1e7d33b9
rename to ogg/activities/trash collection/keypress2.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/keypress3.ogg_801952ce b/ogg/activities/trash collection/keypress3.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/keypress3.ogg_801952ce
rename to ogg/activities/trash collection/keypress3.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/keypress4.ogg_e6e98c03 b/ogg/activities/trash collection/keypress4.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/keypress4.ogg_e6e98c03
rename to ogg/activities/trash collection/keypress4.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/minikeyboard.ogg_c13acdb6 b/ogg/activities/trash collection/minikeyboard.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/minikeyboard.ogg_c13acdb6
rename to ogg/activities/trash collection/minikeyboard.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/orbitgearretract.ogg_c0dfa93f b/ogg/activities/trash collection/orbitgearretract.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/orbitgearretract.ogg_c0dfa93f
rename to ogg/activities/trash collection/orbitgearretract.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/purify.ogg_971a3141 b/ogg/activities/trash collection/purify.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/purify.ogg_971a3141
rename to ogg/activities/trash collection/purify.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/repairstart.ogg_5de60cf0 b/ogg/activities/trash collection/repairstart.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/repairstart.ogg_5de60cf0
rename to ogg/activities/trash collection/repairstart.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/scoop.ogg_58b6cfb0 b/ogg/activities/trash collection/scoop.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/scoop.ogg_58b6cfb0
rename to ogg/activities/trash collection/scoop.ogg
diff --git a/ogg/activities_b2f8d932/trash collection_5d5cd536/zap.ogg_a1a14556 b/ogg/activities/trash collection/zap.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/trash collection_5d5cd536/zap.ogg_a1a14556
rename to ogg/activities/trash collection/zap.ogg
diff --git a/ogg/activities_b2f8d932/volcanoharvesting_d847ff55/center.ogg_3921c3af b/ogg/activities/volcanoharvesting/center.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanoharvesting_d847ff55/center.ogg_3921c3af
rename to ogg/activities/volcanoharvesting/center.ogg
diff --git a/ogg/activities_b2f8d932/volcanoharvesting_d847ff55/direct1.ogg_b0d9f892 b/ogg/activities/volcanoharvesting/direct1.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanoharvesting_d847ff55/direct1.ogg_b0d9f892
rename to ogg/activities/volcanoharvesting/direct1.ogg
diff --git a/ogg/activities_b2f8d932/volcanoharvesting_d847ff55/direct2.ogg_5d389361 b/ogg/activities/volcanoharvesting/direct2.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanoharvesting_d847ff55/direct2.ogg_5d389361
rename to ogg/activities/volcanoharvesting/direct2.ogg
diff --git a/ogg/activities_b2f8d932/volcanoharvesting_d847ff55/dril.ogg_ad0001d8 b/ogg/activities/volcanoharvesting/dril.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanoharvesting_d847ff55/dril.ogg_ad0001d8
rename to ogg/activities/volcanoharvesting/dril.ogg
diff --git a/ogg/activities_b2f8d932/volcanoharvesting_d847ff55/drill.ogg_dc9e2811 b/ogg/activities/volcanoharvesting/drill.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanoharvesting_d847ff55/drill.ogg_dc9e2811
rename to ogg/activities/volcanoharvesting/drill.ogg
diff --git a/ogg/activities_b2f8d932/volcanoharvesting_d847ff55/geardown.ogg_0dfab4f7 b/ogg/activities/volcanoharvesting/geardown.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanoharvesting_d847ff55/geardown.ogg_0dfab4f7
rename to ogg/activities/volcanoharvesting/geardown.ogg
diff --git a/ogg/activities_b2f8d932/volcanoharvesting_d847ff55/gearup.ogg_912e339c b/ogg/activities/volcanoharvesting/gearup.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanoharvesting_d847ff55/gearup.ogg_912e339c
rename to ogg/activities/volcanoharvesting/gearup.ogg
diff --git a/ogg/activities_b2f8d932/volcanoharvesting_d847ff55/move.ogg_de8e12ff b/ogg/activities/volcanoharvesting/move.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanoharvesting_d847ff55/move.ogg_de8e12ff
rename to ogg/activities/volcanoharvesting/move.ogg
diff --git a/ogg/activities_b2f8d932/volcanoharvesting_d847ff55/release.ogg_27d20a0b b/ogg/activities/volcanoharvesting/release.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanoharvesting_d847ff55/release.ogg_27d20a0b
rename to ogg/activities/volcanoharvesting/release.ogg
diff --git a/ogg/activities_b2f8d932/volcanoharvesting_d847ff55/rockfall.ogg_88cb99bd b/ogg/activities/volcanoharvesting/rockfall.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanoharvesting_d847ff55/rockfall.ogg_88cb99bd
rename to ogg/activities/volcanoharvesting/rockfall.ogg
diff --git a/ogg/activities_b2f8d932/volcanoharvesting_d847ff55/unstable.ogg_085ea6d1 b/ogg/activities/volcanoharvesting/unstable.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanoharvesting_d847ff55/unstable.ogg_085ea6d1
rename to ogg/activities/volcanoharvesting/unstable.ogg
diff --git a/ogg/activities_b2f8d932/volcanoharvesting_d847ff55/volcanotransferbegin.ogg_57331698 b/ogg/activities/volcanoharvesting/volcanotransferbegin.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanoharvesting_d847ff55/volcanotransferbegin.ogg_57331698
rename to ogg/activities/volcanoharvesting/volcanotransferbegin.ogg
diff --git a/ogg/activities_b2f8d932/volcanoharvesting_d847ff55/volcanotransferend.ogg_ff453dfe b/ogg/activities/volcanoharvesting/volcanotransferend.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanoharvesting_d847ff55/volcanotransferend.ogg_ff453dfe
rename to ogg/activities/volcanoharvesting/volcanotransferend.ogg
diff --git a/ogg/activities_b2f8d932/volcanomining_5685fbc1/bubble.ogg_73a23071 b/ogg/activities/volcanomining/bubble.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanomining_5685fbc1/bubble.ogg_73a23071
rename to ogg/activities/volcanomining/bubble.ogg
diff --git a/ogg/activities_b2f8d932/volcanomining_5685fbc1/crunch.ogg_97472fc0 b/ogg/activities/volcanomining/crunch.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanomining_5685fbc1/crunch.ogg_97472fc0
rename to ogg/activities/volcanomining/crunch.ogg
diff --git a/ogg/activities_b2f8d932/volcanomining_5685fbc1/deploy.ogg_5e621ed1 b/ogg/activities/volcanomining/deploy.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanomining_5685fbc1/deploy.ogg_5e621ed1
rename to ogg/activities/volcanomining/deploy.ogg
diff --git a/ogg/activities_b2f8d932/volcanomining_5685fbc1/extend.ogg_fe0780d7 b/ogg/activities/volcanomining/extend.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanomining_5685fbc1/extend.ogg_fe0780d7
rename to ogg/activities/volcanomining/extend.ogg
diff --git a/ogg/activities_b2f8d932/volcanomining_5685fbc1/pipe.ogg_4c01d9f3 b/ogg/activities/volcanomining/pipe.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanomining_5685fbc1/pipe.ogg_4c01d9f3
rename to ogg/activities/volcanomining/pipe.ogg
diff --git a/ogg/activities_b2f8d932/volcanomining_5685fbc1/rock.ogg_5c7ed2e8 b/ogg/activities/volcanomining/rock.ogg
similarity index 100%
rename from ogg/activities_b2f8d932/volcanomining_5685fbc1/rock.ogg_5c7ed2e8
rename to ogg/activities/volcanomining/rock.ogg
diff --git a/ogg/ambiances_c3b0f100/accesstube.ogg_f409e904 b/ogg/ambiances/accesstube.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/accesstube.ogg_f409e904
rename to ogg/ambiances/accesstube.ogg
diff --git a/ogg/ambiances_c3b0f100/aircraft.ogg_9d73ccfd b/ogg/ambiances/aircraft.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/aircraft.ogg_9d73ccfd
rename to ogg/ambiances/aircraft.ogg
diff --git a/ogg/ambiances_c3b0f100/asteroidsurface.ogg_1a27b949 b/ogg/ambiances/asteroidsurface.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/asteroidsurface.ogg_1a27b949
rename to ogg/ambiances/asteroidsurface.ogg
diff --git a/ogg/ambiances_c3b0f100/av.ogg_00804762 b/ogg/ambiances/av.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/av.ogg_00804762
rename to ogg/ambiances/av.ogg
diff --git a/ogg/ambiances_c3b0f100/bar.ogg_3a242c6d b/ogg/ambiances/bar.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/bar.ogg_3a242c6d
rename to ogg/ambiances/bar.ogg
diff --git a/ogg/ambiances_c3b0f100/beach.ogg_465750fa b/ogg/ambiances/beach.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/beach.ogg_465750fa
rename to ogg/ambiances/beach.ogg
diff --git a/ogg/ambiances_c3b0f100/biology.ogg_9d62fb50 b/ogg/ambiances/biology.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/biology.ogg_9d62fb50
rename to ogg/ambiances/biology.ogg
diff --git a/ogg/ambiances_c3b0f100/bowling.ogg_76c5054e b/ogg/ambiances/bowling.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/bowling.ogg_76c5054e
rename to ogg/ambiances/bowling.ogg
diff --git a/ogg/ambiances_c3b0f100/build.ogg_96fcf37f b/ogg/ambiances/build.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/build.ogg_96fcf37f
rename to ogg/ambiances/build.ogg
diff --git a/ogg/ambiances_c3b0f100/cathedral.ogg_18abef10 b/ogg/ambiances/cathedral.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/cathedral.ogg_18abef10
rename to ogg/ambiances/cathedral.ogg
diff --git a/ogg/ambiances_c3b0f100/cave.ogg_c016725c b/ogg/ambiances/cave.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/cave.ogg_c016725c
rename to ogg/ambiances/cave.ogg
diff --git a/ogg/ambiances_c3b0f100/coffeeshop.ogg_09a0a39c b/ogg/ambiances/coffeeshop.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/coffeeshop.ogg_09a0a39c
rename to ogg/ambiances/coffeeshop.ogg
diff --git a/ogg/ambiances_c3b0f100/construction.ogg_ab43f428 b/ogg/ambiances/construction.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/construction.ogg_ab43f428
rename to ogg/ambiances/construction.ogg
diff --git a/ogg/ambiances_c3b0f100/corridor.ogg_4024a091 b/ogg/ambiances/corridor.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/corridor.ogg_4024a091
rename to ogg/ambiances/corridor.ogg
diff --git a/ogg/ambiances_c3b0f100/crushary.ogg_3d9caa01 b/ogg/ambiances/crushary.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/crushary.ogg_3d9caa01
rename to ogg/ambiances/crushary.ogg
diff --git a/ogg/ambiances_c3b0f100/death.ogg_0221488c b/ogg/ambiances/death.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/death.ogg_0221488c
rename to ogg/ambiances/death.ogg
diff --git a/ogg/ambiances_c3b0f100/decontamination.ogg_ba62f8f7 b/ogg/ambiances/decontamination.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/decontamination.ogg_ba62f8f7
rename to ogg/ambiances/decontamination.ogg
diff --git a/ogg/ambiances_c3b0f100/digger.ogg_8d580c39 b/ogg/ambiances/digger.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/digger.ogg_8d580c39
rename to ogg/ambiances/digger.ogg
diff --git a/ogg/ambiances_c3b0f100/dining.ogg_07b5ab47 b/ogg/ambiances/dining.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/dining.ogg_07b5ab47
rename to ogg/ambiances/dining.ogg
diff --git a/ogg/ambiances_c3b0f100/drone operations.ogg_c2451518 b/ogg/ambiances/drone operations.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/drone operations.ogg_c2451518
rename to ogg/ambiances/drone operations.ogg
diff --git a/ogg/ambiances_c3b0f100/escape pod.ogg_d44dde56 b/ogg/ambiances/escape pod.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/escape pod.ogg_d44dde56
rename to ogg/ambiances/escape pod.ogg
diff --git a/ogg/ambiances_c3b0f100/factory control room.ogg_e15ef0e0 b/ogg/ambiances/factory control room.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/factory control room.ogg_e15ef0e0
rename to ogg/ambiances/factory control room.ogg
diff --git a/ogg/ambiances_c3b0f100/factory lounge.ogg_603b94e1 b/ogg/ambiances/factory lounge.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/factory lounge.ogg_603b94e1
rename to ogg/ambiances/factory lounge.ogg
diff --git a/ogg/ambiances_c3b0f100/farm.ogg_8a967bdb b/ogg/ambiances/farm.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/farm.ogg_8a967bdb
rename to ogg/ambiances/farm.ogg
diff --git a/ogg/ambiances_c3b0f100/forest.ogg_9d95eb23 b/ogg/ambiances/forest.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/forest.ogg_9d95eb23
rename to ogg/ambiances/forest.ogg
diff --git a/ogg/ambiances_c3b0f100/forge.ogg_685ed518 b/ogg/ambiances/forge.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/forge.ogg_685ed518
rename to ogg/ambiances/forge.ogg
diff --git a/ogg/ambiances_c3b0f100/garage.ogg_32b12457 b/ogg/ambiances/garage.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/garage.ogg_32b12457
rename to ogg/ambiances/garage.ogg
diff --git a/ogg/ambiances_c3b0f100/garden.ogg_3b63682b b/ogg/ambiances/garden.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/garden.ogg_3b63682b
rename to ogg/ambiances/garden.ogg
diff --git a/ogg/ambiances_c3b0f100/grabber.ogg_625d8051 b/ogg/ambiances/grabber.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/grabber.ogg_625d8051
rename to ogg/ambiances/grabber.ogg
diff --git a/ogg/ambiances_c3b0f100/grinode.ogg_13bc78ef b/ogg/ambiances/grinode.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/grinode.ogg_13bc78ef
rename to ogg/ambiances/grinode.ogg
diff --git a/ogg/ambiances_c3b0f100/hall.ogg_f3c8d22b b/ogg/ambiances/hall.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/hall.ogg_f3c8d22b
rename to ogg/ambiances/hall.ogg
diff --git a/ogg/ambiances_c3b0f100/hallway.ogg_61abd122 b/ogg/ambiances/hallway.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/hallway.ogg_61abd122
rename to ogg/ambiances/hallway.ogg
diff --git a/ogg/ambiances_c3b0f100/hangar.ogg_f6e9fe3e b/ogg/ambiances/hangar.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/hangar.ogg_f6e9fe3e
rename to ogg/ambiances/hangar.ogg
diff --git a/ogg/ambiances_c3b0f100/horses.ogg_4d18538e b/ogg/ambiances/horses.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/horses.ogg_4d18538e
rename to ogg/ambiances/horses.ogg
diff --git a/ogg/ambiances_c3b0f100/inthesky.ogg_448e47f2 b/ogg/ambiances/inthesky.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/inthesky.ogg_448e47f2
rename to ogg/ambiances/inthesky.ogg
diff --git a/ogg/ambiances_c3b0f100/jet.ogg_e520d6ec b/ogg/ambiances/jet.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/jet.ogg_e520d6ec
rename to ogg/ambiances/jet.ogg
diff --git a/ogg/ambiances_c3b0f100/jungle.ogg_ad0e7350 b/ogg/ambiances/jungle.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/jungle.ogg_ad0e7350
rename to ogg/ambiances/jungle.ogg
diff --git a/ogg/ambiances_c3b0f100/lake.ogg_0d956c7f b/ogg/ambiances/lake.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/lake.ogg_0d956c7f
rename to ogg/ambiances/lake.ogg
diff --git a/ogg/ambiances_c3b0f100/landingpad.ogg_13602f1b b/ogg/ambiances/landingpad.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/landingpad.ogg_13602f1b
rename to ogg/ambiances/landingpad.ogg
diff --git a/ogg/ambiances_c3b0f100/library.ogg_d8e7006c b/ogg/ambiances/library.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/library.ogg_d8e7006c
rename to ogg/ambiances/library.ogg
diff --git a/ogg/ambiances_c3b0f100/living room.ogg_74291b07 b/ogg/ambiances/living room.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/living room.ogg_74291b07
rename to ogg/ambiances/living room.ogg
diff --git a/ogg/ambiances_c3b0f100/lobby.ogg_633ac2d9 b/ogg/ambiances/lobby.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/lobby.ogg_633ac2d9
rename to ogg/ambiances/lobby.ogg
diff --git a/ogg/ambiances_c3b0f100/merchantship.ogg_8e70d779 b/ogg/ambiances/merchantship.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/merchantship.ogg_8e70d779
rename to ogg/ambiances/merchantship.ogg
diff --git a/ogg/ambiances_c3b0f100/mining tunnel.ogg_b653eee9 b/ogg/ambiances/mining tunnel.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/mining tunnel.ogg_b653eee9
rename to ogg/ambiances/mining tunnel.ogg
diff --git a/ogg/ambiances_c3b0f100/mountain.ogg_afb836a8 b/ogg/ambiances/mountain.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/mountain.ogg_afb836a8
rename to ogg/ambiances/mountain.ogg
diff --git a/ogg/ambiances_c3b0f100/navidad.ogg_92528a29 b/ogg/ambiances/navidad.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/navidad.ogg_92528a29
rename to ogg/ambiances/navidad.ogg
diff --git a/ogg/ambiances_c3b0f100/night.ogg_4987d900 b/ogg/ambiances/night.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/night.ogg_4987d900
rename to ogg/ambiances/night.ogg
diff --git a/ogg/ambiances_c3b0f100/office.ogg_fdc819a8 b/ogg/ambiances/office.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/office.ogg_fdc819a8
rename to ogg/ambiances/office.ogg
diff --git a/ogg/ambiances_c3b0f100/old_mining tunnel.ogg_cae6cda4 b/ogg/ambiances/old_mining tunnel.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/old_mining tunnel.ogg_cae6cda4
rename to ogg/ambiances/old_mining tunnel.ogg
diff --git a/ogg/ambiances_c3b0f100/oldcar.ogg_f83c1f38 b/ogg/ambiances/oldcar.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/oldcar.ogg_f83c1f38
rename to ogg/ambiances/oldcar.ogg
diff --git a/ogg/ambiances_c3b0f100/operatingroom.ogg_ef98a649 b/ogg/ambiances/operatingroom.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/operatingroom.ogg_ef98a649
rename to ogg/ambiances/operatingroom.ogg
diff --git a/ogg/ambiances_c3b0f100/operationscenter.ogg_c74a7224 b/ogg/ambiances/operationscenter.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/operationscenter.ogg_c74a7224
rename to ogg/ambiances/operationscenter.ogg
diff --git a/ogg/ambiances_c3b0f100/park.ogg_26eb604d b/ogg/ambiances/park.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/park.ogg_26eb604d
rename to ogg/ambiances/park.ogg
diff --git a/ogg/ambiances_c3b0f100/path.ogg_4aca7258 b/ogg/ambiances/path.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/path.ogg_4aca7258
rename to ogg/ambiances/path.ogg
diff --git a/ogg/ambiances_c3b0f100/planetarypod.ogg_10a4e478 b/ogg/ambiances/planetarypod.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/planetarypod.ogg_10a4e478
rename to ogg/ambiances/planetarypod.ogg
diff --git a/ogg/ambiances_c3b0f100/plaza.ogg_49ce54bd b/ogg/ambiances/plaza.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/plaza.ogg_49ce54bd
rename to ogg/ambiances/plaza.ogg
diff --git a/ogg/ambiances_c3b0f100/pool.ogg_46b5c6c1 b/ogg/ambiances/pool.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/pool.ogg_46b5c6c1
rename to ogg/ambiances/pool.ogg
diff --git a/ogg/ambiances_c3b0f100/river1.ogg_e7e34347 b/ogg/ambiances/river1.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/river1.ogg_e7e34347
rename to ogg/ambiances/river1.ogg
diff --git a/ogg/ambiances_c3b0f100/river2.ogg_21711212 b/ogg/ambiances/river2.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/river2.ogg_21711212
rename to ogg/ambiances/river2.ogg
diff --git a/ogg/ambiances_c3b0f100/road.ogg_f7575a2c b/ogg/ambiances/road.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/road.ogg_f7575a2c
rename to ogg/ambiances/road.ogg
diff --git a/ogg/ambiances_c3b0f100/shopping.ogg_26ece7b0 b/ogg/ambiances/shopping.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/shopping.ogg_26ece7b0
rename to ogg/ambiances/shopping.ogg
diff --git a/ogg/ambiances_c3b0f100/space.ogg_eb033d4a b/ogg/ambiances/space.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/space.ogg_eb033d4a
rename to ogg/ambiances/space.ogg
diff --git a/ogg/ambiances_c3b0f100/stage.ogg_d2aa222b b/ogg/ambiances/stage.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/stage.ogg_d2aa222b
rename to ogg/ambiances/stage.ogg
diff --git a/ogg/ambiances_c3b0f100/storage.ogg_02aed2e3 b/ogg/ambiances/storage.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/storage.ogg_02aed2e3
rename to ogg/ambiances/storage.ogg
diff --git a/ogg/ambiances_c3b0f100/store.ogg_f8c4f166 b/ogg/ambiances/store.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/store.ogg_f8c4f166
rename to ogg/ambiances/store.ogg
diff --git a/ogg/ambiances_c3b0f100/swamp.ogg_c8d0986f b/ogg/ambiances/swamp.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/swamp.ogg_c8d0986f
rename to ogg/ambiances/swamp.ogg
diff --git a/ogg/ambiances_c3b0f100/teleport.ogg_e3b4e52d b/ogg/ambiances/teleport.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/teleport.ogg_e3b4e52d
rename to ogg/ambiances/teleport.ogg
diff --git a/ogg/ambiances_c3b0f100/theater.ogg_d4a068c4 b/ogg/ambiances/theater.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/theater.ogg_d4a068c4
rename to ogg/ambiances/theater.ogg
diff --git a/ogg/ambiances_c3b0f100/transportvehicle.ogg_ef22cd59 b/ogg/ambiances/transportvehicle.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/transportvehicle.ogg_ef22cd59
rename to ogg/ambiances/transportvehicle.ogg
diff --git a/ogg/ambiances_c3b0f100/trash.ogg_13547e62 b/ogg/ambiances/trash.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/trash.ogg_13547e62
rename to ogg/ambiances/trash.ogg
diff --git a/ogg/ambiances_c3b0f100/trauma.ogg_3bb4f9a2 b/ogg/ambiances/trauma.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/trauma.ogg_3bb4f9a2
rename to ogg/ambiances/trauma.ogg
diff --git a/ogg/ambiances_c3b0f100/turret pod.ogg_6b52e7d1 b/ogg/ambiances/turret pod.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/turret pod.ogg_6b52e7d1
rename to ogg/ambiances/turret pod.ogg
diff --git a/ogg/ambiances_c3b0f100/vehiclemisc.ogg_e61297f6 b/ogg/ambiances/vehiclemisc.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/vehiclemisc.ogg_e61297f6
rename to ogg/ambiances/vehiclemisc.ogg
diff --git a/ogg/ambiances_c3b0f100/vehiclenopower.ogg_6d609c54 b/ogg/ambiances/vehiclenopower.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/vehiclenopower.ogg_6d609c54
rename to ogg/ambiances/vehiclenopower.ogg
diff --git a/ogg/ambiances_c3b0f100/volcano.ogg_9df2845b b/ogg/ambiances/volcano.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/volcano.ogg_9df2845b
rename to ogg/ambiances/volcano.ogg
diff --git a/ogg/ambiances_c3b0f100/waterfall.ogg_00dd4e11 b/ogg/ambiances/waterfall.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/waterfall.ogg_00dd4e11
rename to ogg/ambiances/waterfall.ogg
diff --git a/ogg/ambiances_c3b0f100/woods.ogg_5b1a7e54 b/ogg/ambiances/woods.ogg
similarity index 100%
rename from ogg/ambiances_c3b0f100/woods.ogg_5b1a7e54
rename to ogg/ambiances/woods.ogg
diff --git a/ogg/general_265f6970/auction_225a28f1/auction bell1.ogg_60b502c1 b/ogg/general/auction/auction bell1.ogg
similarity index 100%
rename from ogg/general_265f6970/auction_225a28f1/auction bell1.ogg_60b502c1
rename to ogg/general/auction/auction bell1.ogg
diff --git a/ogg/general_265f6970/auction_225a28f1/auction bell2.ogg_a5e8bd59 b/ogg/general/auction/auction bell2.ogg
similarity index 100%
rename from ogg/general_265f6970/auction_225a28f1/auction bell2.ogg_a5e8bd59
rename to ogg/general/auction/auction bell2.ogg
diff --git a/ogg/general_265f6970/auction_225a28f1/auction bell3.ogg_8d7a4a75 b/ogg/general/auction/auction bell3.ogg
similarity index 100%
rename from ogg/general_265f6970/auction_225a28f1/auction bell3.ogg_8d7a4a75
rename to ogg/general/auction/auction bell3.ogg
diff --git a/ogg/general_265f6970/auction_225a28f1/bid.ogg_9f4791ef b/ogg/general/auction/bid.ogg
similarity index 100%
rename from ogg/general_265f6970/auction_225a28f1/bid.ogg_9f4791ef
rename to ogg/general/auction/bid.ogg
diff --git a/ogg/general_265f6970/auction_225a28f1/item sold.ogg_8e7e61cf b/ogg/general/auction/item sold.ogg
similarity index 100%
rename from ogg/general_265f6970/auction_225a28f1/item sold.ogg_8e7e61cf
rename to ogg/general/auction/item sold.ogg
diff --git a/ogg/general_265f6970/auction_225a28f1/start auction.ogg_be0fec88 b/ogg/general/auction/start auction.ogg
similarity index 100%
rename from ogg/general_265f6970/auction_225a28f1/start auction.ogg_be0fec88
rename to ogg/general/auction/start auction.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/babyburps.ogg_a7931fc3 b/ogg/general/baby/babyburps.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/babyburps.ogg_a7931fc3
rename to ogg/general/baby/babyburps.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/babycoo.ogg_ae11de7c b/ogg/general/baby/babycoo.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/babycoo.ogg_ae11de7c
rename to ogg/general/baby/babycoo.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/babydrinks.ogg_30adfc27 b/ogg/general/baby/babydrinks.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/babydrinks.ogg_30adfc27
rename to ogg/general/baby/babydrinks.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/babyeat.ogg_693f1623 b/ogg/general/baby/babyeat.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/babyeat.ogg_693f1623
rename to ogg/general/baby/babyeat.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/babyhappy.ogg_3ac0821b b/ogg/general/baby/babyhappy.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/babyhappy.ogg_3ac0821b
rename to ogg/general/baby/babyhappy.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/babylaugh.ogg_5360ca92 b/ogg/general/baby/babylaugh.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/babylaugh.ogg_5360ca92
rename to ogg/general/baby/babylaugh.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/babylaugh1.ogg_f7ad5863 b/ogg/general/baby/babylaugh1.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/babylaugh1.ogg_f7ad5863
rename to ogg/general/baby/babylaugh1.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/babylaugh2.ogg_418d083a b/ogg/general/baby/babylaugh2.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/babylaugh2.ogg_418d083a
rename to ogg/general/baby/babylaugh2.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/babyscream1.ogg_74be917a b/ogg/general/baby/babyscream1.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/babyscream1.ogg_74be917a
rename to ogg/general/baby/babyscream1.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/babyscream2.ogg_d1fa3175 b/ogg/general/baby/babyscream2.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/babyscream2.ogg_d1fa3175
rename to ogg/general/baby/babyscream2.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/babyscream3.ogg_61bb0210 b/ogg/general/baby/babyscream3.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/babyscream3.ogg_61bb0210
rename to ogg/general/baby/babyscream3.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/babyscream4.ogg_729776c9 b/ogg/general/baby/babyscream4.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/babyscream4.ogg_729776c9
rename to ogg/general/baby/babyscream4.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/babysob1.ogg_3abec8ea b/ogg/general/baby/babysob1.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/babysob1.ogg_3abec8ea
rename to ogg/general/baby/babysob1.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/babysob2.ogg_063d9796 b/ogg/general/baby/babysob2.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/babysob2.ogg_063d9796
rename to ogg/general/baby/babysob2.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/babywhimper1.ogg_0ba55fcf b/ogg/general/baby/babywhimper1.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/babywhimper1.ogg_0ba55fcf
rename to ogg/general/baby/babywhimper1.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/babywhimper2.ogg_24160113 b/ogg/general/baby/babywhimper2.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/babywhimper2.ogg_24160113
rename to ogg/general/baby/babywhimper2.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/babywhine.ogg_0dcb23f0 b/ogg/general/baby/babywhine.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/babywhine.ogg_0dcb23f0
rename to ogg/general/baby/babywhine.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/beams.ogg_bd6e1299 b/ogg/general/baby/beams.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/beams.ogg_bd6e1299
rename to ogg/general/baby/beams.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/bounce.ogg_d20025b2 b/ogg/general/baby/bounce.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/bounce.ogg_d20025b2
rename to ogg/general/baby/bounce.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/byawn1.ogg_1ddc8746 b/ogg/general/baby/byawn1.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/byawn1.ogg_1ddc8746
rename to ogg/general/baby/byawn1.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/byawn2.ogg_194e1bb2 b/ogg/general/baby/byawn2.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/byawn2.ogg_194e1bb2
rename to ogg/general/baby/byawn2.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/changing.ogg_f912b4c8 b/ogg/general/baby/changing.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/changing.ogg_f912b4c8
rename to ogg/general/baby/changing.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/clap.ogg_8ee58a10 b/ogg/general/baby/clap.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/clap.ogg_8ee58a10
rename to ogg/general/baby/clap.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/cough.ogg_c2151f3f b/ogg/general/baby/cough.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/cough.ogg_c2151f3f
rename to ogg/general/baby/cough.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/dragonroar.ogg_eb270ef1 b/ogg/general/baby/dragonroar.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/dragonroar.ogg_eb270ef1
rename to ogg/general/baby/dragonroar.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/giggle.ogg_14252fbc b/ogg/general/baby/giggle.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/giggle.ogg_14252fbc
rename to ogg/general/baby/giggle.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/grunts.ogg_31044a43 b/ogg/general/baby/grunts.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/grunts.ogg_31044a43
rename to ogg/general/baby/grunts.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/hugs.ogg_fbf70db0 b/ogg/general/baby/hugs.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/hugs.ogg_fbf70db0
rename to ogg/general/baby/hugs.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/peekaboo1.ogg_17f5335e b/ogg/general/baby/peekaboo1.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/peekaboo1.ogg_17f5335e
rename to ogg/general/baby/peekaboo1.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/peekaboo2.ogg_cf938ea9 b/ogg/general/baby/peekaboo2.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/peekaboo2.ogg_cf938ea9
rename to ogg/general/baby/peekaboo2.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/peekaboo3.ogg_eb6e92c4 b/ogg/general/baby/peekaboo3.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/peekaboo3.ogg_eb6e92c4
rename to ogg/general/baby/peekaboo3.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/roar.ogg_5c137f82 b/ogg/general/baby/roar.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/roar.ogg_5c137f82
rename to ogg/general/baby/roar.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/sneeze1.ogg_3333a3a7 b/ogg/general/baby/sneeze1.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/sneeze1.ogg_3333a3a7
rename to ogg/general/baby/sneeze1.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/sneeze2.ogg_c8c61862 b/ogg/general/baby/sneeze2.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/sneeze2.ogg_c8c61862
rename to ogg/general/baby/sneeze2.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/sob.ogg_f805b0f6 b/ogg/general/baby/sob.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/sob.ogg_f805b0f6
rename to ogg/general/baby/sob.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/take_diaper.ogg_8d233007 b/ogg/general/baby/take_diaper.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/take_diaper.ogg_8d233007
rename to ogg/general/baby/take_diaper.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/take_wipe.ogg_60b45f13 b/ogg/general/baby/take_wipe.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/take_wipe.ogg_60b45f13
rename to ogg/general/baby/take_wipe.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/tease.ogg_5c97623a b/ogg/general/baby/tease.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/tease.ogg_5c97623a
rename to ogg/general/baby/tease.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/tester.txt_3ba6772e b/ogg/general/baby/tester.txt
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/tester.txt_3ba6772e
rename to ogg/general/baby/tester.txt
diff --git a/ogg/general_265f6970/baby_ea812089/tickle1.ogg_9009d6b1 b/ogg/general/baby/tickle1.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/tickle1.ogg_9009d6b1
rename to ogg/general/baby/tickle1.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/tickle2.ogg_88ac498a b/ogg/general/baby/tickle2.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/tickle2.ogg_88ac498a
rename to ogg/general/baby/tickle2.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/tickle3.ogg_58d1cd59 b/ogg/general/baby/tickle3.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/tickle3.ogg_58d1cd59
rename to ogg/general/baby/tickle3.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/tickle4.ogg_b4a53464 b/ogg/general/baby/tickle4.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/tickle4.ogg_b4a53464
rename to ogg/general/baby/tickle4.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/tickle5.ogg_942d0e90 b/ogg/general/baby/tickle5.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/tickle5.ogg_942d0e90
rename to ogg/general/baby/tickle5.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/tickle6.ogg_80271b57 b/ogg/general/baby/tickle6.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/tickle6.ogg_80271b57
rename to ogg/general/baby/tickle6.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/tickle7.ogg_de8119e0 b/ogg/general/baby/tickle7.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/tickle7.ogg_de8119e0
rename to ogg/general/baby/tickle7.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/tickle8.ogg_ed12f6ce b/ogg/general/baby/tickle8.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/tickle8.ogg_ed12f6ce
rename to ogg/general/baby/tickle8.ogg
diff --git a/ogg/general_265f6970/baby_ea812089/waves.ogg_81ffdff4 b/ogg/general/baby/waves.ogg
similarity index 100%
rename from ogg/general_265f6970/baby_ea812089/waves.ogg_81ffdff4
rename to ogg/general/baby/waves.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/accelerate.ogg_bad9958f b/ogg/general/cars/accelerate.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/accelerate.ogg_bad9958f
rename to ogg/general/cars/accelerate.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/decelerate.ogg_24e45a67 b/ogg/general/cars/decelerate.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/decelerate.ogg_24e45a67
rename to ogg/general/cars/decelerate.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/driving.ogg_6bede8fc b/ogg/general/cars/driving.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/driving.ogg_6bede8fc
rename to ogg/general/cars/driving.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/exit.ogg_68541d53 b/ogg/general/cars/exit.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/exit.ogg_68541d53
rename to ogg/general/cars/exit.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/flip1.ogg_d450f123 b/ogg/general/cars/flip1.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/flip1.ogg_d450f123
rename to ogg/general/cars/flip1.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/flip1_out.ogg_87e1237d b/ogg/general/cars/flip1_out.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/flip1_out.ogg_87e1237d
rename to ogg/general/cars/flip1_out.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/handbrake_down.ogg_aa24eadf b/ogg/general/cars/handbrake_down.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/handbrake_down.ogg_aa24eadf
rename to ogg/general/cars/handbrake_down.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/handbrake_up.ogg_cd1fa5cd b/ogg/general/cars/handbrake_up.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/handbrake_up.ogg_cd1fa5cd
rename to ogg/general/cars/handbrake_up.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/horn.ogg_452d95e1 b/ogg/general/cars/horn.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/horn.ogg_452d95e1
rename to ogg/general/cars/horn.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/idle.ogg_02c64b06 b/ogg/general/cars/idle.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/idle.ogg_02c64b06
rename to ogg/general/cars/idle.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/key1.ogg_6c67b5e7 b/ogg/general/cars/key1.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/key1.ogg_6c67b5e7
rename to ogg/general/cars/key1.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/key2.ogg_277138bc b/ogg/general/cars/key2.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/key2.ogg_277138bc
rename to ogg/general/cars/key2.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/pullaway_out1.ogg_eddd1adf b/ogg/general/cars/pullaway_out1.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/pullaway_out1.ogg_eddd1adf
rename to ogg/general/cars/pullaway_out1.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/pullaway_out2.ogg_4f382431 b/ogg/general/cars/pullaway_out2.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/pullaway_out2.ogg_4f382431
rename to ogg/general/cars/pullaway_out2.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/pullaway_out3.ogg_749660f7 b/ogg/general/cars/pullaway_out3.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/pullaway_out3.ogg_749660f7
rename to ogg/general/cars/pullaway_out3.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/pullaway_out4.ogg_1b845aca b/ogg/general/cars/pullaway_out4.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/pullaway_out4.ogg_1b845aca
rename to ogg/general/cars/pullaway_out4.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/rev1.ogg_ef32c271 b/ogg/general/cars/rev1.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/rev1.ogg_ef32c271
rename to ogg/general/cars/rev1.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/rev2.ogg_231e5178 b/ogg/general/cars/rev2.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/rev2.ogg_231e5178
rename to ogg/general/cars/rev2.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/rev3.ogg_a97d6368 b/ogg/general/cars/rev3.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/rev3.ogg_a97d6368
rename to ogg/general/cars/rev3.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/rev4.ogg_658b9903 b/ogg/general/cars/rev4.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/rev4.ogg_658b9903
rename to ogg/general/cars/rev4.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/rev5.ogg_c43cfa27 b/ogg/general/cars/rev5.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/rev5.ogg_c43cfa27
rename to ogg/general/cars/rev5.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/rev_out1.ogg_d34490a6 b/ogg/general/cars/rev_out1.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/rev_out1.ogg_d34490a6
rename to ogg/general/cars/rev_out1.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/rev_out2.ogg_de5272b9 b/ogg/general/cars/rev_out2.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/rev_out2.ogg_de5272b9
rename to ogg/general/cars/rev_out2.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/rev_out3.ogg_35bad90a b/ogg/general/cars/rev_out3.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/rev_out3.ogg_35bad90a
rename to ogg/general/cars/rev_out3.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/rev_out4.ogg_e6af4bef b/ogg/general/cars/rev_out4.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/rev_out4.ogg_e6af4bef
rename to ogg/general/cars/rev_out4.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/reverse.ogg_82c58c49 b/ogg/general/cars/reverse.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/reverse.ogg_82c58c49
rename to ogg/general/cars/reverse.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/shutdown.ogg_947bd058 b/ogg/general/cars/shutdown.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/shutdown.ogg_947bd058
rename to ogg/general/cars/shutdown.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/shutdown_out.ogg_285f91bb b/ogg/general/cars/shutdown_out.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/shutdown_out.ogg_285f91bb
rename to ogg/general/cars/shutdown_out.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/skid1.ogg_760827de b/ogg/general/cars/skid1.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/skid1.ogg_760827de
rename to ogg/general/cars/skid1.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/skid2.ogg_9e9e412d b/ogg/general/cars/skid2.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/skid2.ogg_9e9e412d
rename to ogg/general/cars/skid2.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/skid3.ogg_e1cbb054 b/ogg/general/cars/skid3.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/skid3.ogg_e1cbb054
rename to ogg/general/cars/skid3.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/skidin1.ogg_756a0364 b/ogg/general/cars/skidin1.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/skidin1.ogg_756a0364
rename to ogg/general/cars/skidin1.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/skidin2.ogg_00605d64 b/ogg/general/cars/skidin2.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/skidin2.ogg_00605d64
rename to ogg/general/cars/skidin2.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/skidin3.ogg_28401a47 b/ogg/general/cars/skidin3.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/skidin3.ogg_28401a47
rename to ogg/general/cars/skidin3.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/start.ogg_44f2138c b/ogg/general/cars/start.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/start.ogg_44f2138c
rename to ogg/general/cars/start.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/start_out.ogg_1bce3946 b/ogg/general/cars/start_out.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/start_out.ogg_1bce3946
rename to ogg/general/cars/start_out.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/stop_out1.ogg_546ce452 b/ogg/general/cars/stop_out1.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/stop_out1.ogg_546ce452
rename to ogg/general/cars/stop_out1.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/stop_out2.ogg_f221dbcf b/ogg/general/cars/stop_out2.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/stop_out2.ogg_f221dbcf
rename to ogg/general/cars/stop_out2.ogg
diff --git a/ogg/general_265f6970/cars_49b9958f/wallcrash.ogg_02748d12 b/ogg/general/cars/wallcrash.ogg
similarity index 100%
rename from ogg/general_265f6970/cars_49b9958f/wallcrash.ogg_02748d12
rename to ogg/general/cars/wallcrash.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/default_b8f04ddd/fire1.ogg_9de6d5a4 b/ogg/general/combat/abilities/default/fire1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/default_b8f04ddd/fire1.ogg_9de6d5a4
rename to ogg/general/combat/abilities/default/fire1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/default_b8f04ddd/fire2.ogg_10bde14d b/ogg/general/combat/abilities/default/fire2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/default_b8f04ddd/fire2.ogg_10bde14d
rename to ogg/general/combat/abilities/default/fire2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/default_b8f04ddd/fire3.ogg_46055e84 b/ogg/general/combat/abilities/default/fire3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/default_b8f04ddd/fire3.ogg_46055e84
rename to ogg/general/combat/abilities/default/fire3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/default_b8f04ddd/metal1.ogg_4ef0cbad b/ogg/general/combat/abilities/default/metal1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/default_b8f04ddd/metal1.ogg_4ef0cbad
rename to ogg/general/combat/abilities/default/metal1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/default_b8f04ddd/metal2.ogg_e1624de1 b/ogg/general/combat/abilities/default/metal2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/default_b8f04ddd/metal2.ogg_e1624de1
rename to ogg/general/combat/abilities/default/metal2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/default_b8f04ddd/metal3.ogg_040b00b0 b/ogg/general/combat/abilities/default/metal3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/default_b8f04ddd/metal3.ogg_040b00b0
rename to ogg/general/combat/abilities/default/metal3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/flurry_884bf4e1/fire1.ogg_0787da65 b/ogg/general/combat/abilities/flurry/fire1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/flurry_884bf4e1/fire1.ogg_0787da65
rename to ogg/general/combat/abilities/flurry/fire1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/flurry_884bf4e1/fire2.ogg_e1773d6c b/ogg/general/combat/abilities/flurry/fire2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/flurry_884bf4e1/fire2.ogg_e1773d6c
rename to ogg/general/combat/abilities/flurry/fire2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/flurry_884bf4e1/fire3.ogg_416425ba b/ogg/general/combat/abilities/flurry/fire3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/flurry_884bf4e1/fire3.ogg_416425ba
rename to ogg/general/combat/abilities/flurry/fire3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/flurry_884bf4e1/flesh1.ogg_fe2f3be8 b/ogg/general/combat/abilities/flurry/flesh1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/flurry_884bf4e1/flesh1.ogg_fe2f3be8
rename to ogg/general/combat/abilities/flurry/flesh1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/flurry_884bf4e1/flesh2.ogg_4f68a02b b/ogg/general/combat/abilities/flurry/flesh2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/flurry_884bf4e1/flesh2.ogg_4f68a02b
rename to ogg/general/combat/abilities/flurry/flesh2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/flurry_884bf4e1/flesh3.ogg_e6760ee6 b/ogg/general/combat/abilities/flurry/flesh3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/flurry_884bf4e1/flesh3.ogg_e6760ee6
rename to ogg/general/combat/abilities/flurry/flesh3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/flurry_884bf4e1/metal1.ogg_fbeb06ec b/ogg/general/combat/abilities/flurry/metal1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/flurry_884bf4e1/metal1.ogg_fbeb06ec
rename to ogg/general/combat/abilities/flurry/metal1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/flurry_884bf4e1/metal2.ogg_6b6b86b0 b/ogg/general/combat/abilities/flurry/metal2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/flurry_884bf4e1/metal2.ogg_6b6b86b0
rename to ogg/general/combat/abilities/flurry/metal2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/flurry_884bf4e1/metal3.ogg_fa9ec195 b/ogg/general/combat/abilities/flurry/metal3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/flurry_884bf4e1/metal3.ogg_fa9ec195
rename to ogg/general/combat/abilities/flurry/metal3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/haymaker_a662faf5/fire1.ogg_11f8061e b/ogg/general/combat/abilities/haymaker/fire1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/haymaker_a662faf5/fire1.ogg_11f8061e
rename to ogg/general/combat/abilities/haymaker/fire1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/haymaker_a662faf5/fire2.ogg_88750ccc b/ogg/general/combat/abilities/haymaker/fire2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/haymaker_a662faf5/fire2.ogg_88750ccc
rename to ogg/general/combat/abilities/haymaker/fire2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/haymaker_a662faf5/fire3.ogg_e34c2c16 b/ogg/general/combat/abilities/haymaker/fire3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/haymaker_a662faf5/fire3.ogg_e34c2c16
rename to ogg/general/combat/abilities/haymaker/fire3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/haymaker_a662faf5/metal1.ogg_ff7037ac b/ogg/general/combat/abilities/haymaker/metal1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/haymaker_a662faf5/metal1.ogg_ff7037ac
rename to ogg/general/combat/abilities/haymaker/metal1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/haymaker_a662faf5/metal2.ogg_de5485c0 b/ogg/general/combat/abilities/haymaker/metal2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/haymaker_a662faf5/metal2.ogg_de5485c0
rename to ogg/general/combat/abilities/haymaker/metal2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/haymaker_a662faf5/metal3.ogg_ed22f888 b/ogg/general/combat/abilities/haymaker/metal3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/haymaker_a662faf5/metal3.ogg_ed22f888
rename to ogg/general/combat/abilities/haymaker/metal3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/left hook_5cd14bfd/fire1.ogg_54b998d8 b/ogg/general/combat/abilities/left hook/fire1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/left hook_5cd14bfd/fire1.ogg_54b998d8
rename to ogg/general/combat/abilities/left hook/fire1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/left hook_5cd14bfd/fire2.ogg_700871fd b/ogg/general/combat/abilities/left hook/fire2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/left hook_5cd14bfd/fire2.ogg_700871fd
rename to ogg/general/combat/abilities/left hook/fire2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/left hook_5cd14bfd/fire3.ogg_22612de7 b/ogg/general/combat/abilities/left hook/fire3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/left hook_5cd14bfd/fire3.ogg_22612de7
rename to ogg/general/combat/abilities/left hook/fire3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/left hook_5cd14bfd/metal1.ogg_1486f51b b/ogg/general/combat/abilities/left hook/metal1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/left hook_5cd14bfd/metal1.ogg_1486f51b
rename to ogg/general/combat/abilities/left hook/metal1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/left hook_5cd14bfd/metal2.ogg_249372f0 b/ogg/general/combat/abilities/left hook/metal2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/left hook_5cd14bfd/metal2.ogg_249372f0
rename to ogg/general/combat/abilities/left hook/metal2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/left hook_5cd14bfd/metal3.ogg_67e69fc8 b/ogg/general/combat/abilities/left hook/metal3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/left hook_5cd14bfd/metal3.ogg_67e69fc8
rename to ogg/general/combat/abilities/left hook/metal3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/right hook_0cb98932/fire1.ogg_c6c8e160 b/ogg/general/combat/abilities/right hook/fire1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/right hook_0cb98932/fire1.ogg_c6c8e160
rename to ogg/general/combat/abilities/right hook/fire1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/right hook_0cb98932/fire2.ogg_380e80b6 b/ogg/general/combat/abilities/right hook/fire2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/right hook_0cb98932/fire2.ogg_380e80b6
rename to ogg/general/combat/abilities/right hook/fire2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/right hook_0cb98932/fire3.ogg_39ee73ee b/ogg/general/combat/abilities/right hook/fire3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/right hook_0cb98932/fire3.ogg_39ee73ee
rename to ogg/general/combat/abilities/right hook/fire3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/right hook_0cb98932/metal1.ogg_7b2e4c5c b/ogg/general/combat/abilities/right hook/metal1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/right hook_0cb98932/metal1.ogg_7b2e4c5c
rename to ogg/general/combat/abilities/right hook/metal1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/right hook_0cb98932/metal2.ogg_4c99c391 b/ogg/general/combat/abilities/right hook/metal2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/right hook_0cb98932/metal2.ogg_4c99c391
rename to ogg/general/combat/abilities/right hook/metal2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/abilities_4f837b28/right hook_0cb98932/metal3.ogg_ebc55451 b/ogg/general/combat/abilities/right hook/metal3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/abilities_4f837b28/right hook_0cb98932/metal3.ogg_ebc55451
rename to ogg/general/combat/abilities/right hook/metal3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/attack.ogg_8e135d64 b/ogg/general/combat/aircraft/attack.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/attack.ogg_8e135d64
rename to ogg/general/combat/aircraft/attack.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/autopilot.ogg_030f8344 b/ogg/general/combat/aircraft/autopilot.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/autopilot.ogg_030f8344
rename to ogg/general/combat/aircraft/autopilot.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/autopilotdis.ogg_b49dce3b b/ogg/general/combat/aircraft/autopilotdis.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/autopilotdis.ogg_b49dce3b
rename to ogg/general/combat/aircraft/autopilotdis.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/autopilotinput.ogg_6137dc95 b/ogg/general/combat/aircraft/autopilotinput.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/autopilotinput.ogg_6137dc95
rename to ogg/general/combat/aircraft/autopilotinput.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/autopilotloop.ogg_d068f0ff b/ogg/general/combat/aircraft/autopilotloop.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/autopilotloop.ogg_d068f0ff
rename to ogg/general/combat/aircraft/autopilotloop.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/autopilotstart.ogg_b79191fa b/ogg/general/combat/aircraft/autopilotstart.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/autopilotstart.ogg_b79191fa
rename to ogg/general/combat/aircraft/autopilotstart.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/autopilotstop.ogg_1c4edf31 b/ogg/general/combat/aircraft/autopilotstop.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/autopilotstop.ogg_1c4edf31
rename to ogg/general/combat/aircraft/autopilotstop.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/boomin.ogg_1c803d9f b/ogg/general/combat/aircraft/boomin.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/boomin.ogg_1c803d9f
rename to ogg/general/combat/aircraft/boomin.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/boomout.ogg_48c83a3f b/ogg/general/combat/aircraft/boomout.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/boomout.ogg_48c83a3f
rename to ogg/general/combat/aircraft/boomout.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/directional.ogg_1a4326d1 b/ogg/general/combat/aircraft/directional.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/directional.ogg_1a4326d1
rename to ogg/general/combat/aircraft/directional.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/eng.ogg_2ee6e00c b/ogg/general/combat/aircraft/eng.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/eng.ogg_2ee6e00c
rename to ogg/general/combat/aircraft/eng.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/enginestart.ogg_e6982d91 b/ogg/general/combat/aircraft/enginestart.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/enginestart.ogg_e6982d91
rename to ogg/general/combat/aircraft/enginestart.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/enginestop.ogg_2963de72 b/ogg/general/combat/aircraft/enginestop.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/enginestop.ogg_2963de72
rename to ogg/general/combat/aircraft/enginestop.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/idle.ogg_2bb53b94 b/ogg/general/combat/aircraft/idle.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/idle.ogg_2bb53b94
rename to ogg/general/combat/aircraft/idle.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/landing.ogg_3ada310f b/ogg/general/combat/aircraft/landing.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/landing.ogg_3ada310f
rename to ogg/general/combat/aircraft/landing.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/laserin.ogg_bca7038e b/ogg/general/combat/aircraft/laserin.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/laserin.ogg_bca7038e
rename to ogg/general/combat/aircraft/laserin.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/laserout.ogg_8628fa2c b/ogg/general/combat/aircraft/laserout.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/laserout.ogg_8628fa2c
rename to ogg/general/combat/aircraft/laserout.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/missile.ogg_e55c25fd b/ogg/general/combat/aircraft/missile.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/missile.ogg_e55c25fd
rename to ogg/general/combat/aircraft/missile.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/missilehit.ogg_8af8abf6 b/ogg/general/combat/aircraft/missilehit.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/missilehit.ogg_8af8abf6
rename to ogg/general/combat/aircraft/missilehit.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/missilewarn.ogg_c2d8790a b/ogg/general/combat/aircraft/missilewarn.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/missilewarn.ogg_c2d8790a
rename to ogg/general/combat/aircraft/missilewarn.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/reachedge.ogg_08580583 b/ogg/general/combat/aircraft/reachedge.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/reachedge.ogg_08580583
rename to ogg/general/combat/aircraft/reachedge.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/rocketgroundin.ogg_c195311c b/ogg/general/combat/aircraft/rocketgroundin.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/rocketgroundin.ogg_c195311c
rename to ogg/general/combat/aircraft/rocketgroundin.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/rocketgroundout.ogg_53e60416 b/ogg/general/combat/aircraft/rocketgroundout.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/rocketgroundout.ogg_53e60416
rename to ogg/general/combat/aircraft/rocketgroundout.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/takeoff.ogg_378dfadc b/ogg/general/combat/aircraft/takeoff.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/takeoff.ogg_378dfadc
rename to ogg/general/combat/aircraft/takeoff.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/tclear.ogg_cdb6cd5d b/ogg/general/combat/aircraft/tclear.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/tclear.ogg_cdb6cd5d
rename to ogg/general/combat/aircraft/tclear.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/turn.ogg_cc241103 b/ogg/general/combat/aircraft/turn.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/aircraft_ad9e32db/turn.ogg_cc241103
rename to ogg/general/combat/aircraft/turn.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/aim.ogg_17def13b b/ogg/general/combat/airpod/aim.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/aim.ogg_17def13b
rename to ogg/general/combat/airpod/aim.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/e.ogg_0531eda3 b/ogg/general/combat/airpod/e.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/e.ogg_0531eda3
rename to ogg/general/combat/airpod/e.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/e1.ogg_73b8e877 b/ogg/general/combat/airpod/e1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/e1.ogg_73b8e877
rename to ogg/general/combat/airpod/e1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/ehit.ogg_5879a761 b/ogg/general/combat/airpod/ehit.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/ehit.ogg_5879a761
rename to ogg/general/combat/airpod/ehit.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/help.ogg_109249e1 b/ogg/general/combat/airpod/help.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/help.ogg_109249e1
rename to ogg/general/combat/airpod/help.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/laser.ogg_895e36e6 b/ogg/general/combat/airpod/laser.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/laser.ogg_895e36e6
rename to ogg/general/combat/airpod/laser.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/laserstop.ogg_9357f540 b/ogg/general/combat/airpod/laserstop.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/laserstop.ogg_9357f540
rename to ogg/general/combat/airpod/laserstop.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/n.ogg_d207fc74 b/ogg/general/combat/airpod/n.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/n.ogg_d207fc74
rename to ogg/general/combat/airpod/n.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/n1.ogg_723d3ca1 b/ogg/general/combat/airpod/n1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/n1.ogg_723d3ca1
rename to ogg/general/combat/airpod/n1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/ne.ogg_44fa0d63 b/ogg/general/combat/airpod/ne.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/ne.ogg_44fa0d63
rename to ogg/general/combat/airpod/ne.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/ne1.ogg_f7713c35 b/ogg/general/combat/airpod/ne1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/ne1.ogg_f7713c35
rename to ogg/general/combat/airpod/ne1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/nw.ogg_b5a8571d b/ogg/general/combat/airpod/nw.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/nw.ogg_b5a8571d
rename to ogg/general/combat/airpod/nw.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/nw1.ogg_317ce5a0 b/ogg/general/combat/airpod/nw1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/nw1.ogg_317ce5a0
rename to ogg/general/combat/airpod/nw1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/s.ogg_8808beb1 b/ogg/general/combat/airpod/s.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/s.ogg_8808beb1
rename to ogg/general/combat/airpod/s.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/s1.ogg_2d2e0b7a b/ogg/general/combat/airpod/s1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/s1.ogg_2d2e0b7a
rename to ogg/general/combat/airpod/s1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/se.ogg_8e7e0f9c b/ogg/general/combat/airpod/se.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/se.ogg_8e7e0f9c
rename to ogg/general/combat/airpod/se.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/se1.ogg_f4972104 b/ogg/general/combat/airpod/se1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/se1.ogg_f4972104
rename to ogg/general/combat/airpod/se1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/sw.ogg_a1e95c5e b/ogg/general/combat/airpod/sw.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/sw.ogg_a1e95c5e
rename to ogg/general/combat/airpod/sw.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/sw1.ogg_107b5b96 b/ogg/general/combat/airpod/sw1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/sw1.ogg_107b5b96
rename to ogg/general/combat/airpod/sw1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/w.ogg_1020ef40 b/ogg/general/combat/airpod/w.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/w.ogg_1020ef40
rename to ogg/general/combat/airpod/w.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/w1.ogg_9c6df829 b/ogg/general/combat/airpod/w1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/w1.ogg_9c6df829
rename to ogg/general/combat/airpod/w1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/airpod_31df3705/yourhit.ogg_fa84558d b/ogg/general/combat/airpod/yourhit.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/airpod_31df3705/yourhit.ogg_fa84558d
rename to ogg/general/combat/airpod/yourhit.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/alarm.ogg_926a7589 b/ogg/general/combat/alarm.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/alarm.ogg_926a7589
rename to ogg/general/combat/alarm.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/armor_154f6bf1/1.ogg_5a1c73f4 b/ogg/general/combat/armor/1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/armor_154f6bf1/1.ogg_5a1c73f4
rename to ogg/general/combat/armor/1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/armor_154f6bf1/2.ogg_9923780e b/ogg/general/combat/armor/2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/armor_154f6bf1/2.ogg_9923780e
rename to ogg/general/combat/armor/2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/armor_154f6bf1/3.ogg_ecdcaa68 b/ogg/general/combat/armor/3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/armor_154f6bf1/3.ogg_ecdcaa68
rename to ogg/general/combat/armor/3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/armor_154f6bf1/4.ogg_db25971c b/ogg/general/combat/armor/4.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/armor_154f6bf1/4.ogg_db25971c
rename to ogg/general/combat/armor/4.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/armor_154f6bf1/5.ogg_6038d4e6 b/ogg/general/combat/armor/5.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/armor_154f6bf1/5.ogg_6038d4e6
rename to ogg/general/combat/armor/5.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/armor_154f6bf1/6.ogg_33d367a5 b/ogg/general/combat/armor/6.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/armor_154f6bf1/6.ogg_33d367a5
rename to ogg/general/combat/armor/6.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/armor_154f6bf1/7.ogg_83c4f2f5 b/ogg/general/combat/armor/7.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/armor_154f6bf1/7.ogg_83c4f2f5
rename to ogg/general/combat/armor/7.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/armor_154f6bf1/8.ogg_1fc6ea69 b/ogg/general/combat/armor/8.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/armor_154f6bf1/8.ogg_1fc6ea69
rename to ogg/general/combat/armor/8.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/armor_154f6bf1/break.ogg_2a0bfdba b/ogg/general/combat/armor/break.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/armor_154f6bf1/break.ogg_2a0bfdba
rename to ogg/general/combat/armor/break.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/armor_154f6bf1/fire.ogg_a19f9d8d b/ogg/general/combat/armor/fire.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/armor_154f6bf1/fire.ogg_a19f9d8d
rename to ogg/general/combat/armor/fire.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/armor_154f6bf1/hammer.ogg_db68d5bf b/ogg/general/combat/armor/hammer.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/armor_154f6bf1/hammer.ogg_db68d5bf
rename to ogg/general/combat/armor/hammer.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/armor_154f6bf1/water.ogg_3ef68063 b/ogg/general/combat/armor/water.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/armor_154f6bf1/water.ogg_3ef68063
rename to ogg/general/combat/armor/water.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/atmosphericgenerator.ogg_958b303b b/ogg/general/combat/atmosphericgenerator.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/atmosphericgenerator.ogg_958b303b
rename to ogg/general/combat/atmosphericgenerator.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlepunch.ogg_fa6ceeaa b/ogg/general/combat/battlesuit/battlepunch.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlepunch.ogg_fa6ceeaa
rename to ogg/general/combat/battlesuit/battlepunch.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_grenade.ogg_d3cd7e07 b/ogg/general/combat/battlesuit/battlesuit_grenade.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_grenade.ogg_d3cd7e07
rename to ogg/general/combat/battlesuit/battlesuit_grenade.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_handcannon.ogg_8c527a12 b/ogg/general/combat/battlesuit/battlesuit_handcannon.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_handcannon.ogg_8c527a12
rename to ogg/general/combat/battlesuit/battlesuit_handcannon.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_hugelaser.ogg_d0c2438d b/ogg/general/combat/battlesuit/battlesuit_hugelaser.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_hugelaser.ogg_d0c2438d
rename to ogg/general/combat/battlesuit/battlesuit_hugelaser.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_largelaser.ogg_9e85d674 b/ogg/general/combat/battlesuit/battlesuit_largelaser.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_largelaser.ogg_9e85d674
rename to ogg/general/combat/battlesuit/battlesuit_largelaser.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_medlaser.ogg_0e4224f7 b/ogg/general/combat/battlesuit/battlesuit_medlaser.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_medlaser.ogg_0e4224f7
rename to ogg/general/combat/battlesuit/battlesuit_medlaser.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_pulsegun.ogg_5996b67d b/ogg/general/combat/battlesuit/battlesuit_pulsegun.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_pulsegun.ogg_5996b67d
rename to ogg/general/combat/battlesuit/battlesuit_pulsegun.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_remove.ogg_345e8b7d b/ogg/general/combat/battlesuit/battlesuit_remove.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_remove.ogg_345e8b7d
rename to ogg/general/combat/battlesuit/battlesuit_remove.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_rocket.ogg_32f2b253 b/ogg/general/combat/battlesuit/battlesuit_rocket.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_rocket.ogg_32f2b253
rename to ogg/general/combat/battlesuit/battlesuit_rocket.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_smalllaser.ogg_63b2d017 b/ogg/general/combat/battlesuit/battlesuit_smalllaser.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_smalllaser.ogg_63b2d017
rename to ogg/general/combat/battlesuit/battlesuit_smalllaser.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_tinylaser.ogg_e9b66574 b/ogg/general/combat/battlesuit/battlesuit_tinylaser.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_tinylaser.ogg_e9b66574
rename to ogg/general/combat/battlesuit/battlesuit_tinylaser.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_wear.ogg_efe66cdb b/ogg/general/combat/battlesuit/battlesuit_wear.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/battlesuit_wear.ogg_efe66cdb
rename to ogg/general/combat/battlesuit/battlesuit_wear.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/beam.ogg_319d8e96 b/ogg/general/combat/battlesuit/beam.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/beam.ogg_319d8e96
rename to ogg/general/combat/battlesuit/beam.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/charge1.ogg_538cc101 b/ogg/general/combat/battlesuit/charge1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/charge1.ogg_538cc101
rename to ogg/general/combat/battlesuit/charge1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/charge2.ogg_6193e11a b/ogg/general/combat/battlesuit/charge2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/charge2.ogg_6193e11a
rename to ogg/general/combat/battlesuit/charge2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/extend.ogg_c8ec2c34 b/ogg/general/combat/battlesuit/extend.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/extend.ogg_c8ec2c34
rename to ogg/general/combat/battlesuit/extend.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/lowoxygen.ogg_28c5bd59 b/ogg/general/combat/battlesuit/lowoxygen.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/lowoxygen.ogg_28c5bd59
rename to ogg/general/combat/battlesuit/lowoxygen.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/move1.ogg_d99bc679 b/ogg/general/combat/battlesuit/move1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/move1.ogg_d99bc679
rename to ogg/general/combat/battlesuit/move1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/move2.ogg_04c6dbfb b/ogg/general/combat/battlesuit/move2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/move2.ogg_04c6dbfb
rename to ogg/general/combat/battlesuit/move2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/repair1.ogg_8b6620b7 b/ogg/general/combat/battlesuit/repair1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/repair1.ogg_8b6620b7
rename to ogg/general/combat/battlesuit/repair1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/repair2.ogg_30db71fb b/ogg/general/combat/battlesuit/repair2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/repair2.ogg_30db71fb
rename to ogg/general/combat/battlesuit/repair2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/repair3.ogg_420b79f5 b/ogg/general/combat/battlesuit/repair3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/repair3.ogg_420b79f5
rename to ogg/general/combat/battlesuit/repair3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/repair4.ogg_67e977e6 b/ogg/general/combat/battlesuit/repair4.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/repair4.ogg_67e977e6
rename to ogg/general/combat/battlesuit/repair4.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/repaircomplete.ogg_ada85d3b b/ogg/general/combat/battlesuit/repaircomplete.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/repaircomplete.ogg_ada85d3b
rename to ogg/general/combat/battlesuit/repaircomplete.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/retract.ogg_8ad30404 b/ogg/general/combat/battlesuit/retract.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/battlesuit_c25ed877/retract.ogg_8ad30404
rename to ogg/general/combat/battlesuit/retract.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/beep.ogg_67e6917a b/ogg/general/combat/beep.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/beep.ogg_67e6917a
rename to ogg/general/combat/beep.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/blood.ogg_44adff92 b/ogg/general/combat/blood.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/blood.ogg_44adff92
rename to ogg/general/combat/blood.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/break1.ogg_0cfa39c8 b/ogg/general/combat/break1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/break1.ogg_0cfa39c8
rename to ogg/general/combat/break1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/break2.ogg_4cba4381 b/ogg/general/combat/break2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/break2.ogg_4cba4381
rename to ogg/general/combat/break2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/break3.ogg_740d2c4e b/ogg/general/combat/break3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/break3.ogg_740d2c4e
rename to ogg/general/combat/break3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/break4.ogg_e85776e0 b/ogg/general/combat/break4.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/break4.ogg_e85776e0
rename to ogg/general/combat/break4.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/bsword1.ogg_8504b55f b/ogg/general/combat/bsword1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/bsword1.ogg_8504b55f
rename to ogg/general/combat/bsword1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/bsword2.ogg_63657dfb b/ogg/general/combat/bsword2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/bsword2.ogg_63657dfb
rename to ogg/general/combat/bsword2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/bsword3.ogg_c7496c85 b/ogg/general/combat/bsword3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/bsword3.ogg_c7496c85
rename to ogg/general/combat/bsword3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/cover.ogg_ee0c17ad b/ogg/general/combat/cover.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/cover.ogg_ee0c17ad
rename to ogg/general/combat/cover.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/attack1.ogg_dfa7bf59 b/ogg/general/combat/creatures/alien/it/attack1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/attack1.ogg_dfa7bf59
rename to ogg/general/combat/creatures/alien/it/attack1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/attack2.ogg_73fd99ad b/ogg/general/combat/creatures/alien/it/attack2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/attack2.ogg_73fd99ad
rename to ogg/general/combat/creatures/alien/it/attack2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/attack3.ogg_155c360a b/ogg/general/combat/creatures/alien/it/attack3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/attack3.ogg_155c360a
rename to ogg/general/combat/creatures/alien/it/attack3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/die1.ogg_34c12d5e b/ogg/general/combat/creatures/alien/it/die1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/die1.ogg_34c12d5e
rename to ogg/general/combat/creatures/alien/it/die1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/hurt1.ogg_15e44999 b/ogg/general/combat/creatures/alien/it/hurt1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/hurt1.ogg_15e44999
rename to ogg/general/combat/creatures/alien/it/hurt1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/hurt2.ogg_4ad759a2 b/ogg/general/combat/creatures/alien/it/hurt2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/hurt2.ogg_4ad759a2
rename to ogg/general/combat/creatures/alien/it/hurt2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/hurt3.ogg_6da1e4c6 b/ogg/general/combat/creatures/alien/it/hurt3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/hurt3.ogg_6da1e4c6
rename to ogg/general/combat/creatures/alien/it/hurt3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/prepare1.ogg_14c64dd8 b/ogg/general/combat/creatures/alien/it/prepare1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/prepare1.ogg_14c64dd8
rename to ogg/general/combat/creatures/alien/it/prepare1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/taunt1.ogg_4b30a573 b/ogg/general/combat/creatures/alien/it/taunt1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/taunt1.ogg_4b30a573
rename to ogg/general/combat/creatures/alien/it/taunt1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/turn1.ogg_b3c75e9d b/ogg/general/combat/creatures/alien/it/turn1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/it_00d68696/turn1.ogg_b3c75e9d
rename to ogg/general/combat/creatures/alien/it/turn1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/attack1.ogg_f4bc9cd6 b/ogg/general/combat/creatures/alien/she/attack1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/attack1.ogg_f4bc9cd6
rename to ogg/general/combat/creatures/alien/she/attack1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/attack2.ogg_2385158a b/ogg/general/combat/creatures/alien/she/attack2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/attack2.ogg_2385158a
rename to ogg/general/combat/creatures/alien/she/attack2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/attack3.ogg_1040b363 b/ogg/general/combat/creatures/alien/she/attack3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/attack3.ogg_1040b363
rename to ogg/general/combat/creatures/alien/she/attack3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/die1.ogg_6d11afa7 b/ogg/general/combat/creatures/alien/she/die1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/die1.ogg_6d11afa7
rename to ogg/general/combat/creatures/alien/she/die1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/hurt1.ogg_73801170 b/ogg/general/combat/creatures/alien/she/hurt1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/hurt1.ogg_73801170
rename to ogg/general/combat/creatures/alien/she/hurt1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/hurt2.ogg_cba44137 b/ogg/general/combat/creatures/alien/she/hurt2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/hurt2.ogg_cba44137
rename to ogg/general/combat/creatures/alien/she/hurt2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/hurt3.ogg_d8bf2be1 b/ogg/general/combat/creatures/alien/she/hurt3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/hurt3.ogg_d8bf2be1
rename to ogg/general/combat/creatures/alien/she/hurt3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/prepare1.ogg_b3d7d3da b/ogg/general/combat/creatures/alien/she/prepare1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/prepare1.ogg_b3d7d3da
rename to ogg/general/combat/creatures/alien/she/prepare1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/taunt1.ogg_b7d89c28 b/ogg/general/combat/creatures/alien/she/taunt1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/taunt1.ogg_b7d89c28
rename to ogg/general/combat/creatures/alien/she/taunt1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/turn1.ogg_ca337690 b/ogg/general/combat/creatures/alien/she/turn1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/alien_ccf44602/she_2a6eca86/turn1.ogg_ca337690
rename to ogg/general/combat/creatures/alien/she/turn1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/attack1.ogg_8e95132d b/ogg/general/combat/creatures/default/he/attack1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/attack1.ogg_8e95132d
rename to ogg/general/combat/creatures/default/he/attack1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/attack2.ogg_f94e317f b/ogg/general/combat/creatures/default/he/attack2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/attack2.ogg_f94e317f
rename to ogg/general/combat/creatures/default/he/attack2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/attack3.ogg_22bff7dc b/ogg/general/combat/creatures/default/he/attack3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/attack3.ogg_22bff7dc
rename to ogg/general/combat/creatures/default/he/attack3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/die1.ogg_8130b7f3 b/ogg/general/combat/creatures/default/he/die1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/die1.ogg_8130b7f3
rename to ogg/general/combat/creatures/default/he/die1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/hurt1.ogg_1aeb20c8 b/ogg/general/combat/creatures/default/he/hurt1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/hurt1.ogg_1aeb20c8
rename to ogg/general/combat/creatures/default/he/hurt1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/hurt2.ogg_a5852790 b/ogg/general/combat/creatures/default/he/hurt2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/hurt2.ogg_a5852790
rename to ogg/general/combat/creatures/default/he/hurt2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/hurt3.ogg_4c2cd93b b/ogg/general/combat/creatures/default/he/hurt3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/hurt3.ogg_4c2cd93b
rename to ogg/general/combat/creatures/default/he/hurt3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/prepare1.ogg_14c35d04 b/ogg/general/combat/creatures/default/he/prepare1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/prepare1.ogg_14c35d04
rename to ogg/general/combat/creatures/default/he/prepare1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/taunt1.ogg_fa10150b b/ogg/general/combat/creatures/default/he/taunt1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/taunt1.ogg_fa10150b
rename to ogg/general/combat/creatures/default/he/taunt1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/turn1.ogg_2ce6143c b/ogg/general/combat/creatures/default/he/turn1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/he_58db718e/turn1.ogg_2ce6143c
rename to ogg/general/combat/creatures/default/he/turn1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/attack1.ogg_fbc11f8b b/ogg/general/combat/creatures/default/she/attack1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/attack1.ogg_fbc11f8b
rename to ogg/general/combat/creatures/default/she/attack1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/attack2.ogg_a5ab485c b/ogg/general/combat/creatures/default/she/attack2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/attack2.ogg_a5ab485c
rename to ogg/general/combat/creatures/default/she/attack2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/attack3.ogg_e5b08a0a b/ogg/general/combat/creatures/default/she/attack3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/attack3.ogg_e5b08a0a
rename to ogg/general/combat/creatures/default/she/attack3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/die1.ogg_e07802b8 b/ogg/general/combat/creatures/default/she/die1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/die1.ogg_e07802b8
rename to ogg/general/combat/creatures/default/she/die1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/hurt1.ogg_c44fef2a b/ogg/general/combat/creatures/default/she/hurt1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/hurt1.ogg_c44fef2a
rename to ogg/general/combat/creatures/default/she/hurt1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/hurt2.ogg_40f8c020 b/ogg/general/combat/creatures/default/she/hurt2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/hurt2.ogg_40f8c020
rename to ogg/general/combat/creatures/default/she/hurt2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/hurt3.ogg_e9c674c8 b/ogg/general/combat/creatures/default/she/hurt3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/hurt3.ogg_e9c674c8
rename to ogg/general/combat/creatures/default/she/hurt3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/prepare1.ogg_686e75cd b/ogg/general/combat/creatures/default/she/prepare1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/prepare1.ogg_686e75cd
rename to ogg/general/combat/creatures/default/she/prepare1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/taunt1.ogg_6656ef56 b/ogg/general/combat/creatures/default/she/taunt1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/taunt1.ogg_6656ef56
rename to ogg/general/combat/creatures/default/she/taunt1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/turn1.ogg_ace5f9c7 b/ogg/general/combat/creatures/default/she/turn1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/creatures_586440b7/default_33c956c0/she_88fbf832/turn1.ogg_ace5f9c7
rename to ogg/general/combat/creatures/default/she/turn1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/dragons_50a909f7/bash1.ogg_197d0e7d b/ogg/general/combat/dragons/bash1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/dragons_50a909f7/bash1.ogg_197d0e7d
rename to ogg/general/combat/dragons/bash1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/dragons_50a909f7/bash2.ogg_a2af7c8d b/ogg/general/combat/dragons/bash2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/dragons_50a909f7/bash2.ogg_a2af7c8d
rename to ogg/general/combat/dragons/bash2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/dragons_50a909f7/dragonbite.ogg_8be575e1 b/ogg/general/combat/dragons/dragonbite.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/dragons_50a909f7/dragonbite.ogg_8be575e1
rename to ogg/general/combat/dragons/dragonbite.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/dragons_50a909f7/dragonclaw.ogg_4d866932 b/ogg/general/combat/dragons/dragonclaw.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/dragons_50a909f7/dragonclaw.ogg_4d866932
rename to ogg/general/combat/dragons/dragonclaw.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/dragons_50a909f7/dragonroar.ogg_f70a7382 b/ogg/general/combat/dragons/dragonroar.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/dragons_50a909f7/dragonroar.ogg_f70a7382
rename to ogg/general/combat/dragons/dragonroar.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/dragons_50a909f7/dragonrush.ogg_08fc87b7 b/ogg/general/combat/dragons/dragonrush.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/dragons_50a909f7/dragonrush.ogg_08fc87b7
rename to ogg/general/combat/dragons/dragonrush.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/dragons_50a909f7/fireball.ogg_5d98e20d b/ogg/general/combat/dragons/fireball.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/dragons_50a909f7/fireball.ogg_5d98e20d
rename to ogg/general/combat/dragons/fireball.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/dragons_50a909f7/fireblow.ogg_023b6780 b/ogg/general/combat/dragons/fireblow.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/dragons_50a909f7/fireblow.ogg_023b6780
rename to ogg/general/combat/dragons/fireblow.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/dragons_50a909f7/firebreath1.ogg_dace257b b/ogg/general/combat/dragons/firebreath1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/dragons_50a909f7/firebreath1.ogg_dace257b
rename to ogg/general/combat/dragons/firebreath1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/dragons_50a909f7/firebreath2.ogg_25b4f9c8 b/ogg/general/combat/dragons/firebreath2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/dragons_50a909f7/firebreath2.ogg_25b4f9c8
rename to ogg/general/combat/dragons/firebreath2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/dragons_50a909f7/firecloak.ogg_9b0a6df6 b/ogg/general/combat/dragons/firecloak.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/dragons_50a909f7/firecloak.ogg_9b0a6df6
rename to ogg/general/combat/dragons/firecloak.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/dragons_50a909f7/roar.ogg_ac6a65c2 b/ogg/general/combat/dragons/roar.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/dragons_50a909f7/roar.ogg_ac6a65c2
rename to ogg/general/combat/dragons/roar.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/dragons_50a909f7/sharpen.ogg_ac23ae31 b/ogg/general/combat/dragons/sharpen.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/dragons_50a909f7/sharpen.ogg_ac23ae31
rename to ogg/general/combat/dragons/sharpen.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/dragons_50a909f7/tailwhip.ogg_76fb7533 b/ogg/general/combat/dragons/tailwhip.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/dragons_50a909f7/tailwhip.ogg_76fb7533
rename to ogg/general/combat/dragons/tailwhip.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/draw.ogg_a5a5ece4 b/ogg/general/combat/draw.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/draw.ogg_a5a5ece4
rename to ogg/general/combat/draw.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy detected.ogg_f324e1d2 b/ogg/general/combat/enemy detected.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy detected.ogg_f324e1d2
rename to ogg/general/combat/enemy detected.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/aliandie1.ogg_3afbd867 b/ogg/general/combat/enemy/aliandie1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/aliandie1.ogg_3afbd867
rename to ogg/general/combat/enemy/aliandie1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/aliandie2.ogg_3d35f3d8 b/ogg/general/combat/enemy/aliandie2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/aliandie2.ogg_3d35f3d8
rename to ogg/general/combat/enemy/aliandie2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/alianhit1.ogg_601abb98 b/ogg/general/combat/enemy/alianhit1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/alianhit1.ogg_601abb98
rename to ogg/general/combat/enemy/alianhit1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/alianhit2.ogg_96fd0dd1 b/ogg/general/combat/enemy/alianhit2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/alianhit2.ogg_96fd0dd1
rename to ogg/general/combat/enemy/alianhit2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/alianhit3.ogg_9aa48938 b/ogg/general/combat/enemy/alianhit3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/alianhit3.ogg_9aa48938
rename to ogg/general/combat/enemy/alianhit3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/att1.ogg_b1c9f5b9 b/ogg/general/combat/enemy/baurg/att1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/att1.ogg_b1c9f5b9
rename to ogg/general/combat/enemy/baurg/att1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/att2.ogg_ee5b6667 b/ogg/general/combat/enemy/baurg/att2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/att2.ogg_ee5b6667
rename to ogg/general/combat/enemy/baurg/att2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/att3.ogg_e74877b6 b/ogg/general/combat/enemy/baurg/att3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/att3.ogg_e74877b6
rename to ogg/general/combat/enemy/baurg/att3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/die1.ogg_445e9ab2 b/ogg/general/combat/enemy/baurg/die1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/die1.ogg_445e9ab2
rename to ogg/general/combat/enemy/baurg/die1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/die2.ogg_05511b24 b/ogg/general/combat/enemy/baurg/die2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/die2.ogg_05511b24
rename to ogg/general/combat/enemy/baurg/die2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/hurt1.ogg_df316dc5 b/ogg/general/combat/enemy/baurg/hurt1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/hurt1.ogg_df316dc5
rename to ogg/general/combat/enemy/baurg/hurt1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/hurt2.ogg_657e6875 b/ogg/general/combat/enemy/baurg/hurt2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/hurt2.ogg_657e6875
rename to ogg/general/combat/enemy/baurg/hurt2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/hurt3.ogg_bfc78d82 b/ogg/general/combat/enemy/baurg/hurt3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/hurt3.ogg_bfc78d82
rename to ogg/general/combat/enemy/baurg/hurt3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/hurt4.ogg_62257086 b/ogg/general/combat/enemy/baurg/hurt4.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/hurt4.ogg_62257086
rename to ogg/general/combat/enemy/baurg/hurt4.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/sonic.ogg_817d42fb b/ogg/general/combat/enemy/baurg/sonic.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/sonic.ogg_817d42fb
rename to ogg/general/combat/enemy/baurg/sonic.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/trunk.ogg_2c246d9f b/ogg/general/combat/enemy/baurg/trunk.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/trunk.ogg_2c246d9f
rename to ogg/general/combat/enemy/baurg/trunk.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/trunk1.ogg_01a63603 b/ogg/general/combat/enemy/baurg/trunk1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/trunk1.ogg_01a63603
rename to ogg/general/combat/enemy/baurg/trunk1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/trunk2.ogg_067994ec b/ogg/general/combat/enemy/baurg/trunk2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/baurg_97b87bb6/trunk2.ogg_067994ec
rename to ogg/general/combat/enemy/baurg/trunk2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/blob.ogg_e0adb85a b/ogg/general/combat/enemy/blob.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/blob.ogg_e0adb85a
rename to ogg/general/combat/enemy/blob.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/bodyslam.ogg_f6d8fbb9 b/ogg/general/combat/enemy/bodyslam.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/bodyslam.ogg_f6d8fbb9
rename to ogg/general/combat/enemy/bodyslam.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/cannon.ogg_67fd9424 b/ogg/general/combat/enemy/cannon.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/cannon.ogg_67fd9424
rename to ogg/general/combat/enemy/cannon.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/caultdie1.ogg_4a85ecce b/ogg/general/combat/enemy/caultdie1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/caultdie1.ogg_4a85ecce
rename to ogg/general/combat/enemy/caultdie1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/caultdie2.ogg_3728ecc3 b/ogg/general/combat/enemy/caultdie2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/caultdie2.ogg_3728ecc3
rename to ogg/general/combat/enemy/caultdie2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/caulthit1.ogg_1cfec06f b/ogg/general/combat/enemy/caulthit1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/caulthit1.ogg_1cfec06f
rename to ogg/general/combat/enemy/caulthit1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/caulthit2.ogg_d2b5f46d b/ogg/general/combat/enemy/caulthit2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/caulthit2.ogg_d2b5f46d
rename to ogg/general/combat/enemy/caulthit2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/caulthit3.ogg_569580f6 b/ogg/general/combat/enemy/caulthit3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/caulthit3.ogg_569580f6
rename to ogg/general/combat/enemy/caulthit3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/coverblow.ogg_270b4830 b/ogg/general/combat/enemy/coverblow.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/coverblow.ogg_270b4830
rename to ogg/general/combat/enemy/coverblow.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/drohit1.ogg_2ee37185 b/ogg/general/combat/enemy/drohit1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/drohit1.ogg_2ee37185
rename to ogg/general/combat/enemy/drohit1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/drohit2.ogg_b7cf8e83 b/ogg/general/combat/enemy/drohit2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/drohit2.ogg_b7cf8e83
rename to ogg/general/combat/enemy/drohit2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/drohit3.ogg_ed72fed8 b/ogg/general/combat/enemy/drohit3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/drohit3.ogg_ed72fed8
rename to ogg/general/combat/enemy/drohit3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/drohit4.ogg_6267981d b/ogg/general/combat/enemy/drohit4.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/drohit4.ogg_6267981d
rename to ogg/general/combat/enemy/drohit4.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid.ogg_b6f59b14 b/ogg/general/combat/enemy/droid.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid.ogg_b6f59b14
rename to ogg/general/combat/enemy/droid.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/att1.ogg_8566c47f b/ogg/general/combat/enemy/droid/att1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/att1.ogg_8566c47f
rename to ogg/general/combat/enemy/droid/att1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/att2.ogg_1991133b b/ogg/general/combat/enemy/droid/att2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/att2.ogg_1991133b
rename to ogg/general/combat/enemy/droid/att2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/att3.ogg_74ce53f9 b/ogg/general/combat/enemy/droid/att3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/att3.ogg_74ce53f9
rename to ogg/general/combat/enemy/droid/att3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/bigatt1.ogg_ab64e52c b/ogg/general/combat/enemy/droid/bigatt1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/bigatt1.ogg_ab64e52c
rename to ogg/general/combat/enemy/droid/bigatt1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/bigatt2.ogg_0c49739f b/ogg/general/combat/enemy/droid/bigatt2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/bigatt2.ogg_0c49739f
rename to ogg/general/combat/enemy/droid/bigatt2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/bigatt3.ogg_76f47b11 b/ogg/general/combat/enemy/droid/bigatt3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/bigatt3.ogg_76f47b11
rename to ogg/general/combat/enemy/droid/bigatt3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/bigdie1.ogg_ce2b2d7b b/ogg/general/combat/enemy/droid/bigdie1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/bigdie1.ogg_ce2b2d7b
rename to ogg/general/combat/enemy/droid/bigdie1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/bigdie2.ogg_522f9243 b/ogg/general/combat/enemy/droid/bigdie2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/bigdie2.ogg_522f9243
rename to ogg/general/combat/enemy/droid/bigdie2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/bigdie3.ogg_ee6bca9e b/ogg/general/combat/enemy/droid/bigdie3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/bigdie3.ogg_ee6bca9e
rename to ogg/general/combat/enemy/droid/bigdie3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/bighurt1.ogg_3afa3b4a b/ogg/general/combat/enemy/droid/bighurt1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/bighurt1.ogg_3afa3b4a
rename to ogg/general/combat/enemy/droid/bighurt1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/bighurt2.ogg_c27a53d6 b/ogg/general/combat/enemy/droid/bighurt2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/bighurt2.ogg_c27a53d6
rename to ogg/general/combat/enemy/droid/bighurt2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/bighurt3.ogg_17ac6cad b/ogg/general/combat/enemy/droid/bighurt3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/bighurt3.ogg_17ac6cad
rename to ogg/general/combat/enemy/droid/bighurt3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/die1.ogg_dd2bac4e b/ogg/general/combat/enemy/droid/die1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/die1.ogg_dd2bac4e
rename to ogg/general/combat/enemy/droid/die1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/die2.ogg_f87335aa b/ogg/general/combat/enemy/droid/die2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/die2.ogg_f87335aa
rename to ogg/general/combat/enemy/droid/die2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/die3.ogg_05f9f710 b/ogg/general/combat/enemy/droid/die3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/die3.ogg_05f9f710
rename to ogg/general/combat/enemy/droid/die3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/hurt1.ogg_c7d42522 b/ogg/general/combat/enemy/droid/hurt1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/hurt1.ogg_c7d42522
rename to ogg/general/combat/enemy/droid/hurt1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/hurt2.ogg_129f0f53 b/ogg/general/combat/enemy/droid/hurt2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/hurt2.ogg_129f0f53
rename to ogg/general/combat/enemy/droid/hurt2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/hurt3.ogg_f738f230 b/ogg/general/combat/enemy/droid/hurt3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/hurt3.ogg_f738f230
rename to ogg/general/combat/enemy/droid/hurt3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/repair.ogg_3106c196 b/ogg/general/combat/enemy/droid/repair.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/droid_caeb8556/repair.ogg_3106c196
rename to ogg/general/combat/enemy/droid/repair.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/drosmash.ogg_9ff638f6 b/ogg/general/combat/enemy/drosmash.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/drosmash.ogg_9ff638f6
rename to ogg/general/combat/enemy/drosmash.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/dulfatt1.ogg_fca5a3cc b/ogg/general/combat/enemy/dulfatt1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/dulfatt1.ogg_fca5a3cc
rename to ogg/general/combat/enemy/dulfatt1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/dulfatt2.ogg_a74cf498 b/ogg/general/combat/enemy/dulfatt2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/dulfatt2.ogg_a74cf498
rename to ogg/general/combat/enemy/dulfatt2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/dulfatt3.ogg_e82af519 b/ogg/general/combat/enemy/dulfatt3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/dulfatt3.ogg_e82af519
rename to ogg/general/combat/enemy/dulfatt3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/dulfdie.ogg_18437876 b/ogg/general/combat/enemy/dulfdie.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/dulfdie.ogg_18437876
rename to ogg/general/combat/enemy/dulfdie.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/dulfhit1.ogg_57fdb2ba b/ogg/general/combat/enemy/dulfhit1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/dulfhit1.ogg_57fdb2ba
rename to ogg/general/combat/enemy/dulfhit1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/dulfhit2.ogg_cd810310 b/ogg/general/combat/enemy/dulfhit2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/dulfhit2.ogg_cd810310
rename to ogg/general/combat/enemy/dulfhit2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/dulfhit3.ogg_bfed559b b/ogg/general/combat/enemy/dulfhit3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/dulfhit3.ogg_bfed559b
rename to ogg/general/combat/enemy/dulfhit3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embahi_597300aa/att1.ogg_f0b06d1d b/ogg/general/combat/enemy/embahi/att1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embahi_597300aa/att1.ogg_f0b06d1d
rename to ogg/general/combat/enemy/embahi/att1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embahi_597300aa/att2.ogg_38b5ac35 b/ogg/general/combat/enemy/embahi/att2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embahi_597300aa/att2.ogg_38b5ac35
rename to ogg/general/combat/enemy/embahi/att2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embahi_597300aa/att3.ogg_74e0c550 b/ogg/general/combat/enemy/embahi/att3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embahi_597300aa/att3.ogg_74e0c550
rename to ogg/general/combat/enemy/embahi/att3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embahi_597300aa/die.ogg_e225ad53 b/ogg/general/combat/enemy/embahi/die.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embahi_597300aa/die.ogg_e225ad53
rename to ogg/general/combat/enemy/embahi/die.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embahi_597300aa/hit1.ogg_45e88d9b b/ogg/general/combat/enemy/embahi/hit1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embahi_597300aa/hit1.ogg_45e88d9b
rename to ogg/general/combat/enemy/embahi/hit1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embahi_597300aa/hit2.ogg_8657743b b/ogg/general/combat/enemy/embahi/hit2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embahi_597300aa/hit2.ogg_8657743b
rename to ogg/general/combat/enemy/embahi/hit2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embahi_597300aa/hit3.ogg_c27e5580 b/ogg/general/combat/enemy/embahi/hit3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embahi_597300aa/hit3.ogg_c27e5580
rename to ogg/general/combat/enemy/embahi/hit3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embahi_597300aa/taunt.ogg_3ef780a4 b/ogg/general/combat/enemy/embahi/taunt.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embahi_597300aa/taunt.ogg_3ef780a4
rename to ogg/general/combat/enemy/embahi/taunt.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embdie.ogg_765cf3cf b/ogg/general/combat/enemy/embdie.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embdie.ogg_765cf3cf
rename to ogg/general/combat/enemy/embdie.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embhit1.ogg_7346b7d8 b/ogg/general/combat/enemy/embhit1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embhit1.ogg_7346b7d8
rename to ogg/general/combat/enemy/embhit1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embhit2.ogg_9e5f6845 b/ogg/general/combat/enemy/embhit2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embhit2.ogg_9e5f6845
rename to ogg/general/combat/enemy/embhit2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embhit3.ogg_54cd02cc b/ogg/general/combat/enemy/embhit3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/embhit3.ogg_54cd02cc
rename to ogg/general/combat/enemy/embhit3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/energy.ogg_1aba55c0 b/ogg/general/combat/enemy/energy.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/energy.ogg_1aba55c0
rename to ogg/general/combat/enemy/energy.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/1.ogg_17e7860b b/ogg/general/combat/enemy/exits/1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/1.ogg_17e7860b
rename to ogg/general/combat/enemy/exits/1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/2.ogg_48072814 b/ogg/general/combat/enemy/exits/2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/2.ogg_48072814
rename to ogg/general/combat/enemy/exits/2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/3.ogg_283bcaef b/ogg/general/combat/enemy/exits/3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/3.ogg_283bcaef
rename to ogg/general/combat/enemy/exits/3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/4.ogg_ecf73108 b/ogg/general/combat/enemy/exits/4.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/4.ogg_ecf73108
rename to ogg/general/combat/enemy/exits/4.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/5.ogg_d8a25a2d b/ogg/general/combat/enemy/exits/5.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/5.ogg_d8a25a2d
rename to ogg/general/combat/enemy/exits/5.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/center.ogg_ae5c945a b/ogg/general/combat/enemy/exits/center.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/center.ogg_ae5c945a
rename to ogg/general/combat/enemy/exits/center.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/e.ogg_c83232d0 b/ogg/general/combat/enemy/exits/e.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/e.ogg_c83232d0
rename to ogg/general/combat/enemy/exits/e.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/n.ogg_936836ce b/ogg/general/combat/enemy/exits/n.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/n.ogg_936836ce
rename to ogg/general/combat/enemy/exits/n.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/ne.ogg_c0ec11ee b/ogg/general/combat/enemy/exits/ne.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/ne.ogg_c0ec11ee
rename to ogg/general/combat/enemy/exits/ne.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/nearby.ogg_ff9786ea b/ogg/general/combat/enemy/exits/nearby.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/nearby.ogg_ff9786ea
rename to ogg/general/combat/enemy/exits/nearby.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/nw.ogg_98034250 b/ogg/general/combat/enemy/exits/nw.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/nw.ogg_98034250
rename to ogg/general/combat/enemy/exits/nw.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/s.ogg_76b5fe14 b/ogg/general/combat/enemy/exits/s.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/s.ogg_76b5fe14
rename to ogg/general/combat/enemy/exits/s.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/se.ogg_fbd20e2b b/ogg/general/combat/enemy/exits/se.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/se.ogg_fbd20e2b
rename to ogg/general/combat/enemy/exits/se.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/sw.ogg_a31fd34c b/ogg/general/combat/enemy/exits/sw.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/sw.ogg_a31fd34c
rename to ogg/general/combat/enemy/exits/sw.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/w.ogg_3afd62d7 b/ogg/general/combat/enemy/exits/w.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/exits_f6cade4c/w.ogg_3afd62d7
rename to ogg/general/combat/enemy/exits/w.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/grenade.ogg_d2f17a15 b/ogg/general/combat/enemy/grenade.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/grenade.ogg_d2f17a15
rename to ogg/general/combat/enemy/grenade.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/grenade2.ogg_cce6364a b/ogg/general/combat/enemy/grenade2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/grenade2.ogg_cce6364a
rename to ogg/general/combat/enemy/grenade2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/gun1.ogg_b69b0478 b/ogg/general/combat/enemy/gun1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/gun1.ogg_b69b0478
rename to ogg/general/combat/enemy/gun1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/gun2.ogg_44344340 b/ogg/general/combat/enemy/gun2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/gun2.ogg_44344340
rename to ogg/general/combat/enemy/gun2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/gun3.ogg_d73d7d81 b/ogg/general/combat/enemy/gun3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/gun3.ogg_d73d7d81
rename to ogg/general/combat/enemy/gun3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/kick1.ogg_4952ac48 b/ogg/general/combat/enemy/kick1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/kick1.ogg_4952ac48
rename to ogg/general/combat/enemy/kick1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/kick2.ogg_6946a4a6 b/ogg/general/combat/enemy/kick2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/kick2.ogg_6946a4a6
rename to ogg/general/combat/enemy/kick2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/largeblade.ogg_69b639ad b/ogg/general/combat/enemy/largeblade.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/largeblade.ogg_69b639ad
rename to ogg/general/combat/enemy/largeblade.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/lighter.ogg_61a1be6d b/ogg/general/combat/enemy/lighter.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/lighter.ogg_61a1be6d
rename to ogg/general/combat/enemy/lighter.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/machine1.ogg_9c887824 b/ogg/general/combat/enemy/machine1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/machine1.ogg_9c887824
rename to ogg/general/combat/enemy/machine1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/machine2.ogg_df3ee903 b/ogg/general/combat/enemy/machine2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/machine2.ogg_df3ee903
rename to ogg/general/combat/enemy/machine2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/monsterapp.ogg_88148616 b/ogg/general/combat/enemy/monsterapp.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/monsterapp.ogg_88148616
rename to ogg/general/combat/enemy/monsterapp.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/monsterdie.ogg_96e2144d b/ogg/general/combat/enemy/monsterdie.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/monsterdie.ogg_96e2144d
rename to ogg/general/combat/enemy/monsterdie.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/monstermiss.ogg_7fb85dbf b/ogg/general/combat/enemy/monstermiss.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/monstermiss.ogg_7fb85dbf
rename to ogg/general/combat/enemy/monstermiss.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/monsterpunch.ogg_1ceaa9e4 b/ogg/general/combat/enemy/monsterpunch.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/monsterpunch.ogg_1ceaa9e4
rename to ogg/general/combat/enemy/monsterpunch.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/pbreathe.ogg_4f9af89d b/ogg/general/combat/enemy/pbreathe.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/pbreathe.ogg_4f9af89d
rename to ogg/general/combat/enemy/pbreathe.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/plagrenade.ogg_907e1f2a b/ogg/general/combat/enemy/plagrenade.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/plagrenade.ogg_907e1f2a
rename to ogg/general/combat/enemy/plagrenade.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/plasrifle.ogg_2e669a39 b/ogg/general/combat/enemy/plasrifle.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/plasrifle.ogg_2e669a39
rename to ogg/general/combat/enemy/plasrifle.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/pshoot1.ogg_8c48bb23 b/ogg/general/combat/enemy/pshoot1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/pshoot1.ogg_8c48bb23
rename to ogg/general/combat/enemy/pshoot1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/pshoot2.ogg_24c3488b b/ogg/general/combat/enemy/pshoot2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/pshoot2.ogg_24c3488b
rename to ogg/general/combat/enemy/pshoot2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/pslash.ogg_10292e3a b/ogg/general/combat/enemy/pslash.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/pslash.ogg_10292e3a
rename to ogg/general/combat/enemy/pslash.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/ram.ogg_bb166628 b/ogg/general/combat/enemy/ram.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/ram.ogg_bb166628
rename to ogg/general/combat/enemy/ram.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/ratqueen.ogg_5ed467e6 b/ogg/general/combat/enemy/ratqueen.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/ratqueen.ogg_5ed467e6
rename to ogg/general/combat/enemy/ratqueen.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/reload.ogg_bf013ccc b/ogg/general/combat/enemy/reload.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/reload.ogg_bf013ccc
rename to ogg/general/combat/enemy/reload.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/rifle.ogg_c43bf7c9 b/ogg/general/combat/enemy/rifle.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/rifle.ogg_c43bf7c9
rename to ogg/general/combat/enemy/rifle.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/rifle1.ogg_8463b260 b/ogg/general/combat/enemy/rifle1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/rifle1.ogg_8463b260
rename to ogg/general/combat/enemy/rifle1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/rifle2.ogg_c92944c8 b/ogg/general/combat/enemy/rifle2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/rifle2.ogg_c92944c8
rename to ogg/general/combat/enemy/rifle2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/rifle3.ogg_f0832230 b/ogg/general/combat/enemy/rifle3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/rifle3.ogg_f0832230
rename to ogg/general/combat/enemy/rifle3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/shake.ogg_83f0ff82 b/ogg/general/combat/enemy/shake.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/shake.ogg_83f0ff82
rename to ogg/general/combat/enemy/shake.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/shell.ogg_3b5717a4 b/ogg/general/combat/enemy/shell.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/shell.ogg_3b5717a4
rename to ogg/general/combat/enemy/shell.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/shells.ogg_18d2e589 b/ogg/general/combat/enemy/shells.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/shells.ogg_18d2e589
rename to ogg/general/combat/enemy/shells.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/shock.ogg_5a40481f b/ogg/general/combat/enemy/shock.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/shock.ogg_5a40481f
rename to ogg/general/combat/enemy/shock.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/slash.ogg_81898967 b/ogg/general/combat/enemy/slash.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/slash.ogg_81898967
rename to ogg/general/combat/enemy/slash.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/smallcannon.ogg_33f2c9b0 b/ogg/general/combat/enemy/smallcannon.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/smallcannon.ogg_33f2c9b0
rename to ogg/general/combat/enemy/smallcannon.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/smallpist.ogg_591dab32 b/ogg/general/combat/enemy/smallpist.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/smallpist.ogg_591dab32
rename to ogg/general/combat/enemy/smallpist.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/sniper.ogg_e174bdd9 b/ogg/general/combat/enemy/sniper.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/sniper.ogg_e174bdd9
rename to ogg/general/combat/enemy/sniper.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/spacewormdie.ogg_6df6198e b/ogg/general/combat/enemy/spacewormdie.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/spacewormdie.ogg_6df6198e
rename to ogg/general/combat/enemy/spacewormdie.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/spit.ogg_aa7e2ea1 b/ogg/general/combat/enemy/spit.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/spit.ogg_aa7e2ea1
rename to ogg/general/combat/enemy/spit.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/stunarmor.ogg_2ba6651d b/ogg/general/combat/enemy/stunarmor.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/stunarmor.ogg_2ba6651d
rename to ogg/general/combat/enemy/stunarmor.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/stungun.ogg_760a8290 b/ogg/general/combat/enemy/stungun.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/stungun.ogg_760a8290
rename to ogg/general/combat/enemy/stungun.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/tentackle.ogg_8dea5b2c b/ogg/general/combat/enemy/tentackle.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/tentackle.ogg_8dea5b2c
rename to ogg/general/combat/enemy/tentackle.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/tinyblade.ogg_16dfaea5 b/ogg/general/combat/enemy/tinyblade.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/tinyblade.ogg_16dfaea5
rename to ogg/general/combat/enemy/tinyblade.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacus_6ed4e75a/att1.ogg_1555cd05 b/ogg/general/combat/enemy/vacus/att1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacus_6ed4e75a/att1.ogg_1555cd05
rename to ogg/general/combat/enemy/vacus/att1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacus_6ed4e75a/att2.ogg_8cbdf5c0 b/ogg/general/combat/enemy/vacus/att2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacus_6ed4e75a/att2.ogg_8cbdf5c0
rename to ogg/general/combat/enemy/vacus/att2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacus_6ed4e75a/att3.ogg_81a2521a b/ogg/general/combat/enemy/vacus/att3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacus_6ed4e75a/att3.ogg_81a2521a
rename to ogg/general/combat/enemy/vacus/att3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacus_6ed4e75a/slime.ogg_a7fc7a52 b/ogg/general/combat/enemy/vacus/slime.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacus_6ed4e75a/slime.ogg_a7fc7a52
rename to ogg/general/combat/enemy/vacus/slime.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacusclone.ogg_31efda91 b/ogg/general/combat/enemy/vacusclone.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacusclone.ogg_31efda91
rename to ogg/general/combat/enemy/vacusclone.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacusdie.ogg_d271e344 b/ogg/general/combat/enemy/vacusdie.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacusdie.ogg_d271e344
rename to ogg/general/combat/enemy/vacusdie.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacusfry.ogg_359f8806 b/ogg/general/combat/enemy/vacusfry.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacusfry.ogg_359f8806
rename to ogg/general/combat/enemy/vacusfry.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacushit1.ogg_4550af58 b/ogg/general/combat/enemy/vacushit1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacushit1.ogg_4550af58
rename to ogg/general/combat/enemy/vacushit1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacushit2.ogg_7a6baa02 b/ogg/general/combat/enemy/vacushit2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacushit2.ogg_7a6baa02
rename to ogg/general/combat/enemy/vacushit2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacushit3.ogg_24f54e45 b/ogg/general/combat/enemy/vacushit3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vacushit3.ogg_24f54e45
rename to ogg/general/combat/enemy/vacushit3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vpunch1.ogg_23ebf11d b/ogg/general/combat/enemy/vpunch1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vpunch1.ogg_23ebf11d
rename to ogg/general/combat/enemy/vpunch1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vpunch2.ogg_a05b4a4d b/ogg/general/combat/enemy/vpunch2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/enemy_1af085a1/vpunch2.ogg_a05b4a4d
rename to ogg/general/combat/enemy/vpunch2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/explosion.ogg_0b6c0266 b/ogg/general/combat/explosion.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/explosion.ogg_0b6c0266
rename to ogg/general/combat/explosion.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/fire.ogg_e4278746 b/ogg/general/combat/fire.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/fire.ogg_e4278746
rename to ogg/general/combat/fire.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/fire2.ogg_c90fac8e b/ogg/general/combat/fire2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/fire2.ogg_c90fac8e
rename to ogg/general/combat/fire2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/footswing1.ogg_64d58bc7 b/ogg/general/combat/footswing1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/footswing1.ogg_64d58bc7
rename to ogg/general/combat/footswing1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/footswing2.ogg_6542802c b/ogg/general/combat/footswing2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/footswing2.ogg_6542802c
rename to ogg/general/combat/footswing2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/footswing3.ogg_0b23e231 b/ogg/general/combat/footswing3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/footswing3.ogg_0b23e231
rename to ogg/general/combat/footswing3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/footswing4.ogg_0e45200b b/ogg/general/combat/footswing4.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/footswing4.ogg_0e45200b
rename to ogg/general/combat/footswing4.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/footswing5.ogg_dca46008 b/ogg/general/combat/footswing5.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/footswing5.ogg_dca46008
rename to ogg/general/combat/footswing5.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/footswing6.ogg_32edec3b b/ogg/general/combat/footswing6.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/footswing6.ogg_32edec3b
rename to ogg/general/combat/footswing6.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/footswing7.ogg_accd526c b/ogg/general/combat/footswing7.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/footswing7.ogg_accd526c
rename to ogg/general/combat/footswing7.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/footswing8.ogg_94100471 b/ogg/general/combat/footswing8.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/footswing8.ogg_94100471
rename to ogg/general/combat/footswing8.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/footswing9.ogg_bc34ea8e b/ogg/general/combat/footswing9.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/footswing9.ogg_bc34ea8e
rename to ogg/general/combat/footswing9.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/grenade throw.ogg_06d9c17c b/ogg/general/combat/grenade throw.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/grenade throw.ogg_06d9c17c
rename to ogg/general/combat/grenade throw.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/grenade-explode.ogg_204f2b69 b/ogg/general/combat/grenade-explode.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/grenade-explode.ogg_204f2b69
rename to ogg/general/combat/grenade-explode.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/grenade_explode_far1.ogg_3456dc5b b/ogg/general/combat/grenade_explode_far1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/grenade_explode_far1.ogg_3456dc5b
rename to ogg/general/combat/grenade_explode_far1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/grenade_roles_in1.ogg_bdd7ed43 b/ogg/general/combat/grenade_roles_in1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/grenade_roles_in1.ogg_bdd7ed43
rename to ogg/general/combat/grenade_roles_in1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/grenade_roles_in2.ogg_e6ee418d b/ogg/general/combat/grenade_roles_in2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/grenade_roles_in2.ogg_e6ee418d
rename to ogg/general/combat/grenade_roles_in2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/grenadeexplode.ogg_c85807e3 b/ogg/general/combat/grenadeexplode.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/grenadeexplode.ogg_c85807e3
rename to ogg/general/combat/grenadeexplode.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/grenadeexplodenextroom.ogg_899feff8 b/ogg/general/combat/grenadeexplodenextroom.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/grenadeexplodenextroom.ogg_899feff8
rename to ogg/general/combat/grenadeexplodenextroom.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/grenadepull.ogg_1315c725 b/ogg/general/combat/grenadepull.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/grenadepull.ogg_1315c725
rename to ogg/general/combat/grenadepull.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/handswing1.ogg_26fc3c9e b/ogg/general/combat/handswing1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/handswing1.ogg_26fc3c9e
rename to ogg/general/combat/handswing1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/handswing2.ogg_e123c195 b/ogg/general/combat/handswing2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/handswing2.ogg_e123c195
rename to ogg/general/combat/handswing2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/handswing3.ogg_4f4a1a3b b/ogg/general/combat/handswing3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/handswing3.ogg_4f4a1a3b
rename to ogg/general/combat/handswing3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/handswing4.ogg_ed2b62b9 b/ogg/general/combat/handswing4.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/handswing4.ogg_ed2b62b9
rename to ogg/general/combat/handswing4.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/handswing5.ogg_f6d21f2e b/ogg/general/combat/handswing5.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/handswing5.ogg_f6d21f2e
rename to ogg/general/combat/handswing5.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/handswing6.ogg_a7c7cb3e b/ogg/general/combat/handswing6.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/handswing6.ogg_a7c7cb3e
rename to ogg/general/combat/handswing6.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/handswing7.ogg_169d48fd b/ogg/general/combat/handswing7.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/handswing7.ogg_169d48fd
rename to ogg/general/combat/handswing7.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/handswing8.ogg_e5ac9427 b/ogg/general/combat/handswing8.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/handswing8.ogg_e5ac9427
rename to ogg/general/combat/handswing8.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/holster.ogg_b75f11ca b/ogg/general/combat/holster.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/holster.ogg_b75f11ca
rename to ogg/general/combat/holster.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/kick1.ogg_f8c0b01f b/ogg/general/combat/kick1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/kick1.ogg_f8c0b01f
rename to ogg/general/combat/kick1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/kick2.ogg_3b35dd06 b/ogg/general/combat/kick2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/kick2.ogg_3b35dd06
rename to ogg/general/combat/kick2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/kick3.ogg_e02d3cf7 b/ogg/general/combat/kick3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/kick3.ogg_e02d3cf7
rename to ogg/general/combat/kick3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/larkanstungun.ogg_e38f273c b/ogg/general/combat/larkanstungun.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/larkanstungun.ogg_e38f273c
rename to ogg/general/combat/larkanstungun.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/lion1.ogg_17d03e2b b/ogg/general/combat/lion1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/lion1.ogg_17d03e2b
rename to ogg/general/combat/lion1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/lion2.ogg_c14585f4 b/ogg/general/combat/lion2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/lion2.ogg_c14585f4
rename to ogg/general/combat/lion2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/liondead.ogg_c59b5cfe b/ogg/general/combat/liondead.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/liondead.ogg_c59b5cfe
rename to ogg/general/combat/liondead.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/attack1.ogg_ea50114e b/ogg/general/combat/megasuit/attack1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/attack1.ogg_ea50114e
rename to ogg/general/combat/megasuit/attack1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/crash1.ogg_b41add77 b/ogg/general/combat/megasuit/crash1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/crash1.ogg_b41add77
rename to ogg/general/combat/megasuit/crash1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/crash2.ogg_f633d996 b/ogg/general/combat/megasuit/crash2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/crash2.ogg_f633d996
rename to ogg/general/combat/megasuit/crash2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/die.ogg_48147be5 b/ogg/general/combat/megasuit/die.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/die.ogg_48147be5
rename to ogg/general/combat/megasuit/die.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/fall.ogg_7928a7c3 b/ogg/general/combat/megasuit/fall.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/fall.ogg_7928a7c3
rename to ogg/general/combat/megasuit/fall.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/lower.ogg_949d023a b/ogg/general/combat/megasuit/lower.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/lower.ogg_949d023a
rename to ogg/general/combat/megasuit/lower.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/o1.ogg_922582d8 b/ogg/general/combat/megasuit/o1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/o1.ogg_922582d8
rename to ogg/general/combat/megasuit/o1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/o2.ogg_3200ff33 b/ogg/general/combat/megasuit/o2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/o2.ogg_3200ff33
rename to ogg/general/combat/megasuit/o2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/punch1.ogg_96a68d7a b/ogg/general/combat/megasuit/punch1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/punch1.ogg_96a68d7a
rename to ogg/general/combat/megasuit/punch1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/punch2.ogg_c2e5f329 b/ogg/general/combat/megasuit/punch2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/punch2.ogg_c2e5f329
rename to ogg/general/combat/megasuit/punch2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/punch3.ogg_55408e35 b/ogg/general/combat/megasuit/punch3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/punch3.ogg_55408e35
rename to ogg/general/combat/megasuit/punch3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/raise.ogg_eafcff64 b/ogg/general/combat/megasuit/raise.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/raise.ogg_eafcff64
rename to ogg/general/combat/megasuit/raise.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/step1.ogg_39036037 b/ogg/general/combat/megasuit/step1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/step1.ogg_39036037
rename to ogg/general/combat/megasuit/step1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/step2.ogg_64b8f118 b/ogg/general/combat/megasuit/step2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/step2.ogg_64b8f118
rename to ogg/general/combat/megasuit/step2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/v1.ogg_cc1e5437 b/ogg/general/combat/megasuit/v1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/v1.ogg_cc1e5437
rename to ogg/general/combat/megasuit/v1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/v2.ogg_d17963b7 b/ogg/general/combat/megasuit/v2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/v2.ogg_d17963b7
rename to ogg/general/combat/megasuit/v2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/v3.ogg_dcecd0ef b/ogg/general/combat/megasuit/v3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/megasuit_1d9e95fb/v3.ogg_dcecd0ef
rename to ogg/general/combat/megasuit/v3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/monster.ogg_700a15ba b/ogg/general/combat/monster.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/monster.ogg_700a15ba
rename to ogg/general/combat/monster.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/monsterclaw.ogg_1ab78a1e b/ogg/general/combat/monsterclaw.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/monsterclaw.ogg_1ab78a1e
rename to ogg/general/combat/monsterclaw.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/outofammo.ogg_db4d16ed b/ogg/general/combat/outofammo.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/outofammo.ogg_db4d16ed
rename to ogg/general/combat/outofammo.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/pelt.ogg_773c0514 b/ogg/general/combat/pelt.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/pelt.ogg_773c0514
rename to ogg/general/combat/pelt.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/ray.ogg_f921ad48 b/ogg/general/combat/ray.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/ray.ogg_f921ad48
rename to ogg/general/combat/ray.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/reload.ogg_cad4c9ac b/ogg/general/combat/reload.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/reload.ogg_cad4c9ac
rename to ogg/general/combat/reload.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/rkick.ogg_40d1ed29 b/ogg/general/combat/rkick.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/rkick.ogg_40d1ed29
rename to ogg/general/combat/rkick.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/robot punch.ogg_82163f83 b/ogg/general/combat/robot punch.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/robot punch.ogg_82163f83
rename to ogg/general/combat/robot punch.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/shellexplode.ogg_d58c1fb7 b/ogg/general/combat/shellexplode.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/shellexplode.ogg_d58c1fb7
rename to ogg/general/combat/shellexplode.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/shoot1.ogg_e67feaae b/ogg/general/combat/shoot1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/shoot1.ogg_e67feaae
rename to ogg/general/combat/shoot1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/shoot2.ogg_c804d6a2 b/ogg/general/combat/shoot2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/shoot2.ogg_c804d6a2
rename to ogg/general/combat/shoot2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/shoot3.ogg_44bb8f73 b/ogg/general/combat/shoot3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/shoot3.ogg_44bb8f73
rename to ogg/general/combat/shoot3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/shoot4.ogg_993ebccc b/ogg/general/combat/shoot4.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/shoot4.ogg_993ebccc
rename to ogg/general/combat/shoot4.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/slime.ogg_283e09e7 b/ogg/general/combat/slime.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/slime.ogg_283e09e7
rename to ogg/general/combat/slime.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/smokegrenade.ogg_6c5e5f5f b/ogg/general/combat/smokegrenade.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/smokegrenade.ogg_6c5e5f5f
rename to ogg/general/combat/smokegrenade.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/sonic scream.ogg_52a8bcc4 b/ogg/general/combat/sonic scream.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/sonic scream.ogg_52a8bcc4
rename to ogg/general/combat/sonic scream.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/stun crystal.ogg_8989e4de b/ogg/general/combat/stun crystal.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/stun crystal.ogg_8989e4de
rename to ogg/general/combat/stun crystal.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/stunned.ogg_e2efbde3 b/ogg/general/combat/stunned.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/stunned.ogg_e2efbde3
rename to ogg/general/combat/stunned.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/suit_8432e814/enter.ogg_466bb343 b/ogg/general/combat/suit/enter.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/suit_8432e814/enter.ogg_466bb343
rename to ogg/general/combat/suit/enter.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/suit_8432e814/explode.ogg_42b474a4 b/ogg/general/combat/suit/explode.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/suit_8432e814/explode.ogg_42b474a4
rename to ogg/general/combat/suit/explode.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/suit_8432e814/hit.ogg_f3a6f236 b/ogg/general/combat/suit/hit.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/suit_8432e814/hit.ogg_f3a6f236
rename to ogg/general/combat/suit/hit.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/suit_8432e814/land.ogg_93cb8fa2 b/ogg/general/combat/suit/land.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/suit_8432e814/land.ogg_93cb8fa2
rename to ogg/general/combat/suit/land.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/suit_8432e814/laser1.ogg_5168472c b/ogg/general/combat/suit/laser1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/suit_8432e814/laser1.ogg_5168472c
rename to ogg/general/combat/suit/laser1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/suit_8432e814/laser2.ogg_7cf39574 b/ogg/general/combat/suit/laser2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/suit_8432e814/laser2.ogg_7cf39574
rename to ogg/general/combat/suit/laser2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/suit_8432e814/launch.ogg_561fb1f7 b/ogg/general/combat/suit/launch.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/suit_8432e814/launch.ogg_561fb1f7
rename to ogg/general/combat/suit/launch.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/suit_8432e814/miss.ogg_963111fd b/ogg/general/combat/suit/miss.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/suit_8432e814/miss.ogg_963111fd
rename to ogg/general/combat/suit/miss.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/suit_8432e814/move.ogg_6f45dc4c b/ogg/general/combat/suit/move.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/suit_8432e814/move.ogg_6f45dc4c
rename to ogg/general/combat/suit/move.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/suit_8432e814/move1.ogg_254d17b9 b/ogg/general/combat/suit/move1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/suit_8432e814/move1.ogg_254d17b9
rename to ogg/general/combat/suit/move1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/suit_8432e814/move2.ogg_817b6909 b/ogg/general/combat/suit/move2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/suit_8432e814/move2.ogg_817b6909
rename to ogg/general/combat/suit/move2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/suit_8432e814/move3.ogg_0117ad15 b/ogg/general/combat/suit/move3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/suit_8432e814/move3.ogg_0117ad15
rename to ogg/general/combat/suit/move3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/suit_8432e814/repair.ogg_0b1d34b7 b/ogg/general/combat/suit/repair.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/suit_8432e814/repair.ogg_0b1d34b7
rename to ogg/general/combat/suit/repair.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/target_a0e30798/bullet.ogg_5251e860 b/ogg/general/combat/target/bullet.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/target_a0e30798/bullet.ogg_5251e860
rename to ogg/general/combat/target/bullet.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/target_a0e30798/shoot.ogg_2b5ea558 b/ogg/general/combat/target/shoot.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/target_a0e30798/shoot.ogg_2b5ea558
rename to ogg/general/combat/target/shoot.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/target_a0e30798/smash.ogg_5dcc05e9 b/ogg/general/combat/target/smash.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/target_a0e30798/smash.ogg_5dcc05e9
rename to ogg/general/combat/target/smash.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/target_a0e30798/target.ogg_413a2350 b/ogg/general/combat/target/target.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/target_a0e30798/target.ogg_413a2350
rename to ogg/general/combat/target/target.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/target_a0e30798/wall.ogg_e47e84ff b/ogg/general/combat/target/wall.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/target_a0e30798/wall.ogg_e47e84ff
rename to ogg/general/combat/target/wall.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/tentakle.ogg_60032e01 b/ogg/general/combat/tentakle.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/tentakle.ogg_60032e01
rename to ogg/general/combat/tentakle.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/throwoffstun.ogg_c0587aa8 b/ogg/general/combat/throwoffstun.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/throwoffstun.ogg_c0587aa8
rename to ogg/general/combat/throwoffstun.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/timer.ogg_d73abc42 b/ogg/general/combat/timer.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/timer.ogg_d73abc42
rename to ogg/general/combat/timer.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/vehicles_2238d24d/gun.ogg_34eb2c19 b/ogg/general/combat/vehicles/gun.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/vehicles_2238d24d/gun.ogg_34eb2c19
rename to ogg/general/combat/vehicles/gun.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/vehicles_2238d24d/guno.ogg_1ae47d46 b/ogg/general/combat/vehicles/guno.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/vehicles_2238d24d/guno.ogg_1ae47d46
rename to ogg/general/combat/vehicles/guno.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/vehicles_2238d24d/machinein.ogg_d3d89884 b/ogg/general/combat/vehicles/machinein.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/vehicles_2238d24d/machinein.ogg_d3d89884
rename to ogg/general/combat/vehicles/machinein.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/vehicles_2238d24d/machineout.ogg_3707afc1 b/ogg/general/combat/vehicles/machineout.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/vehicles_2238d24d/machineout.ogg_3707afc1
rename to ogg/general/combat/vehicles/machineout.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/vehicles_2238d24d/rocket.ogg_833237f3 b/ogg/general/combat/vehicles/rocket.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/vehicles_2238d24d/rocket.ogg_833237f3
rename to ogg/general/combat/vehicles/rocket.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/vehicles_2238d24d/rocketo.ogg_0cf9d27b b/ogg/general/combat/vehicles/rocketo.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/vehicles_2238d24d/rocketo.ogg_0cf9d27b
rename to ogg/general/combat/vehicles/rocketo.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/vehicles_2238d24d/shell.ogg_471119ee b/ogg/general/combat/vehicles/shell.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/vehicles_2238d24d/shell.ogg_471119ee
rename to ogg/general/combat/vehicles/shell.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/vehicles_2238d24d/turin.ogg_3b971f91 b/ogg/general/combat/vehicles/turin.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/vehicles_2238d24d/turin.ogg_3b971f91
rename to ogg/general/combat/vehicles/turin.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/vehicles_2238d24d/turout.ogg_2d39cdf6 b/ogg/general/combat/vehicles/turout.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/vehicles_2238d24d/turout.ogg_2d39cdf6
rename to ogg/general/combat/vehicles/turout.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/warning.ogg_266a3b15 b/ogg/general/combat/warning.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/warning.ogg_266a3b15
rename to ogg/general/combat/warning.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/damaged.ogg_d8053db6 b/ogg/general/combat/weapons/damaged.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/damaged.ogg_d8053db6
rename to ogg/general/combat/weapons/damaged.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/draw1.ogg_3bf0e5ca b/ogg/general/combat/weapons/default_shootable/draw1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/draw1.ogg_3bf0e5ca
rename to ogg/general/combat/weapons/default_shootable/draw1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/fire1.ogg_987fcd0e b/ogg/general/combat/weapons/default_shootable/fire1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/fire1.ogg_987fcd0e
rename to ogg/general/combat/weapons/default_shootable/fire1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/fire2.ogg_ab1c752c b/ogg/general/combat/weapons/default_shootable/fire2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/fire2.ogg_ab1c752c
rename to ogg/general/combat/weapons/default_shootable/fire2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/fire3.ogg_15a5ef57 b/ogg/general/combat/weapons/default_shootable/fire3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/fire3.ogg_15a5ef57
rename to ogg/general/combat/weapons/default_shootable/fire3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/flesh1.ogg_33ed208d b/ogg/general/combat/weapons/default_shootable/flesh1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/flesh1.ogg_33ed208d
rename to ogg/general/combat/weapons/default_shootable/flesh1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/flesh2.ogg_a32199ee b/ogg/general/combat/weapons/default_shootable/flesh2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/flesh2.ogg_a32199ee
rename to ogg/general/combat/weapons/default_shootable/flesh2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/flesh3.ogg_3c16e372 b/ogg/general/combat/weapons/default_shootable/flesh3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/flesh3.ogg_3c16e372
rename to ogg/general/combat/weapons/default_shootable/flesh3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/holster1.ogg_2e3807b1 b/ogg/general/combat/weapons/default_shootable/holster1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/holster1.ogg_2e3807b1
rename to ogg/general/combat/weapons/default_shootable/holster1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/metal1.ogg_0d00c3b9 b/ogg/general/combat/weapons/default_shootable/metal1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/metal1.ogg_0d00c3b9
rename to ogg/general/combat/weapons/default_shootable/metal1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/metal2.ogg_9d118138 b/ogg/general/combat/weapons/default_shootable/metal2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/metal2.ogg_9d118138
rename to ogg/general/combat/weapons/default_shootable/metal2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/metal3.ogg_0e55bc0a b/ogg/general/combat/weapons/default_shootable/metal3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_shootable_3a63a9c2/metal3.ogg_0e55bc0a
rename to ogg/general/combat/weapons/default_shootable/metal3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/draw1.ogg_432dc71e b/ogg/general/combat/weapons/default_swingable/draw1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/draw1.ogg_432dc71e
rename to ogg/general/combat/weapons/default_swingable/draw1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/fire1.ogg_1de5c99a b/ogg/general/combat/weapons/default_swingable/fire1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/fire1.ogg_1de5c99a
rename to ogg/general/combat/weapons/default_swingable/fire1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/fire2.ogg_c5d84d26 b/ogg/general/combat/weapons/default_swingable/fire2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/fire2.ogg_c5d84d26
rename to ogg/general/combat/weapons/default_swingable/fire2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/fire3.ogg_bb65408c b/ogg/general/combat/weapons/default_swingable/fire3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/fire3.ogg_bb65408c
rename to ogg/general/combat/weapons/default_swingable/fire3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/flesh1.ogg_c466ab9d b/ogg/general/combat/weapons/default_swingable/flesh1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/flesh1.ogg_c466ab9d
rename to ogg/general/combat/weapons/default_swingable/flesh1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/flesh2.ogg_b255e45a b/ogg/general/combat/weapons/default_swingable/flesh2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/flesh2.ogg_b255e45a
rename to ogg/general/combat/weapons/default_swingable/flesh2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/flesh3.ogg_f2834d56 b/ogg/general/combat/weapons/default_swingable/flesh3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/flesh3.ogg_f2834d56
rename to ogg/general/combat/weapons/default_swingable/flesh3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/holster1.ogg_cf12cd8c b/ogg/general/combat/weapons/default_swingable/holster1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/holster1.ogg_cf12cd8c
rename to ogg/general/combat/weapons/default_swingable/holster1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/metal1.ogg_908ff986 b/ogg/general/combat/weapons/default_swingable/metal1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/metal1.ogg_908ff986
rename to ogg/general/combat/weapons/default_swingable/metal1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/metal2.ogg_428e0d6b b/ogg/general/combat/weapons/default_swingable/metal2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/metal2.ogg_428e0d6b
rename to ogg/general/combat/weapons/default_swingable/metal2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/metal3.ogg_2e99fdc1 b/ogg/general/combat/weapons/default_swingable/metal3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/default_swingable_3d58ebe4/metal3.ogg_2e99fdc1
rename to ogg/general/combat/weapons/default_swingable/metal3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/generalgun.ogg_f1a48816 b/ogg/general/combat/weapons/generalgun.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/generalgun.ogg_f1a48816
rename to ogg/general/combat/weapons/generalgun.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/generalswing.ogg_e7c60ddd b/ogg/general/combat/weapons/generalswing.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/generalswing.ogg_e7c60ddd
rename to ogg/general/combat/weapons/generalswing.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/hit3.ogg_3bf89021 b/ogg/general/combat/weapons/hit3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/hit3.ogg_3bf89021
rename to ogg/general/combat/weapons/hit3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/mgun1.ogg_0294f3a9 b/ogg/general/combat/weapons/mgun1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/mgun1.ogg_0294f3a9
rename to ogg/general/combat/weapons/mgun1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/mgun2.ogg_117c20fc b/ogg/general/combat/weapons/mgun2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/mgun2.ogg_117c20fc
rename to ogg/general/combat/weapons/mgun2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/overheat.ogg_6af951da b/ogg/general/combat/weapons/overheat.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/overheat.ogg_6af951da
rename to ogg/general/combat/weapons/overheat.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/pistol1.ogg_5f8a7841 b/ogg/general/combat/weapons/pistol1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/pistol1.ogg_5f8a7841
rename to ogg/general/combat/weapons/pistol1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/pistol2.ogg_87e8069d b/ogg/general/combat/weapons/pistol2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/pistol2.ogg_87e8069d
rename to ogg/general/combat/weapons/pistol2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/retract1.ogg_cf47e299 b/ogg/general/combat/weapons/retract1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/retract1.ogg_cf47e299
rename to ogg/general/combat/weapons/retract1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/rifle1.ogg_0f9a9155 b/ogg/general/combat/weapons/rifle1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/rifle1.ogg_0f9a9155
rename to ogg/general/combat/weapons/rifle1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/rifle2.ogg_8caebb42 b/ogg/general/combat/weapons/rifle2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/rifle2.ogg_8caebb42
rename to ogg/general/combat/weapons/rifle2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/rifle3.ogg_d208cd99 b/ogg/general/combat/weapons/rifle3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/rifle3.ogg_d208cd99
rename to ogg/general/combat/weapons/rifle3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/rocketaim.ogg_124a3ea1 b/ogg/general/combat/weapons/rocketaim.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/rocketaim.ogg_124a3ea1
rename to ogg/general/combat/weapons/rocketaim.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/rocketboom1.ogg_e394399d b/ogg/general/combat/weapons/rocketboom1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/rocketboom1.ogg_e394399d
rename to ogg/general/combat/weapons/rocketboom1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/rocketboom2.ogg_b7dc7e13 b/ogg/general/combat/weapons/rocketboom2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/rocketboom2.ogg_b7dc7e13
rename to ogg/general/combat/weapons/rocketboom2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/rocketfly.ogg_64bc4538 b/ogg/general/combat/weapons/rocketfly.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/rocketfly.ogg_64bc4538
rename to ogg/general/combat/weapons/rocketfly.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sb1_5a199ecb/draw1.ogg_75ad8292 b/ogg/general/combat/weapons/sb1/draw1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sb1_5a199ecb/draw1.ogg_75ad8292
rename to ogg/general/combat/weapons/sb1/draw1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sb1_5a199ecb/fire1.ogg_54cac947 b/ogg/general/combat/weapons/sb1/fire1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sb1_5a199ecb/fire1.ogg_54cac947
rename to ogg/general/combat/weapons/sb1/fire1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sb1_5a199ecb/fire2.ogg_7cf45efc b/ogg/general/combat/weapons/sb1/fire2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sb1_5a199ecb/fire2.ogg_7cf45efc
rename to ogg/general/combat/weapons/sb1/fire2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sb1_5a199ecb/fire3.ogg_b06c0f19 b/ogg/general/combat/weapons/sb1/fire3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sb1_5a199ecb/fire3.ogg_b06c0f19
rename to ogg/general/combat/weapons/sb1/fire3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sb1_5a199ecb/flesh1.ogg_be36a8a3 b/ogg/general/combat/weapons/sb1/flesh1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sb1_5a199ecb/flesh1.ogg_be36a8a3
rename to ogg/general/combat/weapons/sb1/flesh1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sb1_5a199ecb/flesh2.ogg_369d8102 b/ogg/general/combat/weapons/sb1/flesh2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sb1_5a199ecb/flesh2.ogg_369d8102
rename to ogg/general/combat/weapons/sb1/flesh2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sb1_5a199ecb/flesh3.ogg_572c61dd b/ogg/general/combat/weapons/sb1/flesh3.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sb1_5a199ecb/flesh3.ogg_572c61dd
rename to ogg/general/combat/weapons/sb1/flesh3.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sb1_5a199ecb/holster1.ogg_d26d1efa b/ogg/general/combat/weapons/sb1/holster1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sb1_5a199ecb/holster1.ogg_d26d1efa
rename to ogg/general/combat/weapons/sb1/holster1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sniper1.ogg_c2d1d6f5 b/ogg/general/combat/weapons/sniper1.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sniper1.ogg_c2d1d6f5
rename to ogg/general/combat/weapons/sniper1.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sniper2.ogg_c0bbce32 b/ogg/general/combat/weapons/sniper2.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/weapons_54fa8d35/sniper2.ogg_c0bbce32
rename to ogg/general/combat/weapons/sniper2.ogg
diff --git a/ogg/general_265f6970/combat_f5886892/whistle.ogg_3fcaca47 b/ogg/general/combat/whistle.ogg
similarity index 100%
rename from ogg/general_265f6970/combat_f5886892/whistle.ogg_3fcaca47
rename to ogg/general/combat/whistle.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/activate.ogg_6a9d5006 b/ogg/general/comms/activate.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/activate.ogg_6a9d5006
rename to ogg/general/comms/activate.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/announcement.ogg_7c41f35c b/ogg/general/comms/announcement.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/announcement.ogg_7c41f35c
rename to ogg/general/comms/announcement.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/arena.ogg_f722f0b2 b/ogg/general/comms/arena.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/arena.ogg_f722f0b2
rename to ogg/general/comms/arena.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/battlesuit.ogg_0d213991 b/ogg/general/comms/battlesuit.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/battlesuit.ogg_0d213991
rename to ogg/general/comms/battlesuit.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/birthday.ogg_9e2daf3f b/ogg/general/comms/birthday.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/birthday.ogg_9e2daf3f
rename to ogg/general/comms/birthday.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/blueprint.ogg_ec17ffd4 b/ogg/general/comms/blueprint.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/blueprint.ogg_ec17ffd4
rename to ogg/general/comms/blueprint.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/bomb.ogg_4478cc27 b/ogg/general/comms/bomb.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/bomb.ogg_4478cc27
rename to ogg/general/comms/bomb.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/brag.ogg_eb203470 b/ogg/general/comms/brag.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/brag.ogg_eb203470
rename to ogg/general/comms/brag.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/change.ogg_6be75009 b/ogg/general/comms/change.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/change.ogg_6be75009
rename to ogg/general/comms/change.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/chargen.ogg_b2113989 b/ogg/general/comms/chargen.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/chargen.ogg_b2113989
rename to ogg/general/comms/chargen.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/chat.ogg_26682b26 b/ogg/general/comms/chat.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/chat.ogg_26682b26
rename to ogg/general/comms/chat.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/cheer.ogg_37e5b6db b/ogg/general/comms/cheer.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/cheer.ogg_37e5b6db
rename to ogg/general/comms/cheer.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/clanchat.ogg_04533339 b/ogg/general/comms/clanchat.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/clanchat.ogg_04533339
rename to ogg/general/comms/clanchat.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/deactivate.ogg_f408a50c b/ogg/general/comms/deactivate.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/deactivate.ogg_f408a50c
rename to ogg/general/comms/deactivate.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/dispatch.ogg_5a015bac b/ogg/general/comms/dispatch.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/dispatch.ogg_5a015bac
rename to ogg/general/comms/dispatch.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/distress.ogg_1b40a3ec b/ogg/general/comms/distress.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/distress.ogg_1b40a3ec
rename to ogg/general/comms/distress.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/drone.ogg_59886f58 b/ogg/general/comms/drone.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/drone.ogg_59886f58
rename to ogg/general/comms/drone.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/drone1.ogg_b3442cd9 b/ogg/general/comms/drone1.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/drone1.ogg_b3442cd9
rename to ogg/general/comms/drone1.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/drone2.ogg_096e42eb b/ogg/general/comms/drone2.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/drone2.ogg_096e42eb
rename to ogg/general/comms/drone2.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/evac.ogg_18442733 b/ogg/general/comms/evac.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/evac.ogg_18442733
rename to ogg/general/comms/evac.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/event.ogg_dd8becb6 b/ogg/general/comms/event.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/event.ogg_dd8becb6
rename to ogg/general/comms/event.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/fires.ogg_b1ae3de1 b/ogg/general/comms/fires.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/fires.ogg_b1ae3de1
rename to ogg/general/comms/fires.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/g2a.ogg_a47def0f b/ogg/general/comms/g2a.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/g2a.ogg_a47def0f
rename to ogg/general/comms/g2a.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/game.ogg_849e8aac b/ogg/general/comms/game.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/game.ogg_849e8aac
rename to ogg/general/comms/game.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/general.ogg_15ea98e1 b/ogg/general/comms/general.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/general.ogg_15ea98e1
rename to ogg/general/comms/general.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/gmc.ogg_f53c7a51 b/ogg/general/comms/gmc.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/gmc.ogg_f53c7a51
rename to ogg/general/comms/gmc.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/growl1.ogg_1dfd888d b/ogg/general/comms/growl1.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/growl1.ogg_1dfd888d
rename to ogg/general/comms/growl1.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/growl2.ogg_8df55d8d b/ogg/general/comms/growl2.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/growl2.ogg_8df55d8d
rename to ogg/general/comms/growl2.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/growl3.ogg_a85804be b/ogg/general/comms/growl3.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/growl3.ogg_a85804be
rename to ogg/general/comms/growl3.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/help.ogg_ad15dc9f b/ogg/general/comms/help.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/help.ogg_ad15dc9f
rename to ogg/general/comms/help.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/holo.ogg_19fe2b36 b/ogg/general/comms/holo.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/holo.ogg_19fe2b36
rename to ogg/general/comms/holo.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/htpc.ogg_1a7fde4d b/ogg/general/comms/htpc.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/htpc.ogg_1a7fde4d
rename to ogg/general/comms/htpc.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/htpl.ogg_4a29df62 b/ogg/general/comms/htpl.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/htpl.ogg_4a29df62
rename to ogg/general/comms/htpl.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/icnotice.ogg_cb50495e b/ogg/general/comms/icnotice.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/icnotice.ogg_cb50495e
rename to ogg/general/comms/icnotice.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/infocomputernotification.ogg_5c932f87 b/ogg/general/comms/infocomputernotification.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/infocomputernotification.ogg_5c932f87
rename to ogg/general/comms/infocomputernotification.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/infocomputershutdown.ogg_3f445bdc b/ogg/general/comms/infocomputershutdown.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/infocomputershutdown.ogg_3f445bdc
rename to ogg/general/comms/infocomputershutdown.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/infocomputerstartup.ogg_961e1e4c b/ogg/general/comms/infocomputerstartup.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/infocomputerstartup.ogg_961e1e4c
rename to ogg/general/comms/infocomputerstartup.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/infocomputerwelcome.ogg_e41a7f7f b/ogg/general/comms/infocomputerwelcome.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/infocomputerwelcome.ogg_e41a7f7f
rename to ogg/general/comms/infocomputerwelcome.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/intel.ogg_ce8f5c3e b/ogg/general/comms/intel.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/intel.ogg_ce8f5c3e
rename to ogg/general/comms/intel.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/intercom.ogg_16a2b586 b/ogg/general/comms/intercom.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/intercom.ogg_16a2b586
rename to ogg/general/comms/intercom.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/jag.ogg_f547a108 b/ogg/general/comms/jag.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/jag.ogg_f547a108
rename to ogg/general/comms/jag.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/link.ogg_181405d0 b/ogg/general/comms/link.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/link.ogg_181405d0
rename to ogg/general/comms/link.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/linkconfirmed.ogg_a2c2ca2e b/ogg/general/comms/linkconfirmed.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/linkconfirmed.ogg_a2c2ca2e
rename to ogg/general/comms/linkconfirmed.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/linkrequest.ogg_f43de377 b/ogg/general/comms/linkrequest.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/linkrequest.ogg_f43de377
rename to ogg/general/comms/linkrequest.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/lowcharge.ogg_be719bbd b/ogg/general/comms/lowcharge.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/lowcharge.ogg_be719bbd
rename to ogg/general/comms/lowcharge.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/mail.ogg_3dfea492 b/ogg/general/comms/mail.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/mail.ogg_3dfea492
rename to ogg/general/comms/mail.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/mailclose.ogg_d0c59567 b/ogg/general/comms/mailclose.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/mailclose.ogg_d0c59567
rename to ogg/general/comms/mailclose.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/maildelete.ogg_b48fc372 b/ogg/general/comms/maildelete.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/maildelete.ogg_b48fc372
rename to ogg/general/comms/maildelete.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/mailopen.ogg_6bcef28d b/ogg/general/comms/mailopen.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/mailopen.ogg_6bcef28d
rename to ogg/general/comms/mailopen.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/mailsent.ogg_20c9497b b/ogg/general/comms/mailsent.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/mailsent.ogg_20c9497b
rename to ogg/general/comms/mailsent.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/mentor.ogg_df7bec9f b/ogg/general/comms/mentor.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/mentor.ogg_df7bec9f
rename to ogg/general/comms/mentor.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/merchant.ogg_8cc9f27b b/ogg/general/comms/merchant.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/merchant.ogg_8cc9f27b
rename to ogg/general/comms/merchant.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/meteor.ogg_b1a74f76 b/ogg/general/comms/meteor.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/meteor.ogg_b1a74f76
rename to ogg/general/comms/meteor.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/mfas.ogg_69c2bafe b/ogg/general/comms/mfas.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/mfas.ogg_69c2bafe
rename to ogg/general/comms/mfas.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/mi.ogg_3aad46a3 b/ogg/general/comms/mi.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/mi.ogg_3aad46a3
rename to ogg/general/comms/mi.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/military.ogg_52a05677 b/ogg/general/comms/military.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/military.ogg_52a05677
rename to ogg/general/comms/military.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/minigame.ogg_6f15793f b/ogg/general/comms/minigame.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/minigame.ogg_6f15793f
rename to ogg/general/comms/minigame.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/missions.ogg_71191fa5 b/ogg/general/comms/missions.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/missions.ogg_71191fa5
rename to ogg/general/comms/missions.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/monitor.ogg_eb1a199c b/ogg/general/comms/monitor.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/monitor.ogg_eb1a199c
rename to ogg/general/comms/monitor.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/movement.ogg_bb7ac0ba b/ogg/general/comms/movement.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/movement.ogg_bb7ac0ba
rename to ogg/general/comms/movement.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/musicfm.ogg_5c438c40 b/ogg/general/comms/musicfm.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/musicfm.ogg_5c438c40
rename to ogg/general/comms/musicfm.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/mutariansi.ogg_3254b943 b/ogg/general/comms/mutariansi.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/mutariansi.ogg_3254b943
rename to ogg/general/comms/mutariansi.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/newbie.ogg_af2fb4c9 b/ogg/general/comms/newbie.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/newbie.ogg_af2fb4c9
rename to ogg/general/comms/newbie.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/news-1.ogg_60ba8bc2 b/ogg/general/comms/news-1.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/news-1.ogg_60ba8bc2
rename to ogg/general/comms/news-1.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/news.ogg_44230eed b/ogg/general/comms/news.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/news.ogg_44230eed
rename to ogg/general/comms/news.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/nh.ogg_655e9ee5 b/ogg/general/comms/nh.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/nh.ogg_655e9ee5
rename to ogg/general/comms/nh.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/ooc.ogg_9ece1934 b/ogg/general/comms/ooc.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/ooc.ogg_9ece1934
rename to ogg/general/comms/ooc.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/oocboard.ogg_fc7ea652 b/ogg/general/comms/oocboard.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/oocboard.ogg_fc7ea652
rename to ogg/general/comms/oocboard.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/oocdenied.ogg_bca027ea b/ogg/general/comms/oocdenied.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/oocdenied.ogg_bca027ea
rename to ogg/general/comms/oocdenied.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/oocinter.ogg_e6b8f31f b/ogg/general/comms/oocinter.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/oocinter.ogg_e6b8f31f
rename to ogg/general/comms/oocinter.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/oocrequest.ogg_76bbf625 b/ogg/general/comms/oocrequest.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/oocrequest.ogg_76bbf625
rename to ogg/general/comms/oocrequest.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/org.ogg_4d9a862a b/ogg/general/comms/org.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/org.ogg_4d9a862a
rename to ogg/general/comms/org.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/origins.ogg_22965b38 b/ogg/general/comms/origins.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/origins.ogg_22965b38
rename to ogg/general/comms/origins.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/originsauto.ogg_4aa495b4 b/ogg/general/comms/originsauto.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/originsauto.ogg_4aa495b4
rename to ogg/general/comms/originsauto.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/otherphase.ogg_6380b805 b/ogg/general/comms/otherphase.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/otherphase.ogg_6380b805
rename to ogg/general/comms/otherphase.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/petition.ogg_0becd9e5 b/ogg/general/comms/petition.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/petition.ogg_0becd9e5
rename to ogg/general/comms/petition.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/phase.ogg_18ec6490 b/ogg/general/comms/phase.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/phase.ogg_18ec6490
rename to ogg/general/comms/phase.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/phasefail.ogg_dbdad6d5 b/ogg/general/comms/phasefail.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/phasefail.ogg_dbdad6d5
rename to ogg/general/comms/phasefail.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/phonering.ogg_b92c8bcd b/ogg/general/comms/phonering.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/phonering.ogg_b92c8bcd
rename to ogg/general/comms/phonering.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/pickup.ogg_77d3a145 b/ogg/general/comms/pickup.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/pickup.ogg_77d3a145
rename to ogg/general/comms/pickup.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/picturemessage.ogg_842a8adf b/ogg/general/comms/picturemessage.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/picturemessage.ogg_842a8adf
rename to ogg/general/comms/picturemessage.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/pn1.ogg_198146d6 b/ogg/general/comms/pn1.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/pn1.ogg_198146d6
rename to ogg/general/comms/pn1.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/pn2.ogg_5b7880f2 b/ogg/general/comms/pn2.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/pn2.ogg_5b7880f2
rename to ogg/general/comms/pn2.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/pn3.ogg_1a8ca1d2 b/ogg/general/comms/pn3.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/pn3.ogg_1a8ca1d2
rename to ogg/general/comms/pn3.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/poll.ogg_f4a39833 b/ogg/general/comms/poll.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/poll.ogg_f4a39833
rename to ogg/general/comms/poll.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/privcom.ogg_36a4e737 b/ogg/general/comms/privcom.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/privcom.ogg_36a4e737
rename to ogg/general/comms/privcom.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/privnet.ogg_91fdd35a b/ogg/general/comms/privnet.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/privnet.ogg_91fdd35a
rename to ogg/general/comms/privnet.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/privooccom.ogg_822ea9f2 b/ogg/general/comms/privooccom.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/privooccom.ogg_822ea9f2
rename to ogg/general/comms/privooccom.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/radio.ogg_acdb84d0 b/ogg/general/comms/radio.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/radio.ogg_acdb84d0
rename to ogg/general/comms/radio.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/recruiting.ogg_6dca516a b/ogg/general/comms/recruiting.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/recruiting.ogg_6dca516a
rename to ogg/general/comms/recruiting.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/reminder.ogg_a11ce19f b/ogg/general/comms/reminder.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/reminder.ogg_a11ce19f
rename to ogg/general/comms/reminder.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/rooc.ogg_32934662 b/ogg/general/comms/rooc.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/rooc.ogg_32934662
rename to ogg/general/comms/rooc.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/rp.ogg_a285562e b/ogg/general/comms/rp.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/rp.ogg_a285562e
rename to ogg/general/comms/rp.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/rumble1.ogg_9d68d71a b/ogg/general/comms/rumble1.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/rumble1.ogg_9d68d71a
rename to ogg/general/comms/rumble1.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/rumble2.ogg_ef418611 b/ogg/general/comms/rumble2.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/rumble2.ogg_ef418611
rename to ogg/general/comms/rumble2.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/rumble3.ogg_4c37d2e8 b/ogg/general/comms/rumble3.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/rumble3.ogg_4c37d2e8
rename to ogg/general/comms/rumble3.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/ryuchichitter1.ogg_681cbfca b/ogg/general/comms/ryuchichitter1.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/ryuchichitter1.ogg_681cbfca
rename to ogg/general/comms/ryuchichitter1.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/ryuchichitter2.ogg_53df9600 b/ogg/general/comms/ryuchichitter2.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/ryuchichitter2.ogg_53df9600
rename to ogg/general/comms/ryuchichitter2.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/ryuchichitter3.ogg_8125196a b/ogg/general/comms/ryuchichitter3.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/ryuchichitter3.ogg_8125196a
rename to ogg/general/comms/ryuchichitter3.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/ryuchichitter4.ogg_389e9fd9 b/ogg/general/comms/ryuchichitter4.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/ryuchichitter4.ogg_389e9fd9
rename to ogg/general/comms/ryuchichitter4.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/ryuchichitter5.ogg_0480550e b/ogg/general/comms/ryuchichitter5.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/ryuchichitter5.ogg_0480550e
rename to ogg/general/comms/ryuchichitter5.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/sdl.ogg_b8903ac7 b/ogg/general/comms/sdl.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/sdl.ogg_b8903ac7
rename to ogg/general/comms/sdl.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/ship2ship.ogg_2ab0922e b/ogg/general/comms/ship2ship.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/ship2ship.ogg_2ab0922e
rename to ogg/general/comms/ship2ship.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/shortwave.ogg_635081fc b/ogg/general/comms/shortwave.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/shortwave.ogg_635081fc
rename to ogg/general/comms/shortwave.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/skilltimer.ogg_3b173e1b b/ogg/general/comms/skilltimer.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/skilltimer.ogg_3b173e1b
rename to ogg/general/comms/skilltimer.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/socials.ogg_fbef1b93 b/ogg/general/comms/socials.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/socials.ogg_fbef1b93
rename to ogg/general/comms/socials.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/sos.ogg_954761aa b/ogg/general/comms/sos.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/sos.ogg_954761aa
rename to ogg/general/comms/sos.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/sp.ogg_acc61560 b/ogg/general/comms/sp.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/sp.ogg_acc61560
rename to ogg/general/comms/sp.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/sp2.ogg_f786d1c6 b/ogg/general/comms/sp2.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/sp2.ogg_f786d1c6
rename to ogg/general/comms/sp2.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/spacesuittalk.ogg_31d8b0a7 b/ogg/general/comms/spacesuittalk.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/spacesuittalk.ogg_31d8b0a7
rename to ogg/general/comms/spacesuittalk.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/spannouncement.ogg_f2a0834a b/ogg/general/comms/spannouncement.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/spannouncement.ogg_f2a0834a
rename to ogg/general/comms/spannouncement.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/sqd.ogg_266d885f b/ogg/general/comms/sqd.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/sqd.ogg_266d885f
rename to ogg/general/comms/sqd.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/story.ogg_2b4d3718 b/ogg/general/comms/story.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/story.ogg_2b4d3718
rename to ogg/general/comms/story.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/subannouncement.ogg_1a96c30c b/ogg/general/comms/subannouncement.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/subannouncement.ogg_1a96c30c
rename to ogg/general/comms/subannouncement.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/subthing.ogg_831b433a b/ogg/general/comms/subthing.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/subthing.ogg_831b433a
rename to ogg/general/comms/subthing.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/textmessage.ogg_8aa005fd b/ogg/general/comms/textmessage.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/textmessage.ogg_8aa005fd
rename to ogg/general/comms/textmessage.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/themesuccess.ogg_309414fb b/ogg/general/comms/themesuccess.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/themesuccess.ogg_309414fb
rename to ogg/general/comms/themesuccess.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/trade.ogg_87ac9048 b/ogg/general/comms/trade.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/trade.ogg_87ac9048
rename to ogg/general/comms/trade.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/treasure.ogg_991460c5 b/ogg/general/comms/treasure.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/treasure.ogg_991460c5
rename to ogg/general/comms/treasure.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/ttlogin.ogg_e37866cb b/ogg/general/comms/ttlogin.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/ttlogin.ogg_e37866cb
rename to ogg/general/comms/ttlogin.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/ttlogout.ogg_0e2da89a b/ogg/general/comms/ttlogout.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/ttlogout.ogg_0e2da89a
rename to ogg/general/comms/ttlogout.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/tune.ogg_77bb80d2 b/ogg/general/comms/tune.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/tune.ogg_77bb80d2
rename to ogg/general/comms/tune.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/unsec.ogg_f74b3011 b/ogg/general/comms/unsec.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/unsec.ogg_f74b3011
rename to ogg/general/comms/unsec.ogg
diff --git a/ogg/general_265f6970/comms_062c1351/win.ogg_6ec9916d b/ogg/general/comms/win.ogg
similarity index 100%
rename from ogg/general_265f6970/comms_062c1351/win.ogg_6ec9916d
rename to ogg/general/comms/win.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/bang.ogg_7c3d11d2 b/ogg/general/doors/bang.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/bang.ogg_7c3d11d2
rename to ogg/general/doors/bang.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/bell.ogg_212ec290 b/ogg/general/doors/bell.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/bell.ogg_212ec290
rename to ogg/general/doors/bell.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/doorclose1.ogg_b0b9eb40 b/ogg/general/doors/doorclose1.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/doorclose1.ogg_b0b9eb40
rename to ogg/general/doors/doorclose1.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/doorclose2.ogg_1bea1daa b/ogg/general/doors/doorclose2.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/doorclose2.ogg_1bea1daa
rename to ogg/general/doors/doorclose2.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/doorclose3.ogg_f164c6d7 b/ogg/general/doors/doorclose3.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/doorclose3.ogg_f164c6d7
rename to ogg/general/doors/doorclose3.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/doorclose4.ogg_2b0b9902 b/ogg/general/doors/doorclose4.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/doorclose4.ogg_2b0b9902
rename to ogg/general/doors/doorclose4.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/doorclose5.ogg_c43e4501 b/ogg/general/doors/doorclose5.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/doorclose5.ogg_c43e4501
rename to ogg/general/doors/doorclose5.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/doorclose6.ogg_f6047da5 b/ogg/general/doors/doorclose6.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/doorclose6.ogg_f6047da5
rename to ogg/general/doors/doorclose6.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/doorhammer.ogg_beb02da2 b/ogg/general/doors/doorhammer.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/doorhammer.ogg_beb02da2
rename to ogg/general/doors/doorhammer.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/doorknock.ogg_be2cbbb9 b/ogg/general/doors/doorknock.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/doorknock.ogg_be2cbbb9
rename to ogg/general/doors/doorknock.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/doorlock.ogg_b2fa7a67 b/ogg/general/doors/doorlock.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/doorlock.ogg_b2fa7a67
rename to ogg/general/doors/doorlock.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/dooropen1.ogg_64d8437e b/ogg/general/doors/dooropen1.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/dooropen1.ogg_64d8437e
rename to ogg/general/doors/dooropen1.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/dooropen2.ogg_cc90a718 b/ogg/general/doors/dooropen2.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/dooropen2.ogg_cc90a718
rename to ogg/general/doors/dooropen2.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/dooropen3.ogg_e52e1d23 b/ogg/general/doors/dooropen3.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/dooropen3.ogg_e52e1d23
rename to ogg/general/doors/dooropen3.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/dooropen4.ogg_2442a4ae b/ogg/general/doors/dooropen4.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/dooropen4.ogg_2442a4ae
rename to ogg/general/doors/dooropen4.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/dooropen5.ogg_a3af5019 b/ogg/general/doors/dooropen5.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/dooropen5.ogg_a3af5019
rename to ogg/general/doors/dooropen5.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/doorpound.ogg_cb7cc89e b/ogg/general/doors/doorpound.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/doorpound.ogg_cb7cc89e
rename to ogg/general/doors/doorpound.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/doortap.ogg_69e60938 b/ogg/general/doors/doortap.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/doortap.ogg_69e60938
rename to ogg/general/doors/doortap.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/doorunlock.ogg_d72f7292 b/ogg/general/doors/doorunlock.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/doorunlock.ogg_d72f7292
rename to ogg/general/doors/doorunlock.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/doorweightedclose.ogg_40601b42 b/ogg/general/doors/doorweightedclose.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/doorweightedclose.ogg_40601b42
rename to ogg/general/doors/doorweightedclose.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/doorweightedopen.ogg_74a54c08 b/ogg/general/doors/doorweightedopen.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/doorweightedopen.ogg_74a54c08
rename to ogg/general/doors/doorweightedopen.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/hissingdoorclose.ogg_27517cd8 b/ogg/general/doors/hissingdoorclose.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/hissingdoorclose.ogg_27517cd8
rename to ogg/general/doors/hissingdoorclose.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/hissingdooropen.ogg_df0d3fa1 b/ogg/general/doors/hissingdooropen.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/hissingdooropen.ogg_df0d3fa1
rename to ogg/general/doors/hissingdooropen.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/noaccess.ogg_d95f9829 b/ogg/general/doors/noaccess.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/noaccess.ogg_d95f9829
rename to ogg/general/doors/noaccess.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/phaseclose.ogg_0f450238 b/ogg/general/doors/phaseclose.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/phaseclose.ogg_0f450238
rename to ogg/general/doors/phaseclose.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/phaseopen.ogg_23699d5b b/ogg/general/doors/phaseopen.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/phaseopen.ogg_23699d5b
rename to ogg/general/doors/phaseopen.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/special1.ogg_38e68cd2 b/ogg/general/doors/special1.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/special1.ogg_38e68cd2
rename to ogg/general/doors/special1.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/special2.ogg_3e2844a2 b/ogg/general/doors/special2.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/special2.ogg_3e2844a2
rename to ogg/general/doors/special2.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/transferclose.ogg_be87f2e7 b/ogg/general/doors/transferclose.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/transferclose.ogg_be87f2e7
rename to ogg/general/doors/transferclose.ogg
diff --git a/ogg/general_265f6970/doors_b4eceab1/transferopen.ogg_d0d3e751 b/ogg/general/doors/transferopen.ogg
similarity index 100%
rename from ogg/general_265f6970/doors_b4eceab1/transferopen.ogg_d0d3e751
rename to ogg/general/doors/transferopen.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/build1.ogg_0f3ed87f b/ogg/general/factory/build1.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/build1.ogg_0f3ed87f
rename to ogg/general/factory/build1.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/build2.ogg_b727bdc2 b/ogg/general/factory/build2.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/build2.ogg_b727bdc2
rename to ogg/general/factory/build2.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/build3.ogg_49b94c56 b/ogg/general/factory/build3.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/build3.ogg_49b94c56
rename to ogg/general/factory/build3.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/build4.ogg_571ea091 b/ogg/general/factory/build4.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/build4.ogg_571ea091
rename to ogg/general/factory/build4.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/build5.ogg_bf38dc21 b/ogg/general/factory/build5.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/build5.ogg_bf38dc21
rename to ogg/general/factory/build5.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/build6.ogg_ace5564d b/ogg/general/factory/build6.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/build6.ogg_ace5564d
rename to ogg/general/factory/build6.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/can.ogg_ce7b2e6b b/ogg/general/factory/can.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/can.ogg_ce7b2e6b
rename to ogg/general/factory/can.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/chunk.ogg_37c4bfd2 b/ogg/general/factory/chunk.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/chunk.ogg_37c4bfd2
rename to ogg/general/factory/chunk.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/clamps.ogg_6a696264 b/ogg/general/factory/clamps.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/clamps.ogg_6a696264
rename to ogg/general/factory/clamps.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/clang.ogg_24dcb0f5 b/ogg/general/factory/clang.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/clang.ogg_24dcb0f5
rename to ogg/general/factory/clang.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/computer1.ogg_9a12815b b/ogg/general/factory/computer1.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/computer1.ogg_9a12815b
rename to ogg/general/factory/computer1.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/computer2.ogg_34d7c2a8 b/ogg/general/factory/computer2.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/computer2.ogg_34d7c2a8
rename to ogg/general/factory/computer2.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/computer3.ogg_472e2711 b/ogg/general/factory/computer3.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/computer3.ogg_472e2711
rename to ogg/general/factory/computer3.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/computer4.ogg_1455bc45 b/ogg/general/factory/computer4.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/computer4.ogg_1455bc45
rename to ogg/general/factory/computer4.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/computer5.ogg_ddfbad48 b/ogg/general/factory/computer5.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/computer5.ogg_ddfbad48
rename to ogg/general/factory/computer5.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/computer6.ogg_09d68323 b/ogg/general/factory/computer6.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/computer6.ogg_09d68323
rename to ogg/general/factory/computer6.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/crash.ogg_31c35124 b/ogg/general/factory/crash.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/crash.ogg_31c35124
rename to ogg/general/factory/crash.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/crush.ogg_55601952 b/ogg/general/factory/crush.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/crush.ogg_55601952
rename to ogg/general/factory/crush.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/crushbrick.ogg_13ef79e4 b/ogg/general/factory/crushbrick.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/crushbrick.ogg_13ef79e4
rename to ogg/general/factory/crushbrick.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/droneactivate.ogg_04c86123 b/ogg/general/factory/droneactivate.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/droneactivate.ogg_04c86123
rename to ogg/general/factory/droneactivate.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/dronebuild.ogg_4c3f0529 b/ogg/general/factory/dronebuild.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/dronebuild.ogg_4c3f0529
rename to ogg/general/factory/dronebuild.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/dronein.ogg_621faf92 b/ogg/general/factory/dronein.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/dronein.ogg_621faf92
rename to ogg/general/factory/dronein.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/droneout.ogg_b5f12aea b/ogg/general/factory/droneout.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/droneout.ogg_b5f12aea
rename to ogg/general/factory/droneout.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/dumpingore.ogg_9c17f0c2 b/ogg/general/factory/dumpingore.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/dumpingore.ogg_9c17f0c2
rename to ogg/general/factory/dumpingore.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/explode.ogg_1802642e b/ogg/general/factory/explode.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/explode.ogg_1802642e
rename to ogg/general/factory/explode.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/factorypowerdown.ogg_2dc6ceef b/ogg/general/factory/factorypowerdown.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/factorypowerdown.ogg_2dc6ceef
rename to ogg/general/factory/factorypowerdown.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/factorypowerup.ogg_93765c03 b/ogg/general/factory/factorypowerup.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/factorypowerup.ogg_93765c03
rename to ogg/general/factory/factorypowerup.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/factoryrepair.ogg_f558051c b/ogg/general/factory/factoryrepair.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/factoryrepair.ogg_f558051c
rename to ogg/general/factory/factoryrepair.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/fan.ogg_2d44f078 b/ogg/general/factory/fan.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/fan.ogg_2d44f078
rename to ogg/general/factory/fan.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/fanactivate.ogg_038fb95d b/ogg/general/factory/fanactivate.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/fanactivate.ogg_038fb95d
rename to ogg/general/factory/fanactivate.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/fueltank.ogg_df061479 b/ogg/general/factory/fueltank.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/fueltank.ogg_df061479
rename to ogg/general/factory/fueltank.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/gastank.ogg_f9fd55d7 b/ogg/general/factory/gastank.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/gastank.ogg_f9fd55d7
rename to ogg/general/factory/gastank.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/hail.ogg_ccc6910e b/ogg/general/factory/hail.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/hail.ogg_ccc6910e
rename to ogg/general/factory/hail.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/hugelaser.ogg_d1a9fce5 b/ogg/general/factory/hugelaser.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/hugelaser.ogg_d1a9fce5
rename to ogg/general/factory/hugelaser.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/laser.ogg_ae84817d b/ogg/general/factory/laser.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/laser.ogg_ae84817d
rename to ogg/general/factory/laser.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/metalprocess.ogg_f2f84bdf b/ogg/general/factory/metalprocess.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/metalprocess.ogg_f2f84bdf
rename to ogg/general/factory/metalprocess.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/milk.ogg_dd6f4543 b/ogg/general/factory/milk.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/milk.ogg_dd6f4543
rename to ogg/general/factory/milk.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/pa.ogg_a338a335 b/ogg/general/factory/pa.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/pa.ogg_a338a335
rename to ogg/general/factory/pa.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/pa2.ogg_27adfd2a b/ogg/general/factory/pa2.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/pa2.ogg_27adfd2a
rename to ogg/general/factory/pa2.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/pourmilk1.ogg_cb4fe421 b/ogg/general/factory/pourmilk1.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/pourmilk1.ogg_cb4fe421
rename to ogg/general/factory/pourmilk1.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/pourmilk2.ogg_34635cc3 b/ogg/general/factory/pourmilk2.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/pourmilk2.ogg_34635cc3
rename to ogg/general/factory/pourmilk2.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/resteleport.ogg_bd9dd25c b/ogg/general/factory/resteleport.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/resteleport.ogg_bd9dd25c
rename to ogg/general/factory/resteleport.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/resunload.ogg_3c99c7d6 b/ogg/general/factory/resunload.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/resunload.ogg_3c99c7d6
rename to ogg/general/factory/resunload.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/roller coaster.ogg_1f863d03 b/ogg/general/factory/roller coaster.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/roller coaster.ogg_1f863d03
rename to ogg/general/factory/roller coaster.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/rumbling.ogg_88da3617 b/ogg/general/factory/rumbling.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/rumbling.ogg_88da3617
rename to ogg/general/factory/rumbling.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/shipslam.ogg_5d026ed5 b/ogg/general/factory/shipslam.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/shipslam.ogg_5d026ed5
rename to ogg/general/factory/shipslam.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/tannoy.ogg_e628c496 b/ogg/general/factory/tannoy.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/tannoy.ogg_e628c496
rename to ogg/general/factory/tannoy.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/tumbling.ogg_efe6435b b/ogg/general/factory/tumbling.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/tumbling.ogg_efe6435b
rename to ogg/general/factory/tumbling.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/water.ogg_06de3f6d b/ogg/general/factory/water.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/water.ogg_06de3f6d
rename to ogg/general/factory/water.ogg
diff --git a/ogg/general_265f6970/factory_22e48ef2/whirr.ogg_d2d3e6e8 b/ogg/general/factory/whirr.ogg
similarity index 100%
rename from ogg/general_265f6970/factory_22e48ef2/whirr.ogg_d2d3e6e8
rename to ogg/general/factory/whirr.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/big.ogg_a9234fbf b/ogg/general/firework/big.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/big.ogg_a9234fbf
rename to ogg/general/firework/big.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/crackle.ogg_b7826473 b/ogg/general/firework/crackle.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/crackle.ogg_b7826473
rename to ogg/general/firework/crackle.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/dragon.ogg_8e6c1512 b/ogg/general/firework/dragon.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/dragon.ogg_8e6c1512
rename to ogg/general/firework/dragon.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/e1.ogg_618856a3 b/ogg/general/firework/e1.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/e1.ogg_618856a3
rename to ogg/general/firework/e1.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/e2.ogg_4285c199 b/ogg/general/firework/e2.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/e2.ogg_4285c199
rename to ogg/general/firework/e2.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/e3.ogg_ad5381e5 b/ogg/general/firework/e3.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/e3.ogg_ad5381e5
rename to ogg/general/firework/e3.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/e4.ogg_aa004960 b/ogg/general/firework/e4.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/e4.ogg_aa004960
rename to ogg/general/firework/e4.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/e5.ogg_af495b57 b/ogg/general/firework/e5.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/e5.ogg_af495b57
rename to ogg/general/firework/e5.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/e6.ogg_7bffa1c7 b/ogg/general/firework/e6.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/e6.ogg_7bffa1c7
rename to ogg/general/firework/e6.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/fade.ogg_beb0da44 b/ogg/general/firework/fade.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/fade.ogg_beb0da44
rename to ogg/general/firework/fade.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/flair.ogg_354f1750 b/ogg/general/firework/flair.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/flair.ogg_354f1750
rename to ogg/general/firework/flair.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/loop.ogg_7fe3c8e6 b/ogg/general/firework/loop.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/loop.ogg_7fe3c8e6
rename to ogg/general/firework/loop.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/spin.ogg_8a27945a b/ogg/general/firework/spin.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/spin.ogg_8a27945a
rename to ogg/general/firework/spin.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/w1.ogg_4d7a70e3 b/ogg/general/firework/w1.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/w1.ogg_4d7a70e3
rename to ogg/general/firework/w1.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/w2.ogg_30b94c10 b/ogg/general/firework/w2.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/w2.ogg_30b94c10
rename to ogg/general/firework/w2.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/w3.ogg_5690d1fb b/ogg/general/firework/w3.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/w3.ogg_5690d1fb
rename to ogg/general/firework/w3.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/w4.ogg_45309f50 b/ogg/general/firework/w4.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/w4.ogg_45309f50
rename to ogg/general/firework/w4.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/w5.ogg_291cf0eb b/ogg/general/firework/w5.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/w5.ogg_291cf0eb
rename to ogg/general/firework/w5.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/w6.ogg_dd2f3eea b/ogg/general/firework/w6.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/w6.ogg_dd2f3eea
rename to ogg/general/firework/w6.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/woosh1.ogg_a014e4fd b/ogg/general/firework/woosh1.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/woosh1.ogg_a014e4fd
rename to ogg/general/firework/woosh1.ogg
diff --git a/ogg/general_265f6970/firework_5ed1dea0/woosh2.ogg_9d5fa6be b/ogg/general/firework/woosh2.ogg
similarity index 100%
rename from ogg/general_265f6970/firework_5ed1dea0/woosh2.ogg_9d5fa6be
rename to ogg/general/firework/woosh2.ogg
diff --git a/ogg/general_265f6970/food and drink_31cf7af8/eatfood.ogg_cdd2bd82 b/ogg/general/food and drink/eatfood.ogg
similarity index 100%
rename from ogg/general_265f6970/food and drink_31cf7af8/eatfood.ogg_cdd2bd82
rename to ogg/general/food and drink/eatfood.ogg
diff --git a/ogg/general_265f6970/food and drink_31cf7af8/gulpliquid.ogg_891318a4 b/ogg/general/food and drink/gulpliquid.ogg
similarity index 100%
rename from ogg/general_265f6970/food and drink_31cf7af8/gulpliquid.ogg_891318a4
rename to ogg/general/food and drink/gulpliquid.ogg
diff --git a/ogg/general_265f6970/food and drink_31cf7af8/liquid.ogg_c71e2655 b/ogg/general/food and drink/liquid.ogg
similarity index 100%
rename from ogg/general_265f6970/food and drink_31cf7af8/liquid.ogg_c71e2655
rename to ogg/general/food and drink/liquid.ogg
diff --git a/ogg/general_265f6970/food and drink_31cf7af8/scarf.ogg_2d60fe85 b/ogg/general/food and drink/scarf.ogg
similarity index 100%
rename from ogg/general_265f6970/food and drink_31cf7af8/scarf.ogg_2d60fe85
rename to ogg/general/food and drink/scarf.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/bank.ogg_a742bb3a b/ogg/general/games/bank.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/bank.ogg_a742bb3a
rename to ogg/general/games/bank.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/breach.ogg_c4604c59 b/ogg/general/games/breach.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/breach.ogg_c4604c59
rename to ogg/general/games/breach.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/button.ogg_8a44be86 b/ogg/general/games/button.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/button.ogg_8a44be86
rename to ogg/general/games/button.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/chessplay.ogg_b8557454 b/ogg/general/games/chessplay.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/chessplay.ogg_b8557454
rename to ogg/general/games/chessplay.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/console.ogg_19f57c0b b/ogg/general/games/console.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/console.ogg_19f57c0b
rename to ogg/general/games/console.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/cult.ogg_3d69b4c6 b/ogg/general/games/cult.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/cult.ogg_3d69b4c6
rename to ogg/general/games/cult.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/cult1.ogg_fecaf4e6 b/ogg/general/games/cult1.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/cult1.ogg_fecaf4e6
rename to ogg/general/games/cult1.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/cult2.ogg_3b3d87bc b/ogg/general/games/cult2.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/cult2.ogg_3b3d87bc
rename to ogg/general/games/cult2.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/dice.ogg_2991aca9 b/ogg/general/games/dice.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/dice.ogg_2991aca9
rename to ogg/general/games/dice.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/duck.ogg_a4c2bd4f b/ogg/general/games/duck.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/duck.ogg_a4c2bd4f
rename to ogg/general/games/duck.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/duck2.ogg_c560fcd8 b/ogg/general/games/duck2.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/duck2.ogg_c560fcd8
rename to ogg/general/games/duck2.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/duck3.ogg_71d401cb b/ogg/general/games/duck3.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/duck3.ogg_71d401cb
rename to ogg/general/games/duck3.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/electric.ogg_89d9470c b/ogg/general/games/electric.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/electric.ogg_89d9470c
rename to ogg/general/games/electric.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/hopdown.ogg_82c1b1c5 b/ogg/general/games/hopdown.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/hopdown.ogg_82c1b1c5
rename to ogg/general/games/hopdown.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/hophop.ogg_86c7fd53 b/ogg/general/games/hophop.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/hophop.ogg_86c7fd53
rename to ogg/general/games/hophop.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/lift.ogg_8f08e8ca b/ogg/general/games/lift.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/lift.ogg_8f08e8ca
rename to ogg/general/games/lift.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/liftdown.ogg_d1bac65a b/ogg/general/games/liftdown.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/liftdown.ogg_d1bac65a
rename to ogg/general/games/liftdown.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/liftup.ogg_d7b32f1e b/ogg/general/games/liftup.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/liftup.ogg_d7b32f1e
rename to ogg/general/games/liftup.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/plating.ogg_1b3bc4df b/ogg/general/games/plating.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/plating.ogg_1b3bc4df
rename to ogg/general/games/plating.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/poker.ogg_838875eb b/ogg/general/games/poker.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/poker.ogg_838875eb
rename to ogg/general/games/poker.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/pokerbet.ogg_74ecb1f6 b/ogg/general/games/pokerbet.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/pokerbet.ogg_74ecb1f6
rename to ogg/general/games/pokerbet.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/pokercard.ogg_1218c7b3 b/ogg/general/games/pokercard.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/pokercard.ogg_1218c7b3
rename to ogg/general/games/pokercard.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/pokerchips.ogg_d5445ef2 b/ogg/general/games/pokerchips.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/pokerchips.ogg_d5445ef2
rename to ogg/general/games/pokerchips.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/pokerplay.ogg_721424b6 b/ogg/general/games/pokerplay.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/pokerplay.ogg_721424b6
rename to ogg/general/games/pokerplay.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/random.ogg_fb88c1d8 b/ogg/general/games/random.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/random.ogg_fb88c1d8
rename to ogg/general/games/random.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/rocket.ogg_bac7a195 b/ogg/general/games/rocket.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/rocket.ogg_bac7a195
rename to ogg/general/games/rocket.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/run.ogg_c08c0e53 b/ogg/general/games/run.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/run.ogg_c08c0e53
rename to ogg/general/games/run.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/slotmachine.ogg_decfe78c b/ogg/general/games/slotmachine.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/slotmachine.ogg_decfe78c
rename to ogg/general/games/slotmachine.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/teleporter.ogg_5aaca643 b/ogg/general/games/teleporter.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/teleporter.ogg_5aaca643
rename to ogg/general/games/teleporter.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/token.ogg_5825fbc6 b/ogg/general/games/token.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/token.ogg_5825fbc6
rename to ogg/general/games/token.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/tokens.ogg_53b76b16 b/ogg/general/games/tokens.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/tokens.ogg_53b76b16
rename to ogg/general/games/tokens.ogg
diff --git a/ogg/general_265f6970/games_ea1acf43/zap.ogg_1eedcfbd b/ogg/general/games/zap.ogg
similarity index 100%
rename from ogg/general_265f6970/games_ea1acf43/zap.ogg_1eedcfbd
rename to ogg/general/games/zap.ogg
diff --git a/ogg/general_265f6970/gmc_bfcebf3b/alarm.ogg_e82806e0 b/ogg/general/gmc/alarm.ogg
similarity index 100%
rename from ogg/general_265f6970/gmc_bfcebf3b/alarm.ogg_e82806e0
rename to ogg/general/gmc/alarm.ogg
diff --git a/ogg/general_265f6970/gmc_bfcebf3b/ambdoorclose.ogg_7d0c4c1b b/ogg/general/gmc/ambdoorclose.ogg
similarity index 100%
rename from ogg/general_265f6970/gmc_bfcebf3b/ambdoorclose.ogg_7d0c4c1b
rename to ogg/general/gmc/ambdoorclose.ogg
diff --git a/ogg/general_265f6970/gmc_bfcebf3b/ambdooropen.ogg_d09ab343 b/ogg/general/gmc/ambdooropen.ogg
similarity index 100%
rename from ogg/general_265f6970/gmc_bfcebf3b/ambdooropen.ogg_d09ab343
rename to ogg/general/gmc/ambdooropen.ogg
diff --git a/ogg/general_265f6970/gmc_bfcebf3b/gurneyload.ogg_a48a0984 b/ogg/general/gmc/gurneyload.ogg
similarity index 100%
rename from ogg/general_265f6970/gmc_bfcebf3b/gurneyload.ogg_a48a0984
rename to ogg/general/gmc/gurneyload.ogg
diff --git a/ogg/general_265f6970/gmc_bfcebf3b/gurneyunload.ogg_9a105db2 b/ogg/general/gmc/gurneyunload.ogg
similarity index 100%
rename from ogg/general_265f6970/gmc_bfcebf3b/gurneyunload.ogg_9a105db2
rename to ogg/general/gmc/gurneyunload.ogg
diff --git a/ogg/general_265f6970/gmc_bfcebf3b/inject.ogg_f5df1905 b/ogg/general/gmc/inject.ogg
similarity index 100%
rename from ogg/general_265f6970/gmc_bfcebf3b/inject.ogg_f5df1905
rename to ogg/general/gmc/inject.ogg
diff --git a/ogg/general_265f6970/gmc_bfcebf3b/laser.ogg_e2e85356 b/ogg/general/gmc/laser.ogg
similarity index 100%
rename from ogg/general_265f6970/gmc_bfcebf3b/laser.ogg_e2e85356
rename to ogg/general/gmc/laser.ogg
diff --git a/ogg/general_265f6970/gmc_bfcebf3b/mederror.ogg_83567049 b/ogg/general/gmc/mederror.ogg
similarity index 100%
rename from ogg/general_265f6970/gmc_bfcebf3b/mederror.ogg_83567049
rename to ogg/general/gmc/mederror.ogg
diff --git a/ogg/general_265f6970/gmc_bfcebf3b/medscan.ogg_1d69e5a8 b/ogg/general/gmc/medscan.ogg
similarity index 100%
rename from ogg/general_265f6970/gmc_bfcebf3b/medscan.ogg_1d69e5a8
rename to ogg/general/gmc/medscan.ogg
diff --git a/ogg/general_265f6970/gmc_bfcebf3b/sirenin.ogg_b26ff000 b/ogg/general/gmc/sirenin.ogg
similarity index 100%
rename from ogg/general_265f6970/gmc_bfcebf3b/sirenin.ogg_b26ff000
rename to ogg/general/gmc/sirenin.ogg
diff --git a/ogg/general_265f6970/gmc_bfcebf3b/sirenout.ogg_351ecb5f b/ogg/general/gmc/sirenout.ogg
similarity index 100%
rename from ogg/general_265f6970/gmc_bfcebf3b/sirenout.ogg_351ecb5f
rename to ogg/general/gmc/sirenout.ogg
diff --git a/ogg/general_265f6970/gmc_bfcebf3b/synaptic.ogg_a989a8d9 b/ogg/general/gmc/synaptic.ogg
similarity index 100%
rename from ogg/general_265f6970/gmc_bfcebf3b/synaptic.ogg_a989a8d9
rename to ogg/general/gmc/synaptic.ogg
diff --git a/ogg/general_265f6970/gmc_bfcebf3b/tambdoorclose.ogg_8f411c6d b/ogg/general/gmc/tambdoorclose.ogg
similarity index 100%
rename from ogg/general_265f6970/gmc_bfcebf3b/tambdoorclose.ogg_8f411c6d
rename to ogg/general/gmc/tambdoorclose.ogg
diff --git a/ogg/general_265f6970/grilling_7d378601/coal.ogg_4d34cae6 b/ogg/general/grilling/coal.ogg
similarity index 100%
rename from ogg/general_265f6970/grilling_7d378601/coal.ogg_4d34cae6
rename to ogg/general/grilling/coal.ogg
diff --git a/ogg/general_265f6970/grilling_7d378601/cook.ogg_193fa8eb b/ogg/general/grilling/cook.ogg
similarity index 100%
rename from ogg/general_265f6970/grilling_7d378601/cook.ogg_193fa8eb
rename to ogg/general/grilling/cook.ogg
diff --git a/ogg/general_265f6970/grilling_7d378601/done.ogg_ef113ff6 b/ogg/general/grilling/done.ogg
similarity index 100%
rename from ogg/general_265f6970/grilling_7d378601/done.ogg_ef113ff6
rename to ogg/general/grilling/done.ogg
diff --git a/ogg/general_265f6970/grilling_7d378601/ext.ogg_22a4ea37 b/ogg/general/grilling/ext.ogg
similarity index 100%
rename from ogg/general_265f6970/grilling_7d378601/ext.ogg_22a4ea37
rename to ogg/general/grilling/ext.ogg
diff --git a/ogg/general_265f6970/grilling_7d378601/light.ogg_ce8e0234 b/ogg/general/grilling/light.ogg
similarity index 100%
rename from ogg/general_265f6970/grilling_7d378601/light.ogg_ce8e0234
rename to ogg/general/grilling/light.ogg
diff --git a/ogg/general_265f6970/grilling_7d378601/open.ogg_3b2b2c05 b/ogg/general/grilling/open.ogg
similarity index 100%
rename from ogg/general_265f6970/grilling_7d378601/open.ogg_3b2b2c05
rename to ogg/general/grilling/open.ogg
diff --git a/ogg/general_265f6970/grilling_7d378601/set.ogg_dab841e0 b/ogg/general/grilling/set.ogg
similarity index 100%
rename from ogg/general_265f6970/grilling_7d378601/set.ogg_dab841e0
rename to ogg/general/grilling/set.ogg
diff --git a/ogg/general_265f6970/help_b25d524a/aliases.ogg_4f5fbbc2 b/ogg/general/help/aliases.ogg
similarity index 100%
rename from ogg/general_265f6970/help_b25d524a/aliases.ogg_4f5fbbc2
rename to ogg/general/help/aliases.ogg
diff --git a/ogg/general_265f6970/help_b25d524a/announcements.ogg_47f65892 b/ogg/general/help/announcements.ogg
similarity index 100%
rename from ogg/general_265f6970/help_b25d524a/announcements.ogg_47f65892
rename to ogg/general/help/announcements.ogg
diff --git a/ogg/general_265f6970/help_b25d524a/buffers.ogg_e5a2daf9 b/ogg/general/help/buffers.ogg
similarity index 100%
rename from ogg/general_265f6970/help_b25d524a/buffers.ogg_e5a2daf9
rename to ogg/general/help/buffers.ogg
diff --git a/ogg/general_265f6970/help_b25d524a/changelog.ogg_34cdc88f b/ogg/general/help/changelog.ogg
similarity index 100%
rename from ogg/general_265f6970/help_b25d524a/changelog.ogg_34cdc88f
rename to ogg/general/help/changelog.ogg
diff --git a/ogg/general_265f6970/help_b25d524a/keys.ogg_eded4634 b/ogg/general/help/keys.ogg
similarity index 100%
rename from ogg/general_265f6970/help_b25d524a/keys.ogg_eded4634
rename to ogg/general/help/keys.ogg
diff --git a/ogg/general_265f6970/help_b25d524a/readme.ogg_07f3762a b/ogg/general/help/readme.ogg
similarity index 100%
rename from ogg/general_265f6970/help_b25d524a/readme.ogg_07f3762a
rename to ogg/general/help/readme.ogg
diff --git a/ogg/general_265f6970/help_b25d524a/soundpackcredits.ogg_94f00f9f b/ogg/general/help/soundpackcredits.ogg
similarity index 100%
rename from ogg/general_265f6970/help_b25d524a/soundpackcredits.ogg_94f00f9f
rename to ogg/general/help/soundpackcredits.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/ac1.ogg_b546a618 b/ogg/general/highway/ac1.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/ac1.ogg_b546a618
rename to ogg/general/highway/ac1.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/ac2.ogg_b3e4f431 b/ogg/general/highway/ac2.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/ac2.ogg_b3e4f431
rename to ogg/general/highway/ac2.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/ac3.ogg_f816815c b/ogg/general/highway/ac3.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/ac3.ogg_f816815c
rename to ogg/general/highway/ac3.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/alarm.ogg_59e537c7 b/ogg/general/highway/alarm.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/alarm.ogg_59e537c7
rename to ogg/general/highway/alarm.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/blair.ogg_c1f04f06 b/ogg/general/highway/blair.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/blair.ogg_c1f04f06
rename to ogg/general/highway/blair.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/bounce.ogg_c112907f b/ogg/general/highway/bounce.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/bounce.ogg_c112907f
rename to ogg/general/highway/bounce.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/car1.ogg_85d999ab b/ogg/general/highway/car1.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/car1.ogg_85d999ab
rename to ogg/general/highway/car1.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/car10.ogg_a3539ba1 b/ogg/general/highway/car10.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/car10.ogg_a3539ba1
rename to ogg/general/highway/car10.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/car2.ogg_c59670a1 b/ogg/general/highway/car2.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/car2.ogg_c59670a1
rename to ogg/general/highway/car2.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/car3.ogg_277d6c19 b/ogg/general/highway/car3.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/car3.ogg_277d6c19
rename to ogg/general/highway/car3.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/car4.ogg_157d4706 b/ogg/general/highway/car4.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/car4.ogg_157d4706
rename to ogg/general/highway/car4.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/car5.ogg_065e24f0 b/ogg/general/highway/car5.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/car5.ogg_065e24f0
rename to ogg/general/highway/car5.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/car6.ogg_0a0b2ada b/ogg/general/highway/car6.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/car6.ogg_0a0b2ada
rename to ogg/general/highway/car6.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/car7.ogg_fc9f995a b/ogg/general/highway/car7.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/car7.ogg_fc9f995a
rename to ogg/general/highway/car7.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/car8.ogg_0c22e1db b/ogg/general/highway/car8.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/car8.ogg_0c22e1db
rename to ogg/general/highway/car8.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/car9.ogg_52c81424 b/ogg/general/highway/car9.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/car9.ogg_52c81424
rename to ogg/general/highway/car9.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/clip1.ogg_25828663 b/ogg/general/highway/clip1.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/clip1.ogg_25828663
rename to ogg/general/highway/clip1.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/clip2.ogg_168fb385 b/ogg/general/highway/clip2.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/clip2.ogg_168fb385
rename to ogg/general/highway/clip2.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/clip3.ogg_5befec72 b/ogg/general/highway/clip3.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/clip3.ogg_5befec72
rename to ogg/general/highway/clip3.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/clip4.ogg_f3ed9f8f b/ogg/general/highway/clip4.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/clip4.ogg_f3ed9f8f
rename to ogg/general/highway/clip4.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/crash.ogg_220d7db9 b/ogg/general/highway/crash.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/crash.ogg_220d7db9
rename to ogg/general/highway/crash.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/dec1.ogg_7c77c56c b/ogg/general/highway/dec1.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/dec1.ogg_7c77c56c
rename to ogg/general/highway/dec1.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/dec2.ogg_0a280396 b/ogg/general/highway/dec2.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/dec2.ogg_0a280396
rename to ogg/general/highway/dec2.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/dec3.ogg_8dda80a1 b/ogg/general/highway/dec3.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/dec3.ogg_8dda80a1
rename to ogg/general/highway/dec3.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/honk1.ogg_75d1e0ac b/ogg/general/highway/honk1.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/honk1.ogg_75d1e0ac
rename to ogg/general/highway/honk1.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/honk2.ogg_8dc699e9 b/ogg/general/highway/honk2.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/honk2.ogg_8dc699e9
rename to ogg/general/highway/honk2.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/honk3.ogg_ed052e9e b/ogg/general/highway/honk3.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/honk3.ogg_ed052e9e
rename to ogg/general/highway/honk3.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/honk4.ogg_5b835cab b/ogg/general/highway/honk4.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/honk4.ogg_5b835cab
rename to ogg/general/highway/honk4.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/honk5.ogg_daaffbb5 b/ogg/general/highway/honk5.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/honk5.ogg_daaffbb5
rename to ogg/general/highway/honk5.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/loop.ogg_2a5c2c4d b/ogg/general/highway/loop.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/loop.ogg_2a5c2c4d
rename to ogg/general/highway/loop.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/ac1.ogg_83ba5cff b/ogg/general/highway/oldcar/ac1.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/ac1.ogg_83ba5cff
rename to ogg/general/highway/oldcar/ac1.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/ac2.ogg_063f5153 b/ogg/general/highway/oldcar/ac2.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/ac2.ogg_063f5153
rename to ogg/general/highway/oldcar/ac2.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/ac3.ogg_e6e3fc47 b/ogg/general/highway/oldcar/ac3.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/ac3.ogg_e6e3fc47
rename to ogg/general/highway/oldcar/ac3.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/alarm.ogg_4fc5979b b/ogg/general/highway/oldcar/alarm.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/alarm.ogg_4fc5979b
rename to ogg/general/highway/oldcar/alarm.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/blair.ogg_62940c52 b/ogg/general/highway/oldcar/blair.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/blair.ogg_62940c52
rename to ogg/general/highway/oldcar/blair.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/bounce.ogg_11368eaf b/ogg/general/highway/oldcar/bounce.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/bounce.ogg_11368eaf
rename to ogg/general/highway/oldcar/bounce.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car1.ogg_e129e485 b/ogg/general/highway/oldcar/car1.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car1.ogg_e129e485
rename to ogg/general/highway/oldcar/car1.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car10.ogg_5a1717e6 b/ogg/general/highway/oldcar/car10.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car10.ogg_5a1717e6
rename to ogg/general/highway/oldcar/car10.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car2.ogg_5e1967dd b/ogg/general/highway/oldcar/car2.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car2.ogg_5e1967dd
rename to ogg/general/highway/oldcar/car2.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car3.ogg_3837cc0f b/ogg/general/highway/oldcar/car3.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car3.ogg_3837cc0f
rename to ogg/general/highway/oldcar/car3.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car4.ogg_5bab94e2 b/ogg/general/highway/oldcar/car4.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car4.ogg_5bab94e2
rename to ogg/general/highway/oldcar/car4.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car5.ogg_ab899c19 b/ogg/general/highway/oldcar/car5.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car5.ogg_ab899c19
rename to ogg/general/highway/oldcar/car5.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car6.ogg_43106db7 b/ogg/general/highway/oldcar/car6.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car6.ogg_43106db7
rename to ogg/general/highway/oldcar/car6.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car7.ogg_2cea1f3e b/ogg/general/highway/oldcar/car7.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car7.ogg_2cea1f3e
rename to ogg/general/highway/oldcar/car7.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car8.ogg_2597cb67 b/ogg/general/highway/oldcar/car8.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car8.ogg_2597cb67
rename to ogg/general/highway/oldcar/car8.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car9.ogg_1dd492d3 b/ogg/general/highway/oldcar/car9.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/car9.ogg_1dd492d3
rename to ogg/general/highway/oldcar/car9.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/clip1.ogg_f6b98547 b/ogg/general/highway/oldcar/clip1.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/clip1.ogg_f6b98547
rename to ogg/general/highway/oldcar/clip1.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/clip2.ogg_59749291 b/ogg/general/highway/oldcar/clip2.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/clip2.ogg_59749291
rename to ogg/general/highway/oldcar/clip2.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/clip3.ogg_30ed6882 b/ogg/general/highway/oldcar/clip3.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/clip3.ogg_30ed6882
rename to ogg/general/highway/oldcar/clip3.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/clip4.ogg_c13c51cc b/ogg/general/highway/oldcar/clip4.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/clip4.ogg_c13c51cc
rename to ogg/general/highway/oldcar/clip4.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/crash.ogg_14e09a83 b/ogg/general/highway/oldcar/crash.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/crash.ogg_14e09a83
rename to ogg/general/highway/oldcar/crash.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/dec1.ogg_d092e6fa b/ogg/general/highway/oldcar/dec1.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/dec1.ogg_d092e6fa
rename to ogg/general/highway/oldcar/dec1.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/dec2.ogg_69a683d3 b/ogg/general/highway/oldcar/dec2.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/dec2.ogg_69a683d3
rename to ogg/general/highway/oldcar/dec2.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/dec3.ogg_1371e1f3 b/ogg/general/highway/oldcar/dec3.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/dec3.ogg_1371e1f3
rename to ogg/general/highway/oldcar/dec3.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/honk1.ogg_5bf44339 b/ogg/general/highway/oldcar/honk1.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/honk1.ogg_5bf44339
rename to ogg/general/highway/oldcar/honk1.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/honk2.ogg_468a9732 b/ogg/general/highway/oldcar/honk2.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/honk2.ogg_468a9732
rename to ogg/general/highway/oldcar/honk2.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/honk3.ogg_9c763515 b/ogg/general/highway/oldcar/honk3.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/honk3.ogg_9c763515
rename to ogg/general/highway/oldcar/honk3.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/honk4.ogg_024fb15b b/ogg/general/highway/oldcar/honk4.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/honk4.ogg_024fb15b
rename to ogg/general/highway/oldcar/honk4.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/honk5.ogg_d6dd0eb0 b/ogg/general/highway/oldcar/honk5.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/honk5.ogg_d6dd0eb0
rename to ogg/general/highway/oldcar/honk5.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/loop.ogg_0676a33d b/ogg/general/highway/oldcar/loop.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/loop.ogg_0676a33d
rename to ogg/general/highway/oldcar/loop.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/p1.ogg_0e01c4bb b/ogg/general/highway/oldcar/p1.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/p1.ogg_0e01c4bb
rename to ogg/general/highway/oldcar/p1.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/p2.ogg_65bc6d1c b/ogg/general/highway/oldcar/p2.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/p2.ogg_65bc6d1c
rename to ogg/general/highway/oldcar/p2.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/p3.ogg_3526775d b/ogg/general/highway/oldcar/p3.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/p3.ogg_3526775d
rename to ogg/general/highway/oldcar/p3.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/p4.ogg_0f7e2d15 b/ogg/general/highway/oldcar/p4.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/p4.ogg_0f7e2d15
rename to ogg/general/highway/oldcar/p4.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/shriekstop.ogg_83adb380 b/ogg/general/highway/oldcar/shriekstop.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/shriekstop.ogg_83adb380
rename to ogg/general/highway/oldcar/shriekstop.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/speedcam.ogg_108fe50e b/ogg/general/highway/oldcar/speedcam.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/speedcam.ogg_108fe50e
rename to ogg/general/highway/oldcar/speedcam.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/splat.ogg_a776bda6 b/ogg/general/highway/oldcar/splat.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/splat.ogg_a776bda6
rename to ogg/general/highway/oldcar/splat.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/start.ogg_ed8a6577 b/ogg/general/highway/oldcar/start.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/start.ogg_ed8a6577
rename to ogg/general/highway/oldcar/start.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/stop.ogg_28cb49c7 b/ogg/general/highway/oldcar/stop.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/stop.ogg_28cb49c7
rename to ogg/general/highway/oldcar/stop.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/switch.ogg_6fba8228 b/ogg/general/highway/oldcar/switch.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/switch.ogg_6fba8228
rename to ogg/general/highway/oldcar/switch.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/tovertake1.ogg_3775e01e b/ogg/general/highway/oldcar/tovertake1.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/tovertake1.ogg_3775e01e
rename to ogg/general/highway/oldcar/tovertake1.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/tovertake2.ogg_a6ebd6db b/ogg/general/highway/oldcar/tovertake2.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/tovertake2.ogg_a6ebd6db
rename to ogg/general/highway/oldcar/tovertake2.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/tovertake3.ogg_ec062478 b/ogg/general/highway/oldcar/tovertake3.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/tovertake3.ogg_ec062478
rename to ogg/general/highway/oldcar/tovertake3.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/tovertake4.ogg_ea40d6d9 b/ogg/general/highway/oldcar/tovertake4.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/tovertake4.ogg_ea40d6d9
rename to ogg/general/highway/oldcar/tovertake4.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/tovertake5.ogg_325586ac b/ogg/general/highway/oldcar/tovertake5.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/tovertake5.ogg_325586ac
rename to ogg/general/highway/oldcar/tovertake5.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/tovertake6.ogg_388a1a28 b/ogg/general/highway/oldcar/tovertake6.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/tovertake6.ogg_388a1a28
rename to ogg/general/highway/oldcar/tovertake6.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/tovertake7.ogg_712f5ae6 b/ogg/general/highway/oldcar/tovertake7.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/tovertake7.ogg_712f5ae6
rename to ogg/general/highway/oldcar/tovertake7.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/tovertake8.ogg_e2ca6f4c b/ogg/general/highway/oldcar/tovertake8.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/tovertake8.ogg_e2ca6f4c
rename to ogg/general/highway/oldcar/tovertake8.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/tovertake9.ogg_ff00ab66 b/ogg/general/highway/oldcar/tovertake9.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/tovertake9.ogg_ff00ab66
rename to ogg/general/highway/oldcar/tovertake9.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/oldcar_941f0238/weave.ogg_5a6eafe5 b/ogg/general/highway/oldcar/weave.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/oldcar_941f0238/weave.ogg_5a6eafe5
rename to ogg/general/highway/oldcar/weave.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/p1.ogg_e93105f1 b/ogg/general/highway/p1.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/p1.ogg_e93105f1
rename to ogg/general/highway/p1.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/p2.ogg_a942951b b/ogg/general/highway/p2.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/p2.ogg_a942951b
rename to ogg/general/highway/p2.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/p3.ogg_840be525 b/ogg/general/highway/p3.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/p3.ogg_840be525
rename to ogg/general/highway/p3.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/p4.ogg_7e73f8a1 b/ogg/general/highway/p4.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/p4.ogg_7e73f8a1
rename to ogg/general/highway/p4.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/shriekstop.ogg_4b32649c b/ogg/general/highway/shriekstop.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/shriekstop.ogg_4b32649c
rename to ogg/general/highway/shriekstop.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/speedcam.ogg_d1050354 b/ogg/general/highway/speedcam.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/speedcam.ogg_d1050354
rename to ogg/general/highway/speedcam.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/splat.ogg_02f17ffc b/ogg/general/highway/splat.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/splat.ogg_02f17ffc
rename to ogg/general/highway/splat.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/start.ogg_e07f3cd0 b/ogg/general/highway/start.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/start.ogg_e07f3cd0
rename to ogg/general/highway/start.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/stop.ogg_cc6e6871 b/ogg/general/highway/stop.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/stop.ogg_cc6e6871
rename to ogg/general/highway/stop.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/switch.ogg_2e61bb9b b/ogg/general/highway/switch.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/switch.ogg_2e61bb9b
rename to ogg/general/highway/switch.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/tovertake1.ogg_739a833c b/ogg/general/highway/tovertake1.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/tovertake1.ogg_739a833c
rename to ogg/general/highway/tovertake1.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/tovertake2.ogg_4e69534b b/ogg/general/highway/tovertake2.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/tovertake2.ogg_4e69534b
rename to ogg/general/highway/tovertake2.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/tovertake3.ogg_669c2582 b/ogg/general/highway/tovertake3.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/tovertake3.ogg_669c2582
rename to ogg/general/highway/tovertake3.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/tovertake4.ogg_57b40093 b/ogg/general/highway/tovertake4.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/tovertake4.ogg_57b40093
rename to ogg/general/highway/tovertake4.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/tovertake5.ogg_467d0489 b/ogg/general/highway/tovertake5.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/tovertake5.ogg_467d0489
rename to ogg/general/highway/tovertake5.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/tovertake6.ogg_3f879f4e b/ogg/general/highway/tovertake6.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/tovertake6.ogg_3f879f4e
rename to ogg/general/highway/tovertake6.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/tovertake7.ogg_bc6c27cf b/ogg/general/highway/tovertake7.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/tovertake7.ogg_bc6c27cf
rename to ogg/general/highway/tovertake7.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/tovertake8.ogg_c31697a1 b/ogg/general/highway/tovertake8.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/tovertake8.ogg_c31697a1
rename to ogg/general/highway/tovertake8.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/tovertake9.ogg_f38cdff4 b/ogg/general/highway/tovertake9.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/tovertake9.ogg_f38cdff4
rename to ogg/general/highway/tovertake9.ogg
diff --git a/ogg/general_265f6970/highway_466fc079/weave.ogg_1d0ed4c6 b/ogg/general/highway/weave.ogg
similarity index 100%
rename from ogg/general_265f6970/highway_466fc079/weave.ogg_1d0ed4c6
rename to ogg/general/highway/weave.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/brush.ogg_77ce237f b/ogg/general/horses/brush.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/brush.ogg_77ce237f
rename to ogg/general/horses/brush.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/canter1.ogg_b614abee b/ogg/general/horses/canter1.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/canter1.ogg_b614abee
rename to ogg/general/horses/canter1.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/canter2.ogg_83fed8b8 b/ogg/general/horses/canter2.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/canter2.ogg_83fed8b8
rename to ogg/general/horses/canter2.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/charge1.ogg_f119e827 b/ogg/general/horses/charge1.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/charge1.ogg_f119e827
rename to ogg/general/horses/charge1.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/charge2.ogg_3e049372 b/ogg/general/horses/charge2.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/charge2.ogg_3e049372
rename to ogg/general/horses/charge2.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/clean.ogg_920c65a1 b/ogg/general/horses/clean.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/clean.ogg_920c65a1
rename to ogg/general/horses/clean.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/eat.ogg_641adc86 b/ogg/general/horses/eat.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/eat.ogg_641adc86
rename to ogg/general/horses/eat.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/gallop1.ogg_9a8e9e3e b/ogg/general/horses/gallop1.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/gallop1.ogg_9a8e9e3e
rename to ogg/general/horses/gallop1.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/gallop2.ogg_6b4cfb4f b/ogg/general/horses/gallop2.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/gallop2.ogg_6b4cfb4f
rename to ogg/general/horses/gallop2.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/mount.ogg_c8964495 b/ogg/general/horses/mount.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/mount.ogg_c8964495
rename to ogg/general/horses/mount.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/rear1.ogg_e8ff3876 b/ogg/general/horses/rear1.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/rear1.ogg_e8ff3876
rename to ogg/general/horses/rear1.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/rear2.ogg_bec13b5a b/ogg/general/horses/rear2.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/rear2.ogg_bec13b5a
rename to ogg/general/horses/rear2.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/rear3.ogg_234244ba b/ogg/general/horses/rear3.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/rear3.ogg_234244ba
rename to ogg/general/horses/rear3.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/rear4.ogg_2362ab68 b/ogg/general/horses/rear4.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/rear4.ogg_2362ab68
rename to ogg/general/horses/rear4.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/saddle.ogg_e049853b b/ogg/general/horses/saddle.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/saddle.ogg_e049853b
rename to ogg/general/horses/saddle.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/sniff.ogg_a70a05c3 b/ogg/general/horses/sniff.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/sniff.ogg_a70a05c3
rename to ogg/general/horses/sniff.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/snort.ogg_4ae11324 b/ogg/general/horses/snort.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/snort.ogg_4ae11324
rename to ogg/general/horses/snort.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/treat.ogg_c51a19bf b/ogg/general/horses/treat.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/treat.ogg_c51a19bf
rename to ogg/general/horses/treat.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/trot1.ogg_e3443a45 b/ogg/general/horses/trot1.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/trot1.ogg_e3443a45
rename to ogg/general/horses/trot1.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/trot2.ogg_a08a0a7b b/ogg/general/horses/trot2.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/trot2.ogg_a08a0a7b
rename to ogg/general/horses/trot2.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/trot3.ogg_28312842 b/ogg/general/horses/trot3.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/trot3.ogg_28312842
rename to ogg/general/horses/trot3.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/walk1.ogg_83e7ee28 b/ogg/general/horses/walk1.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/walk1.ogg_83e7ee28
rename to ogg/general/horses/walk1.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/walk2.ogg_c89ff7d0 b/ogg/general/horses/walk2.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/walk2.ogg_c89ff7d0
rename to ogg/general/horses/walk2.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/whinny1.ogg_029934f8 b/ogg/general/horses/whinny1.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/whinny1.ogg_029934f8
rename to ogg/general/horses/whinny1.ogg
diff --git a/ogg/general_265f6970/horses_166f8792/whinny2.ogg_abbf0426 b/ogg/general/horses/whinny2.ogg
similarity index 100%
rename from ogg/general_265f6970/horses_166f8792/whinny2.ogg_abbf0426
rename to ogg/general/horses/whinny2.ogg
diff --git a/ogg/general_265f6970/hotpotato_918e21fc/out.ogg_f8c32b15 b/ogg/general/hotpotato/out.ogg
similarity index 100%
rename from ogg/general_265f6970/hotpotato_918e21fc/out.ogg_f8c32b15
rename to ogg/general/hotpotato/out.ogg
diff --git a/ogg/general_265f6970/hotpotato_918e21fc/toss.ogg_f710072f b/ogg/general/hotpotato/toss.ogg
similarity index 100%
rename from ogg/general_265f6970/hotpotato_918e21fc/toss.ogg_f710072f
rename to ogg/general/hotpotato/toss.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/bath1.ogg_f67744e2 b/ogg/general/house/bath1.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/bath1.ogg_f67744e2
rename to ogg/general/house/bath1.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/bath2.ogg_bfb82a15 b/ogg/general/house/bath2.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/bath2.ogg_bfb82a15
rename to ogg/general/house/bath2.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/bath3.ogg_68483ab0 b/ogg/general/house/bath3.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/bath3.ogg_68483ab0
rename to ogg/general/house/bath3.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/bath4.ogg_7ea8298d b/ogg/general/house/bath4.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/bath4.ogg_7ea8298d
rename to ogg/general/house/bath4.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/bath5.ogg_5898e043 b/ogg/general/house/bath5.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/bath5.ogg_5898e043
rename to ogg/general/house/bath5.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/bath6.ogg_7e3fca71 b/ogg/general/house/bath6.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/bath6.ogg_7e3fca71
rename to ogg/general/house/bath6.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/broom.ogg_8d8451c2 b/ogg/general/house/broom.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/broom.ogg_8d8451c2
rename to ogg/general/house/broom.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/bump.ogg_9374558d b/ogg/general/house/bump.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/bump.ogg_9374558d
rename to ogg/general/house/bump.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/cam.ogg_25bf7c1c b/ogg/general/house/cam.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/cam.ogg_25bf7c1c
rename to ogg/general/house/cam.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/clock half hour chime.ogg_94a795bc b/ogg/general/house/clock half hour chime.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/clock half hour chime.ogg_94a795bc
rename to ogg/general/house/clock half hour chime.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/clock hour chime.ogg_57fd2594 b/ogg/general/house/clock hour chime.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/clock hour chime.ogg_57fd2594
rename to ogg/general/house/clock hour chime.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/clock quarter-hour chime.ogg_c51694ee b/ogg/general/house/clock quarter-hour chime.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/clock quarter-hour chime.ogg_c51694ee
rename to ogg/general/house/clock quarter-hour chime.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/clock three-quarter hour chime.ogg_5f5699dc b/ogg/general/house/clock three-quarter hour chime.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/clock three-quarter hour chime.ogg_5f5699dc
rename to ogg/general/house/clock three-quarter hour chime.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/crystalrefiner.ogg_5f3867cd b/ogg/general/house/crystalrefiner.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/crystalrefiner.ogg_5f3867cd
rename to ogg/general/house/crystalrefiner.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/doorbell.ogg_7c9d4735 b/ogg/general/house/doorbell.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/doorbell.ogg_7c9d4735
rename to ogg/general/house/doorbell.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/doorbell2.ogg_c9ee8086 b/ogg/general/house/doorbell2.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/doorbell2.ogg_c9ee8086
rename to ogg/general/house/doorbell2.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/flush.ogg_7749f119 b/ogg/general/house/flush.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/flush.ogg_7749f119
rename to ogg/general/house/flush.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/get.ogg_75923323 b/ogg/general/house/get.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/get.ogg_75923323
rename to ogg/general/house/get.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/haircut1.ogg_e85a6d6f b/ogg/general/house/haircut1.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/haircut1.ogg_e85a6d6f
rename to ogg/general/house/haircut1.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/haircut2.ogg_2f13d968 b/ogg/general/house/haircut2.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/haircut2.ogg_2f13d968
rename to ogg/general/house/haircut2.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/haircut3.ogg_74a7bdf6 b/ogg/general/house/haircut3.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/haircut3.ogg_74a7bdf6
rename to ogg/general/house/haircut3.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/haircut4.ogg_eedea151 b/ogg/general/house/haircut4.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/haircut4.ogg_eedea151
rename to ogg/general/house/haircut4.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/haircut5.ogg_073dcca9 b/ogg/general/house/haircut5.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/haircut5.ogg_073dcca9
rename to ogg/general/house/haircut5.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/haircut6.ogg_fb35c369 b/ogg/general/house/haircut6.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/haircut6.ogg_fb35c369
rename to ogg/general/house/haircut6.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/hairdry.ogg_33a4e0e0 b/ogg/general/house/hairdry.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/hairdry.ogg_33a4e0e0
rename to ogg/general/house/hairdry.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/hangingclothe.ogg_4ce774fe b/ogg/general/house/hangingclothe.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/hangingclothe.ogg_4ce774fe
rename to ogg/general/house/hangingclothe.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/liftamb.ogg_292624bb b/ogg/general/house/liftamb.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/liftamb.ogg_292624bb
rename to ogg/general/house/liftamb.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/liftbutton.ogg_221f71e5 b/ogg/general/house/liftbutton.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/liftbutton.ogg_221f71e5
rename to ogg/general/house/liftbutton.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/liftdoorclose.ogg_74df47d1 b/ogg/general/house/liftdoorclose.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/liftdoorclose.ogg_74df47d1
rename to ogg/general/house/liftdoorclose.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/liftdooropen.ogg_eb53fe58 b/ogg/general/house/liftdooropen.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/liftdooropen.ogg_eb53fe58
rename to ogg/general/house/liftdooropen.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/liftmoving.ogg_c13c100f b/ogg/general/house/liftmoving.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/liftmoving.ogg_c13c100f
rename to ogg/general/house/liftmoving.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/liftstart.ogg_05ad03cb b/ogg/general/house/liftstart.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/liftstart.ogg_05ad03cb
rename to ogg/general/house/liftstart.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/liftstop.ogg_dc9bf547 b/ogg/general/house/liftstop.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/liftstop.ogg_dc9bf547
rename to ogg/general/house/liftstop.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/mop.ogg_a92b373a b/ogg/general/house/mop.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/mop.ogg_a92b373a
rename to ogg/general/house/mop.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/paper.ogg_9d344241 b/ogg/general/house/paper.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/paper.ogg_9d344241
rename to ogg/general/house/paper.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/pooljump.ogg_206778cd b/ogg/general/house/pooljump.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/pooljump.ogg_206778cd
rename to ogg/general/house/pooljump.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/poolpush.ogg_94d876c3 b/ogg/general/house/poolpush.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/poolpush.ogg_94d876c3
rename to ogg/general/house/poolpush.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/put.ogg_a63324e6 b/ogg/general/house/put.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/put.ogg_a63324e6
rename to ogg/general/house/put.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/shave.ogg_d4f48277 b/ogg/general/house/shave.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/shave.ogg_d4f48277
rename to ogg/general/house/shave.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/shower.ogg_46da4ca7 b/ogg/general/house/shower.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/shower.ogg_46da4ca7
rename to ogg/general/house/shower.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/showercurtainclose.ogg_384ea4f4 b/ogg/general/house/showercurtainclose.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/showercurtainclose.ogg_384ea4f4
rename to ogg/general/house/showercurtainclose.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/showercurtainopen.ogg_609e948d b/ogg/general/house/showercurtainopen.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/showercurtainopen.ogg_609e948d
rename to ogg/general/house/showercurtainopen.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/showerend.ogg_15803014 b/ogg/general/house/showerend.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/showerend.ogg_15803014
rename to ogg/general/house/showerend.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/showersong.ogg_cb1a0423 b/ogg/general/house/showersong.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/showersong.ogg_cb1a0423
rename to ogg/general/house/showersong.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/showerstart.ogg_2e089734 b/ogg/general/house/showerstart.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/showerstart.ogg_2e089734
rename to ogg/general/house/showerstart.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/sink.ogg_1909ef67 b/ogg/general/house/sink.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/sink.ogg_1909ef67
rename to ogg/general/house/sink.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/swim1.ogg_e0a4652d b/ogg/general/house/swim1.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/swim1.ogg_e0a4652d
rename to ogg/general/house/swim1.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/swim2.ogg_f6ba91f3 b/ogg/general/house/swim2.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/swim2.ogg_f6ba91f3
rename to ogg/general/house/swim2.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/swim3.ogg_72f886e4 b/ogg/general/house/swim3.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/swim3.ogg_72f886e4
rename to ogg/general/house/swim3.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/swim4.ogg_59d64e80 b/ogg/general/house/swim4.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/swim4.ogg_59d64e80
rename to ogg/general/house/swim4.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/swim5.ogg_499cda5d b/ogg/general/house/swim5.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/swim5.ogg_499cda5d
rename to ogg/general/house/swim5.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/tape_pull1.ogg_b5140ffb b/ogg/general/house/tape_pull1.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/tape_pull1.ogg_b5140ffb
rename to ogg/general/house/tape_pull1.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/tape_pull2.ogg_b22082de b/ogg/general/house/tape_pull2.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/tape_pull2.ogg_b22082de
rename to ogg/general/house/tape_pull2.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/tape_roll1.ogg_c6f1fdff b/ogg/general/house/tape_roll1.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/tape_roll1.ogg_c6f1fdff
rename to ogg/general/house/tape_roll1.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/tape_roll2.ogg_66b5d2d7 b/ogg/general/house/tape_roll2.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/tape_roll2.ogg_66b5d2d7
rename to ogg/general/house/tape_roll2.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/tooth1.ogg_64c3034e b/ogg/general/house/tooth1.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/tooth1.ogg_64c3034e
rename to ogg/general/house/tooth1.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/tooth2.ogg_5454566f b/ogg/general/house/tooth2.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/tooth2.ogg_5454566f
rename to ogg/general/house/tooth2.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/towel.ogg_a2a128e0 b/ogg/general/house/towel.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/towel.ogg_a2a128e0
rename to ogg/general/house/towel.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/umbrella1.ogg_9a3a593a b/ogg/general/house/umbrella1.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/umbrella1.ogg_9a3a593a
rename to ogg/general/house/umbrella1.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/umbrella2.ogg_7e78caa7 b/ogg/general/house/umbrella2.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/umbrella2.ogg_7e78caa7
rename to ogg/general/house/umbrella2.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/vacuum.ogg_68319cb0 b/ogg/general/house/vacuum.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/vacuum.ogg_68319cb0
rename to ogg/general/house/vacuum.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/wardrobe1.ogg_6e929732 b/ogg/general/house/wardrobe1.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/wardrobe1.ogg_6e929732
rename to ogg/general/house/wardrobe1.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/wardrobe2.ogg_34bc5196 b/ogg/general/house/wardrobe2.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/wardrobe2.ogg_34bc5196
rename to ogg/general/house/wardrobe2.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/wash.ogg_00812e2c b/ogg/general/house/wash.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/wash.ogg_00812e2c
rename to ogg/general/house/wash.ogg
diff --git a/ogg/general_265f6970/house_08c0d9b1/watercool.ogg_6f1f0449 b/ogg/general/house/watercool.ogg
similarity index 100%
rename from ogg/general_265f6970/house_08c0d9b1/watercool.ogg_6f1f0449
rename to ogg/general/house/watercool.ogg
diff --git a/ogg/general_265f6970/jets_8acb3609/doorsclosed.ogg_dec73ab8 b/ogg/general/jets/doorsclosed.ogg
similarity index 100%
rename from ogg/general_265f6970/jets_8acb3609/doorsclosed.ogg_dec73ab8
rename to ogg/general/jets/doorsclosed.ogg
diff --git a/ogg/general_265f6970/jets_8acb3609/doorsopen.ogg_ffe2397c b/ogg/general/jets/doorsopen.ogg
similarity index 100%
rename from ogg/general_265f6970/jets_8acb3609/doorsopen.ogg_ffe2397c
rename to ogg/general/jets/doorsopen.ogg
diff --git a/ogg/general_265f6970/jets_8acb3609/jetapproach.ogg_c6c00e2d b/ogg/general/jets/jetapproach.ogg
similarity index 100%
rename from ogg/general_265f6970/jets_8acb3609/jetapproach.ogg_c6c00e2d
rename to ogg/general/jets/jetapproach.ogg
diff --git a/ogg/general_265f6970/jets_8acb3609/jetbeginland.ogg_5108181d b/ogg/general/jets/jetbeginland.ogg
similarity index 100%
rename from ogg/general_265f6970/jets_8acb3609/jetbeginland.ogg_5108181d
rename to ogg/general/jets/jetbeginland.ogg
diff --git a/ogg/general_265f6970/jets_8acb3609/jetdive.ogg_c53d36a3 b/ogg/general/jets/jetdive.ogg
similarity index 100%
rename from ogg/general_265f6970/jets_8acb3609/jetdive.ogg_c53d36a3
rename to ogg/general/jets/jetdive.ogg
diff --git a/ogg/general_265f6970/jets_8acb3609/jetdooropen.ogg_b3822c66 b/ogg/general/jets/jetdooropen.ogg
similarity index 100%
rename from ogg/general_265f6970/jets_8acb3609/jetdooropen.ogg_b3822c66
rename to ogg/general/jets/jetdooropen.ogg
diff --git a/ogg/general_265f6970/jets_8acb3609/jetflight.ogg_4b2f6836 b/ogg/general/jets/jetflight.ogg
similarity index 100%
rename from ogg/general_265f6970/jets_8acb3609/jetflight.ogg_4b2f6836
rename to ogg/general/jets/jetflight.ogg
diff --git a/ogg/general_265f6970/jets_8acb3609/jetgoing.ogg_ee28f8e7 b/ogg/general/jets/jetgoing.ogg
similarity index 100%
rename from ogg/general_265f6970/jets_8acb3609/jetgoing.ogg_ee28f8e7
rename to ogg/general/jets/jetgoing.ogg
diff --git a/ogg/general_265f6970/jets_8acb3609/jetland.ogg_2ccb59fd b/ogg/general/jets/jetland.ogg
similarity index 100%
rename from ogg/general_265f6970/jets_8acb3609/jetland.ogg_2ccb59fd
rename to ogg/general/jets/jetland.ogg
diff --git a/ogg/general_265f6970/jets_8acb3609/jettakeoff.ogg_29f549f0 b/ogg/general/jets/jettakeoff.ogg
similarity index 100%
rename from ogg/general_265f6970/jets_8acb3609/jettakeoff.ogg_29f549f0
rename to ogg/general/jets/jettakeoff.ogg
diff --git a/ogg/general_265f6970/larkan_e9615846/complete.ogg_4977f92f b/ogg/general/larkan/complete.ogg
similarity index 100%
rename from ogg/general_265f6970/larkan_e9615846/complete.ogg_4977f92f
rename to ogg/general/larkan/complete.ogg
diff --git a/ogg/general_265f6970/larkan_e9615846/energyball.ogg_663ec87e b/ogg/general/larkan/energyball.ogg
similarity index 100%
rename from ogg/general_265f6970/larkan_e9615846/energyball.ogg_663ec87e
rename to ogg/general/larkan/energyball.ogg
diff --git a/ogg/general_265f6970/larkan_e9615846/extend.ogg_24fa0967 b/ogg/general/larkan/extend.ogg
similarity index 100%
rename from ogg/general_265f6970/larkan_e9615846/extend.ogg_24fa0967
rename to ogg/general/larkan/extend.ogg
diff --git a/ogg/general_265f6970/larkan_e9615846/grasp.ogg_b859d640 b/ogg/general/larkan/grasp.ogg
similarity index 100%
rename from ogg/general_265f6970/larkan_e9615846/grasp.ogg_b859d640
rename to ogg/general/larkan/grasp.ogg
diff --git a/ogg/general_265f6970/larkan_e9615846/install.ogg_61cacdf1 b/ogg/general/larkan/install.ogg
similarity index 100%
rename from ogg/general_265f6970/larkan_e9615846/install.ogg_61cacdf1
rename to ogg/general/larkan/install.ogg
diff --git a/ogg/general_265f6970/larkan_e9615846/land.ogg_3404821d b/ogg/general/larkan/land.ogg
similarity index 100%
rename from ogg/general_265f6970/larkan_e9615846/land.ogg_3404821d
rename to ogg/general/larkan/land.ogg
diff --git a/ogg/general_265f6970/larkan_e9615846/launch.ogg_db7364d0 b/ogg/general/larkan/launch.ogg
similarity index 100%
rename from ogg/general_265f6970/larkan_e9615846/launch.ogg_db7364d0
rename to ogg/general/larkan/launch.ogg
diff --git a/ogg/general_265f6970/larkan_e9615846/ll.ogg_fc4b28aa b/ogg/general/larkan/ll.ogg
similarity index 100%
rename from ogg/general_265f6970/larkan_e9615846/ll.ogg_fc4b28aa
rename to ogg/general/larkan/ll.ogg
diff --git a/ogg/general_265f6970/larkan_e9615846/modinstall.ogg_80cede06 b/ogg/general/larkan/modinstall.ogg
similarity index 100%
rename from ogg/general_265f6970/larkan_e9615846/modinstall.ogg_80cede06
rename to ogg/general/larkan/modinstall.ogg
diff --git a/ogg/general_265f6970/larkan_e9615846/otherland.ogg_c93937ab b/ogg/general/larkan/otherland.ogg
similarity index 100%
rename from ogg/general_265f6970/larkan_e9615846/otherland.ogg_c93937ab
rename to ogg/general/larkan/otherland.ogg
diff --git a/ogg/general_265f6970/larkan_e9615846/otherlaunch.ogg_c8f4f530 b/ogg/general/larkan/otherlaunch.ogg
similarity index 100%
rename from ogg/general_265f6970/larkan_e9615846/otherlaunch.ogg_c8f4f530
rename to ogg/general/larkan/otherlaunch.ogg
diff --git a/ogg/general_265f6970/larkan_e9615846/retract.ogg_da1b2bcc b/ogg/general/larkan/retract.ogg
similarity index 100%
rename from ogg/general_265f6970/larkan_e9615846/retract.ogg_da1b2bcc
rename to ogg/general/larkan/retract.ogg
diff --git a/ogg/general_265f6970/larkan_e9615846/teleport.ogg_77483ad9 b/ogg/general/larkan/teleport.ogg
similarity index 100%
rename from ogg/general_265f6970/larkan_e9615846/teleport.ogg_77483ad9
rename to ogg/general/larkan/teleport.ogg
diff --git a/ogg/general_265f6970/larkan_e9615846/teleport2.ogg_d7dcacbe b/ogg/general/larkan/teleport2.ogg
similarity index 100%
rename from ogg/general_265f6970/larkan_e9615846/teleport2.ogg_d7dcacbe
rename to ogg/general/larkan/teleport2.ogg
diff --git a/ogg/general_265f6970/level_dbaf4bd3/level.ogg_35e1c403 b/ogg/general/level/level.ogg
similarity index 100%
rename from ogg/general_265f6970/level_dbaf4bd3/level.ogg_35e1c403
rename to ogg/general/level/level.ogg
diff --git a/ogg/general_265f6970/level_dbaf4bd3/raise.ogg_bbc811e2 b/ogg/general/level/raise.ogg
similarity index 100%
rename from ogg/general_265f6970/level_dbaf4bd3/raise.ogg_bbc811e2
rename to ogg/general/level/raise.ogg
diff --git a/ogg/general_265f6970/messageboards_c2ae8c8d/chat.ogg_d38c83da b/ogg/general/messageboards/chat.ogg
similarity index 100%
rename from ogg/general_265f6970/messageboards_c2ae8c8d/chat.ogg_d38c83da
rename to ogg/general/messageboards/chat.ogg
diff --git a/ogg/general_265f6970/messageboards_c2ae8c8d/dead.ogg_f5708a56 b/ogg/general/messageboards/dead.ogg
similarity index 100%
rename from ogg/general_265f6970/messageboards_c2ae8c8d/dead.ogg_f5708a56
rename to ogg/general/messageboards/dead.ogg
diff --git a/ogg/general_265f6970/messageboards_c2ae8c8d/general.ogg_d4845962 b/ogg/general/messageboards/general.ogg
similarity index 100%
rename from ogg/general_265f6970/messageboards_c2ae8c8d/general.ogg_d4845962
rename to ogg/general/messageboards/general.ogg
diff --git a/ogg/general_265f6970/messageboards_c2ae8c8d/graduate.ogg_aaeadddd b/ogg/general/messageboards/graduate.ogg
similarity index 100%
rename from ogg/general_265f6970/messageboards_c2ae8c8d/graduate.ogg_aaeadddd
rename to ogg/general/messageboards/graduate.ogg
diff --git a/ogg/general_265f6970/messageboards_c2ae8c8d/gripe.ogg_b7dacd33 b/ogg/general/messageboards/gripe.ogg
similarity index 100%
rename from ogg/general_265f6970/messageboards_c2ae8c8d/gripe.ogg_b7dacd33
rename to ogg/general/messageboards/gripe.ogg
diff --git a/ogg/general_265f6970/messageboards_c2ae8c8d/hostthankyou.ogg_cc693595 b/ogg/general/messageboards/hostthankyou.ogg
similarity index 100%
rename from ogg/general_265f6970/messageboards_c2ae8c8d/hostthankyou.ogg_cc693595
rename to ogg/general/messageboards/hostthankyou.ogg
diff --git a/ogg/general_265f6970/messageboards_c2ae8c8d/larkan.ogg_d931e796 b/ogg/general/messageboards/larkan.ogg
similarity index 100%
rename from ogg/general_265f6970/messageboards_c2ae8c8d/larkan.ogg_d931e796
rename to ogg/general/messageboards/larkan.ogg
diff --git a/ogg/general_265f6970/messageboards_c2ae8c8d/mbn.ogg_62f6d948 b/ogg/general/messageboards/mbn.ogg
similarity index 100%
rename from ogg/general_265f6970/messageboards_c2ae8c8d/mbn.ogg_62f6d948
rename to ogg/general/messageboards/mbn.ogg
diff --git a/ogg/general_265f6970/messageboards_c2ae8c8d/namechange.ogg_b75413db b/ogg/general/messageboards/namechange.ogg
similarity index 100%
rename from ogg/general_265f6970/messageboards_c2ae8c8d/namechange.ogg_b75413db
rename to ogg/general/messageboards/namechange.ogg
diff --git a/ogg/general_265f6970/messageboards_c2ae8c8d/notice.ogg_8fb52e8b b/ogg/general/messageboards/notice.ogg
similarity index 100%
rename from ogg/general_265f6970/messageboards_c2ae8c8d/notice.ogg_8fb52e8b
rename to ogg/general/messageboards/notice.ogg
diff --git a/ogg/general_265f6970/messageboards_c2ae8c8d/origin.ogg_5d8d368e b/ogg/general/messageboards/origin.ogg
similarity index 100%
rename from ogg/general_265f6970/messageboards_c2ae8c8d/origin.ogg_5d8d368e
rename to ogg/general/messageboards/origin.ogg
diff --git a/ogg/general_265f6970/messageboards_c2ae8c8d/ownership.ogg_4fdcd068 b/ogg/general/messageboards/ownership.ogg
similarity index 100%
rename from ogg/general_265f6970/messageboards_c2ae8c8d/ownership.ogg_4fdcd068
rename to ogg/general/messageboards/ownership.ogg
diff --git a/ogg/general_265f6970/messageboards_c2ae8c8d/pilotnotice.ogg_780c10a7 b/ogg/general/messageboards/pilotnotice.ogg
similarity index 100%
rename from ogg/general_265f6970/messageboards_c2ae8c8d/pilotnotice.ogg_780c10a7
rename to ogg/general/messageboards/pilotnotice.ogg
diff --git a/ogg/general_265f6970/military_01f521eb/display.ogg_2ad3fdcd b/ogg/general/military/display.ogg
similarity index 100%
rename from ogg/general_265f6970/military_01f521eb/display.ogg_2ad3fdcd
rename to ogg/general/military/display.ogg
diff --git a/ogg/general_265f6970/military_01f521eb/handcuffoff.ogg_30ce183a b/ogg/general/military/handcuffoff.ogg
similarity index 100%
rename from ogg/general_265f6970/military_01f521eb/handcuffoff.ogg_30ce183a
rename to ogg/general/military/handcuffoff.ogg
diff --git a/ogg/general_265f6970/military_01f521eb/handcuffon.ogg_63cd849b b/ogg/general/military/handcuffon.ogg
similarity index 100%
rename from ogg/general_265f6970/military_01f521eb/handcuffon.ogg_63cd849b
rename to ogg/general/military/handcuffon.ogg
diff --git a/ogg/general_265f6970/military_01f521eb/override.ogg_5315977f b/ogg/general/military/override.ogg
similarity index 100%
rename from ogg/general_265f6970/military_01f521eb/override.ogg_5315977f
rename to ogg/general/military/override.ogg
diff --git a/ogg/general_265f6970/military_01f521eb/shutterclick.ogg_7ee12997 b/ogg/general/military/shutterclick.ogg
similarity index 100%
rename from ogg/general_265f6970/military_01f521eb/shutterclick.ogg_7ee12997
rename to ogg/general/military/shutterclick.ogg
diff --git a/ogg/general_265f6970/military_01f521eb/stuncharge.ogg_c5205fd1 b/ogg/general/military/stuncharge.ogg
similarity index 100%
rename from ogg/general_265f6970/military_01f521eb/stuncharge.ogg_c5205fd1
rename to ogg/general/military/stuncharge.ogg
diff --git a/ogg/general_265f6970/military_01f521eb/stungun.ogg_d208e14b b/ogg/general/military/stungun.ogg
similarity index 100%
rename from ogg/general_265f6970/military_01f521eb/stungun.ogg_d208e14b
rename to ogg/general/military/stungun.ogg
diff --git a/ogg/general_265f6970/military_01f521eb/stunin.ogg_6d1c60e0 b/ogg/general/military/stunin.ogg
similarity index 100%
rename from ogg/general_265f6970/military_01f521eb/stunin.ogg_6d1c60e0
rename to ogg/general/military/stunin.ogg
diff --git a/ogg/general_265f6970/military_01f521eb/stunout.ogg_a2576fa3 b/ogg/general/military/stunout.ogg
similarity index 100%
rename from ogg/general_265f6970/military_01f521eb/stunout.ogg_a2576fa3
rename to ogg/general/military/stunout.ogg
diff --git a/ogg/general_265f6970/military_01f521eb/weaponsafe1.ogg_a2ac48b1 b/ogg/general/military/weaponsafe1.ogg
similarity index 100%
rename from ogg/general_265f6970/military_01f521eb/weaponsafe1.ogg_a2ac48b1
rename to ogg/general/military/weaponsafe1.ogg
diff --git a/ogg/general_265f6970/military_01f521eb/weaponsafe2.ogg_d9e5d600 b/ogg/general/military/weaponsafe2.ogg
similarity index 100%
rename from ogg/general_265f6970/military_01f521eb/weaponsafe2.ogg_d9e5d600
rename to ogg/general/military/weaponsafe2.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/abort.ogg_852580f2 b/ogg/general/misc/abort.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/abort.ogg_852580f2
rename to ogg/general/misc/abort.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/afk1.ogg_a9881100 b/ogg/general/misc/afk1.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/afk1.ogg_a9881100
rename to ogg/general/misc/afk1.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/afk2.ogg_d6f339ed b/ogg/general/misc/afk2.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/afk2.ogg_d6f339ed
rename to ogg/general/misc/afk2.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/air freshener spray.ogg_1927fc2a b/ogg/general/misc/air freshener spray.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/air freshener spray.ogg_1927fc2a
rename to ogg/general/misc/air freshener spray.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/alarm.ogg_56099d9d b/ogg/general/misc/alarm.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/alarm.ogg_56099d9d
rename to ogg/general/misc/alarm.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/alert.ogg_f50e9335 b/ogg/general/misc/alert.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/alert.ogg_f50e9335
rename to ogg/general/misc/alert.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/anchor.ogg_0b3781ae b/ogg/general/misc/anchor.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/anchor.ogg_0b3781ae
rename to ogg/general/misc/anchor.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/arriveddestination.ogg_97722e0a b/ogg/general/misc/arriveddestination.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/arriveddestination.ogg_97722e0a
rename to ogg/general/misc/arriveddestination.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/auto.ogg_3864e82b b/ogg/general/misc/auto.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/auto.ogg_3864e82b
rename to ogg/general/misc/auto.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/autosave.ogg_abed8654 b/ogg/general/misc/autosave.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/autosave.ogg_abed8654
rename to ogg/general/misc/autosave.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/backupsetting.ogg_afd3d621 b/ogg/general/misc/backupsetting.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/backupsetting.ogg_afd3d621
rename to ogg/general/misc/backupsetting.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/balloonblow.ogg_0b238648 b/ogg/general/misc/balloonblow.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/balloonblow.ogg_0b238648
rename to ogg/general/misc/balloonblow.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/balloonpop.ogg_85ebe607 b/ogg/general/misc/balloonpop.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/balloonpop.ogg_85ebe607
rename to ogg/general/misc/balloonpop.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/bell.ogg_66171adb b/ogg/general/misc/bell.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/bell.ogg_66171adb
rename to ogg/general/misc/bell.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/bikemove.ogg_fcb7e30a b/ogg/general/misc/bikemove.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/bikemove.ogg_fcb7e30a
rename to ogg/general/misc/bikemove.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/blast door close.ogg_2757fc2b b/ogg/general/misc/blast door close.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/blast door close.ogg_2757fc2b
rename to ogg/general/misc/blast door close.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/blast door open.ogg_6ea74aaf b/ogg/general/misc/blast door open.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/blast door open.ogg_6ea74aaf
rename to ogg/general/misc/blast door open.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/bolt.ogg_db539dc0 b/ogg/general/misc/bolt.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/bolt.ogg_db539dc0
rename to ogg/general/misc/bolt.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/bookclose.ogg_5bcf15ba b/ogg/general/misc/bookclose.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/bookclose.ogg_5bcf15ba
rename to ogg/general/misc/bookclose.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/bookturn1.ogg_60c0fe00 b/ogg/general/misc/bookturn1.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/bookturn1.ogg_60c0fe00
rename to ogg/general/misc/bookturn1.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/bookturn2.ogg_956a3f1f b/ogg/general/misc/bookturn2.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/bookturn2.ogg_956a3f1f
rename to ogg/general/misc/bookturn2.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/bookturn3.ogg_623070f3 b/ogg/general/misc/bookturn3.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/bookturn3.ogg_623070f3
rename to ogg/general/misc/bookturn3.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/boop.ogg_974758b0 b/ogg/general/misc/boop.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/boop.ogg_974758b0
rename to ogg/general/misc/boop.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/braceletchime.ogg_750eb240 b/ogg/general/misc/braceletchime.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/braceletchime.ogg_750eb240
rename to ogg/general/misc/braceletchime.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/bufferaction.ogg_ae4a2831 b/ogg/general/misc/bufferaction.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/bufferaction.ogg_ae4a2831
rename to ogg/general/misc/bufferaction.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/bufferactive.ogg_51381d1a b/ogg/general/misc/bufferactive.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/bufferactive.ogg_51381d1a
rename to ogg/general/misc/bufferactive.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/bufferadd.ogg_7f34e11e b/ogg/general/misc/bufferadd.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/bufferadd.ogg_7f34e11e
rename to ogg/general/misc/bufferadd.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/bufferadded.ogg_9f9640f6 b/ogg/general/misc/bufferadded.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/bufferadded.ogg_9f9640f6
rename to ogg/general/misc/bufferadded.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/bufferboundary.ogg_9a2936ca b/ogg/general/misc/bufferboundary.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/bufferboundary.ogg_9a2936ca
rename to ogg/general/misc/bufferboundary.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/bufferdelete.ogg_0ba4b5e5 b/ogg/general/misc/bufferdelete.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/bufferdelete.ogg_0ba4b5e5
rename to ogg/general/misc/bufferdelete.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/bufferremoved.ogg_824d5f00 b/ogg/general/misc/bufferremoved.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/bufferremoved.ogg_824d5f00
rename to ogg/general/misc/bufferremoved.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/buffersloaded.ogg_78974c31 b/ogg/general/misc/buffersloaded.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/buffersloaded.ogg_78974c31
rename to ogg/general/misc/buffersloaded.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/bufferssaved.ogg_e79d0393 b/ogg/general/misc/bufferssaved.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/bufferssaved.ogg_e79d0393
rename to ogg/general/misc/bufferssaved.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/bufferswitch.ogg_885afa17 b/ogg/general/misc/bufferswitch.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/bufferswitch.ogg_885afa17
rename to ogg/general/misc/bufferswitch.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/camera.ogg_b37d7223 b/ogg/general/misc/camera.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/camera.ogg_b37d7223
rename to ogg/general/misc/camera.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/cantgo.ogg_5b18cc79 b/ogg/general/misc/cantgo.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/cantgo.ogg_5b18cc79
rename to ogg/general/misc/cantgo.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/cargodrone.ogg_eadfaefd b/ogg/general/misc/cargodrone.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/cargodrone.ogg_eadfaefd
rename to ogg/general/misc/cargodrone.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/cash-register-antiq-bell-op.ogg_3d61baab b/ogg/general/misc/cash-register-antiq-bell-op.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/cash-register-antiq-bell-op.ogg_3d61baab
rename to ogg/general/misc/cash-register-antiq-bell-op.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/cashcheck.ogg_46816361 b/ogg/general/misc/cashcheck.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/cashcheck.ogg_46816361
rename to ogg/general/misc/cashcheck.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/change.ogg_315990f6 b/ogg/general/misc/change.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/change.ogg_315990f6
rename to ogg/general/misc/change.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/checkpoint.ogg_1ece5bdd b/ogg/general/misc/checkpoint.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/checkpoint.ogg_1ece5bdd
rename to ogg/general/misc/checkpoint.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/cheer.ogg_a42b9150 b/ogg/general/misc/cheer.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/cheer.ogg_a42b9150
rename to ogg/general/misc/cheer.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/chimes.ogg_5d849518 b/ogg/general/misc/chimes.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/chimes.ogg_5d849518
rename to ogg/general/misc/chimes.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/christmas.ogg_71e32850 b/ogg/general/misc/christmas.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/christmas.ogg_71e32850
rename to ogg/general/misc/christmas.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/commandwrong.ogg_7d6072f7 b/ogg/general/misc/commandwrong.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/commandwrong.ogg_7d6072f7
rename to ogg/general/misc/commandwrong.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/commpackgreen.ogg_3714f4b7 b/ogg/general/misc/commpackgreen.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/commpackgreen.ogg_3714f4b7
rename to ogg/general/misc/commpackgreen.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/commpackred.ogg_7c1122f8 b/ogg/general/misc/commpackred.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/commpackred.ogg_7c1122f8
rename to ogg/general/misc/commpackred.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/comp.ogg_b2a69da2 b/ogg/general/misc/comp.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/comp.ogg_b2a69da2
rename to ogg/general/misc/comp.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/confman.ogg_da9d3e9e b/ogg/general/misc/confman.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/confman.ogg_da9d3e9e
rename to ogg/general/misc/confman.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/congratulations.ogg_7f0fde79 b/ogg/general/misc/congratulations.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/congratulations.ogg_7f0fde79
rename to ogg/general/misc/congratulations.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/connection1.ogg_cde3b962 b/ogg/general/misc/connection1.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/connection1.ogg_cde3b962
rename to ogg/general/misc/connection1.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/connection2.ogg_23e3c47d b/ogg/general/misc/connection2.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/connection2.ogg_23e3c47d
rename to ogg/general/misc/connection2.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/credits1.ogg_5c19f833 b/ogg/general/misc/credits1.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/credits1.ogg_5c19f833
rename to ogg/general/misc/credits1.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/credits2.ogg_8b391d80 b/ogg/general/misc/credits2.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/credits2.ogg_8b391d80
rename to ogg/general/misc/credits2.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/credits3.ogg_a3a086b8 b/ogg/general/misc/credits3.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/credits3.ogg_a3a086b8
rename to ogg/general/misc/credits3.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/credits4.ogg_d10db354 b/ogg/general/misc/credits4.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/credits4.ogg_d10db354
rename to ogg/general/misc/credits4.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/crystaldrop.ogg_151dd3ae b/ogg/general/misc/crystaldrop.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/crystaldrop.ogg_151dd3ae
rename to ogg/general/misc/crystaldrop.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/cureeat.ogg_538ba552 b/ogg/general/misc/cureeat.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/cureeat.ogg_538ba552
rename to ogg/general/misc/cureeat.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/curefind.ogg_fd2ae993 b/ogg/general/misc/curefind.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/curefind.ogg_fd2ae993
rename to ogg/general/misc/curefind.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/curesearch.ogg_5ed65a82 b/ogg/general/misc/curesearch.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/curesearch.ogg_5ed65a82
rename to ogg/general/misc/curesearch.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/datasaved.ogg_28d2193d b/ogg/general/misc/datasaved.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/datasaved.ogg_28d2193d
rename to ogg/general/misc/datasaved.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/decontamination.ogg_82bc2a47 b/ogg/general/misc/decontamination.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/decontamination.ogg_82bc2a47
rename to ogg/general/misc/decontamination.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/disband.ogg_9f31329b b/ogg/general/misc/disband.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/disband.ogg_9f31329b
rename to ogg/general/misc/disband.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/doorclose.ogg_81d8c6e2 b/ogg/general/misc/doorclose.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/doorclose.ogg_81d8c6e2
rename to ogg/general/misc/doorclose.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/doorclose2.ogg_2a038ced b/ogg/general/misc/doorclose2.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/doorclose2.ogg_2a038ced
rename to ogg/general/misc/doorclose2.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/dooropen.ogg_d0f4a2fa b/ogg/general/misc/dooropen.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/dooropen.ogg_d0f4a2fa
rename to ogg/general/misc/dooropen.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/dooropen2.ogg_66762845 b/ogg/general/misc/dooropen2.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/dooropen2.ogg_66762845
rename to ogg/general/misc/dooropen2.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/doorsclosed.ogg_5719821d b/ogg/general/misc/doorsclosed.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/doorsclosed.ogg_5719821d
rename to ogg/general/misc/doorsclosed.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/doorsopen.ogg_59d9a957 b/ogg/general/misc/doorsopen.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/doorsopen.ogg_59d9a957
rename to ogg/general/misc/doorsopen.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/dragonfeel.ogg_450a3705 b/ogg/general/misc/dragonfeel.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/dragonfeel.ogg_450a3705
rename to ogg/general/misc/dragonfeel.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/dragonflying.ogg_8b06ddfc b/ogg/general/misc/dragonflying.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/dragonflying.ogg_8b06ddfc
rename to ogg/general/misc/dragonflying.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/dragonlanding.ogg_f7d3889a b/ogg/general/misc/dragonlanding.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/dragonlanding.ogg_f7d3889a
rename to ogg/general/misc/dragonlanding.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/dragonstartingtofly.ogg_c0478fcd b/ogg/general/misc/dragonstartingtofly.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/dragonstartingtofly.ogg_c0478fcd
rename to ogg/general/misc/dragonstartingtofly.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/droid.ogg_e2971f44 b/ogg/general/misc/droid.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/droid.ogg_e2971f44
rename to ogg/general/misc/droid.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/droidenters.ogg_16367e92 b/ogg/general/misc/droidenters.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/droidenters.ogg_16367e92
rename to ogg/general/misc/droidenters.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/droidleaves.ogg_8e7e265d b/ogg/general/misc/droidleaves.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/droidleaves.ogg_8e7e265d
rename to ogg/general/misc/droidleaves.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/dronebuzz.ogg_eb62af72 b/ogg/general/misc/dronebuzz.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/dronebuzz.ogg_eb62af72
rename to ogg/general/misc/dronebuzz.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/dronesay.ogg_728c2696 b/ogg/general/misc/dronesay.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/dronesay.ogg_728c2696
rename to ogg/general/misc/dronesay.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/emergency.ogg_2cf7d918 b/ogg/general/misc/emergency.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/emergency.ogg_2cf7d918
rename to ogg/general/misc/emergency.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/emote.ogg_b4632cd0 b/ogg/general/misc/emote.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/emote.ogg_b4632cd0
rename to ogg/general/misc/emote.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/escalator.ogg_5c836f65 b/ogg/general/misc/escalator.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/escalator.ogg_5c836f65
rename to ogg/general/misc/escalator.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/evac.ogg_49370739 b/ogg/general/misc/evac.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/evac.ogg_49370739
rename to ogg/general/misc/evac.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/event.ogg_77fa2cf9 b/ogg/general/misc/event.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/event.ogg_77fa2cf9
rename to ogg/general/misc/event.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/externalriftwind.ogg_d268c650 b/ogg/general/misc/externalriftwind.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/externalriftwind.ogg_d268c650
rename to ogg/general/misc/externalriftwind.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/flutter.ogg_bc2e23d6 b/ogg/general/misc/flutter.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/flutter.ogg_bc2e23d6
rename to ogg/general/misc/flutter.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/food.ogg_39b22f92 b/ogg/general/misc/food.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/food.ogg_39b22f92
rename to ogg/general/misc/food.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/forcefield1.ogg_21db4057 b/ogg/general/misc/forcefield1.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/forcefield1.ogg_21db4057
rename to ogg/general/misc/forcefield1.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/forcefield2.ogg_ee786ae3 b/ogg/general/misc/forcefield2.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/forcefield2.ogg_ee786ae3
rename to ogg/general/misc/forcefield2.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/fountain.ogg_af4a55a8 b/ogg/general/misc/fountain.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/fountain.ogg_af4a55a8
rename to ogg/general/misc/fountain.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/fridgeclose.ogg_5640d169 b/ogg/general/misc/fridgeclose.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/fridgeclose.ogg_5640d169
rename to ogg/general/misc/fridgeclose.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/fridgeopen.ogg_5beecb1f b/ogg/general/misc/fridgeopen.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/fridgeopen.ogg_5beecb1f
rename to ogg/general/misc/fridgeopen.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/gamesave.ogg_e8dd3a6e b/ogg/general/misc/gamesave.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/gamesave.ogg_e8dd3a6e
rename to ogg/general/misc/gamesave.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/gavel.ogg_313019d0 b/ogg/general/misc/gavel.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/gavel.ogg_313019d0
rename to ogg/general/misc/gavel.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/getpoints.ogg_3fecb110 b/ogg/general/misc/getpoints.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/getpoints.ogg_3fecb110
rename to ogg/general/misc/getpoints.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/gottrash.ogg_e0b7123d b/ogg/general/misc/gottrash.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/gottrash.ogg_e0b7123d
rename to ogg/general/misc/gottrash.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/happybirthday.ogg_374f3baa b/ogg/general/misc/happybirthday.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/happybirthday.ogg_374f3baa
rename to ogg/general/misc/happybirthday.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/hardcore.ogg_17cadab1 b/ogg/general/misc/hardcore.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/hardcore.ogg_17cadab1
rename to ogg/general/misc/hardcore.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/hose.ogg_a9794a3f b/ogg/general/misc/hose.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/hose.ogg_a9794a3f
rename to ogg/general/misc/hose.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/invade.ogg_943153cc b/ogg/general/misc/invade.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/invade.ogg_943153cc
rename to ogg/general/misc/invade.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/joins.ogg_bb7856c8 b/ogg/general/misc/joins.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/joins.ogg_bb7856c8
rename to ogg/general/misc/joins.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/keypad.ogg_0b7d1265 b/ogg/general/misc/keypad.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/keypad.ogg_0b7d1265
rename to ogg/general/misc/keypad.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/knock.ogg_30ba52bb b/ogg/general/misc/knock.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/knock.ogg_30ba52bb
rename to ogg/general/misc/knock.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/lark.ogg_3c3c6883 b/ogg/general/misc/lark.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/lark.ogg_3c3c6883
rename to ogg/general/misc/lark.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/larkancharge.ogg_cd6c10fd b/ogg/general/misc/larkancharge.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/larkancharge.ogg_cd6c10fd
rename to ogg/general/misc/larkancharge.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/larkdown.ogg_ebb2a240 b/ogg/general/misc/larkdown.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/larkdown.ogg_ebb2a240
rename to ogg/general/misc/larkdown.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/leadrequest.ogg_dd5608b6 b/ogg/general/misc/leadrequest.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/leadrequest.ogg_dd5608b6
rename to ogg/general/misc/leadrequest.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/lightswitch.ogg_6311eef7 b/ogg/general/misc/lightswitch.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/lightswitch.ogg_6311eef7
rename to ogg/general/misc/lightswitch.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/loadingfile.ogg_a759c4d1 b/ogg/general/misc/loadingfile.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/loadingfile.ogg_a759c4d1
rename to ogg/general/misc/loadingfile.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/loginnew.ogg_0859d853 b/ogg/general/misc/loginnew.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/loginnew.ogg_0859d853
rename to ogg/general/misc/loginnew.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/loginold.ogg_6f9053f3 b/ogg/general/misc/loginold.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/loginold.ogg_6f9053f3
rename to ogg/general/misc/loginold.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/logoutnew.ogg_0fa002a2 b/ogg/general/misc/logoutnew.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/logoutnew.ogg_0fa002a2
rename to ogg/general/misc/logoutnew.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/logoutold.ogg_ed553dc4 b/ogg/general/misc/logoutold.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/logoutold.ogg_ed553dc4
rename to ogg/general/misc/logoutold.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/mail.ogg_6fbc34e2 b/ogg/general/misc/mail.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/mail.ogg_6fbc34e2
rename to ogg/general/misc/mail.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/mapper.ogg_1fa68a9b b/ogg/general/misc/mapper.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/mapper.ogg_1fa68a9b
rename to ogg/general/misc/mapper.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/march.ogg_d71c953e b/ogg/general/misc/march.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/march.ogg_d71c953e
rename to ogg/general/misc/march.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/market.ogg_e114e570 b/ogg/general/misc/market.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/market.ogg_e114e570
rename to ogg/general/misc/market.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/mic.ogg_6a4c229e b/ogg/general/misc/mic.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/mic.ogg_6a4c229e
rename to ogg/general/misc/mic.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/minikeyboard.ogg_b0bcd2a5 b/ogg/general/misc/minikeyboard.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/minikeyboard.ogg_b0bcd2a5
rename to ogg/general/misc/minikeyboard.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/newleader.ogg_c31680e6 b/ogg/general/misc/newleader.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/newleader.ogg_c31680e6
rename to ogg/general/misc/newleader.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/nightmare.ogg_08adddd9 b/ogg/general/misc/nightmare.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/nightmare.ogg_08adddd9
rename to ogg/general/misc/nightmare.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/normal.ogg_df4edd27 b/ogg/general/misc/normal.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/normal.ogg_df4edd27
rename to ogg/general/misc/normal.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/notice.ogg_1a5f441a b/ogg/general/misc/notice.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/notice.ogg_1a5f441a
rename to ogg/general/misc/notice.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/notify.ogg_ea727679 b/ogg/general/misc/notify.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/notify.ogg_ea727679
rename to ogg/general/misc/notify.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/off.ogg_31fdc531 b/ogg/general/misc/off.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/off.ogg_31fdc531
rename to ogg/general/misc/off.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/on.ogg_96d0e6f3 b/ogg/general/misc/on.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/on.ogg_96d0e6f3
rename to ogg/general/misc/on.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/order.ogg_955e0975 b/ogg/general/misc/order.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/order.ogg_955e0975
rename to ogg/general/misc/order.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/partyhorn.ogg_28735af5 b/ogg/general/misc/partyhorn.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/partyhorn.ogg_28735af5
rename to ogg/general/misc/partyhorn.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/partypopper.ogg_09e71bc7 b/ogg/general/misc/partypopper.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/partypopper.ogg_09e71bc7
rename to ogg/general/misc/partypopper.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/petburp.ogg_e17bfc86 b/ogg/general/misc/petburp.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/petburp.ogg_e17bfc86
rename to ogg/general/misc/petburp.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/petdrink.ogg_ebd1af84 b/ogg/general/misc/petdrink.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/petdrink.ogg_ebd1af84
rename to ogg/general/misc/petdrink.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/peteat.ogg_c2a6fd36 b/ogg/general/misc/peteat.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/peteat.ogg_c2a6fd36
rename to ogg/general/misc/peteat.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/ping.ogg_ab446272 b/ogg/general/misc/ping.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/ping.ogg_ab446272
rename to ogg/general/misc/ping.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/plasmarecover.ogg_6f2678b6 b/ogg/general/misc/plasmarecover.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/plasmarecover.ogg_6f2678b6
rename to ogg/general/misc/plasmarecover.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/prompt1.ogg_f208d6cb b/ogg/general/misc/prompt1.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/prompt1.ogg_f208d6cb
rename to ogg/general/misc/prompt1.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/prompt2.ogg_aa9ce1fc b/ogg/general/misc/prompt2.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/prompt2.ogg_aa9ce1fc
rename to ogg/general/misc/prompt2.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/pvpoff.ogg_bad40ca6 b/ogg/general/misc/pvpoff.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/pvpoff.ogg_bad40ca6
rename to ogg/general/misc/pvpoff.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/pvpon.ogg_5786b47b b/ogg/general/misc/pvpon.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/pvpon.ogg_5786b47b
rename to ogg/general/misc/pvpon.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/quit.ogg_59607f5a b/ogg/general/misc/quit.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/quit.ogg_59607f5a
rename to ogg/general/misc/quit.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/quote.ogg_d636eda6 b/ogg/general/misc/quote.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/quote.ogg_d636eda6
rename to ogg/general/misc/quote.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/recycle.ogg_4e36b402 b/ogg/general/misc/recycle.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/recycle.ogg_4e36b402
rename to ogg/general/misc/recycle.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/reload.ogg_1e0f980c b/ogg/general/misc/reload.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/reload.ogg_1e0f980c
rename to ogg/general/misc/reload.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/reminder.ogg_f5207366 b/ogg/general/misc/reminder.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/reminder.ogg_f5207366
rename to ogg/general/misc/reminder.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/reset.ogg_8e503680 b/ogg/general/misc/reset.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/reset.ogg_8e503680
rename to ogg/general/misc/reset.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/restoresetting.ogg_e09294ca b/ogg/general/misc/restoresetting.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/restoresetting.ogg_e09294ca
rename to ogg/general/misc/restoresetting.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/ring.ogg_5acf06e3 b/ogg/general/misc/ring.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/ring.ogg_5acf06e3
rename to ogg/general/misc/ring.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/roundtime.ogg_d40569a3 b/ogg/general/misc/roundtime.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/roundtime.ogg_d40569a3
rename to ogg/general/misc/roundtime.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/save.ogg_f5e4e83b b/ogg/general/misc/save.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/save.ogg_f5e4e83b
rename to ogg/general/misc/save.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/say.ogg_c9781d52 b/ogg/general/misc/say.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/say.ogg_c9781d52
rename to ogg/general/misc/say.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/scannergreen.ogg_f0661aee b/ogg/general/misc/scannergreen.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/scannergreen.ogg_f0661aee
rename to ogg/general/misc/scannergreen.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/scannerred.ogg_a1c45a29 b/ogg/general/misc/scannerred.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/scannerred.ogg_a1c45a29
rename to ogg/general/misc/scannerred.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/seatbelt.ogg_3cbdd592 b/ogg/general/misc/seatbelt.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/seatbelt.ogg_3cbdd592
rename to ogg/general/misc/seatbelt.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/sewing.ogg_240e8f03 b/ogg/general/misc/sewing.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/sewing.ogg_240e8f03
rename to ogg/general/misc/sewing.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/silent.ogg_855c2730 b/ogg/general/misc/silent.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/silent.ogg_855c2730
rename to ogg/general/misc/silent.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/sillystring.ogg_feb7697f b/ogg/general/misc/sillystring.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/sillystring.ogg_feb7697f
rename to ogg/general/misc/sillystring.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/sit.ogg_5900d78e b/ogg/general/misc/sit.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/sit.ogg_5900d78e
rename to ogg/general/misc/sit.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/skateloop.ogg_702bc541 b/ogg/general/misc/skateloop.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/skateloop.ogg_702bc541
rename to ogg/general/misc/skateloop.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/skatestart.ogg_bbe84e31 b/ogg/general/misc/skatestart.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/skatestart.ogg_bbe84e31
rename to ogg/general/misc/skatestart.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/skatestop.ogg_ce8e659f b/ogg/general/misc/skatestop.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/skatestop.ogg_ce8e659f
rename to ogg/general/misc/skatestop.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/slime.ogg_16c2a720 b/ogg/general/misc/slime.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/slime.ogg_16c2a720
rename to ogg/general/misc/slime.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/smoke.ogg_c3fae157 b/ogg/general/misc/smoke.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/smoke.ogg_c3fae157
rename to ogg/general/misc/smoke.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/smokelight.ogg_ea719b9a b/ogg/general/misc/smokelight.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/smokelight.ogg_ea719b9a
rename to ogg/general/misc/smokelight.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/snowball.ogg_4cc364bd b/ogg/general/misc/snowball.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/snowball.ogg_4cc364bd
rename to ogg/general/misc/snowball.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/snowgather1.ogg_b717deee b/ogg/general/misc/snowgather1.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/snowgather1.ogg_b717deee
rename to ogg/general/misc/snowgather1.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/snowgather2.ogg_f24ce74a b/ogg/general/misc/snowgather2.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/snowgather2.ogg_f24ce74a
rename to ogg/general/misc/snowgather2.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/snowhit.ogg_25d2ada5 b/ogg/general/misc/snowhit.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/snowhit.ogg_25d2ada5
rename to ogg/general/misc/snowhit.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/soulsuck.ogg_cd513b87 b/ogg/general/misc/soulsuck.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/soulsuck.ogg_cd513b87
rename to ogg/general/misc/soulsuck.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/soundsstopped.ogg_46dd6a56 b/ogg/general/misc/soundsstopped.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/soundsstopped.ogg_46dd6a56
rename to ogg/general/misc/soundsstopped.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/spannouncement.ogg_64d67232 b/ogg/general/misc/spannouncement.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/spannouncement.ogg_64d67232
rename to ogg/general/misc/spannouncement.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/spbug.ogg_be49517b b/ogg/general/misc/spbug.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/spbug.ogg_be49517b
rename to ogg/general/misc/spbug.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/speedwalkoff.ogg_a0ac3eeb b/ogg/general/misc/speedwalkoff.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/speedwalkoff.ogg_a0ac3eeb
rename to ogg/general/misc/speedwalkoff.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/speedwalkon.ogg_de4b197d b/ogg/general/misc/speedwalkon.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/speedwalkon.ogg_de4b197d
rename to ogg/general/misc/speedwalkon.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/spsave.ogg_4a22d4c9 b/ogg/general/misc/spsave.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/spsave.ogg_4a22d4c9
rename to ogg/general/misc/spsave.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/spsuggest.ogg_d8bd5281 b/ogg/general/misc/spsuggest.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/spsuggest.ogg_d8bd5281
rename to ogg/general/misc/spsuggest.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/stack.ogg_9655db17 b/ogg/general/misc/stack.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/stack.ogg_9655db17
rename to ogg/general/misc/stack.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/stand.ogg_7bb35772 b/ogg/general/misc/stand.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/stand.ogg_7bb35772
rename to ogg/general/misc/stand.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/stocksrefreshed.ogg_d0b12e18 b/ogg/general/misc/stocksrefreshed.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/stocksrefreshed.ogg_d0b12e18
rename to ogg/general/misc/stocksrefreshed.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/storyinvite.ogg_ab708cc7 b/ogg/general/misc/storyinvite.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/storyinvite.ogg_ab708cc7
rename to ogg/general/misc/storyinvite.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/swish.ogg_2458768c b/ogg/general/misc/swish.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/swish.ogg_2458768c
rename to ogg/general/misc/swish.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/synapticreturn.ogg_d0c9187b b/ogg/general/misc/synapticreturn.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/synapticreturn.ogg_d0c9187b
rename to ogg/general/misc/synapticreturn.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/tap.ogg_4bd93b43 b/ogg/general/misc/tap.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/tap.ogg_4bd93b43
rename to ogg/general/misc/tap.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/taxi_hangup.ogg_8e008248 b/ogg/general/misc/taxi_hangup.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/taxi_hangup.ogg_8e008248
rename to ogg/general/misc/taxi_hangup.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/taxi_phone.ogg_74e029da b/ogg/general/misc/taxi_phone.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/taxi_phone.ogg_74e029da
rename to ogg/general/misc/taxi_phone.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/taxiopen.ogg_2c8a01b9 b/ogg/general/misc/taxiopen.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/taxiopen.ogg_2c8a01b9
rename to ogg/general/misc/taxiopen.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/teleport1.ogg_9af18521 b/ogg/general/misc/teleport1.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/teleport1.ogg_9af18521
rename to ogg/general/misc/teleport1.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/teleport2.ogg_5fd8562e b/ogg/general/misc/teleport2.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/teleport2.ogg_5fd8562e
rename to ogg/general/misc/teleport2.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/teleport3.ogg_3f284ab3 b/ogg/general/misc/teleport3.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/teleport3.ogg_3f284ab3
rename to ogg/general/misc/teleport3.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/thump.ogg_484676e0 b/ogg/general/misc/thump.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/thump.ogg_484676e0
rename to ogg/general/misc/thump.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/time.ogg_ec966e77 b/ogg/general/misc/time.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/time.ogg_ec966e77
rename to ogg/general/misc/time.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/timer.ogg_c072576d b/ogg/general/misc/timer.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/timer.ogg_c072576d
rename to ogg/general/misc/timer.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/tip.ogg_8c269283 b/ogg/general/misc/tip.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/tip.ogg_8c269283
rename to ogg/general/misc/tip.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/traceback.ogg_c7253b50 b/ogg/general/misc/traceback.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/traceback.ogg_c7253b50
rename to ogg/general/misc/traceback.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/trash.ogg_69cf3326 b/ogg/general/misc/trash.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/trash.ogg_69cf3326
rename to ogg/general/misc/trash.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/trashcan1.ogg_a1a4c4bc b/ogg/general/misc/trashcan1.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/trashcan1.ogg_a1a4c4bc
rename to ogg/general/misc/trashcan1.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/trashcan2.ogg_d6e8ec39 b/ogg/general/misc/trashcan2.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/trashcan2.ogg_d6e8ec39
rename to ogg/general/misc/trashcan2.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/unblock.ogg_cd51ec5e b/ogg/general/misc/unblock.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/unblock.ogg_cd51ec5e
rename to ogg/general/misc/unblock.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/unbolt.ogg_7731ac23 b/ogg/general/misc/unbolt.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/unbolt.ogg_7731ac23
rename to ogg/general/misc/unbolt.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/unbuckle.ogg_e8cf0b01 b/ogg/general/misc/unbuckle.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/unbuckle.ogg_e8cf0b01
rename to ogg/general/misc/unbuckle.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/vending machine.ogg_f868c38b b/ogg/general/misc/vending machine.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/vending machine.ogg_f868c38b
rename to ogg/general/misc/vending machine.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/vending1.ogg_66d41c10 b/ogg/general/misc/vending1.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/vending1.ogg_66d41c10
rename to ogg/general/misc/vending1.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/vending2.ogg_e87379ec b/ogg/general/misc/vending2.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/vending2.ogg_e87379ec
rename to ogg/general/misc/vending2.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/volcano.ogg_09d7f930 b/ogg/general/misc/volcano.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/volcano.ogg_09d7f930
rename to ogg/general/misc/volcano.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/volumedown.ogg_1bf178d3 b/ogg/general/misc/volumedown.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/volumedown.ogg_1bf178d3
rename to ogg/general/misc/volumedown.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/volumeup.ogg_b2a7c8a0 b/ogg/general/misc/volumeup.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/volumeup.ogg_b2a7c8a0
rename to ogg/general/misc/volumeup.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/vote.ogg_62c86e7c b/ogg/general/misc/vote.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/vote.ogg_62c86e7c
rename to ogg/general/misc/vote.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/wall.ogg_84a77191 b/ogg/general/misc/wall.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/wall.ogg_84a77191
rename to ogg/general/misc/wall.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/warning.ogg_96482c30 b/ogg/general/misc/warning.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/warning.ogg_96482c30
rename to ogg/general/misc/warning.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/wheelchair.ogg_23deeed8 b/ogg/general/misc/wheelchair.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/wheelchair.ogg_23deeed8
rename to ogg/general/misc/wheelchair.ogg
diff --git a/ogg/general_265f6970/misc_5d930fa9/whisper.ogg_9c362a41 b/ogg/general/misc/whisper.ogg
similarity index 100%
rename from ogg/general_265f6970/misc_5d930fa9/whisper.ogg_9c362a41
rename to ogg/general/misc/whisper.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/bark1.ogg_6ee9a298 b/ogg/general/mutariansi/bark1.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/bark1.ogg_6ee9a298
rename to ogg/general/mutariansi/bark1.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/bark2.ogg_dd53e262 b/ogg/general/mutariansi/bark2.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/bark2.ogg_dd53e262
rename to ogg/general/mutariansi/bark2.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/bark3.ogg_6cc8a024 b/ogg/general/mutariansi/bark3.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/bark3.ogg_6cc8a024
rename to ogg/general/mutariansi/bark3.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/bear.ogg_5533123a b/ogg/general/mutariansi/bear.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/bear.ogg_5533123a
rename to ogg/general/mutariansi/bear.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/bearcharge.ogg_1fa1f760 b/ogg/general/mutariansi/bearcharge.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/bearcharge.ogg_1fa1f760
rename to ogg/general/mutariansi/bearcharge.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/bite.ogg_170d5f3f b/ogg/general/mutariansi/bite.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/bite.ogg_170d5f3f
rename to ogg/general/mutariansi/bite.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/bubble.ogg_05c168ed b/ogg/general/mutariansi/bubble.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/bubble.ogg_05c168ed
rename to ogg/general/mutariansi/bubble.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/bullcharge.ogg_51ddac8d b/ogg/general/mutariansi/bullcharge.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/bullcharge.ogg_51ddac8d
rename to ogg/general/mutariansi/bullcharge.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/chimp.ogg_a8a8c492 b/ogg/general/mutariansi/chimp.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/chimp.ogg_a8a8c492
rename to ogg/general/mutariansi/chimp.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/claw1.ogg_6d01a070 b/ogg/general/mutariansi/claw1.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/claw1.ogg_6d01a070
rename to ogg/general/mutariansi/claw1.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/claw2.ogg_e9a499f6 b/ogg/general/mutariansi/claw2.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/claw2.ogg_e9a499f6
rename to ogg/general/mutariansi/claw2.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/claw3.ogg_419f7c41 b/ogg/general/mutariansi/claw3.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/claw3.ogg_419f7c41
rename to ogg/general/mutariansi/claw3.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/cswing1.ogg_8ea33fb6 b/ogg/general/mutariansi/cswing1.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/cswing1.ogg_8ea33fb6
rename to ogg/general/mutariansi/cswing1.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/cswing2.ogg_32117cfa b/ogg/general/mutariansi/cswing2.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/cswing2.ogg_32117cfa
rename to ogg/general/mutariansi/cswing2.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/cswing3.ogg_fed15a36 b/ogg/general/mutariansi/cswing3.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/cswing3.ogg_fed15a36
rename to ogg/general/mutariansi/cswing3.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/dogbark.ogg_81903a00 b/ogg/general/mutariansi/dogbark.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/dogbark.ogg_81903a00
rename to ogg/general/mutariansi/dogbark.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/ecombo.ogg_0baadb08 b/ogg/general/mutariansi/ecombo.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/ecombo.ogg_0baadb08
rename to ogg/general/mutariansi/ecombo.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/ecombo2.ogg_67697b6f b/ogg/general/mutariansi/ecombo2.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/ecombo2.ogg_67697b6f
rename to ogg/general/mutariansi/ecombo2.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/elecall.ogg_b44bc35c b/ogg/general/mutariansi/elecall.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/elecall.ogg_b44bc35c
rename to ogg/general/mutariansi/elecall.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/elelift.ogg_5d42e924 b/ogg/general/mutariansi/elelift.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/elelift.ogg_5d42e924
rename to ogg/general/mutariansi/elelift.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/elephant.ogg_96cc8e28 b/ogg/general/mutariansi/elephant.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/elephant.ogg_96cc8e28
rename to ogg/general/mutariansi/elephant.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/elesay.ogg_7bb52638 b/ogg/general/mutariansi/elesay.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/elesay.ogg_7bb52638
rename to ogg/general/mutariansi/elesay.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/esniff1 - kopya.ogg_f887248d b/ogg/general/mutariansi/esniff1 - kopya.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/esniff1 - kopya.ogg_f887248d
rename to ogg/general/mutariansi/esniff1 - kopya.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/esniff1.ogg_a90cc9b4 b/ogg/general/mutariansi/esniff1.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/esniff1.ogg_a90cc9b4
rename to ogg/general/mutariansi/esniff1.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/forget.ogg_41922f33 b/ogg/general/mutariansi/forget.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/forget.ogg_41922f33
rename to ogg/general/mutariansi/forget.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/hawkdive.ogg_08b2cfd4 b/ogg/general/mutariansi/hawkdive.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/hawkdive.ogg_08b2cfd4
rename to ogg/general/mutariansi/hawkdive.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/hiss.ogg_ede25565 b/ogg/general/mutariansi/hiss.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/hiss.ogg_ede25565
rename to ogg/general/mutariansi/hiss.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/howl.ogg_a01ce878 b/ogg/general/mutariansi/howl.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/howl.ogg_a01ce878
rename to ogg/general/mutariansi/howl.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/kitten.ogg_b713023d b/ogg/general/mutariansi/kitten.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/kitten.ogg_b713023d
rename to ogg/general/mutariansi/kitten.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/lion.ogg_1fb31944 b/ogg/general/mutariansi/lion.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/lion.ogg_1fb31944
rename to ogg/general/mutariansi/lion.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/moo1.ogg_dfd7627c b/ogg/general/mutariansi/moo1.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/moo1.ogg_dfd7627c
rename to ogg/general/mutariansi/moo1.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/moo2.ogg_b5643022 b/ogg/general/mutariansi/moo2.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/moo2.ogg_b5643022
rename to ogg/general/mutariansi/moo2.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/plasreform.ogg_f66606fd b/ogg/general/mutariansi/plasreform.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/plasreform.ogg_f66606fd
rename to ogg/general/mutariansi/plasreform.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/raven.ogg_e485e388 b/ogg/general/mutariansi/raven.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/raven.ogg_e485e388
rename to ogg/general/mutariansi/raven.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/reform.ogg_04cc26ea b/ogg/general/mutariansi/reform.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/reform.ogg_04cc26ea
rename to ogg/general/mutariansi/reform.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/sirenssong.ogg_ce9856c8 b/ogg/general/mutariansi/sirenssong.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/sirenssong.ogg_ce9856c8
rename to ogg/general/mutariansi/sirenssong.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/snowlep.ogg_5e52c60f b/ogg/general/mutariansi/snowlep.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/snowlep.ogg_5e52c60f
rename to ogg/general/mutariansi/snowlep.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/sonar.ogg_2b18eb2f b/ogg/general/mutariansi/sonar.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/sonar.ogg_2b18eb2f
rename to ogg/general/mutariansi/sonar.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/squeak.ogg_f369b55e b/ogg/general/mutariansi/squeak.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/squeak.ogg_f369b55e
rename to ogg/general/mutariansi/squeak.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/stonefail1.ogg_1770764e b/ogg/general/mutariansi/stonefail1.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/stonefail1.ogg_1770764e
rename to ogg/general/mutariansi/stonefail1.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/stonefail2.ogg_8d4892e5 b/ogg/general/mutariansi/stonefail2.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/stonefail2.ogg_8d4892e5
rename to ogg/general/mutariansi/stonefail2.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/stonefail3.ogg_a5569dff b/ogg/general/mutariansi/stonefail3.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/stonefail3.ogg_a5569dff
rename to ogg/general/mutariansi/stonefail3.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/stonesuccess1.ogg_2524133c b/ogg/general/mutariansi/stonesuccess1.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/stonesuccess1.ogg_2524133c
rename to ogg/general/mutariansi/stonesuccess1.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/stonesuccess2.ogg_04e50949 b/ogg/general/mutariansi/stonesuccess2.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/stonesuccess2.ogg_04e50949
rename to ogg/general/mutariansi/stonesuccess2.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/swipe1.ogg_ca145e5f b/ogg/general/mutariansi/swipe1.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/swipe1.ogg_ca145e5f
rename to ogg/general/mutariansi/swipe1.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/swipe2.ogg_1e5c55b3 b/ogg/general/mutariansi/swipe2.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/swipe2.ogg_1e5c55b3
rename to ogg/general/mutariansi/swipe2.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/swipe3.ogg_4dd8a04e b/ogg/general/mutariansi/swipe3.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/swipe3.ogg_4dd8a04e
rename to ogg/general/mutariansi/swipe3.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/tigergrowl.ogg_39af9d7c b/ogg/general/mutariansi/tigergrowl.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/tigergrowl.ogg_39af9d7c
rename to ogg/general/mutariansi/tigergrowl.ogg
diff --git a/ogg/general_265f6970/mutariansi_5f746b01/wolfgrowl.ogg_ffb148e6 b/ogg/general/mutariansi/wolfgrowl.ogg
similarity index 100%
rename from ogg/general_265f6970/mutariansi_5f746b01/wolfgrowl.ogg_ffb148e6
rename to ogg/general/mutariansi/wolfgrowl.ogg
diff --git a/ogg/general_265f6970/mwtp_5f53ab30/left.ogg_99bc25e9 b/ogg/general/mwtp/left.ogg
similarity index 100%
rename from ogg/general_265f6970/mwtp_5f53ab30/left.ogg_99bc25e9
rename to ogg/general/mwtp/left.ogg
diff --git a/ogg/general_265f6970/mwtp_5f53ab30/microdi.ogg_343a6393 b/ogg/general/mwtp/microdi.ogg
similarity index 100%
rename from ogg/general_265f6970/mwtp_5f53ab30/microdi.ogg_343a6393
rename to ogg/general/mwtp/microdi.ogg
diff --git a/ogg/general_265f6970/mwtp_5f53ab30/microdk.ogg_7bdd5521 b/ogg/general/mwtp/microdk.ogg
similarity index 100%
rename from ogg/general_265f6970/mwtp_5f53ab30/microdk.ogg_7bdd5521
rename to ogg/general/mwtp/microdk.ogg
diff --git a/ogg/general_265f6970/mwtp_5f53ab30/microii.ogg_d577fdc3 b/ogg/general/mwtp/microii.ogg
similarity index 100%
rename from ogg/general_265f6970/mwtp_5f53ab30/microii.ogg_d577fdc3
rename to ogg/general/mwtp/microii.ogg
diff --git a/ogg/general_265f6970/mwtp_5f53ab30/microik.ogg_455d7b9f b/ogg/general/mwtp/microik.ogg
similarity index 100%
rename from ogg/general_265f6970/mwtp_5f53ab30/microik.ogg_455d7b9f
rename to ogg/general/mwtp/microik.ogg
diff --git a/ogg/general_265f6970/mwtp_5f53ab30/right.ogg_5837876b b/ogg/general/mwtp/right.ogg
similarity index 100%
rename from ogg/general_265f6970/mwtp_5f53ab30/right.ogg_5837876b
rename to ogg/general/mwtp/right.ogg
diff --git a/ogg/general_265f6970/pod_625461e0/doorc.ogg_15cdaaaa b/ogg/general/pod/doorc.ogg
similarity index 100%
rename from ogg/general_265f6970/pod_625461e0/doorc.ogg_15cdaaaa
rename to ogg/general/pod/doorc.ogg
diff --git a/ogg/general_265f6970/pod_625461e0/dooro.ogg_db253b42 b/ogg/general/pod/dooro.ogg
similarity index 100%
rename from ogg/general_265f6970/pod_625461e0/dooro.ogg_db253b42
rename to ogg/general/pod/dooro.ogg
diff --git a/ogg/general_265f6970/pod_625461e0/loop.ogg_01c74154 b/ogg/general/pod/loop.ogg
similarity index 100%
rename from ogg/general_265f6970/pod_625461e0/loop.ogg_01c74154
rename to ogg/general/pod/loop.ogg
diff --git a/ogg/general_265f6970/pod_625461e0/partland.ogg_7e9df67d b/ogg/general/pod/partland.ogg
similarity index 100%
rename from ogg/general_265f6970/pod_625461e0/partland.ogg_7e9df67d
rename to ogg/general/pod/partland.ogg
diff --git a/ogg/general_265f6970/pod_625461e0/partlaunch.ogg_edfe3e24 b/ogg/general/pod/partlaunch.ogg
similarity index 100%
rename from ogg/general_265f6970/pod_625461e0/partlaunch.ogg_edfe3e24
rename to ogg/general/pod/partlaunch.ogg
diff --git a/ogg/general_265f6970/pod_625461e0/partloop.ogg_86327d09 b/ogg/general/pod/partloop.ogg
similarity index 100%
rename from ogg/general_265f6970/pod_625461e0/partloop.ogg_86327d09
rename to ogg/general/pod/partloop.ogg
diff --git a/ogg/general_265f6970/pod_625461e0/start.ogg_0a4d7fa3 b/ogg/general/pod/start.ogg
similarity index 100%
rename from ogg/general_265f6970/pod_625461e0/start.ogg_0a4d7fa3
rename to ogg/general/pod/start.ogg
diff --git a/ogg/general_265f6970/pod_625461e0/stop.ogg_dbf5dc51 b/ogg/general/pod/stop.ogg
similarity index 100%
rename from ogg/general_265f6970/pod_625461e0/stop.ogg_dbf5dc51
rename to ogg/general/pod/stop.ogg
diff --git a/ogg/general_265f6970/pong_9c46c3cb/bounce.ogg_ac8b45cb b/ogg/general/pong/bounce.ogg
similarity index 100%
rename from ogg/general_265f6970/pong_9c46c3cb/bounce.ogg_ac8b45cb
rename to ogg/general/pong/bounce.ogg
diff --git a/ogg/general_265f6970/pong_9c46c3cb/hit1.ogg_79f775b4 b/ogg/general/pong/hit1.ogg
similarity index 100%
rename from ogg/general_265f6970/pong_9c46c3cb/hit1.ogg_79f775b4
rename to ogg/general/pong/hit1.ogg
diff --git a/ogg/general_265f6970/pong_9c46c3cb/hit2.ogg_711a77b9 b/ogg/general/pong/hit2.ogg
similarity index 100%
rename from ogg/general_265f6970/pong_9c46c3cb/hit2.ogg_711a77b9
rename to ogg/general/pong/hit2.ogg
diff --git a/ogg/general_265f6970/pong_9c46c3cb/hit3.ogg_a58e0304 b/ogg/general/pong/hit3.ogg
similarity index 100%
rename from ogg/general_265f6970/pong_9c46c3cb/hit3.ogg_a58e0304
rename to ogg/general/pong/hit3.ogg
diff --git a/ogg/general_265f6970/pong_9c46c3cb/hit4.ogg_f6481036 b/ogg/general/pong/hit4.ogg
similarity index 100%
rename from ogg/general_265f6970/pong_9c46c3cb/hit4.ogg_f6481036
rename to ogg/general/pong/hit4.ogg
diff --git a/ogg/general_265f6970/pong_9c46c3cb/move.ogg_581d8afb b/ogg/general/pong/move.ogg
similarity index 100%
rename from ogg/general_265f6970/pong_9c46c3cb/move.ogg_581d8afb
rename to ogg/general/pong/move.ogg
diff --git a/ogg/general_265f6970/pong_9c46c3cb/top.ogg_1bad3f52 b/ogg/general/pong/top.ogg
similarity index 100%
rename from ogg/general_265f6970/pong_9c46c3cb/top.ogg_1bad3f52
rename to ogg/general/pong/top.ogg
diff --git a/ogg/general_265f6970/pong_9c46c3cb/topben.ogg_3aefcb3e b/ogg/general/pong/topben.ogg
similarity index 100%
rename from ogg/general_265f6970/pong_9c46c3cb/topben.ogg_3aefcb3e
rename to ogg/general/pong/topben.ogg
diff --git a/ogg/general_265f6970/pong_9c46c3cb/topsen.ogg_ebd26f61 b/ogg/general/pong/topsen.ogg
similarity index 100%
rename from ogg/general_265f6970/pong_9c46c3cb/topsen.ogg_ebd26f61
rename to ogg/general/pong/topsen.ogg
diff --git a/ogg/general_265f6970/pong_9c46c3cb/whoosh.ogg_5e1890b0 b/ogg/general/pong/whoosh.ogg
similarity index 100%
rename from ogg/general_265f6970/pong_9c46c3cb/whoosh.ogg_5e1890b0
rename to ogg/general/pong/whoosh.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/cash.ogg_565b3db2 b/ogg/general/pp/cash.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/cash.ogg_565b3db2
rename to ogg/general/pp/cash.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/cave.ogg_aad05ba1 b/ogg/general/pp/cave.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/cave.ogg_aad05ba1
rename to ogg/general/pp/cave.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/dig.ogg_9586562d b/ogg/general/pp/dig.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/dig.ogg_9586562d
rename to ogg/general/pp/dig.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/escape.ogg_5dd810c1 b/ogg/general/pp/escape.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/escape.ogg_5dd810c1
rename to ogg/general/pp/escape.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/extra.ogg_4808398b b/ogg/general/pp/extra.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/extra.ogg_4808398b
rename to ogg/general/pp/extra.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/grenadethrow.ogg_d3c28b85 b/ogg/general/pp/grenadethrow.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/grenadethrow.ogg_d3c28b85
rename to ogg/general/pp/grenadethrow.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/grenadeyou.ogg_4041bd92 b/ogg/general/pp/grenadeyou.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/grenadeyou.ogg_4041bd92
rename to ogg/general/pp/grenadeyou.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/helmoff.ogg_6750c1ee b/ogg/general/pp/helmoff.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/helmoff.ogg_6750c1ee
rename to ogg/general/pp/helmoff.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/helmon.ogg_a5962a66 b/ogg/general/pp/helmon.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/helmon.ogg_a5962a66
rename to ogg/general/pp/helmon.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/jail.ogg_e2079a13 b/ogg/general/pp/jail.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/jail.ogg_e2079a13
rename to ogg/general/pp/jail.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/land.ogg_95bd862d b/ogg/general/pp/land.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/land.ogg_95bd862d
rename to ogg/general/pp/land.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/launch.ogg_aa824483 b/ogg/general/pp/launch.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/launch.ogg_aa824483
rename to ogg/general/pp/launch.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/logo.ogg_b39be091 b/ogg/general/pp/logo.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/logo.ogg_b39be091
rename to ogg/general/pp/logo.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/loose2.ogg_2bcbae4e b/ogg/general/pp/loose2.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/loose2.ogg_2bcbae4e
rename to ogg/general/pp/loose2.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/looser.ogg_c2ea74c8 b/ogg/general/pp/looser.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/looser.ogg_c2ea74c8
rename to ogg/general/pp/looser.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/roll.ogg_be9b4dbc b/ogg/general/pp/roll.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/roll.ogg_be9b4dbc
rename to ogg/general/pp/roll.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/ryacusmad.ogg_33a90bdc b/ogg/general/pp/ryacusmad.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/ryacusmad.ogg_33a90bdc
rename to ogg/general/pp/ryacusmad.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/sdlshot.ogg_da14a096 b/ogg/general/pp/sdlshot.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/sdlshot.ogg_da14a096
rename to ogg/general/pp/sdlshot.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/slide.ogg_fc34d014 b/ogg/general/pp/slide.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/slide.ogg_fc34d014
rename to ogg/general/pp/slide.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/stun.ogg_e6b5e9ec b/ogg/general/pp/stun.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/stun.ogg_e6b5e9ec
rename to ogg/general/pp/stun.ogg
diff --git a/ogg/general_265f6970/pp_2651dd43/thunder.ogg_c7dc56c8 b/ogg/general/pp/thunder.ogg
similarity index 100%
rename from ogg/general_265f6970/pp_2651dd43/thunder.ogg_c7dc56c8
rename to ogg/general/pp/thunder.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/bark.ogg_bbee8c64 b/ogg/general/socials/bark.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/bark.ogg_bbee8c64
rename to ogg/general/socials/bark.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/bearhug.ogg_a8248378 b/ogg/general/socials/bearhug.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/bearhug.ogg_a8248378
rename to ogg/general/socials/bearhug.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/bee.ogg_2e92bc7c b/ogg/general/socials/bee.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/bee.ogg_2e92bc7c
rename to ogg/general/socials/bee.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/belch.ogg_2e3d8be7 b/ogg/general/socials/belch.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/belch.ogg_2e3d8be7
rename to ogg/general/socials/belch.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/bitchslap.ogg_980200d3 b/ogg/general/socials/bitchslap.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/bitchslap.ogg_980200d3
rename to ogg/general/socials/bitchslap.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/blink.ogg_d615d51e b/ogg/general/socials/blink.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/blink.ogg_d615d51e
rename to ogg/general/socials/blink.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/bounce1.ogg_97321c57 b/ogg/general/socials/bounce1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/bounce1.ogg_97321c57
rename to ogg/general/socials/bounce1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/bounce2.ogg_884326c9 b/ogg/general/socials/bounce2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/bounce2.ogg_884326c9
rename to ogg/general/socials/bounce2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/box.ogg_e668a09e b/ogg/general/socials/box.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/box.ogg_e668a09e
rename to ogg/general/socials/box.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/burp.ogg_02142c8a b/ogg/general/socials/burp.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/burp.ogg_02142c8a
rename to ogg/general/socials/burp.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/buzz.ogg_cb2303cc b/ogg/general/socials/buzz.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/buzz.ogg_cb2303cc
rename to ogg/general/socials/buzz.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/cackle.ogg_927054bd b/ogg/general/socials/cackle.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/cackle.ogg_927054bd
rename to ogg/general/socials/cackle.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/cheer1.ogg_2631c5d1 b/ogg/general/socials/cheer1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/cheer1.ogg_2631c5d1
rename to ogg/general/socials/cheer1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/cheer2.ogg_65c0db3f b/ogg/general/socials/cheer2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/cheer2.ogg_65c0db3f
rename to ogg/general/socials/cheer2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/cheer3.ogg_e771a980 b/ogg/general/socials/cheer3.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/cheer3.ogg_e771a980
rename to ogg/general/socials/cheer3.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/chortle.ogg_393c034b b/ogg/general/socials/chortle.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/chortle.ogg_393c034b
rename to ogg/general/socials/chortle.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/chuckle.ogg_624cf35b b/ogg/general/socials/chuckle.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/chuckle.ogg_624cf35b
rename to ogg/general/socials/chuckle.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/clearthroat.ogg_b90f9a98 b/ogg/general/socials/clearthroat.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/clearthroat.ogg_b90f9a98
rename to ogg/general/socials/clearthroat.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/collapse1.ogg_ea0519a1 b/ogg/general/socials/collapse1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/collapse1.ogg_ea0519a1
rename to ogg/general/socials/collapse1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/collapse2.ogg_5f9d3a29 b/ogg/general/socials/collapse2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/collapse2.ogg_5f9d3a29
rename to ogg/general/socials/collapse2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/collapse3.ogg_02235d56 b/ogg/general/socials/collapse3.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/collapse3.ogg_02235d56
rename to ogg/general/socials/collapse3.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/cough1.ogg_ca5ae715 b/ogg/general/socials/cough1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/cough1.ogg_ca5ae715
rename to ogg/general/socials/cough1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/cough2.ogg_1d873e60 b/ogg/general/socials/cough2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/cough2.ogg_1d873e60
rename to ogg/general/socials/cough2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/cough3.ogg_1dbf700d b/ogg/general/socials/cough3.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/cough3.ogg_1dbf700d
rename to ogg/general/socials/cough3.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/cough4.ogg_b1a64fc0 b/ogg/general/socials/cough4.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/cough4.ogg_b1a64fc0
rename to ogg/general/socials/cough4.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/cough5.ogg_2d95f5ed b/ogg/general/socials/cough5.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/cough5.ogg_2d95f5ed
rename to ogg/general/socials/cough5.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/crunch01.ogg_f2f1d5cc b/ogg/general/socials/crunch01.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/crunch01.ogg_f2f1d5cc
rename to ogg/general/socials/crunch01.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/crunch02.ogg_b83b18d9 b/ogg/general/socials/crunch02.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/crunch02.ogg_b83b18d9
rename to ogg/general/socials/crunch02.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/crunch03.ogg_d9dab93f b/ogg/general/socials/crunch03.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/crunch03.ogg_d9dab93f
rename to ogg/general/socials/crunch03.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/crunch04.ogg_91e491d5 b/ogg/general/socials/crunch04.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/crunch04.ogg_91e491d5
rename to ogg/general/socials/crunch04.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/crunch05.ogg_2d2acdea b/ogg/general/socials/crunch05.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/crunch05.ogg_2d2acdea
rename to ogg/general/socials/crunch05.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/crunch06.ogg_2ad9b4d2 b/ogg/general/socials/crunch06.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/crunch06.ogg_2ad9b4d2
rename to ogg/general/socials/crunch06.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/cry1.ogg_272552a2 b/ogg/general/socials/cry1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/cry1.ogg_272552a2
rename to ogg/general/socials/cry1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/cry2.ogg_a836e055 b/ogg/general/socials/cry2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/cry2.ogg_a836e055
rename to ogg/general/socials/cry2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/cry3.ogg_671b8588 b/ogg/general/socials/cry3.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/cry3.ogg_671b8588
rename to ogg/general/socials/cry3.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/cry4.ogg_715fbe4a b/ogg/general/socials/cry4.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/cry4.ogg_715fbe4a
rename to ogg/general/socials/cry4.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/dong1.ogg_118959ae b/ogg/general/socials/dong1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/dong1.ogg_118959ae
rename to ogg/general/socials/dong1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/dong2.ogg_7ebebf11 b/ogg/general/socials/dong2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/dong2.ogg_7ebebf11
rename to ogg/general/socials/dong2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/eat.ogg_ac920cf8 b/ogg/general/socials/eat.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/eat.ogg_ac920cf8
rename to ogg/general/socials/eat.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/execute.ogg_7fc85527 b/ogg/general/socials/execute.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/execute.ogg_7fc85527
rename to ogg/general/socials/execute.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/execute2.ogg_0c91d850 b/ogg/general/socials/execute2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/execute2.ogg_0c91d850
rename to ogg/general/socials/execute2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/fail.ogg_76e1fefd b/ogg/general/socials/fail.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/fail.ogg_76e1fefd
rename to ogg/general/socials/fail.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/fart.ogg_644a7e81 b/ogg/general/socials/fart.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/fart.ogg_644a7e81
rename to ogg/general/socials/fart.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/gag1.ogg_3465653d b/ogg/general/socials/gag1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/gag1.ogg_3465653d
rename to ogg/general/socials/gag1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/gag2.ogg_dfb634c7 b/ogg/general/socials/gag2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/gag2.ogg_dfb634c7
rename to ogg/general/socials/gag2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/garrybeer.ogg_7cb17221 b/ogg/general/socials/garrybeer.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/garrybeer.ogg_7cb17221
rename to ogg/general/socials/garrybeer.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/giggle.ogg_921eef89 b/ogg/general/socials/giggle.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/giggle.ogg_921eef89
rename to ogg/general/socials/giggle.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/glove.ogg_8fa17ab8 b/ogg/general/socials/glove.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/glove.ogg_8fa17ab8
rename to ogg/general/socials/glove.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/growl.ogg_7f5667a6 b/ogg/general/socials/growl.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/growl.ogg_7f5667a6
rename to ogg/general/socials/growl.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/headbash.ogg_d17eeb61 b/ogg/general/socials/headbash.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/headbash.ogg_d17eeb61
rename to ogg/general/socials/headbash.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/headdesk1.ogg_145f3607 b/ogg/general/socials/headdesk1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/headdesk1.ogg_145f3607
rename to ogg/general/socials/headdesk1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/headdesk2.ogg_1279145f b/ogg/general/socials/headdesk2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/headdesk2.ogg_1279145f
rename to ogg/general/socials/headdesk2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/hero1.ogg_7e302e31 b/ogg/general/socials/hero1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/hero1.ogg_7e302e31
rename to ogg/general/socials/hero1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/hero2.ogg_9d53724b b/ogg/general/socials/hero2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/hero2.ogg_9d53724b
rename to ogg/general/socials/hero2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/hero3.ogg_77c60e3f b/ogg/general/socials/hero3.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/hero3.ogg_77c60e3f
rename to ogg/general/socials/hero3.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/hero4.ogg_5bd99f9d b/ogg/general/socials/hero4.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/hero4.ogg_5bd99f9d
rename to ogg/general/socials/hero4.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/hero5.ogg_41f93387 b/ogg/general/socials/hero5.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/hero5.ogg_41f93387
rename to ogg/general/socials/hero5.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/hero6.ogg_f89e5b7f b/ogg/general/socials/hero6.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/hero6.ogg_f89e5b7f
rename to ogg/general/socials/hero6.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/iblink.ogg_436937d6 b/ogg/general/socials/iblink.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/iblink.ogg_436937d6
rename to ogg/general/socials/iblink.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/ic.ogg_2aaf11aa b/ogg/general/socials/ic.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/ic.ogg_2aaf11aa
rename to ogg/general/socials/ic.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/judgesaw.ogg_b7aae031 b/ogg/general/socials/judgesaw.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/judgesaw.ogg_b7aae031
rename to ogg/general/socials/judgesaw.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/judgesaw2.ogg_ec22aa65 b/ogg/general/socials/judgesaw2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/judgesaw2.ogg_ec22aa65
rename to ogg/general/socials/judgesaw2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/judgewhip.ogg_d8089aae b/ogg/general/socials/judgewhip.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/judgewhip.ogg_d8089aae
rename to ogg/general/socials/judgewhip.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/kick1.ogg_e752c53b b/ogg/general/socials/kick1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/kick1.ogg_e752c53b
rename to ogg/general/socials/kick1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/kick2.ogg_78015adb b/ogg/general/socials/kick2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/kick2.ogg_78015adb
rename to ogg/general/socials/kick2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/kick3.ogg_91672011 b/ogg/general/socials/kick3.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/kick3.ogg_91672011
rename to ogg/general/socials/kick3.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/kick4.ogg_7b2d7f02 b/ogg/general/socials/kick4.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/kick4.ogg_7b2d7f02
rename to ogg/general/socials/kick4.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/kick5.ogg_ad2a465a b/ogg/general/socials/kick5.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/kick5.ogg_ad2a465a
rename to ogg/general/socials/kick5.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/kick6.ogg_bef6c344 b/ogg/general/socials/kick6.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/kick6.ogg_bef6c344
rename to ogg/general/socials/kick6.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/kick7.ogg_cc1f565b b/ogg/general/socials/kick7.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/kick7.ogg_cc1f565b
rename to ogg/general/socials/kick7.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/kick8.ogg_9ce97696 b/ogg/general/socials/kick8.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/kick8.ogg_9ce97696
rename to ogg/general/socials/kick8.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/kick9.ogg_79c11543 b/ogg/general/socials/kick9.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/kick9.ogg_79c11543
rename to ogg/general/socials/kick9.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/kiss1.ogg_65a7b50e b/ogg/general/socials/kiss1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/kiss1.ogg_65a7b50e
rename to ogg/general/socials/kiss1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/kiss2.ogg_2c645668 b/ogg/general/socials/kiss2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/kiss2.ogg_2c645668
rename to ogg/general/socials/kiss2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/laugh.ogg_7e305150 b/ogg/general/socials/laugh.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/laugh.ogg_7e305150
rename to ogg/general/socials/laugh.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/laugh2.ogg_8cbfb838 b/ogg/general/socials/laugh2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/laugh2.ogg_8cbfb838
rename to ogg/general/socials/laugh2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/lie.ogg_6b9dad6b b/ogg/general/socials/lie.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/lie.ogg_6b9dad6b
rename to ogg/general/socials/lie.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/meow.ogg_f5eaadf0 b/ogg/general/socials/meow.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/meow.ogg_f5eaadf0
rename to ogg/general/socials/meow.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/meow1.ogg_68353510 b/ogg/general/socials/meow1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/meow1.ogg_68353510
rename to ogg/general/socials/meow1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/meow2.ogg_bc1b09e4 b/ogg/general/socials/meow2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/meow2.ogg_bc1b09e4
rename to ogg/general/socials/meow2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/meow3.ogg_8b71aec0 b/ogg/general/socials/meow3.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/meow3.ogg_8b71aec0
rename to ogg/general/socials/meow3.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/murder.ogg_66618b7d b/ogg/general/socials/murder.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/murder.ogg_66618b7d
rename to ogg/general/socials/murder.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/myleg.ogg_d74db1df b/ogg/general/socials/myleg.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/myleg.ogg_d74db1df
rename to ogg/general/socials/myleg.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/nutkick.ogg_3138286c b/ogg/general/socials/nutkick.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/nutkick.ogg_3138286c
rename to ogg/general/socials/nutkick.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/oocburp1.ogg_52649e87 b/ogg/general/socials/oocburp1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/oocburp1.ogg_52649e87
rename to ogg/general/socials/oocburp1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/oocburp2.ogg_9a4e5b1d b/ogg/general/socials/oocburp2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/oocburp2.ogg_9a4e5b1d
rename to ogg/general/socials/oocburp2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/poke.ogg_a531e43c b/ogg/general/socials/poke.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/poke.ogg_a531e43c
rename to ogg/general/socials/poke.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/punch1.ogg_07a56555 b/ogg/general/socials/punch1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/punch1.ogg_07a56555
rename to ogg/general/socials/punch1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/punch10.ogg_e05ed8e2 b/ogg/general/socials/punch10.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/punch10.ogg_e05ed8e2
rename to ogg/general/socials/punch10.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/punch2.ogg_00c65a03 b/ogg/general/socials/punch2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/punch2.ogg_00c65a03
rename to ogg/general/socials/punch2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/punch3.ogg_f837b242 b/ogg/general/socials/punch3.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/punch3.ogg_f837b242
rename to ogg/general/socials/punch3.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/punch4.ogg_a2b38e6d b/ogg/general/socials/punch4.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/punch4.ogg_a2b38e6d
rename to ogg/general/socials/punch4.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/punch5.ogg_0b216d87 b/ogg/general/socials/punch5.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/punch5.ogg_0b216d87
rename to ogg/general/socials/punch5.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/punch6.ogg_6cbfa6c7 b/ogg/general/socials/punch6.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/punch6.ogg_6cbfa6c7
rename to ogg/general/socials/punch6.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/punch7.ogg_3cc57331 b/ogg/general/socials/punch7.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/punch7.ogg_3cc57331
rename to ogg/general/socials/punch7.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/punch8.ogg_af2e64c9 b/ogg/general/socials/punch8.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/punch8.ogg_af2e64c9
rename to ogg/general/socials/punch8.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/punch9.ogg_0bc69313 b/ogg/general/socials/punch9.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/punch9.ogg_0bc69313
rename to ogg/general/socials/punch9.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/punt.ogg_c6857350 b/ogg/general/socials/punt.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/punt.ogg_c6857350
rename to ogg/general/socials/punt.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/puppy.ogg_25f16208 b/ogg/general/socials/puppy.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/puppy.ogg_25f16208
rename to ogg/general/socials/puppy.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/purr.ogg_746c24bd b/ogg/general/socials/purr.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/purr.ogg_746c24bd
rename to ogg/general/socials/purr.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/rofl1.ogg_f4584fc8 b/ogg/general/socials/rofl1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/rofl1.ogg_f4584fc8
rename to ogg/general/socials/rofl1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/rofl2.ogg_5d9a37e5 b/ogg/general/socials/rofl2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/rofl2.ogg_5d9a37e5
rename to ogg/general/socials/rofl2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/rofl3.ogg_223205ae b/ogg/general/socials/rofl3.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/rofl3.ogg_223205ae
rename to ogg/general/socials/rofl3.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/say.ogg_da63aaa9 b/ogg/general/socials/say.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/say.ogg_da63aaa9
rename to ogg/general/socials/say.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/scream1.ogg_8dba2ad8 b/ogg/general/socials/scream1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/scream1.ogg_8dba2ad8
rename to ogg/general/socials/scream1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/scream2.ogg_c4cc0895 b/ogg/general/socials/scream2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/scream2.ogg_c4cc0895
rename to ogg/general/socials/scream2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/scream3.ogg_303bf7b5 b/ogg/general/socials/scream3.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/scream3.ogg_303bf7b5
rename to ogg/general/socials/scream3.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/scream4.ogg_859c1bef b/ogg/general/socials/scream4.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/scream4.ogg_859c1bef
rename to ogg/general/socials/scream4.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/scream5.ogg_0dcc874e b/ogg/general/socials/scream5.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/scream5.ogg_0dcc874e
rename to ogg/general/socials/scream5.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/scream6.ogg_9ac15f08 b/ogg/general/socials/scream6.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/scream6.ogg_9ac15f08
rename to ogg/general/socials/scream6.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/shitsqueeze.ogg_b1ef0e7f b/ogg/general/socials/shitsqueeze.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/shitsqueeze.ogg_b1ef0e7f
rename to ogg/general/socials/shitsqueeze.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/shush1.ogg_d78a9388 b/ogg/general/socials/shush1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/shush1.ogg_d78a9388
rename to ogg/general/socials/shush1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/shush2.ogg_72abf687 b/ogg/general/socials/shush2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/shush2.ogg_72abf687
rename to ogg/general/socials/shush2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/sigh1.ogg_73c3766c b/ogg/general/socials/sigh1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/sigh1.ogg_73c3766c
rename to ogg/general/socials/sigh1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/sigh2.ogg_37e4b3e3 b/ogg/general/socials/sigh2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/sigh2.ogg_37e4b3e3
rename to ogg/general/socials/sigh2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/sigh3.ogg_9c500866 b/ogg/general/socials/sigh3.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/sigh3.ogg_9c500866
rename to ogg/general/socials/sigh3.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/sigh4.ogg_0dd5ba3f b/ogg/general/socials/sigh4.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/sigh4.ogg_0dd5ba3f
rename to ogg/general/socials/sigh4.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/sigh5.ogg_9a0a8647 b/ogg/general/socials/sigh5.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/sigh5.ogg_9a0a8647
rename to ogg/general/socials/sigh5.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/slap1.ogg_62731fb6 b/ogg/general/socials/slap1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/slap1.ogg_62731fb6
rename to ogg/general/socials/slap1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/slap2.ogg_fbe1874b b/ogg/general/socials/slap2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/slap2.ogg_fbe1874b
rename to ogg/general/socials/slap2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/slap3.ogg_8eb7496c b/ogg/general/socials/slap3.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/slap3.ogg_8eb7496c
rename to ogg/general/socials/slap3.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/slap4.ogg_0d540a9a b/ogg/general/socials/slap4.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/slap4.ogg_0d540a9a
rename to ogg/general/socials/slap4.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/slap5.ogg_3c430dcd b/ogg/general/socials/slap5.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/slap5.ogg_3c430dcd
rename to ogg/general/socials/slap5.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/snap1.ogg_a97dfcde b/ogg/general/socials/snap1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/snap1.ogg_a97dfcde
rename to ogg/general/socials/snap1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/snap2.ogg_880cea34 b/ogg/general/socials/snap2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/snap2.ogg_880cea34
rename to ogg/general/socials/snap2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/snap3.ogg_cf19f1fd b/ogg/general/socials/snap3.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/snap3.ogg_cf19f1fd
rename to ogg/general/socials/snap3.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/snarl.ogg_f9945bc8 b/ogg/general/socials/snarl.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/snarl.ogg_f9945bc8
rename to ogg/general/socials/snarl.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/sneeze1.ogg_be69fe6b b/ogg/general/socials/sneeze1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/sneeze1.ogg_be69fe6b
rename to ogg/general/socials/sneeze1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/sneeze2.ogg_a29de3f7 b/ogg/general/socials/sneeze2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/sneeze2.ogg_a29de3f7
rename to ogg/general/socials/sneeze2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/sneeze3.ogg_ba8b15d2 b/ogg/general/socials/sneeze3.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/sneeze3.ogg_ba8b15d2
rename to ogg/general/socials/sneeze3.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/sneeze4.ogg_973a366e b/ogg/general/socials/sneeze4.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/sneeze4.ogg_973a366e
rename to ogg/general/socials/sneeze4.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/sneeze5.ogg_c121c1c4 b/ogg/general/socials/sneeze5.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/sneeze5.ogg_c121c1c4
rename to ogg/general/socials/sneeze5.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/snore.ogg_31811631 b/ogg/general/socials/snore.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/snore.ogg_31811631
rename to ogg/general/socials/snore.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/snort.ogg_f4bdf8f6 b/ogg/general/socials/snort.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/snort.ogg_f4bdf8f6
rename to ogg/general/socials/snort.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/sob.ogg_4ded76fe b/ogg/general/socials/sob.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/sob.ogg_4ded76fe
rename to ogg/general/socials/sob.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/socialfromafar.ogg_6f68cf40 b/ogg/general/socials/socialfromafar.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/socialfromafar.ogg_6f68cf40
rename to ogg/general/socials/socialfromafar.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/socks.ogg_d6b47e5c b/ogg/general/socials/socks.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/socks.ogg_d6b47e5c
rename to ogg/general/socials/socks.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/spank.ogg_8d2e17ae b/ogg/general/socials/spank.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/spank.ogg_8d2e17ae
rename to ogg/general/socials/spank.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/squeak1.ogg_16527450 b/ogg/general/socials/squeak1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/squeak1.ogg_16527450
rename to ogg/general/socials/squeak1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/squeak2.ogg_b9ab7982 b/ogg/general/socials/squeak2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/squeak2.ogg_b9ab7982
rename to ogg/general/socials/squeak2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/tackle1.ogg_631767df b/ogg/general/socials/tackle1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/tackle1.ogg_631767df
rename to ogg/general/socials/tackle1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/tackle2.ogg_a6582924 b/ogg/general/socials/tackle2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/tackle2.ogg_a6582924
rename to ogg/general/socials/tackle2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/tackle3.ogg_5cb626ad b/ogg/general/socials/tackle3.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/tackle3.ogg_5cb626ad
rename to ogg/general/socials/tackle3.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/tackle4.ogg_f84dddf5 b/ogg/general/socials/tackle4.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/tackle4.ogg_f84dddf5
rename to ogg/general/socials/tackle4.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/tackle5.ogg_e2345a4d b/ogg/general/socials/tackle5.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/tackle5.ogg_e2345a4d
rename to ogg/general/socials/tackle5.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/tailpull.ogg_9dd9607a b/ogg/general/socials/tailpull.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/tailpull.ogg_9dd9607a
rename to ogg/general/socials/tailpull.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/throat1.ogg_217535c9 b/ogg/general/socials/throat1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/throat1.ogg_217535c9
rename to ogg/general/socials/throat1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/throat2.ogg_fbe0341a b/ogg/general/socials/throat2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/throat2.ogg_fbe0341a
rename to ogg/general/socials/throat2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/throw.ogg_13ea848c b/ogg/general/socials/throw.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/throw.ogg_13ea848c
rename to ogg/general/socials/throw.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/tickle1.ogg_9531a343 b/ogg/general/socials/tickle1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/tickle1.ogg_9531a343
rename to ogg/general/socials/tickle1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/tickle2.ogg_41d46fd5 b/ogg/general/socials/tickle2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/tickle2.ogg_41d46fd5
rename to ogg/general/socials/tickle2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/trash.ogg_cb561d86 b/ogg/general/socials/trash.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/trash.ogg_cb561d86
rename to ogg/general/socials/trash.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/uppercut.ogg_dc3c675e b/ogg/general/socials/uppercut.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/uppercut.ogg_dc3c675e
rename to ogg/general/socials/uppercut.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/villain1.ogg_5ad29bb8 b/ogg/general/socials/villain1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/villain1.ogg_5ad29bb8
rename to ogg/general/socials/villain1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/villain2.ogg_5e2b3ac1 b/ogg/general/socials/villain2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/villain2.ogg_5e2b3ac1
rename to ogg/general/socials/villain2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/villain3.ogg_e97498da b/ogg/general/socials/villain3.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/villain3.ogg_e97498da
rename to ogg/general/socials/villain3.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/villain4.ogg_278212fa b/ogg/general/socials/villain4.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/villain4.ogg_278212fa
rename to ogg/general/socials/villain4.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/villain5.ogg_0b589ab8 b/ogg/general/socials/villain5.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/villain5.ogg_0b589ab8
rename to ogg/general/socials/villain5.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/villain6.ogg_46b05077 b/ogg/general/socials/villain6.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/villain6.ogg_46b05077
rename to ogg/general/socials/villain6.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/vomit.ogg_ed1c5b20 b/ogg/general/socials/vomit.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/vomit.ogg_ed1c5b20
rename to ogg/general/socials/vomit.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/wakeup.ogg_86b6303a b/ogg/general/socials/wakeup.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/wakeup.ogg_86b6303a
rename to ogg/general/socials/wakeup.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/whimper.ogg_517a5aec b/ogg/general/socials/whimper.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/whimper.ogg_517a5aec
rename to ogg/general/socials/whimper.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/whip.ogg_38ffc6bd b/ogg/general/socials/whip.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/whip.ogg_38ffc6bd
rename to ogg/general/socials/whip.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/whistle1.ogg_1f9d45d4 b/ogg/general/socials/whistle1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/whistle1.ogg_1f9d45d4
rename to ogg/general/socials/whistle1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/whistle2.ogg_fb5fc822 b/ogg/general/socials/whistle2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/whistle2.ogg_fb5fc822
rename to ogg/general/socials/whistle2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/whistle3.ogg_1d81682a b/ogg/general/socials/whistle3.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/whistle3.ogg_1d81682a
rename to ogg/general/socials/whistle3.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/whistle4.ogg_4118b6b4 b/ogg/general/socials/whistle4.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/whistle4.ogg_4118b6b4
rename to ogg/general/socials/whistle4.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/whistle5.ogg_6a049a3f b/ogg/general/socials/whistle5.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/whistle5.ogg_6a049a3f
rename to ogg/general/socials/whistle5.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/whistle6.ogg_8b8b5f71 b/ogg/general/socials/whistle6.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/whistle6.ogg_8b8b5f71
rename to ogg/general/socials/whistle6.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/yawn1.ogg_1cabaa24 b/ogg/general/socials/yawn1.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/yawn1.ogg_1cabaa24
rename to ogg/general/socials/yawn1.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/yawn2.ogg_54adfa13 b/ogg/general/socials/yawn2.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/yawn2.ogg_54adfa13
rename to ogg/general/socials/yawn2.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/yell.ogg_6cae8d4e b/ogg/general/socials/yell.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/yell.ogg_6cae8d4e
rename to ogg/general/socials/yell.ogg
diff --git a/ogg/general_265f6970/socials_d1ca94df/yournose.ogg_80abe9aa b/ogg/general/socials/yournose.ogg
similarity index 100%
rename from ogg/general_265f6970/socials_d1ca94df/yournose.ogg_80abe9aa
rename to ogg/general/socials/yournose.ogg
diff --git a/ogg/general_265f6970/telephone_ef3fb543/cam.ogg_a0611008 b/ogg/general/telephone/cam.ogg
similarity index 100%
rename from ogg/general_265f6970/telephone_ef3fb543/cam.ogg_a0611008
rename to ogg/general/telephone/cam.ogg
diff --git a/ogg/general_265f6970/telephone_ef3fb543/click.ogg_f3509d54 b/ogg/general/telephone/click.ogg
similarity index 100%
rename from ogg/general_265f6970/telephone_ef3fb543/click.ogg_f3509d54
rename to ogg/general/telephone/click.ogg
diff --git a/ogg/general_265f6970/telephone_ef3fb543/error.ogg_af8825f2 b/ogg/general/telephone/error.ogg
similarity index 100%
rename from ogg/general_265f6970/telephone_ef3fb543/error.ogg_af8825f2
rename to ogg/general/telephone/error.ogg
diff --git a/ogg/general_265f6970/telephone_ef3fb543/guitarriff.ogg_799e0a5c b/ogg/general/telephone/guitarriff.ogg
similarity index 100%
rename from ogg/general_265f6970/telephone_ef3fb543/guitarriff.ogg_799e0a5c
rename to ogg/general/telephone/guitarriff.ogg
diff --git a/ogg/general_265f6970/telephone_ef3fb543/message.ogg_cf00d864 b/ogg/general/telephone/message.ogg
similarity index 100%
rename from ogg/general_265f6970/telephone_ef3fb543/message.ogg_cf00d864
rename to ogg/general/telephone/message.ogg
diff --git a/ogg/general_265f6970/telephone_ef3fb543/ring.ogg_6e293d23 b/ogg/general/telephone/ring.ogg
similarity index 100%
rename from ogg/general_265f6970/telephone_ef3fb543/ring.ogg_6e293d23
rename to ogg/general/telephone/ring.ogg
diff --git a/ogg/general_265f6970/telephone_ef3fb543/ringtone.ogg_bf2b2747 b/ogg/general/telephone/ringtone.ogg
similarity index 100%
rename from ogg/general_265f6970/telephone_ef3fb543/ringtone.ogg_bf2b2747
rename to ogg/general/telephone/ringtone.ogg
diff --git a/ogg/general_265f6970/telephone_ef3fb543/smartphoneholdbutton.ogg_2e64dfd1 b/ogg/general/telephone/smartphoneholdbutton.ogg
similarity index 100%
rename from ogg/general_265f6970/telephone_ef3fb543/smartphoneholdbutton.ogg_2e64dfd1
rename to ogg/general/telephone/smartphoneholdbutton.ogg
diff --git a/ogg/general_265f6970/telephone_ef3fb543/smartphonestartup.ogg_f4ff9416 b/ogg/general/telephone/smartphonestartup.ogg
similarity index 100%
rename from ogg/general_265f6970/telephone_ef3fb543/smartphonestartup.ogg_f4ff9416
rename to ogg/general/telephone/smartphonestartup.ogg
diff --git a/ogg/general_265f6970/telephone_ef3fb543/talk.ogg_4d9395e4 b/ogg/general/telephone/talk.ogg
similarity index 100%
rename from ogg/general_265f6970/telephone_ef3fb543/talk.ogg_4d9395e4
rename to ogg/general/telephone/talk.ogg
diff --git a/ogg/general_265f6970/toys_112d6703/ball1.ogg_0d2eb0f1 b/ogg/general/toys/ball1.ogg
similarity index 100%
rename from ogg/general_265f6970/toys_112d6703/ball1.ogg_0d2eb0f1
rename to ogg/general/toys/ball1.ogg
diff --git a/ogg/general_265f6970/toys_112d6703/ball2.ogg_80477fb5 b/ogg/general/toys/ball2.ogg
similarity index 100%
rename from ogg/general_265f6970/toys_112d6703/ball2.ogg_80477fb5
rename to ogg/general/toys/ball2.ogg
diff --git a/ogg/general_265f6970/toys_112d6703/gbwclose.ogg_f9801fff b/ogg/general/toys/gbwclose.ogg
similarity index 100%
rename from ogg/general_265f6970/toys_112d6703/gbwclose.ogg_f9801fff
rename to ogg/general/toys/gbwclose.ogg
diff --git a/ogg/general_265f6970/toys_112d6703/gbwopen.ogg_9d9d07c1 b/ogg/general/toys/gbwopen.ogg
similarity index 100%
rename from ogg/general_265f6970/toys_112d6703/gbwopen.ogg_9d9d07c1
rename to ogg/general/toys/gbwopen.ogg
diff --git a/ogg/general_265f6970/toys_112d6703/gbwstart.ogg_b5db925a b/ogg/general/toys/gbwstart.ogg
similarity index 100%
rename from ogg/general_265f6970/toys_112d6703/gbwstart.ogg_b5db925a
rename to ogg/general/toys/gbwstart.ogg
diff --git a/ogg/general_265f6970/toys_112d6703/gbwstop.ogg_f1e9d46a b/ogg/general/toys/gbwstop.ogg
similarity index 100%
rename from ogg/general_265f6970/toys_112d6703/gbwstop.ogg_f1e9d46a
rename to ogg/general/toys/gbwstop.ogg
diff --git a/ogg/general_265f6970/toys_112d6703/helistart.ogg_57ca0594 b/ogg/general/toys/helistart.ogg
similarity index 100%
rename from ogg/general_265f6970/toys_112d6703/helistart.ogg_57ca0594
rename to ogg/general/toys/helistart.ogg
diff --git a/ogg/general_265f6970/toys_112d6703/helistop.ogg_8e9050fe b/ogg/general/toys/helistop.ogg
similarity index 100%
rename from ogg/general_265f6970/toys_112d6703/helistop.ogg_8e9050fe
rename to ogg/general/toys/helistop.ogg
diff --git a/ogg/general_265f6970/toys_112d6703/rattle.ogg_0df0c8a1 b/ogg/general/toys/rattle.ogg
similarity index 100%
rename from ogg/general_265f6970/toys_112d6703/rattle.ogg_0df0c8a1
rename to ogg/general/toys/rattle.ogg
diff --git a/ogg/general_265f6970/toys_112d6703/shield.ogg_ad9fd069 b/ogg/general/toys/shield.ogg
similarity index 100%
rename from ogg/general_265f6970/toys_112d6703/shield.ogg_ad9fd069
rename to ogg/general/toys/shield.ogg
diff --git a/ogg/general_265f6970/toys_112d6703/squeak1.ogg_0e67808b b/ogg/general/toys/squeak1.ogg
similarity index 100%
rename from ogg/general_265f6970/toys_112d6703/squeak1.ogg_0e67808b
rename to ogg/general/toys/squeak1.ogg
diff --git a/ogg/general_265f6970/toys_112d6703/squeak2.ogg_445872ba b/ogg/general/toys/squeak2.ogg
similarity index 100%
rename from ogg/general_265f6970/toys_112d6703/squeak2.ogg_445872ba
rename to ogg/general/toys/squeak2.ogg
diff --git a/ogg/general_265f6970/toys_112d6703/toycar.ogg_a65c46ea b/ogg/general/toys/toycar.ogg
similarity index 100%
rename from ogg/general_265f6970/toys_112d6703/toycar.ogg_a65c46ea
rename to ogg/general/toys/toycar.ogg
diff --git a/ogg/general_265f6970/trains_2122cd04/announcement.ogg_e28003a4 b/ogg/general/trains/announcement.ogg
similarity index 100%
rename from ogg/general_265f6970/trains_2122cd04/announcement.ogg_e28003a4
rename to ogg/general/trains/announcement.ogg
diff --git a/ogg/general_265f6970/trains_2122cd04/arrive.ogg_320c7bad b/ogg/general/trains/arrive.ogg
similarity index 100%
rename from ogg/general_265f6970/trains_2122cd04/arrive.ogg_320c7bad
rename to ogg/general/trains/arrive.ogg
diff --git a/ogg/general_265f6970/trains_2122cd04/doorsclosed.ogg_0a4bec3a b/ogg/general/trains/doorsclosed.ogg
similarity index 100%
rename from ogg/general_265f6970/trains_2122cd04/doorsclosed.ogg_0a4bec3a
rename to ogg/general/trains/doorsclosed.ogg
diff --git a/ogg/general_265f6970/trains_2122cd04/doorsclosed2.ogg_7194cefa b/ogg/general/trains/doorsclosed2.ogg
similarity index 100%
rename from ogg/general_265f6970/trains_2122cd04/doorsclosed2.ogg_7194cefa
rename to ogg/general/trains/doorsclosed2.ogg
diff --git a/ogg/general_265f6970/trains_2122cd04/doorsopen.ogg_d4906922 b/ogg/general/trains/doorsopen.ogg
similarity index 100%
rename from ogg/general_265f6970/trains_2122cd04/doorsopen.ogg_d4906922
rename to ogg/general/trains/doorsopen.ogg
diff --git a/ogg/general_265f6970/trains_2122cd04/doorsopen2.ogg_7c3c538c b/ogg/general/trains/doorsopen2.ogg
similarity index 100%
rename from ogg/general_265f6970/trains_2122cd04/doorsopen2.ogg_7c3c538c
rename to ogg/general/trains/doorsopen2.ogg
diff --git a/ogg/general_265f6970/trains_2122cd04/leave2.ogg_ef29e998 b/ogg/general/trains/leave2.ogg
similarity index 100%
rename from ogg/general_265f6970/trains_2122cd04/leave2.ogg_ef29e998
rename to ogg/general/trains/leave2.ogg
diff --git a/ogg/general_265f6970/trains_2122cd04/loop.ogg_d557d60b b/ogg/general/trains/loop.ogg
similarity index 100%
rename from ogg/general_265f6970/trains_2122cd04/loop.ogg_d557d60b
rename to ogg/general/trains/loop.ogg
diff --git a/ogg/general_265f6970/trains_2122cd04/start.ogg_9d4ee703 b/ogg/general/trains/start.ogg
similarity index 100%
rename from ogg/general_265f6970/trains_2122cd04/start.ogg_9d4ee703
rename to ogg/general/trains/start.ogg
diff --git a/ogg/general_265f6970/trains_2122cd04/stop.ogg_8a78eace b/ogg/general/trains/stop.ogg
similarity index 100%
rename from ogg/general_265f6970/trains_2122cd04/stop.ogg_8a78eace
rename to ogg/general/trains/stop.ogg
diff --git a/ogg/general_265f6970/trains_2122cd04/trainamb.ogg_38a64f0c b/ogg/general/trains/trainamb.ogg
similarity index 100%
rename from ogg/general_265f6970/trains_2122cd04/trainamb.ogg_38a64f0c
rename to ogg/general/trains/trainamb.ogg
diff --git a/ogg/general_265f6970/trolley_aa0a2e2a/brick.ogg_cda12ccc b/ogg/general/trolley/brick.ogg
similarity index 100%
rename from ogg/general_265f6970/trolley_aa0a2e2a/brick.ogg_cda12ccc
rename to ogg/general/trolley/brick.ogg
diff --git a/ogg/general_265f6970/trolley_aa0a2e2a/button.ogg_8f1193d9 b/ogg/general/trolley/button.ogg
similarity index 100%
rename from ogg/general_265f6970/trolley_aa0a2e2a/button.ogg_8f1193d9
rename to ogg/general/trolley/button.ogg
diff --git a/ogg/general_265f6970/trolley_aa0a2e2a/corpse.ogg_791615f6 b/ogg/general/trolley/corpse.ogg
similarity index 100%
rename from ogg/general_265f6970/trolley_aa0a2e2a/corpse.ogg_791615f6
rename to ogg/general/trolley/corpse.ogg
diff --git a/ogg/general_265f6970/trolley_aa0a2e2a/done.ogg_d2d012aa b/ogg/general/trolley/done.ogg
similarity index 100%
rename from ogg/general_265f6970/trolley_aa0a2e2a/done.ogg_d2d012aa
rename to ogg/general/trolley/done.ogg
diff --git a/ogg/general_265f6970/trolley_aa0a2e2a/eq.ogg_8a4661d0 b/ogg/general/trolley/eq.ogg
similarity index 100%
rename from ogg/general_265f6970/trolley_aa0a2e2a/eq.ogg_8a4661d0
rename to ogg/general/trolley/eq.ogg
diff --git a/ogg/general_265f6970/trolley_aa0a2e2a/fusel.ogg_641696dd b/ogg/general/trolley/fusel.ogg
similarity index 100%
rename from ogg/general_265f6970/trolley_aa0a2e2a/fusel.ogg_641696dd
rename to ogg/general/trolley/fusel.ogg
diff --git a/ogg/general_265f6970/trolley_aa0a2e2a/fuses.ogg_07a6dce3 b/ogg/general/trolley/fuses.ogg
similarity index 100%
rename from ogg/general_265f6970/trolley_aa0a2e2a/fuses.ogg_07a6dce3
rename to ogg/general/trolley/fuses.ogg
diff --git a/ogg/general_265f6970/trolley_aa0a2e2a/fusest.ogg_14855ac1 b/ogg/general/trolley/fusest.ogg
similarity index 100%
rename from ogg/general_265f6970/trolley_aa0a2e2a/fusest.ogg_14855ac1
rename to ogg/general/trolley/fusest.ogg
diff --git a/ogg/general_265f6970/trolley_aa0a2e2a/latex.ogg_5d43f413 b/ogg/general/trolley/latex.ogg
similarity index 100%
rename from ogg/general_265f6970/trolley_aa0a2e2a/latex.ogg_5d43f413
rename to ogg/general/trolley/latex.ogg
diff --git a/ogg/general_265f6970/trolley_aa0a2e2a/metal.ogg_ac8e3659 b/ogg/general/trolley/metal.ogg
similarity index 100%
rename from ogg/general_265f6970/trolley_aa0a2e2a/metal.ogg_ac8e3659
rename to ogg/general/trolley/metal.ogg
diff --git a/ogg/general_265f6970/trolley_aa0a2e2a/metalgather.ogg_462799c7 b/ogg/general/trolley/metalgather.ogg
similarity index 100%
rename from ogg/general_265f6970/trolley_aa0a2e2a/metalgather.ogg_462799c7
rename to ogg/general/trolley/metalgather.ogg
diff --git a/ogg/general_265f6970/trolley_aa0a2e2a/plastic.ogg_4e01ec50 b/ogg/general/trolley/plastic.ogg
similarity index 100%
rename from ogg/general_265f6970/trolley_aa0a2e2a/plastic.ogg_4e01ec50
rename to ogg/general/trolley/plastic.ogg
diff --git a/ogg/general_265f6970/trolley_aa0a2e2a/water.ogg_d24fe106 b/ogg/general/trolley/water.ogg
similarity index 100%
rename from ogg/general_265f6970/trolley_aa0a2e2a/water.ogg_d24fe106
rename to ogg/general/trolley/water.ogg
diff --git a/ogg/general_265f6970/trolley_aa0a2e2a/wood.ogg_b80c949e b/ogg/general/trolley/wood.ogg
similarity index 100%
rename from ogg/general_265f6970/trolley_aa0a2e2a/wood.ogg_b80c949e
rename to ogg/general/trolley/wood.ogg
diff --git a/ogg/general_265f6970/washing_e4d2d49f/dry1.ogg_2ffd3325 b/ogg/general/washing/dry1.ogg
similarity index 100%
rename from ogg/general_265f6970/washing_e4d2d49f/dry1.ogg_2ffd3325
rename to ogg/general/washing/dry1.ogg
diff --git a/ogg/general_265f6970/washing_e4d2d49f/dry2.ogg_879a1ac3 b/ogg/general/washing/dry2.ogg
similarity index 100%
rename from ogg/general_265f6970/washing_e4d2d49f/dry2.ogg_879a1ac3
rename to ogg/general/washing/dry2.ogg
diff --git a/ogg/general_265f6970/washing_e4d2d49f/washing1.ogg_20c111a3 b/ogg/general/washing/washing1.ogg
similarity index 100%
rename from ogg/general_265f6970/washing_e4d2d49f/washing1.ogg_20c111a3
rename to ogg/general/washing/washing1.ogg
diff --git a/ogg/general_265f6970/washing_e4d2d49f/washing2.ogg_d41f84aa b/ogg/general/washing/washing2.ogg
similarity index 100%
rename from ogg/general_265f6970/washing_e4d2d49f/washing2.ogg_d41f84aa
rename to ogg/general/washing/washing2.ogg
diff --git a/ogg/general_265f6970/washing_e4d2d49f/washing3.ogg_ee632248 b/ogg/general/washing/washing3.ogg
similarity index 100%
rename from ogg/general_265f6970/washing_e4d2d49f/washing3.ogg_ee632248
rename to ogg/general/washing/washing3.ogg
diff --git a/ogg/general_265f6970/washing_e4d2d49f/washing4.ogg_5a82c011 b/ogg/general/washing/washing4.ogg
similarity index 100%
rename from ogg/general_265f6970/washing_e4d2d49f/washing4.ogg_5a82c011
rename to ogg/general/washing/washing4.ogg
diff --git a/ogg/general_265f6970/washing_e4d2d49f/washing5.ogg_527b35ea b/ogg/general/washing/washing5.ogg
similarity index 100%
rename from ogg/general_265f6970/washing_e4d2d49f/washing5.ogg_527b35ea
rename to ogg/general/washing/washing5.ogg
diff --git a/ogg/general_265f6970/weather_ceadc45b/hail.ogg_859b2829 b/ogg/general/weather/hail.ogg
similarity index 100%
rename from ogg/general_265f6970/weather_ceadc45b/hail.ogg_859b2829
rename to ogg/general/weather/hail.ogg
diff --git a/ogg/general_265f6970/weather_ceadc45b/harshwind.ogg_e5047772 b/ogg/general/weather/harshwind.ogg
similarity index 100%
rename from ogg/general_265f6970/weather_ceadc45b/harshwind.ogg_e5047772
rename to ogg/general/weather/harshwind.ogg
diff --git a/ogg/general_265f6970/weather_ceadc45b/lightrain.ogg_94fb04e9 b/ogg/general/weather/lightrain.ogg
similarity index 100%
rename from ogg/general_265f6970/weather_ceadc45b/lightrain.ogg_94fb04e9
rename to ogg/general/weather/lightrain.ogg
diff --git a/ogg/general_265f6970/weather_ceadc45b/night.ogg_27dac1af b/ogg/general/weather/night.ogg
similarity index 100%
rename from ogg/general_265f6970/weather_ceadc45b/night.ogg_27dac1af
rename to ogg/general/weather/night.ogg
diff --git a/ogg/general_265f6970/weather_ceadc45b/pouringrain.ogg_a79f6ccf b/ogg/general/weather/pouringrain.ogg
similarity index 100%
rename from ogg/general_265f6970/weather_ceadc45b/pouringrain.ogg_a79f6ccf
rename to ogg/general/weather/pouringrain.ogg
diff --git a/ogg/general_265f6970/weather_ceadc45b/rainonwindows.ogg_769a6782 b/ogg/general/weather/rainonwindows.ogg
similarity index 100%
rename from ogg/general_265f6970/weather_ceadc45b/rainonwindows.ogg_769a6782
rename to ogg/general/weather/rainonwindows.ogg
diff --git a/ogg/general_265f6970/weather_ceadc45b/rainpuddle.ogg_0cc8b93a b/ogg/general/weather/rainpuddle.ogg
similarity index 100%
rename from ogg/general_265f6970/weather_ceadc45b/rainpuddle.ogg_0cc8b93a
rename to ogg/general/weather/rainpuddle.ogg
diff --git a/ogg/general_265f6970/weather_ceadc45b/sleet.ogg_3121b67a b/ogg/general/weather/sleet.ogg
similarity index 100%
rename from ogg/general_265f6970/weather_ceadc45b/sleet.ogg_3121b67a
rename to ogg/general/weather/sleet.ogg
diff --git a/ogg/general_265f6970/weather_ceadc45b/thunder.ogg_b9870535 b/ogg/general/weather/thunder.ogg
similarity index 100%
rename from ogg/general_265f6970/weather_ceadc45b/thunder.ogg_b9870535
rename to ogg/general/weather/thunder.ogg
diff --git a/ogg/general_265f6970/weather_ceadc45b/thunder_large_crack_se.ogg_1eabb349 b/ogg/general/weather/thunder_large_crack_se.ogg
similarity index 100%
rename from ogg/general_265f6970/weather_ceadc45b/thunder_large_crack_se.ogg_1eabb349
rename to ogg/general/weather/thunder_large_crack_se.ogg
diff --git a/ogg/general_265f6970/weather_ceadc45b/thunderboom.ogg_a4330bb7 b/ogg/general/weather/thunderboom.ogg
similarity index 100%
rename from ogg/general_265f6970/weather_ceadc45b/thunderboom.ogg_a4330bb7
rename to ogg/general/weather/thunderboom.ogg
diff --git a/ogg/general_265f6970/weather_ceadc45b/thunderhuge.ogg_4959bcc0 b/ogg/general/weather/thunderhuge.ogg
similarity index 100%
rename from ogg/general_265f6970/weather_ceadc45b/thunderhuge.ogg_4959bcc0
rename to ogg/general/weather/thunderhuge.ogg
diff --git a/ogg/general_265f6970/weather_ceadc45b/winddwelling.ogg_37e6aed7 b/ogg/general/weather/winddwelling.ogg
similarity index 100%
rename from ogg/general_265f6970/weather_ceadc45b/winddwelling.ogg_37e6aed7
rename to ogg/general/weather/winddwelling.ogg
diff --git a/ogg/hosts_e86728fa/biliin.ogg_6cd2ac30 b/ogg/hosts/biliin.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/biliin.ogg_6cd2ac30
rename to ogg/hosts/biliin.ogg
diff --git a/ogg/hosts_e86728fa/brandon.ogg_8422b592 b/ogg/hosts/brandon.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/brandon.ogg_8422b592
rename to ogg/hosts/brandon.ogg
diff --git a/ogg/hosts_e86728fa/compile success.ogg_daa1998a b/ogg/hosts/compile success.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/compile success.ogg_daa1998a
rename to ogg/hosts/compile success.ogg
diff --git a/ogg/hosts_e86728fa/control1.ogg_680c2923 b/ogg/hosts/control1.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/control1.ogg_680c2923
rename to ogg/hosts/control1.ogg
diff --git a/ogg/hosts_e86728fa/control2.ogg_4996be2f b/ogg/hosts/control2.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/control2.ogg_4996be2f
rename to ogg/hosts/control2.ogg
diff --git a/ogg/hosts_e86728fa/control3.ogg_e28e4b8d b/ogg/hosts/control3.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/control3.ogg_e28e4b8d
rename to ogg/hosts/control3.ogg
diff --git a/ogg/hosts_e86728fa/control4.ogg_b66365ae b/ogg/hosts/control4.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/control4.ogg_b66365ae
rename to ogg/hosts/control4.ogg
diff --git a/ogg/hosts_e86728fa/dante.ogg_65d38c92 b/ogg/hosts/dante.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/dante.ogg_65d38c92
rename to ogg/hosts/dante.ogg
diff --git a/ogg/hosts_e86728fa/dante2.ogg_8135eff1 b/ogg/hosts/dante2.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/dante2.ogg_8135eff1
rename to ogg/hosts/dante2.ogg
diff --git a/ogg/hosts_e86728fa/elijahin.ogg_42cef561 b/ogg/hosts/elijahin.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/elijahin.ogg_42cef561
rename to ogg/hosts/elijahin.ogg
diff --git a/ogg/hosts_e86728fa/elijahout.ogg_b7329b80 b/ogg/hosts/elijahout.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/elijahout.ogg_b7329b80
rename to ogg/hosts/elijahout.ogg
diff --git a/ogg/hosts_e86728fa/evil.ogg_937e5ee5 b/ogg/hosts/evil.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/evil.ogg_937e5ee5
rename to ogg/hosts/evil.ogg
diff --git a/ogg/hosts_e86728fa/heal.ogg_71db88b0 b/ogg/hosts/heal.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/heal.ogg_71db88b0
rename to ogg/hosts/heal.ogg
diff --git a/ogg/hosts_e86728fa/kill1.ogg_b277b98a b/ogg/hosts/kill1.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/kill1.ogg_b277b98a
rename to ogg/hosts/kill1.ogg
diff --git a/ogg/hosts_e86728fa/kill2.ogg_62efd561 b/ogg/hosts/kill2.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/kill2.ogg_62efd561
rename to ogg/hosts/kill2.ogg
diff --git a/ogg/hosts_e86728fa/larain.ogg_e12da684 b/ogg/hosts/larain.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/larain.ogg_e12da684
rename to ogg/hosts/larain.ogg
diff --git a/ogg/hosts_e86728fa/laraout.ogg_7722ca2f b/ogg/hosts/laraout.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/laraout.ogg_7722ca2f
rename to ogg/hosts/laraout.ogg
diff --git a/ogg/hosts_e86728fa/magictea.ogg_857118fc b/ogg/hosts/magictea.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/magictea.ogg_857118fc
rename to ogg/hosts/magictea.ogg
diff --git a/ogg/hosts_e86728fa/mater.ogg_0363706f b/ogg/hosts/mater.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/mater.ogg_0363706f
rename to ogg/hosts/mater.ogg
diff --git a/ogg/hosts_e86728fa/shout.ogg_a84ac39a b/ogg/hosts/shout.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/shout.ogg_a84ac39a
rename to ogg/hosts/shout.ogg
diff --git a/ogg/hosts_e86728fa/transform.ogg_27b34689 b/ogg/hosts/transform.ogg
similarity index 100%
rename from ogg/hosts_e86728fa/transform.ogg_27b34689
rename to ogg/hosts/transform.ogg
diff --git a/ogg/music_60888fe2/combat_7fe4ff00/theme1.ogg_29971d15 b/ogg/music/combat/theme1.ogg
similarity index 100%
rename from ogg/music_60888fe2/combat_7fe4ff00/theme1.ogg_29971d15
rename to ogg/music/combat/theme1.ogg
diff --git a/ogg/music_60888fe2/combat_7fe4ff00/theme2.ogg_4e1fc6e2 b/ogg/music/combat/theme2.ogg
similarity index 100%
rename from ogg/music_60888fe2/combat_7fe4ff00/theme2.ogg_4e1fc6e2
rename to ogg/music/combat/theme2.ogg
diff --git a/ogg/music_60888fe2/intromusic_3d552027/defaultintro.ogg_75d576c9 b/ogg/music/intromusic/defaultintro.ogg
similarity index 100%
rename from ogg/music_60888fe2/intromusic_3d552027/defaultintro.ogg_75d576c9
rename to ogg/music/intromusic/defaultintro.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/aeloriana.ogg_ba099c75 b/ogg/music/planets/aeloriana.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/aeloriana.ogg_ba099c75
rename to ogg/music/planets/aeloriana.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/astraeus.ogg_3cf9fc83 b/ogg/music/planets/astraeus.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/astraeus.ogg_3cf9fc83
rename to ogg/music/planets/astraeus.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/battle stations.ogg_1adafa60 b/ogg/music/planets/battle stations.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/battle stations.ogg_1adafa60
rename to ogg/music/planets/battle stations.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/beacon stations.ogg_29080447 b/ogg/music/planets/beacon stations.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/beacon stations.ogg_29080447
rename to ogg/music/planets/beacon stations.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/business central.ogg_a8038f13 b/ogg/music/planets/business central.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/business central.ogg_a8038f13
rename to ogg/music/planets/business central.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/calira dura 9 1.ogg_1d0d4b5b b/ogg/music/planets/calira dura 9 1.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/calira dura 9 1.ogg_1d0d4b5b
rename to ogg/music/planets/calira dura 9 1.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/cape dread.ogg_01b97c7e b/ogg/music/planets/cape dread.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/cape dread.ogg_01b97c7e
rename to ogg/music/planets/cape dread.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/carstairs.ogg_3405993d b/ogg/music/planets/carstairs.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/carstairs.ogg_3405993d
rename to ogg/music/planets/carstairs.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/danimara.ogg_b4f7e83e b/ogg/music/planets/danimara.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/danimara.ogg_b4f7e83e
rename to ogg/music/planets/danimara.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/death.ogg_c98e33ea b/ogg/music/planets/death.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/death.ogg_c98e33ea
rename to ogg/music/planets/death.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/diana.ogg_6ad22be4 b/ogg/music/planets/diana.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/diana.ogg_6ad22be4
rename to ogg/music/planets/diana.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/earth.ogg_ba66f100 b/ogg/music/planets/earth.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/earth.ogg_ba66f100
rename to ogg/music/planets/earth.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/estrana.ogg_019192b4 b/ogg/music/planets/estrana.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/estrana.ogg_019192b4
rename to ogg/music/planets/estrana.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/galactic academy.ogg_c2bcbc50 b/ogg/music/planets/galactic academy.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/galactic academy.ogg_c2bcbc50
rename to ogg/music/planets/galactic academy.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/gmc.ogg_4ece209f b/ogg/music/planets/gmc.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/gmc.ogg_4ece209f
rename to ogg/music/planets/gmc.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/goscro crah.ogg_15552499 b/ogg/music/planets/goscro crah.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/goscro crah.ogg_15552499
rename to ogg/music/planets/goscro crah.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/harmonia.ogg_7659c848 b/ogg/music/planets/harmonia.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/harmonia.ogg_7659c848
rename to ogg/music/planets/harmonia.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/kaldara.ogg_e2def056 b/ogg/music/planets/kaldara.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/kaldara.ogg_e2def056
rename to ogg/music/planets/kaldara.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/koroku.ogg_615f782f b/ogg/music/planets/koroku.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/koroku.ogg_615f782f
rename to ogg/music/planets/koroku.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/maraquda.ogg_68ea7e8b b/ogg/music/planets/maraquda.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/maraquda.ogg_68ea7e8b
rename to ogg/music/planets/maraquda.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/mars.ogg_d9320da6 b/ogg/music/planets/mars.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/mars.ogg_d9320da6
rename to ogg/music/planets/mars.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/mercury.ogg_cbb2bfb3 b/ogg/music/planets/mercury.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/mercury.ogg_cbb2bfb3
rename to ogg/music/planets/mercury.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/mulrala.ogg_546d0485 b/ogg/music/planets/mulrala.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/mulrala.ogg_546d0485
rename to ogg/music/planets/mulrala.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/navidad.ogg_73dd4e51 b/ogg/music/planets/navidad.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/navidad.ogg_73dd4e51
rename to ogg/music/planets/navidad.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/navu.ogg_1a1c4af8 b/ogg/music/planets/navu.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/navu.ogg_1a1c4af8
rename to ogg/music/planets/navu.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/oriali.ogg_8297c7b9 b/ogg/music/planets/oriali.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/oriali.ogg_8297c7b9
rename to ogg/music/planets/oriali.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/orions wallet.ogg_be7a1ebd b/ogg/music/planets/orions wallet.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/orions wallet.ogg_be7a1ebd
rename to ogg/music/planets/orions wallet.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/panaxes.ogg_0d68a332 b/ogg/music/planets/panaxes.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/panaxes.ogg_0d68a332
rename to ogg/music/planets/panaxes.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/parody.ogg_aff5aaa4 b/ogg/music/planets/parody.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/parody.ogg_aff5aaa4
rename to ogg/music/planets/parody.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/partaculous spectaculous.ogg_15153612 b/ogg/music/planets/partaculous spectaculous.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/partaculous spectaculous.ogg_15153612
rename to ogg/music/planets/partaculous spectaculous.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/pilot training core facility alpha 1.ogg_08122b59 b/ogg/music/planets/pilot training core facility alpha 1.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/pilot training core facility alpha 1.ogg_08122b59
rename to ogg/music/planets/pilot training core facility alpha 1.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/research.ogg_28758b89 b/ogg/music/planets/research.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/research.ogg_28758b89
rename to ogg/music/planets/research.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/sahariana.ogg_ea360405 b/ogg/music/planets/sahariana.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/sahariana.ogg_ea360405
rename to ogg/music/planets/sahariana.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/salura.ogg_7974cb9b b/ogg/music/planets/salura.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/salura.ogg_7974cb9b
rename to ogg/music/planets/salura.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/saturn, jupiter, uranus, neptune.ogg_e917ddc2 b/ogg/music/planets/saturn, jupiter, uranus, neptune.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/saturn, jupiter, uranus, neptune.ogg_e917ddc2
rename to ogg/music/planets/saturn, jupiter, uranus, neptune.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/sdf mining station eexei othairus.ogg_b6ce3327 b/ogg/music/planets/sdf mining station eexei othairus.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/sdf mining station eexei othairus.ogg_b6ce3327
rename to ogg/music/planets/sdf mining station eexei othairus.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/ship building facility omega 8.ogg_2daff5c3 b/ogg/music/planets/ship building facility omega 8.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/ship building facility omega 8.ogg_2daff5c3
rename to ogg/music/planets/ship building facility omega 8.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/sola.ogg_61774d7d b/ogg/music/planets/sola.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/sola.ogg_61774d7d
rename to ogg/music/planets/sola.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/star command.ogg_02be9592 b/ogg/music/planets/star command.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/star command.ogg_02be9592
rename to ogg/music/planets/star command.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/tarania.ogg_21dc637e b/ogg/music/planets/tarania.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/tarania.ogg_21dc637e
rename to ogg/music/planets/tarania.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/temrith.ogg_f0431fec b/ogg/music/planets/temrith.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/temrith.ogg_f0431fec
rename to ogg/music/planets/temrith.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/tera.ogg_b7ef6588 b/ogg/music/planets/tera.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/tera.ogg_b7ef6588
rename to ogg/music/planets/tera.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/tillaria.ogg_7c0a07f0 b/ogg/music/planets/tillaria.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/tillaria.ogg_7c0a07f0
rename to ogg/music/planets/tillaria.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/vakari.ogg_a383a083 b/ogg/music/planets/vakari.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/vakari.ogg_a383a083
rename to ogg/music/planets/vakari.ogg
diff --git a/ogg/music_60888fe2/planets_ca94ee57/valissianna.ogg_e0db9069 b/ogg/music/planets/valissianna.ogg
similarity index 100%
rename from ogg/music_60888fe2/planets_ca94ee57/valissianna.ogg_e0db9069
rename to ogg/music/planets/valissianna.ogg
diff --git a/ogg/ships_1e7b5cfa/com_7a31a747/oocpa.ogg_ecf187e0 b/ogg/ships/com/oocpa.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/com_7a31a747/oocpa.ogg_ecf187e0
rename to ogg/ships/com/oocpa.ogg
diff --git a/ogg/ships_1e7b5cfa/com_7a31a747/pa1.ogg_a6c7e14a b/ogg/ships/com/pa1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/com_7a31a747/pa1.ogg_a6c7e14a
rename to ogg/ships/com/pa1.ogg
diff --git a/ogg/ships_1e7b5cfa/com_7a31a747/pa2.ogg_5781f2bc b/ogg/ships/com/pa2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/com_7a31a747/pa2.ogg_5781f2bc
rename to ogg/ships/com/pa2.ogg
diff --git a/ogg/ships_1e7b5cfa/com_7a31a747/sector.ogg_d8d60dca b/ogg/ships/com/sector.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/com_7a31a747/sector.ogg_d8d60dca
rename to ogg/ships/com/sector.ogg
diff --git a/ogg/ships_1e7b5cfa/com_7a31a747/somethingtoship.ogg_6d211d5d b/ogg/ships/com/somethingtoship.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/com_7a31a747/somethingtoship.ogg_6d211d5d
rename to ogg/ships/com/somethingtoship.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/ball.ogg_0aca4bf1 b/ogg/ships/combat/ball.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/ball.ogg_0aca4bf1
rename to ogg/ships/combat/ball.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/beam.ogg_ed6d1b99 b/ogg/ships/combat/beam.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/beam.ogg_ed6d1b99
rename to ogg/ships/combat/beam.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/bladeslice1.ogg_02d62d41 b/ogg/ships/combat/bladeslice1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/bladeslice1.ogg_02d62d41
rename to ogg/ships/combat/bladeslice1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/bladeslice2.ogg_9c5e7d56 b/ogg/ships/combat/bladeslice2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/bladeslice2.ogg_9c5e7d56
rename to ogg/ships/combat/bladeslice2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/bladeslice3.ogg_def1622c b/ogg/ships/combat/bladeslice3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/bladeslice3.ogg_def1622c
rename to ogg/ships/combat/bladeslice3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/bladeslice4.ogg_3e012eca b/ogg/ships/combat/bladeslice4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/bladeslice4.ogg_3e012eca
rename to ogg/ships/combat/bladeslice4.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/bladeslice5.ogg_a2dd928e b/ogg/ships/combat/bladeslice5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/bladeslice5.ogg_a2dd928e
rename to ogg/ships/combat/bladeslice5.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/bladesoff.ogg_d0219164 b/ogg/ships/combat/bladesoff.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/bladesoff.ogg_d0219164
rename to ogg/ships/combat/bladesoff.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/bladeson.ogg_b4370a39 b/ogg/ships/combat/bladeson.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/bladeson.ogg_b4370a39
rename to ogg/ships/combat/bladeson.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/bomb.ogg_3176285b b/ogg/ships/combat/bomb.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/bomb.ogg_3176285b
rename to ogg/ships/combat/bomb.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/bombexplode.ogg_1730c720 b/ogg/ships/combat/bombexplode.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/bombexplode.ogg_1730c720
rename to ogg/ships/combat/bombexplode.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/boom.ogg_0a6998c0 b/ogg/ships/combat/boom.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/boom.ogg_0a6998c0
rename to ogg/ships/combat/boom.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/code.ogg_b3c7c8ee b/ogg/ships/combat/code.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/code.ogg_b3c7c8ee
rename to ogg/ships/combat/code.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/combat drone launch.ogg_484a94cb b/ogg/ships/combat/combat drone launch.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/combat drone launch.ogg_484a94cb
rename to ogg/ships/combat/combat drone launch.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/combatdroneinstall.ogg_0a06a2a6 b/ogg/ships/combat/combatdroneinstall.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/combatdroneinstall.ogg_0a06a2a6
rename to ogg/ships/combat/combatdroneinstall.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/combatdronerecall.ogg_68ae66dd b/ogg/ships/combat/combatdronerecall.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/combatdronerecall.ogg_68ae66dd
rename to ogg/ships/combat/combatdronerecall.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/completed.ogg_3bfd7f3f b/ogg/ships/combat/completed.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/completed.ogg_3bfd7f3f
rename to ogg/ships/combat/completed.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/1.ogg_5f364c3f b/ogg/ships/combat/component/1/1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/1.ogg_5f364c3f
rename to ogg/ships/combat/component/1/1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/10.ogg_815e23ca b/ogg/ships/combat/component/1/10.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/10.ogg_815e23ca
rename to ogg/ships/combat/component/1/10.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/2.ogg_6b51fdd8 b/ogg/ships/combat/component/1/2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/2.ogg_6b51fdd8
rename to ogg/ships/combat/component/1/2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/3.ogg_7a21dfb7 b/ogg/ships/combat/component/1/3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/3.ogg_7a21dfb7
rename to ogg/ships/combat/component/1/3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/4.ogg_b9ff0103 b/ogg/ships/combat/component/1/4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/4.ogg_b9ff0103
rename to ogg/ships/combat/component/1/4.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/5.ogg_12eb9594 b/ogg/ships/combat/component/1/5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/5.ogg_12eb9594
rename to ogg/ships/combat/component/1/5.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/6.ogg_906a4fdf b/ogg/ships/combat/component/1/6.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/6.ogg_906a4fdf
rename to ogg/ships/combat/component/1/6.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/7.ogg_e3ac919e b/ogg/ships/combat/component/1/7.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/7.ogg_e3ac919e
rename to ogg/ships/combat/component/1/7.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/8.ogg_cfc751ca b/ogg/ships/combat/component/1/8.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/8.ogg_cfc751ca
rename to ogg/ships/combat/component/1/8.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/9.ogg_65636167 b/ogg/ships/combat/component/1/9.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/9.ogg_65636167
rename to ogg/ships/combat/component/1/9.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/bzzt.ogg_69cf1155 b/ogg/ships/combat/component/1/bzzt.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/bzzt.ogg_69cf1155
rename to ogg/ships/combat/component/1/bzzt.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/e1.ogg_cabc6490 b/ogg/ships/combat/component/1/e1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/1_eb33ca1e/e1.ogg_cabc6490
rename to ogg/ships/combat/component/1/e1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/10_933848d1/1.ogg_69acc7fc b/ogg/ships/combat/component/10/1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/10_933848d1/1.ogg_69acc7fc
rename to ogg/ships/combat/component/10/1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/10_933848d1/2.ogg_ad61f1cf b/ogg/ships/combat/component/10/2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/10_933848d1/2.ogg_ad61f1cf
rename to ogg/ships/combat/component/10/2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/10_933848d1/3.ogg_072a0a54 b/ogg/ships/combat/component/10/3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/10_933848d1/3.ogg_072a0a54
rename to ogg/ships/combat/component/10/3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/11_954b5c98/1.ogg_a3190212 b/ogg/ships/combat/component/11/1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/11_954b5c98/1.ogg_a3190212
rename to ogg/ships/combat/component/11/1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/12_b5979796/1.ogg_13457910 b/ogg/ships/combat/component/12/1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/12_b5979796/1.ogg_13457910
rename to ogg/ships/combat/component/12/1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/12_b5979796/2.ogg_b8fd53d7 b/ogg/ships/combat/component/12/2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/12_b5979796/2.ogg_b8fd53d7
rename to ogg/ships/combat/component/12/2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/12_b5979796/3.ogg_976fb7e7 b/ogg/ships/combat/component/12/3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/12_b5979796/3.ogg_976fb7e7
rename to ogg/ships/combat/component/12/3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/12_b5979796/4.ogg_e94180af b/ogg/ships/combat/component/12/4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/12_b5979796/4.ogg_e94180af
rename to ogg/ships/combat/component/12/4.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/2_b4f91e63/1.ogg_e31e89e0 b/ogg/ships/combat/component/2/1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/2_b4f91e63/1.ogg_e31e89e0
rename to ogg/ships/combat/component/2/1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/2_b4f91e63/2.ogg_d245e530 b/ogg/ships/combat/component/2/2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/2_b4f91e63/2.ogg_d245e530
rename to ogg/ships/combat/component/2/2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/2_b4f91e63/3.ogg_f020ad65 b/ogg/ships/combat/component/2/3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/2_b4f91e63/3.ogg_f020ad65
rename to ogg/ships/combat/component/2/3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/2_b4f91e63/4.ogg_50c235b6 b/ogg/ships/combat/component/2/4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/2_b4f91e63/4.ogg_50c235b6
rename to ogg/ships/combat/component/2/4.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/2_b4f91e63/5.ogg_3c4b6e7d b/ogg/ships/combat/component/2/5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/2_b4f91e63/5.ogg_3c4b6e7d
rename to ogg/ships/combat/component/2/5.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/2_b4f91e63/6.ogg_896e2aa9 b/ogg/ships/combat/component/2/6.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/2_b4f91e63/6.ogg_896e2aa9
rename to ogg/ships/combat/component/2/6.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/3_0ba145ce/1.ogg_838445e3 b/ogg/ships/combat/component/3/1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/3_0ba145ce/1.ogg_838445e3
rename to ogg/ships/combat/component/3/1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/3_0ba145ce/2.ogg_7f5cc143 b/ogg/ships/combat/component/3/2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/3_0ba145ce/2.ogg_7f5cc143
rename to ogg/ships/combat/component/3/2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/3_0ba145ce/3.ogg_84791b7b b/ogg/ships/combat/component/3/3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/3_0ba145ce/3.ogg_84791b7b
rename to ogg/ships/combat/component/3/3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/4_fbd459c9/1.ogg_68f21071 b/ogg/ships/combat/component/4/1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/4_fbd459c9/1.ogg_68f21071
rename to ogg/ships/combat/component/4/1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/4_fbd459c9/2.ogg_39cd47cb b/ogg/ships/combat/component/4/2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/4_fbd459c9/2.ogg_39cd47cb
rename to ogg/ships/combat/component/4/2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/4_fbd459c9/3.ogg_24104058 b/ogg/ships/combat/component/4/3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/4_fbd459c9/3.ogg_24104058
rename to ogg/ships/combat/component/4/3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/4_fbd459c9/4.ogg_f806cfb0 b/ogg/ships/combat/component/4/4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/4_fbd459c9/4.ogg_f806cfb0
rename to ogg/ships/combat/component/4/4.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/4_fbd459c9/5.ogg_6afc5413 b/ogg/ships/combat/component/4/5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/4_fbd459c9/5.ogg_6afc5413
rename to ogg/ships/combat/component/4/5.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/5_42086d64/1.ogg_5b214b8c b/ogg/ships/combat/component/5/1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/5_42086d64/1.ogg_5b214b8c
rename to ogg/ships/combat/component/5/1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/5_42086d64/2.ogg_c3001bdc b/ogg/ships/combat/component/5/2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/5_42086d64/2.ogg_c3001bdc
rename to ogg/ships/combat/component/5/2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/5_42086d64/3.ogg_b6bf854b b/ogg/ships/combat/component/5/3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/5_42086d64/3.ogg_b6bf854b
rename to ogg/ships/combat/component/5/3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/5_42086d64/4.ogg_9600dbbd b/ogg/ships/combat/component/5/4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/5_42086d64/4.ogg_9600dbbd
rename to ogg/ships/combat/component/5/4.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/5_42086d64/untitled14.ogg_b9bc5e5d b/ogg/ships/combat/component/5/untitled14.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/5_42086d64/untitled14.ogg_b9bc5e5d
rename to ogg/ships/combat/component/5/untitled14.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/6_332469cd/1.ogg_64c1ad6a b/ogg/ships/combat/component/6/1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/6_332469cd/1.ogg_64c1ad6a
rename to ogg/ships/combat/component/6/1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/6_332469cd/2.ogg_16200ff2 b/ogg/ships/combat/component/6/2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/6_332469cd/2.ogg_16200ff2
rename to ogg/ships/combat/component/6/2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/6_332469cd/3.ogg_f80a6a2a b/ogg/ships/combat/component/6/3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/6_332469cd/3.ogg_f80a6a2a
rename to ogg/ships/combat/component/6/3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/6_332469cd/4.ogg_8e9adb99 b/ogg/ships/combat/component/6/4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/6_332469cd/4.ogg_8e9adb99
rename to ogg/ships/combat/component/6/4.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/6_332469cd/5.ogg_5d518671 b/ogg/ships/combat/component/6/5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/6_332469cd/5.ogg_5d518671
rename to ogg/ships/combat/component/6/5.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/6_332469cd/6.ogg_01abf98b b/ogg/ships/combat/component/6/6.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/6_332469cd/6.ogg_01abf98b
rename to ogg/ships/combat/component/6/6.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/7_20bcf38a/1.ogg_95b58c90 b/ogg/ships/combat/component/7/1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/7_20bcf38a/1.ogg_95b58c90
rename to ogg/ships/combat/component/7/1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/7_20bcf38a/2.ogg_7056e9f0 b/ogg/ships/combat/component/7/2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/7_20bcf38a/2.ogg_7056e9f0
rename to ogg/ships/combat/component/7/2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/7_20bcf38a/3.ogg_961b2375 b/ogg/ships/combat/component/7/3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/7_20bcf38a/3.ogg_961b2375
rename to ogg/ships/combat/component/7/3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/7_20bcf38a/4.ogg_f43a858c b/ogg/ships/combat/component/7/4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/7_20bcf38a/4.ogg_f43a858c
rename to ogg/ships/combat/component/7/4.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/8_bdb09a4c/1.ogg_fb11fb1a b/ogg/ships/combat/component/8/1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/8_bdb09a4c/1.ogg_fb11fb1a
rename to ogg/ships/combat/component/8/1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/8_bdb09a4c/2.ogg_2104808f b/ogg/ships/combat/component/8/2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/8_bdb09a4c/2.ogg_2104808f
rename to ogg/ships/combat/component/8/2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/8_bdb09a4c/3.ogg_967ca25d b/ogg/ships/combat/component/8/3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/8_bdb09a4c/3.ogg_967ca25d
rename to ogg/ships/combat/component/8/3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/8_bdb09a4c/4.ogg_ad05c46f b/ogg/ships/combat/component/8/4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/8_bdb09a4c/4.ogg_ad05c46f
rename to ogg/ships/combat/component/8/4.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/8_bdb09a4c/5.ogg_bb4c0b05 b/ogg/ships/combat/component/8/5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/8_bdb09a4c/5.ogg_bb4c0b05
rename to ogg/ships/combat/component/8/5.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/8_bdb09a4c/6.ogg_4919d013 b/ogg/ships/combat/component/8/6.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/8_bdb09a4c/6.ogg_4919d013
rename to ogg/ships/combat/component/8/6.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/1.ogg_c692037b b/ogg/ships/combat/component/9/1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/1.ogg_c692037b
rename to ogg/ships/combat/component/9/1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/2.ogg_546e606f b/ogg/ships/combat/component/9/2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/2.ogg_546e606f
rename to ogg/ships/combat/component/9/2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/3.ogg_4efea9c9 b/ogg/ships/combat/component/9/3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/3.ogg_4efea9c9
rename to ogg/ships/combat/component/9/3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/4.ogg_ba27b776 b/ogg/ships/combat/component/9/4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/4.ogg_ba27b776
rename to ogg/ships/combat/component/9/4.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/5.ogg_dfc9ea34 b/ogg/ships/combat/component/9/5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/5.ogg_dfc9ea34
rename to ogg/ships/combat/component/9/5.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/6.ogg_50d9089b b/ogg/ships/combat/component/9/6.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/6.ogg_50d9089b
rename to ogg/ships/combat/component/9/6.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/7.ogg_96c9e105 b/ogg/ships/combat/component/9/7.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/7.ogg_96c9e105
rename to ogg/ships/combat/component/9/7.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/8.ogg_35fd09f5 b/ogg/ships/combat/component/9/8.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/8.ogg_35fd09f5
rename to ogg/ships/combat/component/9/8.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/9.ogg_9c2beb03 b/ogg/ships/combat/component/9/9.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/9.ogg_9c2beb03
rename to ogg/ships/combat/component/9/9.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/untitled41.ogg_aa42a3f7 b/ogg/ships/combat/component/9/untitled41.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/component_593a6020/9_9b5e8302/untitled41.ogg_aa42a3f7
rename to ogg/ships/combat/component/9/untitled41.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/dc.ogg_4f4349e9 b/ogg/ships/combat/dc.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/dc.ogg_4f4349e9
rename to ogg/ships/combat/dc.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/defensivesystemspenetrated.ogg_c50306c9 b/ogg/ships/combat/defensivesystemspenetrated.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/defensivesystemspenetrated.ogg_c50306c9
rename to ogg/ships/combat/defensivesystemspenetrated.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/defoff1.ogg_fe6c4d06 b/ogg/ships/combat/defoff1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/defoff1.ogg_fe6c4d06
rename to ogg/ships/combat/defoff1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/defoff2.ogg_37b9a751 b/ogg/ships/combat/defoff2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/defoff2.ogg_37b9a751
rename to ogg/ships/combat/defoff2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/defon1.ogg_d7f26f79 b/ogg/ships/combat/defon1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/defon1.ogg_d7f26f79
rename to ogg/ships/combat/defon1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/direct1.ogg_8fcb975c b/ogg/ships/combat/direct1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/direct1.ogg_8fcb975c
rename to ogg/ships/combat/direct1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/direct2.ogg_f95c5236 b/ogg/ships/combat/direct2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/direct2.ogg_f95c5236
rename to ogg/ships/combat/direct2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/direct3.ogg_99ba48c7 b/ogg/ships/combat/direct3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/direct3.ogg_99ba48c7
rename to ogg/ships/combat/direct3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/disruptor.ogg_07a0b6cd b/ogg/ships/combat/disruptor.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/disruptor.ogg_07a0b6cd
rename to ogg/ships/combat/disruptor.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/dronereloading1.ogg_e8cebd34 b/ogg/ships/combat/dronereloading1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/dronereloading1.ogg_e8cebd34
rename to ogg/ships/combat/dronereloading1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/dronereloading2.ogg_f76520f8 b/ogg/ships/combat/dronereloading2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/dronereloading2.ogg_f76520f8
rename to ogg/ships/combat/dronereloading2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/electric.ogg_51695474 b/ogg/ships/combat/electric.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/electric.ogg_51695474
rename to ogg/ships/combat/electric.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/emp.ogg_c467d8ee b/ogg/ships/combat/emp.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/emp.ogg_c467d8ee
rename to ogg/ships/combat/emp.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/enemybeams.ogg_ac0008eb b/ogg/ships/combat/enemybeams.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/enemybeams.ogg_ac0008eb
rename to ogg/ships/combat/enemybeams.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/enemylasers.ogg_b81a551b b/ogg/ships/combat/enemylasers.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/enemylasers.ogg_b81a551b
rename to ogg/ships/combat/enemylasers.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/enemylasers1.ogg_e21ebf82 b/ogg/ships/combat/enemylasers1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/enemylasers1.ogg_e21ebf82
rename to ogg/ships/combat/enemylasers1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/enemylasers2.ogg_38df0b6d b/ogg/ships/combat/enemylasers2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/enemylasers2.ogg_38df0b6d
rename to ogg/ships/combat/enemylasers2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/enemylasers3.ogg_6984b973 b/ogg/ships/combat/enemylasers3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/enemylasers3.ogg_6984b973
rename to ogg/ships/combat/enemylasers3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/enemymissile.ogg_9e801246 b/ogg/ships/combat/enemymissile.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/enemymissile.ogg_9e801246
rename to ogg/ships/combat/enemymissile.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/energydeflect.ogg_4c6f92a6 b/ogg/ships/combat/energydeflect.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/energydeflect.ogg_4c6f92a6
rename to ogg/ships/combat/energydeflect.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/energydetected.ogg_33c75764 b/ogg/ships/combat/energydetected.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/energydetected.ogg_33c75764
rename to ogg/ships/combat/energydetected.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/explode.ogg_4c0e72f2 b/ogg/ships/combat/explode.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/explode.ogg_4c0e72f2
rename to ogg/ships/combat/explode.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/green.ogg_e6db5724 b/ogg/ships/combat/green.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/green.ogg_e6db5724
rename to ogg/ships/combat/green.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/handle.ogg_cea7098c b/ogg/ships/combat/handle.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/handle.ogg_cea7098c
rename to ogg/ships/combat/handle.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/heatshieldsboost.ogg_c7f277df b/ogg/ships/combat/heatshieldsboost.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/heatshieldsboost.ogg_c7f277df
rename to ogg/ships/combat/heatshieldsboost.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/heatshieldsoff.ogg_6a096234 b/ogg/ships/combat/heatshieldsoff.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/heatshieldsoff.ogg_6a096234
rename to ogg/ships/combat/heatshieldsoff.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/heatshieldson.ogg_ef6d3f46 b/ogg/ships/combat/heatshieldson.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/heatshieldson.ogg_ef6d3f46
rename to ogg/ships/combat/heatshieldson.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/heavy tractor beam.ogg_a020644d b/ogg/ships/combat/heavy tractor beam.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/heavy tractor beam.ogg_a020644d
rename to ogg/ships/combat/heavy tractor beam.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/holovidoff.ogg_a679c134 b/ogg/ships/combat/holovidoff.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/holovidoff.ogg_a679c134
rename to ogg/ships/combat/holovidoff.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/holovidon.ogg_b33a90f0 b/ogg/ships/combat/holovidon.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/holovidon.ogg_b33a90f0
rename to ogg/ships/combat/holovidon.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/hullbreech.ogg_731ba4ea b/ogg/ships/combat/hullbreech.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/hullbreech.ogg_731ba4ea
rename to ogg/ships/combat/hullbreech.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/indirect1.ogg_a51f07de b/ogg/ships/combat/indirect1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/indirect1.ogg_a51f07de
rename to ogg/ships/combat/indirect1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/indirect2.ogg_26d1134d b/ogg/ships/combat/indirect2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/indirect2.ogg_26d1134d
rename to ogg/ships/combat/indirect2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/laser.ogg_04b7a5cf b/ogg/ships/combat/laser.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/laser.ogg_04b7a5cf
rename to ogg/ships/combat/laser.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/lever.ogg_2656569a b/ogg/ships/combat/lever.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/lever.ogg_2656569a
rename to ogg/ships/combat/lever.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/lightn1.ogg_05dd067b b/ogg/ships/combat/lightn1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/lightn1.ogg_05dd067b
rename to ogg/ships/combat/lightn1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/lightn2.ogg_40eb3f30 b/ogg/ships/combat/lightn2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/lightn2.ogg_40eb3f30
rename to ogg/ships/combat/lightn2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/losttrack.ogg_afa46cd3 b/ogg/ships/combat/losttrack.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/losttrack.ogg_afa46cd3
rename to ogg/ships/combat/losttrack.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/missile.ogg_014cc93f b/ogg/ships/combat/missile.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/missile.ogg_014cc93f
rename to ogg/ships/combat/missile.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/missile1.ogg_77342c79 b/ogg/ships/combat/missile1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/missile1.ogg_77342c79
rename to ogg/ships/combat/missile1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/missile2.ogg_efe286ac b/ogg/ships/combat/missile2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/missile2.ogg_efe286ac
rename to ogg/ships/combat/missile2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/obfdef1.ogg_3b21431a b/ogg/ships/combat/obfdef1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/obfdef1.ogg_3b21431a
rename to ogg/ships/combat/obfdef1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/obfdef2.ogg_045912b1 b/ogg/ships/combat/obfdef2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/obfdef2.ogg_045912b1
rename to ogg/ships/combat/obfdef2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/obfdef3.ogg_2c28bcf7 b/ogg/ships/combat/obfdef3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/obfdef3.ogg_2c28bcf7
rename to ogg/ships/combat/obfdef3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/obfdef4.ogg_62b1dcd9 b/ogg/ships/combat/obfdef4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/obfdef4.ogg_62b1dcd9
rename to ogg/ships/combat/obfdef4.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/obffade.ogg_966a9f15 b/ogg/ships/combat/obffade.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/obffade.ogg_966a9f15
rename to ogg/ships/combat/obffade.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/obfoff.ogg_ad1d0370 b/ogg/ships/combat/obfoff.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/obfoff.ogg_ad1d0370
rename to ogg/ships/combat/obfoff.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/obfon.ogg_da215de4 b/ogg/ships/combat/obfon.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/obfon.ogg_da215de4
rename to ogg/ships/combat/obfon.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/obfstart.ogg_cca59733 b/ogg/ships/combat/obfstart.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/obfstart.ogg_cca59733
rename to ogg/ships/combat/obfstart.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/ocharge.ogg_ddf9ca24 b/ogg/ships/combat/ocharge.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/ocharge.ogg_ddf9ca24
rename to ogg/ships/combat/ocharge.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/otherdefensivesystemhit.ogg_ffd52282 b/ogg/ships/combat/otherdefensivesystemhit.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/otherdefensivesystemhit.ogg_ffd52282
rename to ogg/ships/combat/otherdefensivesystemhit.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/otherdestroyed1.ogg_6c5e41f8 b/ogg/ships/combat/otherdestroyed1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/otherdestroyed1.ogg_6c5e41f8
rename to ogg/ships/combat/otherdestroyed1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/otherdestroyed2.ogg_cc95e2cc b/ogg/ships/combat/otherdestroyed2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/otherdestroyed2.ogg_cc95e2cc
rename to ogg/ships/combat/otherdestroyed2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/otherdestroyed3.ogg_4fadf365 b/ogg/ships/combat/otherdestroyed3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/otherdestroyed3.ogg_4fadf365
rename to ogg/ships/combat/otherdestroyed3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/otherdestroyed4.ogg_8b092302 b/ogg/ships/combat/otherdestroyed4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/otherdestroyed4.ogg_8b092302
rename to ogg/ships/combat/otherdestroyed4.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/otherdestroyed5.ogg_482a4cec b/ogg/ships/combat/otherdestroyed5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/otherdestroyed5.ogg_482a4cec
rename to ogg/ships/combat/otherdestroyed5.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/otherdestroyed6.ogg_4a5c26a6 b/ogg/ships/combat/otherdestroyed6.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/otherdestroyed6.ogg_4a5c26a6
rename to ogg/ships/combat/otherdestroyed6.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/otherdestroyed7.ogg_8fc2a285 b/ogg/ships/combat/otherdestroyed7.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/otherdestroyed7.ogg_8fc2a285
rename to ogg/ships/combat/otherdestroyed7.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/otherhit1.ogg_8e53f99d b/ogg/ships/combat/otherhit1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/otherhit1.ogg_8e53f99d
rename to ogg/ships/combat/otherhit1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/otherhit2.ogg_decea821 b/ogg/ships/combat/otherhit2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/otherhit2.ogg_decea821
rename to ogg/ships/combat/otherhit2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/otherhit3.ogg_c97aa035 b/ogg/ships/combat/otherhit3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/otherhit3.ogg_c97aa035
rename to ogg/ships/combat/otherhit3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/otherphaser1.ogg_242e16fa b/ogg/ships/combat/otherphaser1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/otherphaser1.ogg_242e16fa
rename to ogg/ships/combat/otherphaser1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/otherphaser2.ogg_f3208b95 b/ogg/ships/combat/otherphaser2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/otherphaser2.ogg_f3208b95
rename to ogg/ships/combat/otherphaser2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/otherphaser3.ogg_7c802ac0 b/ogg/ships/combat/otherphaser3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/otherphaser3.ogg_7c802ac0
rename to ogg/ships/combat/otherphaser3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/othershieldsdown.ogg_7f25c138 b/ogg/ships/combat/othershieldsdown.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/othershieldsdown.ogg_7f25c138
rename to ogg/ships/combat/othershieldsdown.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/othershieldshit.ogg_4735f137 b/ogg/ships/combat/othershieldshit.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/othershieldshit.ogg_4735f137
rename to ogg/ships/combat/othershieldshit.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/phaser.ogg_ebbc0807 b/ogg/ships/combat/phaser.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/phaser.ogg_ebbc0807
rename to ogg/ships/combat/phaser.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/plasma.ogg_7f87db50 b/ogg/ships/combat/plasma.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/plasma.ogg_7f87db50
rename to ogg/ships/combat/plasma.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/plasmacannonfilter.ogg_9a87c3a9 b/ogg/ships/combat/plasmacannonfilter.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/plasmacannonfilter.ogg_9a87c3a9
rename to ogg/ships/combat/plasmacannonfilter.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/plasmacannonhum.ogg_5fba843e b/ogg/ships/combat/plasmacannonhum.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/plasmacannonhum.ogg_5fba843e
rename to ogg/ships/combat/plasmacannonhum.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/plasmacannonpowerup.ogg_8bd52f8c b/ogg/ships/combat/plasmacannonpowerup.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/plasmacannonpowerup.ogg_8bd52f8c
rename to ogg/ships/combat/plasmacannonpowerup.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/pm.ogg_c81fda02 b/ogg/ships/combat/pm.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/pm.ogg_c81fda02
rename to ogg/ships/combat/pm.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/pulsecannon.ogg_1653b31f b/ogg/ships/combat/pulsecannon.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/pulsecannon.ogg_1653b31f
rename to ogg/ships/combat/pulsecannon.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/railgun.ogg_800ae2c5 b/ogg/ships/combat/railgun.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/railgun.ogg_800ae2c5
rename to ogg/ships/combat/railgun.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/railgunlaunch.ogg_a6cf797e b/ogg/ships/combat/railgunlaunch.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/railgunlaunch.ogg_a6cf797e
rename to ogg/ships/combat/railgunlaunch.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/recall.ogg_bafe9b7e b/ogg/ships/combat/recall.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/recall.ogg_bafe9b7e
rename to ogg/ships/combat/recall.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/recharge.ogg_0e27cb0f b/ogg/ships/combat/recharge.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/recharge.ogg_0e27cb0f
rename to ogg/ships/combat/recharge.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/red.ogg_01882a79 b/ogg/ships/combat/red.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/red.ogg_01882a79
rename to ogg/ships/combat/red.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/redalert.ogg_d1dbe258 b/ogg/ships/combat/redalert.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/redalert.ogg_d1dbe258
rename to ogg/ships/combat/redalert.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/reload.ogg_c31c9eac b/ogg/ships/combat/reload.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/reload.ogg_c31c9eac
rename to ogg/ships/combat/reload.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/reload1.ogg_5c80dd74 b/ogg/ships/combat/reload1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/reload1.ogg_5c80dd74
rename to ogg/ships/combat/reload1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/reload2.ogg_1cbde8e8 b/ogg/ships/combat/reload2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/reload2.ogg_1cbde8e8
rename to ogg/ships/combat/reload2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/selfdestructfive.ogg_b019cf9e b/ogg/ships/combat/selfdestructfive.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/selfdestructfive.ogg_b019cf9e
rename to ogg/ships/combat/selfdestructfive.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/selfdestructfour.ogg_f3c2fec2 b/ogg/ships/combat/selfdestructfour.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/selfdestructfour.ogg_f3c2fec2
rename to ogg/ships/combat/selfdestructfour.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/selfdestructone.ogg_4e6e9df1 b/ogg/ships/combat/selfdestructone.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/selfdestructone.ogg_4e6e9df1
rename to ogg/ships/combat/selfdestructone.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/selfdestructstart.ogg_1eb6c5a5 b/ogg/ships/combat/selfdestructstart.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/selfdestructstart.ogg_1eb6c5a5
rename to ogg/ships/combat/selfdestructstart.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/selfdestructten.ogg_21b266ce b/ogg/ships/combat/selfdestructten.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/selfdestructten.ogg_21b266ce
rename to ogg/ships/combat/selfdestructten.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/selfdestructthirty.ogg_590295b6 b/ogg/ships/combat/selfdestructthirty.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/selfdestructthirty.ogg_590295b6
rename to ogg/ships/combat/selfdestructthirty.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/selfdestructthree.ogg_a6ad646c b/ogg/ships/combat/selfdestructthree.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/selfdestructthree.ogg_a6ad646c
rename to ogg/ships/combat/selfdestructthree.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/selfdestructtwo.ogg_e24bf870 b/ogg/ships/combat/selfdestructtwo.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/selfdestructtwo.ogg_e24bf870
rename to ogg/ships/combat/selfdestructtwo.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/shielddeflect.ogg_3eaeb6cb b/ogg/ships/combat/shielddeflect.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/shielddeflect.ogg_3eaeb6cb
rename to ogg/ships/combat/shielddeflect.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/shieldsfail.ogg_e027c22b b/ogg/ships/combat/shieldsfail.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/shieldsfail.ogg_e027c22b
rename to ogg/ships/combat/shieldsfail.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/shieldsoff.ogg_9d5b7a81 b/ogg/ships/combat/shieldsoff.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/shieldsoff.ogg_9d5b7a81
rename to ogg/ships/combat/shieldsoff.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/shieldsoff2.ogg_4a3b1bc3 b/ogg/ships/combat/shieldsoff2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/shieldsoff2.ogg_4a3b1bc3
rename to ogg/ships/combat/shieldsoff2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/shieldson.ogg_a1c71f9e b/ogg/ships/combat/shieldson.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/shieldson.ogg_a1c71f9e
rename to ogg/ships/combat/shieldson.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/solar1.ogg_ca855bf5 b/ogg/ships/combat/solar1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/solar1.ogg_ca855bf5
rename to ogg/ships/combat/solar1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/solar2.ogg_ee06bf74 b/ogg/ships/combat/solar2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/solar2.ogg_ee06bf74
rename to ogg/ships/combat/solar2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/solarflare.ogg_1d8632ea b/ogg/ships/combat/solarflare.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/solarflare.ogg_1d8632ea
rename to ogg/ships/combat/solarflare.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/targeted.ogg_4d33ac3f b/ogg/ships/combat/targeted.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/targeted.ogg_4d33ac3f
rename to ogg/ships/combat/targeted.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/torp.ogg_97d7aa8d b/ogg/ships/combat/torp.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/torp.ogg_97d7aa8d
rename to ogg/ships/combat/torp.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/torps.ogg_863bbd58 b/ogg/ships/combat/torps.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/torps.ogg_863bbd58
rename to ogg/ships/combat/torps.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/missilea.ogg_e1f3c47f b/ogg/ships/combat/weapons/missilea.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/missilea.ogg_e1f3c47f
rename to ogg/ships/combat/weapons/missilea.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/missilef.ogg_8339f659 b/ogg/ships/combat/weapons/missilef.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/missilef.ogg_8339f659
rename to ogg/ships/combat/weapons/missilef.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/pma.ogg_e5ef0833 b/ogg/ships/combat/weapons/pma.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/pma.ogg_e5ef0833
rename to ogg/ships/combat/weapons/pma.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/pmf.ogg_ec495253 b/ogg/ships/combat/weapons/pmf.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/pmf.ogg_ec495253
rename to ogg/ships/combat/weapons/pmf.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/salvomisa.ogg_06be5fa7 b/ogg/ships/combat/weapons/salvomisa.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/salvomisa.ogg_06be5fa7
rename to ogg/ships/combat/weapons/salvomisa.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/salvomisf.ogg_55f540d0 b/ogg/ships/combat/weapons/salvomisf.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/salvomisf.ogg_55f540d0
rename to ogg/ships/combat/weapons/salvomisf.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/salvopma.ogg_b17cebf0 b/ogg/ships/combat/weapons/salvopma.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/salvopma.ogg_b17cebf0
rename to ogg/ships/combat/weapons/salvopma.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/salvopmf.ogg_ceb073f1 b/ogg/ships/combat/weapons/salvopmf.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/salvopmf.ogg_ceb073f1
rename to ogg/ships/combat/weapons/salvopmf.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/salvotorpa.ogg_31f821cd b/ogg/ships/combat/weapons/salvotorpa.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/salvotorpa.ogg_31f821cd
rename to ogg/ships/combat/weapons/salvotorpa.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/salvotorpf.ogg_d2f5cc31 b/ogg/ships/combat/weapons/salvotorpf.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/salvotorpf.ogg_d2f5cc31
rename to ogg/ships/combat/weapons/salvotorpf.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/torpidoa.ogg_e4f59a1c b/ogg/ships/combat/weapons/torpidoa.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/torpidoa.ogg_e4f59a1c
rename to ogg/ships/combat/weapons/torpidoa.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/torpidof.ogg_b7ebcff5 b/ogg/ships/combat/weapons/torpidof.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/weapons_84a37b67/torpidof.ogg_b7ebcff5
rename to ogg/ships/combat/weapons/torpidof.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/weaponsrecharge.ogg_20b91fc8 b/ogg/ships/combat/weaponsrecharge.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/weaponsrecharge.ogg_20b91fc8
rename to ogg/ships/combat/weaponsrecharge.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/weaponwarning.ogg_40b4dcd4 b/ogg/ships/combat/weaponwarning.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/weaponwarning.ogg_40b4dcd4
rename to ogg/ships/combat/weaponwarning.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/yd1.ogg_2a9eeece b/ogg/ships/combat/yd1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/yd1.ogg_2a9eeece
rename to ogg/ships/combat/yd1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/yd2.ogg_a17ad356 b/ogg/ships/combat/yd2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/yd2.ogg_a17ad356
rename to ogg/ships/combat/yd2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/yellowalert.ogg_fc205b41 b/ogg/ships/combat/yellowalert.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/yellowalert.ogg_fc205b41
rename to ogg/ships/combat/yellowalert.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/youdestroyed1.ogg_2b7c4312 b/ogg/ships/combat/youdestroyed1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/youdestroyed1.ogg_2b7c4312
rename to ogg/ships/combat/youdestroyed1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/youdestroyed2.ogg_f5883569 b/ogg/ships/combat/youdestroyed2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/youdestroyed2.ogg_f5883569
rename to ogg/ships/combat/youdestroyed2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/youdestroyed3.ogg_b3275321 b/ogg/ships/combat/youdestroyed3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/youdestroyed3.ogg_b3275321
rename to ogg/ships/combat/youdestroyed3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/youhit1.ogg_fb1d4c00 b/ogg/ships/combat/youhit1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/youhit1.ogg_fb1d4c00
rename to ogg/ships/combat/youhit1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/youhit2.ogg_09405a77 b/ogg/ships/combat/youhit2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/youhit2.ogg_09405a77
rename to ogg/ships/combat/youhit2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/youhit3.ogg_b82f7344 b/ogg/ships/combat/youhit3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/youhit3.ogg_b82f7344
rename to ogg/ships/combat/youhit3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/youhit4.ogg_a83dd864 b/ogg/ships/combat/youhit4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/youhit4.ogg_a83dd864
rename to ogg/ships/combat/youhit4.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/youhit5.ogg_08bedda2 b/ogg/ships/combat/youhit5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/youhit5.ogg_08bedda2
rename to ogg/ships/combat/youhit5.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/youhit6.ogg_ec52ff78 b/ogg/ships/combat/youhit6.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/youhit6.ogg_ec52ff78
rename to ogg/ships/combat/youhit6.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/yourdefs1.ogg_bc1fbe6b b/ogg/ships/combat/yourdefs1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/yourdefs1.ogg_bc1fbe6b
rename to ogg/ships/combat/yourdefs1.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/yourdefs2.ogg_fff69289 b/ogg/ships/combat/yourdefs2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/yourdefs2.ogg_fff69289
rename to ogg/ships/combat/yourdefs2.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/yourdefs3.ogg_dcf132e0 b/ogg/ships/combat/yourdefs3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/yourdefs3.ogg_dcf132e0
rename to ogg/ships/combat/yourdefs3.ogg
diff --git a/ogg/ships_1e7b5cfa/combat_419360d5/yourtorps.ogg_ca1edeba b/ogg/ships/combat/yourtorps.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/combat_419360d5/yourtorps.ogg_ca1edeba
rename to ogg/ships/combat/yourtorps.ogg
diff --git a/ogg/ships_1e7b5cfa/comets_83b0b54f/cleanup.ogg_8c16e0ba b/ogg/ships/comets/cleanup.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/comets_83b0b54f/cleanup.ogg_8c16e0ba
rename to ogg/ships/comets/cleanup.ogg
diff --git a/ogg/ships_1e7b5cfa/comets_83b0b54f/getstuff.ogg_731b9e28 b/ogg/ships/comets/getstuff.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/comets_83b0b54f/getstuff.ogg_731b9e28
rename to ogg/ships/comets/getstuff.ogg
diff --git a/ogg/ships_1e7b5cfa/comets_83b0b54f/mininglaser.ogg_8c55a4e2 b/ogg/ships/comets/mininglaser.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/comets_83b0b54f/mininglaser.ogg_8c55a4e2
rename to ogg/ships/comets/mininglaser.ogg
diff --git a/ogg/ships_1e7b5cfa/comets_83b0b54f/power.ogg_d5c95535 b/ogg/ships/comets/power.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/comets_83b0b54f/power.ogg_d5c95535
rename to ogg/ships/comets/power.ogg
diff --git a/ogg/ships_1e7b5cfa/comets_83b0b54f/probeboom.ogg_d4610e96 b/ogg/ships/comets/probeboom.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/comets_83b0b54f/probeboom.ogg_d4610e96
rename to ogg/ships/comets/probeboom.ogg
diff --git a/ogg/ships_1e7b5cfa/comets_83b0b54f/probelaunch.ogg_1af59c78 b/ogg/ships/comets/probelaunch.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/comets_83b0b54f/probelaunch.ogg_1af59c78
rename to ogg/ships/comets/probelaunch.ogg
diff --git a/ogg/ships_1e7b5cfa/comets_83b0b54f/probereturn.ogg_9cf440b5 b/ogg/ships/comets/probereturn.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/comets_83b0b54f/probereturn.ogg_9cf440b5
rename to ogg/ships/comets/probereturn.ogg
diff --git a/ogg/ships_1e7b5cfa/comets_83b0b54f/probetakes.ogg_40fa27a9 b/ogg/ships/comets/probetakes.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/comets_83b0b54f/probetakes.ogg_40fa27a9
rename to ogg/ships/comets/probetakes.ogg
diff --git a/ogg/ships_1e7b5cfa/comets_83b0b54f/retract.ogg_24b4df98 b/ogg/ships/comets/retract.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/comets_83b0b54f/retract.ogg_24b4df98
rename to ogg/ships/comets/retract.ogg
diff --git a/ogg/ships_1e7b5cfa/comets_83b0b54f/shovel1.ogg_7cdf54f3 b/ogg/ships/comets/shovel1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/comets_83b0b54f/shovel1.ogg_7cdf54f3
rename to ogg/ships/comets/shovel1.ogg
diff --git a/ogg/ships_1e7b5cfa/comets_83b0b54f/shovel2.ogg_1a60802f b/ogg/ships/comets/shovel2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/comets_83b0b54f/shovel2.ogg_1a60802f
rename to ogg/ships/comets/shovel2.ogg
diff --git a/ogg/ships_1e7b5cfa/comets_83b0b54f/shovel3.ogg_2dba97b6 b/ogg/ships/comets/shovel3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/comets_83b0b54f/shovel3.ogg_2dba97b6
rename to ogg/ships/comets/shovel3.ogg
diff --git a/ogg/ships_1e7b5cfa/comets_83b0b54f/shovel4.ogg_2b3b37da b/ogg/ships/comets/shovel4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/comets_83b0b54f/shovel4.ogg_2b3b37da
rename to ogg/ships/comets/shovel4.ogg
diff --git a/ogg/ships_1e7b5cfa/comets_83b0b54f/shovel5.ogg_90b73d14 b/ogg/ships/comets/shovel5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/comets_83b0b54f/shovel5.ogg_90b73d14
rename to ogg/ships/comets/shovel5.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/aammo.ogg_7ff734a0 b/ogg/ships/computer/aammo.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/aammo.ogg_7ff734a0
rename to ogg/ships/computer/aammo.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/alert.ogg_cac280c7 b/ogg/ships/computer/alert.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/alert.ogg_cac280c7
rename to ogg/ships/computer/alert.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/announce1.ogg_b594209a b/ogg/ships/computer/announce1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/announce1.ogg_b594209a
rename to ogg/ships/computer/announce1.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/announce2.ogg_49f14729 b/ogg/ships/computer/announce2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/announce2.ogg_49f14729
rename to ogg/ships/computer/announce2.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/announce3.ogg_34458b0c b/ogg/ships/computer/announce3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/announce3.ogg_34458b0c
rename to ogg/ships/computer/announce3.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/announce4.ogg_82398abf b/ogg/ships/computer/announce4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/announce4.ogg_82398abf
rename to ogg/ships/computer/announce4.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/code.ogg_9f992d7f b/ogg/ships/computer/code.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/code.ogg_9f992d7f
rename to ogg/ships/computer/code.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/dalert.ogg_39d6a73a b/ogg/ships/computer/dalert.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/dalert.ogg_39d6a73a
rename to ogg/ships/computer/dalert.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/dhit.ogg_406bea48 b/ogg/ships/computer/dhit.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/dhit.ogg_406bea48
rename to ogg/ships/computer/dhit.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/display.ogg_786df2f5 b/ogg/ships/computer/display.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/display.ogg_786df2f5
rename to ogg/ships/computer/display.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/display1.ogg_92c88c40 b/ogg/ships/computer/display1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/display1.ogg_92c88c40
rename to ogg/ships/computer/display1.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/display2.ogg_1f2a4328 b/ogg/ships/computer/display2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/display2.ogg_1f2a4328
rename to ogg/ships/computer/display2.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/display3.ogg_c5332c50 b/ogg/ships/computer/display3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/display3.ogg_c5332c50
rename to ogg/ships/computer/display3.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/display4.ogg_fb895a8f b/ogg/ships/computer/display4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/display4.ogg_fb895a8f
rename to ogg/ships/computer/display4.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/keyboard1.ogg_f97bff10 b/ogg/ships/computer/keyboard1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/keyboard1.ogg_f97bff10
rename to ogg/ships/computer/keyboard1.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/keyboard2.ogg_bb156434 b/ogg/ships/computer/keyboard2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/keyboard2.ogg_bb156434
rename to ogg/ships/computer/keyboard2.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/keyboard3.ogg_ab85412b b/ogg/ships/computer/keyboard3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/keyboard3.ogg_ab85412b
rename to ogg/ships/computer/keyboard3.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/keyboard4.ogg_8d425dfa b/ogg/ships/computer/keyboard4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/keyboard4.ogg_8d425dfa
rename to ogg/ships/computer/keyboard4.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/keyboard5.ogg_3f242c96 b/ogg/ships/computer/keyboard5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/keyboard5.ogg_3f242c96
rename to ogg/ships/computer/keyboard5.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/keyboard6.ogg_96565b28 b/ogg/ships/computer/keyboard6.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/keyboard6.ogg_96565b28
rename to ogg/ships/computer/keyboard6.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/keyboard7.ogg_32e79b76 b/ogg/ships/computer/keyboard7.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/keyboard7.ogg_32e79b76
rename to ogg/ships/computer/keyboard7.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/keypress1.ogg_691da3d6 b/ogg/ships/computer/keypress1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/keypress1.ogg_691da3d6
rename to ogg/ships/computer/keypress1.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/keypress2.ogg_d9603309 b/ogg/ships/computer/keypress2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/keypress2.ogg_d9603309
rename to ogg/ships/computer/keypress2.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/keypress3.ogg_79c1d982 b/ogg/ships/computer/keypress3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/keypress3.ogg_79c1d982
rename to ogg/ships/computer/keypress3.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/keypress4.ogg_4188670f b/ogg/ships/computer/keypress4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/keypress4.ogg_4188670f
rename to ogg/ships/computer/keypress4.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/minikeyboard.ogg_8dcd10d7 b/ogg/ships/computer/minikeyboard.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/minikeyboard.ogg_8dcd10d7
rename to ogg/ships/computer/minikeyboard.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/mis.ogg_60e2c556 b/ogg/ships/computer/mis.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/mis.ogg_60e2c556
rename to ogg/ships/computer/mis.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/passcoderequired.ogg_36c097d3 b/ogg/ships/computer/passcoderequired.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/passcoderequired.ogg_36c097d3
rename to ogg/ships/computer/passcoderequired.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/phit.ogg_3272fe30 b/ogg/ships/computer/phit.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/phit.ogg_3272fe30
rename to ogg/ships/computer/phit.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/prox.ogg_59296907 b/ogg/ships/computer/prox.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/prox.ogg_59296907
rename to ogg/ships/computer/prox.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/reload1.ogg_245078d1 b/ogg/ships/computer/reload1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/reload1.ogg_245078d1
rename to ogg/ships/computer/reload1.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/repairstart.ogg_4f9686f5 b/ogg/ships/computer/repairstart.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/repairstart.ogg_4f9686f5
rename to ogg/ships/computer/repairstart.ogg
diff --git a/ogg/ships_1e7b5cfa/computer_b9aa5fc8/salert.ogg_29293d5a b/ogg/ships/computer/salert.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/computer_b9aa5fc8/salert.ogg_29293d5a
rename to ogg/ships/computer/salert.ogg
diff --git a/ogg/ships_1e7b5cfa/deepspacerepair_822f002d/batterydrain.ogg_992608c5 b/ogg/ships/deepspacerepair/batterydrain.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/deepspacerepair_822f002d/batterydrain.ogg_992608c5
rename to ogg/ships/deepspacerepair/batterydrain.ogg
diff --git a/ogg/ships_1e7b5cfa/deepspacerepair_822f002d/crash1.ogg_f994bc05 b/ogg/ships/deepspacerepair/crash1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/deepspacerepair_822f002d/crash1.ogg_f994bc05
rename to ogg/ships/deepspacerepair/crash1.ogg
diff --git a/ogg/ships_1e7b5cfa/deepspacerepair_822f002d/crash2.ogg_e24d5651 b/ogg/ships/deepspacerepair/crash2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/deepspacerepair_822f002d/crash2.ogg_e24d5651
rename to ogg/ships/deepspacerepair/crash2.ogg
diff --git a/ogg/ships_1e7b5cfa/deepspacerepair_822f002d/poweroff.ogg_9c42918c b/ogg/ships/deepspacerepair/poweroff.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/deepspacerepair_822f002d/poweroff.ogg_9c42918c
rename to ogg/ships/deepspacerepair/poweroff.ogg
diff --git a/ogg/ships_1e7b5cfa/deepspacerepair_822f002d/poweron.ogg_6dfa2bde b/ogg/ships/deepspacerepair/poweron.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/deepspacerepair_822f002d/poweron.ogg_6dfa2bde
rename to ogg/ships/deepspacerepair/poweron.ogg
diff --git a/ogg/ships_1e7b5cfa/deepspacerepair_822f002d/repair1.ogg_625f0a70 b/ogg/ships/deepspacerepair/repair1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/deepspacerepair_822f002d/repair1.ogg_625f0a70
rename to ogg/ships/deepspacerepair/repair1.ogg
diff --git a/ogg/ships_1e7b5cfa/deepspacerepair_822f002d/repair2.ogg_fe9c5d00 b/ogg/ships/deepspacerepair/repair2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/deepspacerepair_822f002d/repair2.ogg_fe9c5d00
rename to ogg/ships/deepspacerepair/repair2.ogg
diff --git a/ogg/ships_1e7b5cfa/deepspacerepair_822f002d/repair3.ogg_e26381bd b/ogg/ships/deepspacerepair/repair3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/deepspacerepair_822f002d/repair3.ogg_e26381bd
rename to ogg/ships/deepspacerepair/repair3.ogg
diff --git a/ogg/ships_1e7b5cfa/fire_8a59c3e9/extinguisher.ogg_d6155416 b/ogg/ships/fire/extinguisher.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/fire_8a59c3e9/extinguisher.ogg_d6155416
rename to ogg/ships/fire/extinguisher.ogg
diff --git a/ogg/ships_1e7b5cfa/fire_8a59c3e9/siren.ogg_c022a621 b/ogg/ships/fire/siren.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/fire_8a59c3e9/siren.ogg_c022a621
rename to ogg/ships/fire/siren.ogg
diff --git a/ogg/ships_1e7b5cfa/fire_8a59c3e9/spray.ogg_9cb53134 b/ogg/ships/fire/spray.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/fire_8a59c3e9/spray.ogg_9cb53134
rename to ogg/ships/fire/spray.ogg
diff --git a/ogg/ships_1e7b5cfa/flightcontrol_b135416c/blue.ogg_e57b6196 b/ogg/ships/flightcontrol/blue.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/flightcontrol_b135416c/blue.ogg_e57b6196
rename to ogg/ships/flightcontrol/blue.ogg
diff --git a/ogg/ships_1e7b5cfa/flightcontrol_b135416c/fc.ogg_03f20b6f b/ogg/ships/flightcontrol/fc.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/flightcontrol_b135416c/fc.ogg_03f20b6f
rename to ogg/ships/flightcontrol/fc.ogg
diff --git a/ogg/ships_1e7b5cfa/flightcontrol_b135416c/fccheer.ogg_3762c3c9 b/ogg/ships/flightcontrol/fccheer.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/flightcontrol_b135416c/fccheer.ogg_3762c3c9
rename to ogg/ships/flightcontrol/fccheer.ogg
diff --git a/ogg/ships_1e7b5cfa/flightcontrol_b135416c/fcemergency.ogg_d4a58ae9 b/ogg/ships/flightcontrol/fcemergency.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/flightcontrol_b135416c/fcemergency.ogg_d4a58ae9
rename to ogg/ships/flightcontrol/fcemergency.ogg
diff --git a/ogg/ships_1e7b5cfa/flightcontrol_b135416c/fcflyintostar.ogg_c73bc7b8 b/ogg/ships/flightcontrol/fcflyintostar.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/flightcontrol_b135416c/fcflyintostar.ogg_c73bc7b8
rename to ogg/ships/flightcontrol/fcflyintostar.ogg
diff --git a/ogg/ships_1e7b5cfa/flightcontrol_b135416c/fcgold.ogg_047159e8 b/ogg/ships/flightcontrol/fcgold.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/flightcontrol_b135416c/fcgold.ogg_047159e8
rename to ogg/ships/flightcontrol/fcgold.ogg
diff --git a/ogg/ships_1e7b5cfa/flightcontrol_b135416c/fcgreen.ogg_d6e24fab b/ogg/ships/flightcontrol/fcgreen.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/flightcontrol_b135416c/fcgreen.ogg_d6e24fab
rename to ogg/ships/flightcontrol/fcgreen.ogg
diff --git a/ogg/ships_1e7b5cfa/flightcontrol_b135416c/fcinvasion.ogg_c4287535 b/ogg/ships/flightcontrol/fcinvasion.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/flightcontrol_b135416c/fcinvasion.ogg_c4287535
rename to ogg/ships/flightcontrol/fcinvasion.ogg
diff --git a/ogg/ships_1e7b5cfa/flightcontrol_b135416c/fcred.ogg_9d97ca68 b/ogg/ships/flightcontrol/fcred.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/flightcontrol_b135416c/fcred.ogg_9d97ca68
rename to ogg/ships/flightcontrol/fcred.ogg
diff --git a/ogg/ships_1e7b5cfa/flightcontrol_b135416c/fcsmuggling.ogg_e4603f2b b/ogg/ships/flightcontrol/fcsmuggling.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/flightcontrol_b135416c/fcsmuggling.ogg_e4603f2b
rename to ogg/ships/flightcontrol/fcsmuggling.ogg
diff --git a/ogg/ships_1e7b5cfa/flightcontrol_b135416c/fcvolcanoalarm.ogg_464b0dad b/ogg/ships/flightcontrol/fcvolcanoalarm.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/flightcontrol_b135416c/fcvolcanoalarm.ogg_464b0dad
rename to ogg/ships/flightcontrol/fcvolcanoalarm.ogg
diff --git a/ogg/ships_1e7b5cfa/jump_3ec9ca55/jump.ogg_63eb36ad b/ogg/ships/jump/jump.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/jump_3ec9ca55/jump.ogg_63eb36ad
rename to ogg/ships/jump/jump.ogg
diff --git a/ogg/ships_1e7b5cfa/jump_3ec9ca55/jumpend.ogg_815c7150 b/ogg/ships/jump/jumpend.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/jump_3ec9ca55/jumpend.ogg_815c7150
rename to ogg/ships/jump/jumpend.ogg
diff --git a/ogg/ships_1e7b5cfa/jump_3ec9ca55/loop.ogg_080b5aac b/ogg/ships/jump/loop.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/jump_3ec9ca55/loop.ogg_080b5aac
rename to ogg/ships/jump/loop.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/airlock.ogg_55204cca b/ogg/ships/misc/airlock.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/airlock.ogg_55204cca
rename to ogg/ships/misc/airlock.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/airprox.ogg_9b33991b b/ogg/ships/misc/airprox.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/airprox.ogg_9b33991b
rename to ogg/ships/misc/airprox.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/artifact.ogg_3933159d b/ogg/ships/misc/artifact.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/artifact.ogg_3933159d
rename to ogg/ships/misc/artifact.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/asteroidland.ogg_720d0f40 b/ogg/ships/misc/asteroidland.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/asteroidland.ogg_720d0f40
rename to ogg/ships/misc/asteroidland.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/asteroidlaunch.ogg_fa0902ba b/ogg/ships/misc/asteroidlaunch.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/asteroidlaunch.ogg_fa0902ba
rename to ogg/ships/misc/asteroidlaunch.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/attachpump.ogg_1b9261f5 b/ogg/ships/misc/attachpump.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/attachpump.ogg_1b9261f5
rename to ogg/ships/misc/attachpump.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/auto.ogg_1606e271 b/ogg/ships/misc/auto.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/auto.ogg_1606e271
rename to ogg/ships/misc/auto.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/badweather.ogg_43437e1d b/ogg/ships/misc/badweather.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/badweather.ogg_43437e1d
rename to ogg/ships/misc/badweather.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/barrel.ogg_b870ed66 b/ogg/ships/misc/barrel.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/barrel.ogg_b870ed66
rename to ogg/ships/misc/barrel.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/beep1.ogg_25b14257 b/ogg/ships/misc/beep1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/beep1.ogg_25b14257
rename to ogg/ships/misc/beep1.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/beep10.ogg_932bafbf b/ogg/ships/misc/beep10.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/beep10.ogg_932bafbf
rename to ogg/ships/misc/beep10.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/beep2.ogg_a0ee1993 b/ogg/ships/misc/beep2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/beep2.ogg_a0ee1993
rename to ogg/ships/misc/beep2.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/beep3.ogg_bae90b64 b/ogg/ships/misc/beep3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/beep3.ogg_bae90b64
rename to ogg/ships/misc/beep3.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/beep4.ogg_b2219395 b/ogg/ships/misc/beep4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/beep4.ogg_b2219395
rename to ogg/ships/misc/beep4.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/beep5.ogg_fb7eb6fd b/ogg/ships/misc/beep5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/beep5.ogg_fb7eb6fd
rename to ogg/ships/misc/beep5.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/beep6.ogg_9089cdae b/ogg/ships/misc/beep6.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/beep6.ogg_9089cdae
rename to ogg/ships/misc/beep6.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/beep7.ogg_4c3f5f2a b/ogg/ships/misc/beep7.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/beep7.ogg_4c3f5f2a
rename to ogg/ships/misc/beep7.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/beep8.ogg_64e94d33 b/ogg/ships/misc/beep8.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/beep8.ogg_64e94d33
rename to ogg/ships/misc/beep8.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/beep9.ogg_49daa554 b/ogg/ships/misc/beep9.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/beep9.ogg_49daa554
rename to ogg/ships/misc/beep9.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/boardfromaccesstube.ogg_3aab722d b/ogg/ships/misc/boardfromaccesstube.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/boardfromaccesstube.ogg_3aab722d
rename to ogg/ships/misc/boardfromaccesstube.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/boardship.ogg_e17034f4 b/ogg/ships/misc/boardship.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/boardship.ogg_e17034f4
rename to ogg/ships/misc/boardship.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/boom.ogg_59600cda b/ogg/ships/misc/boom.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/boom.ogg_59600cda
rename to ogg/ships/misc/boom.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/buttonpush.ogg_b0521797 b/ogg/ships/misc/buttonpush.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/buttonpush.ogg_b0521797
rename to ogg/ships/misc/buttonpush.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/buzzer.ogg_8ab9da35 b/ogg/ships/misc/buzzer.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/buzzer.ogg_8ab9da35
rename to ogg/ships/misc/buzzer.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/cargobaydamage.ogg_ad461ea9 b/ogg/ships/misc/cargobaydamage.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/cargobaydamage.ogg_ad461ea9
rename to ogg/ships/misc/cargobaydamage.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/cargonetlower.ogg_efefb897 b/ogg/ships/misc/cargonetlower.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/cargonetlower.ogg_efefb897
rename to ogg/ships/misc/cargonetlower.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/clamp1.ogg_6e22664c b/ogg/ships/misc/clamp1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/clamp1.ogg_6e22664c
rename to ogg/ships/misc/clamp1.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/clamp2.ogg_5a17f674 b/ogg/ships/misc/clamp2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/clamp2.ogg_5a17f674
rename to ogg/ships/misc/clamp2.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/clamp3.ogg_72ed167a b/ogg/ships/misc/clamp3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/clamp3.ogg_72ed167a
rename to ogg/ships/misc/clamp3.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/clock.ogg_760c8a8f b/ogg/ships/misc/clock.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/clock.ogg_760c8a8f
rename to ogg/ships/misc/clock.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/closeairlock-1.ogg_8bbdac18 b/ogg/ships/misc/closeairlock-1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/closeairlock-1.ogg_8bbdac18
rename to ogg/ships/misc/closeairlock-1.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/closeairlock.ogg_91b6dacc b/ogg/ships/misc/closeairlock.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/closeairlock.ogg_91b6dacc
rename to ogg/ships/misc/closeairlock.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/combatdrone.ogg_6234f9b4 b/ogg/ships/misc/combatdrone.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/combatdrone.ogg_6234f9b4
rename to ogg/ships/misc/combatdrone.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/controlstick1.ogg_86da2458 b/ogg/ships/misc/controlstick1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/controlstick1.ogg_86da2458
rename to ogg/ships/misc/controlstick1.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/controlstick2.ogg_7eed6469 b/ogg/ships/misc/controlstick2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/controlstick2.ogg_7eed6469
rename to ogg/ships/misc/controlstick2.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/controlstick3.ogg_f1cc0a10 b/ogg/ships/misc/controlstick3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/controlstick3.ogg_f1cc0a10
rename to ogg/ships/misc/controlstick3.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/cool.ogg_32b5ca13 b/ogg/ships/misc/cool.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/cool.ogg_32b5ca13
rename to ogg/ships/misc/cool.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/cordinsert.ogg_261be487 b/ogg/ships/misc/cordinsert.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/cordinsert.ogg_261be487
rename to ogg/ships/misc/cordinsert.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/courseset.ogg_a99cf148 b/ogg/ships/misc/courseset.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/courseset.ogg_a99cf148
rename to ogg/ships/misc/courseset.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/crash.ogg_a16c79eb b/ogg/ships/misc/crash.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/crash.ogg_a16c79eb
rename to ogg/ships/misc/crash.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/cycle.ogg_8cca8fbd b/ogg/ships/misc/cycle.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/cycle.ogg_8cca8fbd
rename to ogg/ships/misc/cycle.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/dock.ogg_543e1774 b/ogg/ships/misc/dock.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/dock.ogg_543e1774
rename to ogg/ships/misc/dock.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/dock1.ogg_73dc99a9 b/ogg/ships/misc/dock1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/dock1.ogg_73dc99a9
rename to ogg/ships/misc/dock1.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/dock2.ogg_8c7cd64c b/ogg/ships/misc/dock2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/dock2.ogg_8c7cd64c
rename to ogg/ships/misc/dock2.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/dockingairlock.ogg_0b143cda b/ogg/ships/misc/dockingairlock.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/dockingairlock.ogg_0b143cda
rename to ogg/ships/misc/dockingairlock.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/dockingbaydock.ogg_f406140f b/ogg/ships/misc/dockingbaydock.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/dockingbaydock.ogg_f406140f
rename to ogg/ships/misc/dockingbaydock.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/dockinginprogress.ogg_aaf0b760 b/ogg/ships/misc/dockinginprogress.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/dockinginprogress.ogg_aaf0b760
rename to ogg/ships/misc/dockinginprogress.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/doors.ogg_6a463a8b b/ogg/ships/misc/doors.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/doors.ogg_6a463a8b
rename to ogg/ships/misc/doors.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/dronein.ogg_9543b9ca b/ogg/ships/misc/dronein.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/dronein.ogg_9543b9ca
rename to ogg/ships/misc/dronein.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/droneout.ogg_d776bcd8 b/ogg/ships/misc/droneout.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/droneout.ogg_d776bcd8
rename to ogg/ships/misc/droneout.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/dronewheeling.ogg_6bf4ae59 b/ogg/ships/misc/dronewheeling.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/dronewheeling.ogg_6bf4ae59
rename to ogg/ships/misc/dronewheeling.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/electrocute.ogg_8426f28b b/ogg/ships/misc/electrocute.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/electrocute.ogg_8426f28b
rename to ogg/ships/misc/electrocute.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/enterauthcode.ogg_aacf136c b/ogg/ships/misc/enterauthcode.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/enterauthcode.ogg_aacf136c
rename to ogg/ships/misc/enterauthcode.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/entersector.ogg_20ab4e9e b/ogg/ships/misc/entersector.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/entersector.ogg_20ab4e9e
rename to ogg/ships/misc/entersector.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/error.ogg_e332ea80 b/ogg/ships/misc/error.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/error.ogg_e332ea80
rename to ogg/ships/misc/error.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/escape1.ogg_9a357fe3 b/ogg/ships/misc/escape1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/escape1.ogg_9a357fe3
rename to ogg/ships/misc/escape1.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/escape2.ogg_8020801a b/ogg/ships/misc/escape2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/escape2.ogg_8020801a
rename to ogg/ships/misc/escape2.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/escape3.ogg_27cc944a b/ogg/ships/misc/escape3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/escape3.ogg_27cc944a
rename to ogg/ships/misc/escape3.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/escape4.ogg_130d89b1 b/ogg/ships/misc/escape4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/escape4.ogg_130d89b1
rename to ogg/ships/misc/escape4.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/escape5.ogg_0aeb0704 b/ogg/ships/misc/escape5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/escape5.ogg_0aeb0704
rename to ogg/ships/misc/escape5.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/exitrift.ogg_55f4e38d b/ogg/ships/misc/exitrift.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/exitrift.ogg_55f4e38d
rename to ogg/ships/misc/exitrift.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/exitsector.ogg_99319471 b/ogg/ships/misc/exitsector.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/exitsector.ogg_99319471
rename to ogg/ships/misc/exitsector.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/exitship.ogg_698716d7 b/ogg/ships/misc/exitship.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/exitship.ogg_698716d7
rename to ogg/ships/misc/exitship.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/extendscoop.ogg_ba14aa64 b/ogg/ships/misc/extendscoop.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/extendscoop.ogg_ba14aa64
rename to ogg/ships/misc/extendscoop.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/fail.ogg_5a25c80f b/ogg/ships/misc/fail.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/fail.ogg_5a25c80f
rename to ogg/ships/misc/fail.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/finishdocking.ogg_a2406a47 b/ogg/ships/misc/finishdocking.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/finishdocking.ogg_a2406a47
rename to ogg/ships/misc/finishdocking.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/fuellinereplace.ogg_01ef1e59 b/ogg/ships/misc/fuellinereplace.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/fuellinereplace.ogg_01ef1e59
rename to ogg/ships/misc/fuellinereplace.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/garage.ogg_9efff04e b/ogg/ships/misc/garage.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/garage.ogg_9efff04e
rename to ogg/ships/misc/garage.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/grav1.ogg_0dbbf0c9 b/ogg/ships/misc/grav1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/grav1.ogg_0dbbf0c9
rename to ogg/ships/misc/grav1.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/grav2.ogg_693523a8 b/ogg/ships/misc/grav2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/grav2.ogg_693523a8
rename to ogg/ships/misc/grav2.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/hangar.ogg_0d08b97a b/ogg/ships/misc/hangar.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/hangar.ogg_0d08b97a
rename to ogg/ships/misc/hangar.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/hangar2.ogg_b89c1716 b/ogg/ships/misc/hangar2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/hangar2.ogg_b89c1716
rename to ogg/ships/misc/hangar2.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/heatshieldsalarm.ogg_b17c7cf0 b/ogg/ships/misc/heatshieldsalarm.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/heatshieldsalarm.ogg_b17c7cf0
rename to ogg/ships/misc/heatshieldsalarm.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/heatshieldsreduced.ogg_4fa95389 b/ogg/ships/misc/heatshieldsreduced.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/heatshieldsreduced.ogg_4fa95389
rename to ogg/ships/misc/heatshieldsreduced.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/hose.ogg_485059a4 b/ogg/ships/misc/hose.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/hose.ogg_485059a4
rename to ogg/ships/misc/hose.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/iclose.ogg_5638bf95 b/ogg/ships/misc/iclose.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/iclose.ogg_5638bf95
rename to ogg/ships/misc/iclose.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/installing.ogg_7d889543 b/ogg/ships/misc/installing.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/installing.ogg_7d889543
rename to ogg/ships/misc/installing.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/intruder.ogg_1cddbc4f b/ogg/ships/misc/intruder.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/intruder.ogg_1cddbc4f
rename to ogg/ships/misc/intruder.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/iopen.ogg_db0ead21 b/ogg/ships/misc/iopen.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/iopen.ogg_db0ead21
rename to ogg/ships/misc/iopen.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/landingpad.ogg_57f5f4a5 b/ogg/ships/misc/landingpad.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/landingpad.ogg_57f5f4a5
rename to ogg/ships/misc/landingpad.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/laser.ogg_ad243858 b/ogg/ships/misc/laser.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/laser.ogg_ad243858
rename to ogg/ships/misc/laser.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/lasers.ogg_b2100fb6 b/ogg/ships/misc/lasers.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/lasers.ogg_b2100fb6
rename to ogg/ships/misc/lasers.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/launch.ogg_62b0ff2b b/ogg/ships/misc/launch.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/launch.ogg_62b0ff2b
rename to ogg/ships/misc/launch.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/launchfromchunk.ogg_61fe81c2 b/ogg/ships/misc/launchfromchunk.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/launchfromchunk.ogg_61fe81c2
rename to ogg/ships/misc/launchfromchunk.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/launchfromdockingbay.ogg_9371f642 b/ogg/ships/misc/launchfromdockingbay.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/launchfromdockingbay.ogg_9371f642
rename to ogg/ships/misc/launchfromdockingbay.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/lever1.ogg_2b94fd8b b/ogg/ships/misc/lever1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/lever1.ogg_2b94fd8b
rename to ogg/ships/misc/lever1.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/lever2.ogg_38ed59bf b/ogg/ships/misc/lever2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/lever2.ogg_38ed59bf
rename to ogg/ships/misc/lever2.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/lever3.ogg_562b1452 b/ogg/ships/misc/lever3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/lever3.ogg_562b1452
rename to ogg/ships/misc/lever3.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/lever4.ogg_6966ef9e b/ogg/ships/misc/lever4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/lever4.ogg_6966ef9e
rename to ogg/ships/misc/lever4.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/lever5.ogg_a901124d b/ogg/ships/misc/lever5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/lever5.ogg_a901124d
rename to ogg/ships/misc/lever5.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/lights.ogg_91d1ae8c b/ogg/ships/misc/lights.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/lights.ogg_91d1ae8c
rename to ogg/ships/misc/lights.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/manual.ogg_99e42a68 b/ogg/ships/misc/manual.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/manual.ogg_99e42a68
rename to ogg/ships/misc/manual.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/missile.ogg_6b062754 b/ogg/ships/misc/missile.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/missile.ogg_6b062754
rename to ogg/ships/misc/missile.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/modulefinish.ogg_73651784 b/ogg/ships/misc/modulefinish.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/modulefinish.ogg_73651784
rename to ogg/ships/misc/modulefinish.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/modulemove1.ogg_118a41d2 b/ogg/ships/misc/modulemove1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/modulemove1.ogg_118a41d2
rename to ogg/ships/misc/modulemove1.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/modulemove2.ogg_be60a8bc b/ogg/ships/misc/modulemove2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/modulemove2.ogg_be60a8bc
rename to ogg/ships/misc/modulemove2.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/modulemove3.ogg_4c4bcf40 b/ogg/ships/misc/modulemove3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/modulemove3.ogg_4c4bcf40
rename to ogg/ships/misc/modulemove3.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/modulemove4.ogg_26bf85df b/ogg/ships/misc/modulemove4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/modulemove4.ogg_26bf85df
rename to ogg/ships/misc/modulemove4.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/modulemove5.ogg_18da46cd b/ogg/ships/misc/modulemove5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/modulemove5.ogg_18da46cd
rename to ogg/ships/misc/modulemove5.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/modulemove6.ogg_18ac08e7 b/ogg/ships/misc/modulemove6.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/modulemove6.ogg_18ac08e7
rename to ogg/ships/misc/modulemove6.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/modulemove7.ogg_4b4232d9 b/ogg/ships/misc/modulemove7.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/modulemove7.ogg_4b4232d9
rename to ogg/ships/misc/modulemove7.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/modulemove8.ogg_e41c1065 b/ogg/ships/misc/modulemove8.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/modulemove8.ogg_e41c1065
rename to ogg/ships/misc/modulemove8.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/netslam.ogg_729370e1 b/ogg/ships/misc/netslam.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/netslam.ogg_729370e1
rename to ogg/ships/misc/netslam.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/nopower.ogg_5f41292f b/ogg/ships/misc/nopower.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/nopower.ogg_5f41292f
rename to ogg/ships/misc/nopower.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/openairlock.ogg_82063ca3 b/ogg/ships/misc/openairlock.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/openairlock.ogg_82063ca3
rename to ogg/ships/misc/openairlock.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/otherlanding1.ogg_9f22309d b/ogg/ships/misc/otherlanding1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/otherlanding1.ogg_9f22309d
rename to ogg/ships/misc/otherlanding1.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/otherlanding2.ogg_31698b0f b/ogg/ships/misc/otherlanding2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/otherlanding2.ogg_31698b0f
rename to ogg/ships/misc/otherlanding2.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/otherlanding3.ogg_a46c5bd2 b/ogg/ships/misc/otherlanding3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/otherlanding3.ogg_a46c5bd2
rename to ogg/ships/misc/otherlanding3.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/otherlaunch1.ogg_c90471b9 b/ogg/ships/misc/otherlaunch1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/otherlaunch1.ogg_c90471b9
rename to ogg/ships/misc/otherlaunch1.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/otherlaunch2.ogg_eb595ccc b/ogg/ships/misc/otherlaunch2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/otherlaunch2.ogg_eb595ccc
rename to ogg/ships/misc/otherlaunch2.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/otherlaunch3.ogg_2561ef89 b/ogg/ships/misc/otherlaunch3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/otherlaunch3.ogg_2561ef89
rename to ogg/ships/misc/otherlaunch3.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/plasmacan.ogg_df2de565 b/ogg/ships/misc/plasmacan.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/plasmacan.ogg_df2de565
rename to ogg/ships/misc/plasmacan.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/poweroff.ogg_ecb71e87 b/ogg/ships/misc/poweroff.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/poweroff.ogg_ecb71e87
rename to ogg/ships/misc/poweroff.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/poweron.ogg_5fb98f4b b/ogg/ships/misc/poweron.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/poweron.ogg_5fb98f4b
rename to ogg/ships/misc/poweron.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/pressurize.ogg_c89fdd66 b/ogg/ships/misc/pressurize.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/pressurize.ogg_c89fdd66
rename to ogg/ships/misc/pressurize.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/ratikadetected.ogg_4867a5b6 b/ogg/ships/misc/ratikadetected.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/ratikadetected.ogg_4867a5b6
rename to ogg/ships/misc/ratikadetected.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/recharge.ogg_a90b4757 b/ogg/ships/misc/recharge.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/recharge.ogg_a90b4757
rename to ogg/ships/misc/recharge.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/repair1.ogg_3db28a95 b/ogg/ships/misc/repair1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/repair1.ogg_3db28a95
rename to ogg/ships/misc/repair1.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/repair2.ogg_8a217deb b/ogg/ships/misc/repair2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/repair2.ogg_8a217deb
rename to ogg/ships/misc/repair2.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/repair3.ogg_678d9613 b/ogg/ships/misc/repair3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/repair3.ogg_678d9613
rename to ogg/ships/misc/repair3.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/repair4.ogg_c2084e9d b/ogg/ships/misc/repair4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/repair4.ogg_c2084e9d
rename to ogg/ships/misc/repair4.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/repair5.ogg_2803c77e b/ogg/ships/misc/repair5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/repair5.ogg_2803c77e
rename to ogg/ships/misc/repair5.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/repair6.ogg_b6592df9 b/ogg/ships/misc/repair6.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/repair6.ogg_b6592df9
rename to ogg/ships/misc/repair6.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/repair7.ogg_6466872c b/ogg/ships/misc/repair7.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/repair7.ogg_6466872c
rename to ogg/ships/misc/repair7.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/repaircomplete.ogg_90283440 b/ogg/ships/misc/repaircomplete.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/repaircomplete.ogg_90283440
rename to ogg/ships/misc/repaircomplete.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/ret1.ogg_6c29b6d0 b/ogg/ships/misc/ret1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/ret1.ogg_6c29b6d0
rename to ogg/ships/misc/ret1.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/ret2.ogg_60dda129 b/ogg/ships/misc/ret2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/ret2.ogg_60dda129
rename to ogg/ships/misc/ret2.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/scan1.ogg_4ed3c591 b/ogg/ships/misc/scan1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/scan1.ogg_4ed3c591
rename to ogg/ships/misc/scan1.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/scan2.ogg_686e3152 b/ogg/ships/misc/scan2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/scan2.ogg_686e3152
rename to ogg/ships/misc/scan2.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/scoopretract.ogg_796e1163 b/ogg/ships/misc/scoopretract.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/scoopretract.ogg_796e1163
rename to ogg/ships/misc/scoopretract.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/shieldrecharge.ogg_084457a8 b/ogg/ships/misc/shieldrecharge.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/shieldrecharge.ogg_084457a8
rename to ogg/ships/misc/shieldrecharge.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/shipassend.ogg_cc95890b b/ogg/ships/misc/shipassend.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/shipassend.ogg_cc95890b
rename to ogg/ships/misc/shipassend.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/shipattach.ogg_2fa77a85 b/ogg/ships/misc/shipattach.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/shipattach.ogg_2fa77a85
rename to ogg/ships/misc/shipattach.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/shiprift.ogg_38a0bf9c b/ogg/ships/misc/shiprift.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/shiprift.ogg_38a0bf9c
rename to ogg/ships/misc/shiprift.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/solarflare.ogg_ae7da1ed b/ogg/ships/misc/solarflare.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/solarflare.ogg_ae7da1ed
rename to ogg/ships/misc/solarflare.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/stargate.ogg_811d4e06 b/ogg/ships/misc/stargate.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/stargate.ogg_811d4e06
rename to ogg/ships/misc/stargate.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/starprobelaunch.ogg_0ac63be2 b/ogg/ships/misc/starprobelaunch.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/starprobelaunch.ogg_0ac63be2
rename to ogg/ships/misc/starprobelaunch.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/startdocking.ogg_964e6bd3 b/ogg/ships/misc/startdocking.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/startdocking.ogg_964e6bd3
rename to ogg/ships/misc/startdocking.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/stationairlock.ogg_06cf051a b/ogg/ships/misc/stationairlock.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/stationairlock.ogg_06cf051a
rename to ogg/ships/misc/stationairlock.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/subatomicdrive.ogg_d9a24164 b/ogg/ships/misc/subatomicdrive.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/subatomicdrive.ogg_d9a24164
rename to ogg/ships/misc/subatomicdrive.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/subatomicfuelpump.ogg_8ee07130 b/ogg/ships/misc/subatomicfuelpump.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/subatomicfuelpump.ogg_8ee07130
rename to ogg/ships/misc/subatomicfuelpump.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/switch.ogg_682d3a4a b/ogg/ships/misc/switch.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/switch.ogg_682d3a4a
rename to ogg/ships/misc/switch.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/tankdock.ogg_d3015469 b/ogg/ships/misc/tankdock.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/tankdock.ogg_d3015469
rename to ogg/ships/misc/tankdock.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/tankundock.ogg_16664b3a b/ogg/ships/misc/tankundock.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/tankundock.ogg_16664b3a
rename to ogg/ships/misc/tankundock.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/tannoy.ogg_91700196 b/ogg/ships/misc/tannoy.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/tannoy.ogg_91700196
rename to ogg/ships/misc/tannoy.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/taxidock.ogg_1a696595 b/ogg/ships/misc/taxidock.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/taxidock.ogg_1a696595
rename to ogg/ships/misc/taxidock.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/transferend.ogg_8f092a21 b/ogg/ships/misc/transferend.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/transferend.ogg_8f092a21
rename to ogg/ships/misc/transferend.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/transferstardata.ogg_c453493a b/ogg/ships/misc/transferstardata.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/transferstardata.ogg_c453493a
rename to ogg/ships/misc/transferstardata.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/transferstart.ogg_aecb648b b/ogg/ships/misc/transferstart.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/transferstart.ogg_aecb648b
rename to ogg/ships/misc/transferstart.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/transportaccesstube.ogg_252d751b b/ogg/ships/misc/transportaccesstube.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/transportaccesstube.ogg_252d751b
rename to ogg/ships/misc/transportaccesstube.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/transporthangar.ogg_64e10bd2 b/ogg/ships/misc/transporthangar.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/transporthangar.ogg_64e10bd2
rename to ogg/ships/misc/transporthangar.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/undock.ogg_b5c9370e b/ogg/ships/misc/undock.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/undock.ogg_b5c9370e
rename to ogg/ships/misc/undock.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/unwind.ogg_cde51722 b/ogg/ships/misc/unwind.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/unwind.ogg_cde51722
rename to ogg/ships/misc/unwind.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/upggood.ogg_9b756aad b/ogg/ships/misc/upggood.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/upggood.ogg_9b756aad
rename to ogg/ships/misc/upggood.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/upgrade.ogg_1f94e237 b/ogg/ships/misc/upgrade.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/upgrade.ogg_1f94e237
rename to ogg/ships/misc/upgrade.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/upgred.ogg_bb520db9 b/ogg/ships/misc/upgred.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/upgred.ogg_bb520db9
rename to ogg/ships/misc/upgred.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/upgyellow.ogg_55abf96a b/ogg/ships/misc/upgyellow.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/upgyellow.ogg_55abf96a
rename to ogg/ships/misc/upgyellow.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/vent.ogg_4127b632 b/ogg/ships/misc/vent.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/vent.ogg_4127b632
rename to ogg/ships/misc/vent.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/warpcoreopen.ogg_d5012714 b/ogg/ships/misc/warpcoreopen.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/warpcoreopen.ogg_d5012714
rename to ogg/ships/misc/warpcoreopen.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/warpfuel.ogg_37bd3560 b/ogg/ships/misc/warpfuel.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/warpfuel.ogg_37bd3560
rename to ogg/ships/misc/warpfuel.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/whine.ogg_21aa91b8 b/ogg/ships/misc/whine.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/whine.ogg_21aa91b8
rename to ogg/ships/misc/whine.ogg
diff --git a/ogg/ships_1e7b5cfa/misc_a6b8ca73/wind.ogg_ccf12b2c b/ogg/ships/misc/wind.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/misc_a6b8ca73/wind.ogg_ccf12b2c
rename to ogg/ships/misc/wind.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/acceleration-old1.ogg_ad6fd7e1 b/ogg/ships/movement/acceleration-old1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/acceleration-old1.ogg_ad6fd7e1
rename to ogg/ships/movement/acceleration-old1.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/acceleration.ogg_fe55cb1e b/ogg/ships/movement/acceleration.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/acceleration.ogg_fe55cb1e
rename to ogg/ships/movement/acceleration.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/acceleration1.ogg_13b12435 b/ogg/ships/movement/acceleration1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/acceleration1.ogg_13b12435
rename to ogg/ships/movement/acceleration1.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/beaconlanding.ogg_5969943f b/ogg/ships/movement/beaconlanding.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/beaconlanding.ogg_5969943f
rename to ogg/ships/movement/beaconlanding.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/beaconlaunch.ogg_17e82d4b b/ogg/ships/movement/beaconlaunch.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/beaconlaunch.ogg_17e82d4b
rename to ogg/ships/movement/beaconlaunch.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/deceleration.ogg_e55e281f b/ogg/ships/movement/deceleration.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/deceleration.ogg_e55e281f
rename to ogg/ships/movement/deceleration.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/deceleration1.ogg_4a7d88c0 b/ogg/ships/movement/deceleration1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/deceleration1.ogg_4a7d88c0
rename to ogg/ships/movement/deceleration1.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/dockinggearretract.ogg_88e6b083 b/ogg/ships/movement/dockinggearretract.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/dockinggearretract.ogg_88e6b083
rename to ogg/ships/movement/dockinggearretract.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/factorylandcomplete.ogg_1496f7f3 b/ogg/ships/movement/factorylandcomplete.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/factorylandcomplete.ogg_1496f7f3
rename to ogg/ships/movement/factorylandcomplete.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/factorylanding.ogg_2dcc961c b/ogg/ships/movement/factorylanding.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/factorylanding.ogg_2dcc961c
rename to ogg/ships/movement/factorylanding.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/gravjump.ogg_3f408c0a b/ogg/ships/movement/gravjump.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/gravjump.ogg_3f408c0a
rename to ogg/ships/movement/gravjump.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/landing1.ogg_b431c469 b/ogg/ships/movement/landing1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/landing1.ogg_b431c469
rename to ogg/ships/movement/landing1.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/landing2.ogg_d75c795e b/ogg/ships/movement/landing2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/landing2.ogg_d75c795e
rename to ogg/ships/movement/landing2.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/landing3.ogg_223b4d27 b/ogg/ships/movement/landing3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/landing3.ogg_223b4d27
rename to ogg/ships/movement/landing3.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/landing4.ogg_fcb2bdc5 b/ogg/ships/movement/landing4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/landing4.ogg_fcb2bdc5
rename to ogg/ships/movement/landing4.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/launch1.ogg_763858eb b/ogg/ships/movement/launch1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/launch1.ogg_763858eb
rename to ogg/ships/movement/launch1.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/launch10.ogg_2bde2dbc b/ogg/ships/movement/launch10.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/launch10.ogg_2bde2dbc
rename to ogg/ships/movement/launch10.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/launch2.ogg_8a24ed1e b/ogg/ships/movement/launch2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/launch2.ogg_8a24ed1e
rename to ogg/ships/movement/launch2.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/launch3.ogg_c9f91ac0 b/ogg/ships/movement/launch3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/launch3.ogg_c9f91ac0
rename to ogg/ships/movement/launch3.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/launch4.ogg_b2c30e0c b/ogg/ships/movement/launch4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/launch4.ogg_b2c30e0c
rename to ogg/ships/movement/launch4.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/launch5.ogg_919c8f34 b/ogg/ships/movement/launch5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/launch5.ogg_919c8f34
rename to ogg/ships/movement/launch5.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/launch6.ogg_fa670dba b/ogg/ships/movement/launch6.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/launch6.ogg_fa670dba
rename to ogg/ships/movement/launch6.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/launch7.ogg_ce8f0fdd b/ogg/ships/movement/launch7.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/launch7.ogg_ce8f0fdd
rename to ogg/ships/movement/launch7.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/launch8.ogg_71a1beba b/ogg/ships/movement/launch8.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/launch8.ogg_71a1beba
rename to ogg/ships/movement/launch8.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/launch9.ogg_d68a7bd1 b/ogg/ships/movement/launch9.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/launch9.ogg_d68a7bd1
rename to ogg/ships/movement/launch9.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/quantime.ogg_5a2e12e6 b/ogg/ships/movement/quantime.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/quantime.ogg_5a2e12e6
rename to ogg/ships/movement/quantime.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/quantimeend.ogg_9b7246cb b/ogg/ships/movement/quantimeend.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/quantimeend.ogg_9b7246cb
rename to ogg/ships/movement/quantimeend.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/quantimeengine.ogg_08b444c3 b/ogg/ships/movement/quantimeengine.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/quantimeengine.ogg_08b444c3
rename to ogg/ships/movement/quantimeengine.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/quantimestart.ogg_d8685bb2 b/ogg/ships/movement/quantimestart.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/quantimestart.ogg_d8685bb2
rename to ogg/ships/movement/quantimestart.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/rocket.ogg_2f91cdc6 b/ogg/ships/movement/rocket.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/rocket.ogg_2f91cdc6
rename to ogg/ships/movement/rocket.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/shipascend.ogg_dcdf8e15 b/ogg/ships/movement/shipascend.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/shipascend.ogg_dcdf8e15
rename to ogg/ships/movement/shipascend.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/shipdescend.ogg_4591c3e0 b/ogg/ships/movement/shipdescend.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/shipdescend.ogg_4591c3e0
rename to ogg/ships/movement/shipdescend.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/shipland.ogg_96f0493a b/ogg/ships/movement/shipland.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/shipland.ogg_96f0493a
rename to ogg/ships/movement/shipland.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/shipmove.ogg_faacfc57 b/ogg/ships/movement/shipmove.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/shipmove.ogg_faacfc57
rename to ogg/ships/movement/shipmove.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/shipmove1.ogg_64f75623 b/ogg/ships/movement/shipmove1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/shipmove1.ogg_64f75623
rename to ogg/ships/movement/shipmove1.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/shipthrum.ogg_fdfafbce b/ogg/ships/movement/shipthrum.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/shipthrum.ogg_fdfafbce
rename to ogg/ships/movement/shipthrum.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/stargate.ogg_e7bd832f b/ogg/ships/movement/stargate.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/stargate.ogg_e7bd832f
rename to ogg/ships/movement/stargate.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/warp.ogg_9d52929b b/ogg/ships/movement/warp.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/warp.ogg_9d52929b
rename to ogg/ships/movement/warp.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/warpacceleration.ogg_b824b938 b/ogg/ships/movement/warpacceleration.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/warpacceleration.ogg_b824b938
rename to ogg/ships/movement/warpacceleration.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/warpend.ogg_725700ac b/ogg/ships/movement/warpend.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/warpend.ogg_725700ac
rename to ogg/ships/movement/warpend.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/warpengine.ogg_13f596d2 b/ogg/ships/movement/warpengine.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/warpengine.ogg_13f596d2
rename to ogg/ships/movement/warpengine.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/wormhole.ogg_ee69746c b/ogg/ships/movement/wormhole.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/wormhole.ogg_ee69746c
rename to ogg/ships/movement/wormhole.ogg
diff --git a/ogg/ships_1e7b5cfa/movement_a29538d5/wormhole2.ogg_10a5f0cc b/ogg/ships/movement/wormhole2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/movement_a29538d5/wormhole2.ogg_10a5f0cc
rename to ogg/ships/movement/wormhole2.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/alarm.ogg_4cead3bc b/ogg/ships/pd/alarm.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/alarm.ogg_4cead3bc
rename to ogg/ships/pd/alarm.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/alarm2.ogg_fa681de6 b/ogg/ships/pd/alarm2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/alarm2.ogg_fa681de6
rename to ogg/ships/pd/alarm2.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/check.ogg_e034c89d b/ogg/ships/pd/check.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/check.ogg_e034c89d
rename to ogg/ships/pd/check.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/cooling.ogg_2f98f3cc b/ogg/ships/pd/cooling.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/cooling.ogg_2f98f3cc
rename to ogg/ships/pd/cooling.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/deploy.ogg_e04a22a7 b/ogg/ships/pd/deploy.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/deploy.ogg_e04a22a7
rename to ogg/ships/pd/deploy.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/enemycome1.ogg_c05db764 b/ogg/ships/pd/enemycome1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/enemycome1.ogg_c05db764
rename to ogg/ships/pd/enemycome1.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/enemycome2.ogg_13271066 b/ogg/ships/pd/enemycome2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/enemycome2.ogg_13271066
rename to ogg/ships/pd/enemycome2.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/enemyshoot.ogg_d8f3f2cd b/ogg/ships/pd/enemyshoot.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/enemyshoot.ogg_d8f3f2cd
rename to ogg/ships/pd/enemyshoot.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/fire1.ogg_1d3f5b04 b/ogg/ships/pd/fire1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/fire1.ogg_1d3f5b04
rename to ogg/ships/pd/fire1.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/fire2.ogg_477705b6 b/ogg/ships/pd/fire2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/fire2.ogg_477705b6
rename to ogg/ships/pd/fire2.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/fire3.ogg_cb68b44d b/ogg/ships/pd/fire3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/fire3.ogg_cb68b44d
rename to ogg/ships/pd/fire3.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/hit1.ogg_9ec7a091 b/ogg/ships/pd/hit1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/hit1.ogg_9ec7a091
rename to ogg/ships/pd/hit1.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/hit2.ogg_2f842643 b/ogg/ships/pd/hit2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/hit2.ogg_2f842643
rename to ogg/ships/pd/hit2.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/hit3.ogg_6f2ad209 b/ogg/ships/pd/hit3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/hit3.ogg_6f2ad209
rename to ogg/ships/pd/hit3.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/link.ogg_0b3dc23c b/ogg/ships/pd/link.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/link.ogg_0b3dc23c
rename to ogg/ships/pd/link.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/miss.ogg_ed4a3712 b/ogg/ships/pd/miss.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/miss.ogg_ed4a3712
rename to ogg/ships/pd/miss.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/move1.ogg_f6cf36c1 b/ogg/ships/pd/move1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/move1.ogg_f6cf36c1
rename to ogg/ships/pd/move1.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/move2.ogg_114ae92b b/ogg/ships/pd/move2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/move2.ogg_114ae92b
rename to ogg/ships/pd/move2.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/move3.ogg_58878bab b/ogg/ships/pd/move3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/move3.ogg_58878bab
rename to ogg/ships/pd/move3.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/move4.ogg_173aff8c b/ogg/ships/pd/move4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/move4.ogg_173aff8c
rename to ogg/ships/pd/move4.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/repair.ogg_3b8b7696 b/ogg/ships/pd/repair.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/repair.ogg_3b8b7696
rename to ogg/ships/pd/repair.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/woosh.ogg_d7856404 b/ogg/ships/pd/woosh.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/woosh.ogg_d7856404
rename to ogg/ships/pd/woosh.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/youexplode.ogg_f15245bd b/ogg/ships/pd/youexplode.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/youexplode.ogg_f15245bd
rename to ogg/ships/pd/youexplode.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/youhit1.ogg_c55eb952 b/ogg/ships/pd/youhit1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/youhit1.ogg_c55eb952
rename to ogg/ships/pd/youhit1.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/youhit2.ogg_7777e61b b/ogg/ships/pd/youhit2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/youhit2.ogg_7777e61b
rename to ogg/ships/pd/youhit2.ogg
diff --git a/ogg/ships_1e7b5cfa/pd_99ad932d/youhit3.ogg_48566afe b/ogg/ships/pd/youhit3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/pd_99ad932d/youhit3.ogg_48566afe
rename to ogg/ships/pd/youhit3.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/alarm.ogg_35454ef7 b/ogg/ships/ratika/alarm.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/alarm.ogg_35454ef7
rename to ogg/ships/ratika/alarm.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/belch.ogg_e4051108 b/ogg/ships/ratika/belch.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/belch.ogg_e4051108
rename to ogg/ships/ratika/belch.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/bite.ogg_a1a7c229 b/ogg/ships/ratika/bite.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/bite.ogg_a1a7c229
rename to ogg/ships/ratika/bite.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/bottle.ogg_f8675918 b/ogg/ships/ratika/bottle.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/bottle.ogg_f8675918
rename to ogg/ships/ratika/bottle.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/break.ogg_1e656915 b/ogg/ships/ratika/break.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/break.ogg_1e656915
rename to ogg/ships/ratika/break.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/build1.ogg_8ba21835 b/ogg/ships/ratika/build1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/build1.ogg_8ba21835
rename to ogg/ships/ratika/build1.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/build2.ogg_d305e236 b/ogg/ships/ratika/build2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/build2.ogg_d305e236
rename to ogg/ships/ratika/build2.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/build3.ogg_63823ff3 b/ogg/ships/ratika/build3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/build3.ogg_63823ff3
rename to ogg/ships/ratika/build3.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/build4.ogg_a43d8926 b/ogg/ships/ratika/build4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/build4.ogg_a43d8926
rename to ogg/ships/ratika/build4.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/build5.ogg_8bccbf85 b/ogg/ships/ratika/build5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/build5.ogg_8bccbf85
rename to ogg/ships/ratika/build5.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/build6.ogg_c5415ca6 b/ogg/ships/ratika/build6.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/build6.ogg_c5415ca6
rename to ogg/ships/ratika/build6.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/build7.ogg_c266666f b/ogg/ships/ratika/build7.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/build7.ogg_c266666f
rename to ogg/ships/ratika/build7.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/build8.ogg_4f3dc2e9 b/ogg/ships/ratika/build8.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/build8.ogg_4f3dc2e9
rename to ogg/ships/ratika/build8.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/build9.ogg_89915a3b b/ogg/ships/ratika/build9.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/build9.ogg_89915a3b
rename to ogg/ships/ratika/build9.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/cage.ogg_475d4253 b/ogg/ships/ratika/cage.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/cage.ogg_475d4253
rename to ogg/ships/ratika/cage.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/claw.ogg_e2270255 b/ogg/ships/ratika/claw.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/claw.ogg_e2270255
rename to ogg/ships/ratika/claw.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/dead.ogg_50741d13 b/ogg/ships/ratika/dead.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/dead.ogg_50741d13
rename to ogg/ships/ratika/dead.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/drink.ogg_df70f497 b/ogg/ships/ratika/drink.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/drink.ogg_df70f497
rename to ogg/ships/ratika/drink.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/eat.ogg_a1146531 b/ogg/ships/ratika/eat.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/eat.ogg_a1146531
rename to ogg/ships/ratika/eat.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/egg.ogg_966225c3 b/ogg/ships/ratika/egg.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/egg.ogg_966225c3
rename to ogg/ships/ratika/egg.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/emptyspray.ogg_eefce8cb b/ogg/ships/ratika/emptyspray.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/emptyspray.ogg_eefce8cb
rename to ogg/ships/ratika/emptyspray.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/error.ogg_d1514ec3 b/ogg/ships/ratika/error.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/error.ogg_d1514ec3
rename to ogg/ships/ratika/error.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/extinguisher.ogg_df23a8f2 b/ogg/ships/ratika/extinguisher.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/extinguisher.ogg_df23a8f2
rename to ogg/ships/ratika/extinguisher.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/fall.ogg_69fe724f b/ogg/ships/ratika/fall.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/fall.ogg_69fe724f
rename to ogg/ships/ratika/fall.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/guard.ogg_b511c298 b/ogg/ships/ratika/guard.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/guard.ogg_b511c298
rename to ogg/ships/ratika/guard.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/hit.ogg_53e3f7c5 b/ogg/ships/ratika/hit.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/hit.ogg_53e3f7c5
rename to ogg/ships/ratika/hit.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/hole.ogg_e1807223 b/ogg/ships/ratika/hole.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/hole.ogg_e1807223
rename to ogg/ships/ratika/hole.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/laser.ogg_9dc3af62 b/ogg/ships/ratika/laser.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/laser.ogg_9dc3af62
rename to ogg/ships/ratika/laser.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/lasers.ogg_428734a1 b/ogg/ships/ratika/lasers.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/lasers.ogg_428734a1
rename to ogg/ships/ratika/lasers.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/noise.ogg_08d7b5bb b/ogg/ships/ratika/noise.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/noise.ogg_08d7b5bb
rename to ogg/ships/ratika/noise.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/pod.ogg_f29f1dbc b/ogg/ships/ratika/pod.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/pod.ogg_f29f1dbc
rename to ogg/ships/ratika/pod.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/pop.ogg_9faf4e29 b/ogg/ships/ratika/pop.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/pop.ogg_9faf4e29
rename to ogg/ships/ratika/pop.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/powerdown.ogg_82eab1d8 b/ogg/ships/ratika/powerdown.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/powerdown.ogg_82eab1d8
rename to ogg/ships/ratika/powerdown.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/powerup.ogg_57510ac6 b/ogg/ships/ratika/powerup.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/powerup.ogg_57510ac6
rename to ogg/ships/ratika/powerup.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/ratappear.ogg_065b137d b/ogg/ships/ratika/ratappear.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/ratappear.ogg_065b137d
rename to ogg/ships/ratika/ratappear.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/ratikadetected.ogg_4acccddc b/ogg/ships/ratika/ratikadetected.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/ratikadetected.ogg_4acccddc
rename to ogg/ships/ratika/ratikadetected.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/repair.ogg_26fb73fc b/ogg/ships/ratika/repair.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/repair.ogg_26fb73fc
rename to ogg/ships/ratika/repair.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/repair_605f8a7d/1.ogg_65edc10a b/ogg/ships/ratika/repair/1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/repair_605f8a7d/1.ogg_65edc10a
rename to ogg/ships/ratika/repair/1.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/repair_605f8a7d/2.ogg_6f49e31e b/ogg/ships/ratika/repair/2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/repair_605f8a7d/2.ogg_6f49e31e
rename to ogg/ships/ratika/repair/2.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/repair_605f8a7d/3.ogg_835534bc b/ogg/ships/ratika/repair/3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/repair_605f8a7d/3.ogg_835534bc
rename to ogg/ships/ratika/repair/3.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/repair_605f8a7d/4.ogg_70c1535d b/ogg/ships/ratika/repair/4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/repair_605f8a7d/4.ogg_70c1535d
rename to ogg/ships/ratika/repair/4.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/repair_605f8a7d/5.ogg_24d8a5a1 b/ogg/ships/ratika/repair/5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/repair_605f8a7d/5.ogg_24d8a5a1
rename to ogg/ships/ratika/repair/5.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/repair_605f8a7d/6.ogg_8763084c b/ogg/ships/ratika/repair/6.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/repair_605f8a7d/6.ogg_8763084c
rename to ogg/ships/ratika/repair/6.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/repair_605f8a7d/repair.ogg_80aea90d b/ogg/ships/ratika/repair/repair.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/repair_605f8a7d/repair.ogg_80aea90d
rename to ogg/ships/ratika/repair/repair.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/siren.ogg_315f2b08 b/ogg/ships/ratika/siren.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/siren.ogg_315f2b08
rename to ogg/ships/ratika/siren.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/snap.ogg_fc730e15 b/ogg/ships/ratika/snap.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/snap.ogg_fc730e15
rename to ogg/ships/ratika/snap.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/sniff.ogg_558b0a45 b/ogg/ships/ratika/sniff.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/sniff.ogg_558b0a45
rename to ogg/ships/ratika/sniff.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/sparks.ogg_32601c5e b/ogg/ships/ratika/sparks.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/sparks.ogg_32601c5e
rename to ogg/ships/ratika/sparks.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/spray.ogg_ee747903 b/ogg/ships/ratika/spray.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/spray.ogg_ee747903
rename to ogg/ships/ratika/spray.ogg
diff --git a/ogg/ships_1e7b5cfa/ratika_48323727/transform.ogg_2c2da76d b/ogg/ships/ratika/transform.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/ratika_48323727/transform.ogg_2c2da76d
rename to ogg/ships/ratika/transform.ogg
diff --git a/ogg/ships_1e7b5cfa/rep_9c339707/bre1.ogg_39d3c110 b/ogg/ships/rep/bre1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rep_9c339707/bre1.ogg_39d3c110
rename to ogg/ships/rep/bre1.ogg
diff --git a/ogg/ships_1e7b5cfa/rep_9c339707/bre2.ogg_787c7d2d b/ogg/ships/rep/bre2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rep_9c339707/bre2.ogg_787c7d2d
rename to ogg/ships/rep/bre2.ogg
diff --git a/ogg/ships_1e7b5cfa/rep_9c339707/c.ogg_b156f113 b/ogg/ships/rep/c.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rep_9c339707/c.ogg_b156f113
rename to ogg/ships/rep/c.ogg
diff --git a/ogg/ships_1e7b5cfa/rep_9c339707/c1.ogg_c1309838 b/ogg/ships/rep/c1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rep_9c339707/c1.ogg_c1309838
rename to ogg/ships/rep/c1.ogg
diff --git a/ogg/ships_1e7b5cfa/rep_9c339707/c2.ogg_0e5d34d6 b/ogg/ships/rep/c2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rep_9c339707/c2.ogg_0e5d34d6
rename to ogg/ships/rep/c2.ogg
diff --git a/ogg/ships_1e7b5cfa/rep_9c339707/c3.ogg_572eceba b/ogg/ships/rep/c3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rep_9c339707/c3.ogg_572eceba
rename to ogg/ships/rep/c3.ogg
diff --git a/ogg/ships_1e7b5cfa/rep_9c339707/c4.ogg_53a58edc b/ogg/ships/rep/c4.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rep_9c339707/c4.ogg_53a58edc
rename to ogg/ships/rep/c4.ogg
diff --git a/ogg/ships_1e7b5cfa/rep_9c339707/c5.ogg_e2382a6d b/ogg/ships/rep/c5.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rep_9c339707/c5.ogg_e2382a6d
rename to ogg/ships/rep/c5.ogg
diff --git a/ogg/ships_1e7b5cfa/rep_9c339707/c6.ogg_b888262d b/ogg/ships/rep/c6.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rep_9c339707/c6.ogg_b888262d
rename to ogg/ships/rep/c6.ogg
diff --git a/ogg/ships_1e7b5cfa/rep_9c339707/doorc.ogg_f40264fa b/ogg/ships/rep/doorc.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rep_9c339707/doorc.ogg_f40264fa
rename to ogg/ships/rep/doorc.ogg
diff --git a/ogg/ships_1e7b5cfa/rep_9c339707/dooro.ogg_fad59a95 b/ogg/ships/rep/dooro.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rep_9c339707/dooro.ogg_fad59a95
rename to ogg/ships/rep/dooro.ogg
diff --git a/ogg/ships_1e7b5cfa/rep_9c339707/f1.ogg_b0a3c374 b/ogg/ships/rep/f1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rep_9c339707/f1.ogg_b0a3c374
rename to ogg/ships/rep/f1.ogg
diff --git a/ogg/ships_1e7b5cfa/rep_9c339707/f2.ogg_ca19433d b/ogg/ships/rep/f2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rep_9c339707/f2.ogg_ca19433d
rename to ogg/ships/rep/f2.ogg
diff --git a/ogg/ships_1e7b5cfa/rep_9c339707/f3.ogg_0c661112 b/ogg/ships/rep/f3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rep_9c339707/f3.ogg_0c661112
rename to ogg/ships/rep/f3.ogg
diff --git a/ogg/ships_1e7b5cfa/rep_9c339707/hullbreech.ogg_cb4f110e b/ogg/ships/rep/hullbreech.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rep_9c339707/hullbreech.ogg_cb4f110e
rename to ogg/ships/rep/hullbreech.ogg
diff --git a/ogg/ships_1e7b5cfa/rep_9c339707/ooro.ogg_00529d01 b/ogg/ships/rep/ooro.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rep_9c339707/ooro.ogg_00529d01
rename to ogg/ships/rep/ooro.ogg
diff --git a/ogg/ships_1e7b5cfa/rep_9c339707/r1.ogg_d9a15730 b/ogg/ships/rep/r1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rep_9c339707/r1.ogg_d9a15730
rename to ogg/ships/rep/r1.ogg
diff --git a/ogg/ships_1e7b5cfa/rep_9c339707/r2.ogg_f0de3403 b/ogg/ships/rep/r2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rep_9c339707/r2.ogg_f0de3403
rename to ogg/ships/rep/r2.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/airlock.ogg_4d3f943e b/ogg/ships/rooms/airlock.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/airlock.ogg_4d3f943e
rename to ogg/ships/rooms/airlock.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/ammochamber.ogg_df06899c b/ogg/ships/rooms/ammochamber.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/ammochamber.ogg_df06899c
rename to ogg/ships/rooms/ammochamber.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/bridge1.ogg_3f4ef2d7 b/ogg/ships/rooms/bridge1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/bridge1.ogg_3f4ef2d7
rename to ogg/ships/rooms/bridge1.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/bridge2.ogg_6e66f9b7 b/ogg/ships/rooms/bridge2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/bridge2.ogg_6e66f9b7
rename to ogg/ships/rooms/bridge2.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/bridge3.ogg_6b792111 b/ogg/ships/rooms/bridge3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/bridge3.ogg_6b792111
rename to ogg/ships/rooms/bridge3.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/briefingroom.ogg_a08af579 b/ogg/ships/rooms/briefingroom.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/briefingroom.ogg_a08af579
rename to ogg/ships/rooms/briefingroom.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/capsule.ogg_370a04e3 b/ogg/ships/rooms/capsule.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/capsule.ogg_370a04e3
rename to ogg/ships/rooms/capsule.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/cargobay.ogg_de004225 b/ogg/ships/rooms/cargobay.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/cargobay.ogg_de004225
rename to ogg/ships/rooms/cargobay.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/cockpit.ogg_aef8f970 b/ogg/ships/rooms/cockpit.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/cockpit.ogg_aef8f970
rename to ogg/ships/rooms/cockpit.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/commandchamber.ogg_ceac97d5 b/ogg/ships/rooms/commandchamber.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/commandchamber.ogg_ceac97d5
rename to ogg/ships/rooms/commandchamber.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/controlroom.ogg_9c8671b1 b/ogg/ships/rooms/controlroom.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/controlroom.ogg_9c8671b1
rename to ogg/ships/rooms/controlroom.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/corridor.ogg_58b521b5 b/ogg/ships/rooms/corridor.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/corridor.ogg_58b521b5
rename to ogg/ships/rooms/corridor.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/deck.ogg_161ece92 b/ogg/ships/rooms/deck.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/deck.ogg_161ece92
rename to ogg/ships/rooms/deck.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/dockingbay.ogg_6091447a b/ogg/ships/rooms/dockingbay.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/dockingbay.ogg_6091447a
rename to ogg/ships/rooms/dockingbay.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/dronebay.ogg_84cf42f2 b/ogg/ships/rooms/dronebay.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/dronebay.ogg_84cf42f2
rename to ogg/ships/rooms/dronebay.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/engineering.ogg_dee36889 b/ogg/ships/rooms/engineering.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/engineering.ogg_dee36889
rename to ogg/ships/rooms/engineering.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/forest.ogg_3cc4b066 b/ogg/ships/rooms/forest.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/forest.ogg_3cc4b066
rename to ogg/ships/rooms/forest.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/galley.ogg_39ed63f4 b/ogg/ships/rooms/galley.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/galley.ogg_39ed63f4
rename to ogg/ships/rooms/galley.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/holodeck.ogg_702b0ca8 b/ogg/ships/rooms/holodeck.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/holodeck.ogg_702b0ca8
rename to ogg/ships/rooms/holodeck.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/jungle.ogg_9adf218f b/ogg/ships/rooms/jungle.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/jungle.ogg_9adf218f
rename to ogg/ships/rooms/jungle.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/lake.ogg_6cefa580 b/ogg/ships/rooms/lake.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/lake.ogg_6cefa580
rename to ogg/ships/rooms/lake.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/livingquarters.ogg_36cd35bb b/ogg/ships/rooms/livingquarters.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/livingquarters.ogg_36cd35bb
rename to ogg/ships/rooms/livingquarters.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/lounge.ogg_996b60c9 b/ogg/ships/rooms/lounge.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/lounge.ogg_996b60c9
rename to ogg/ships/rooms/lounge.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/medicalcenter.ogg_874a52fe b/ogg/ships/rooms/medicalcenter.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/medicalcenter.ogg_874a52fe
rename to ogg/ships/rooms/medicalcenter.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/observationroom.ogg_ed2719ea b/ogg/ships/rooms/observationroom.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/observationroom.ogg_ed2719ea
rename to ogg/ships/rooms/observationroom.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/poolroom.ogg_a724100b b/ogg/ships/rooms/poolroom.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/poolroom.ogg_a724100b
rename to ogg/ships/rooms/poolroom.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/relaxation.ogg_073cddfd b/ogg/ships/rooms/relaxation.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/relaxation.ogg_073cddfd
rename to ogg/ships/rooms/relaxation.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/sphere.ogg_ba52a353 b/ogg/ships/rooms/sphere.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/sphere.ogg_ba52a353
rename to ogg/ships/rooms/sphere.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/vehiclebay.ogg_352e4629 b/ogg/ships/rooms/vehiclebay.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/vehiclebay.ogg_352e4629
rename to ogg/ships/rooms/vehiclebay.ogg
diff --git a/ogg/ships_1e7b5cfa/rooms_76cad9ec/weaponroom.ogg_01d5afac b/ogg/ships/rooms/weaponroom.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/rooms_76cad9ec/weaponroom.ogg_01d5afac
rename to ogg/ships/rooms/weaponroom.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/calibrate bad.ogg_0a205c64 b/ogg/ships/salvaging/calibrate bad.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/calibrate bad.ogg_0a205c64
rename to ogg/ships/salvaging/calibrate bad.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/calibrate good.ogg_0ddfd0cd b/ogg/ships/salvaging/calibrate good.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/calibrate good.ogg_0ddfd0cd
rename to ogg/ships/salvaging/calibrate good.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/calibrate neutral.ogg_5fcf2413 b/ogg/ships/salvaging/calibrate neutral.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/calibrate neutral.ogg_5fcf2413
rename to ogg/ships/salvaging/calibrate neutral.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/can calibrate.ogg_1f146c1a b/ogg/ships/salvaging/can calibrate.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/can calibrate.ogg_1f146c1a
rename to ogg/ships/salvaging/can calibrate.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/cargobayfilled.ogg_91f68423 b/ogg/ships/salvaging/cargobayfilled.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/cargobayfilled.ogg_91f68423
rename to ogg/ships/salvaging/cargobayfilled.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/debrishum.ogg_e843e540 b/ogg/ships/salvaging/debrishum.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/debrishum.ogg_e843e540
rename to ogg/ships/salvaging/debrishum.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/debrislaser.ogg_cd4b8edb b/ogg/ships/salvaging/debrislaser.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/debrislaser.ogg_cd4b8edb
rename to ogg/ships/salvaging/debrislaser.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/deploy.ogg_df9c7cc5 b/ogg/ships/salvaging/deploy.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/deploy.ogg_df9c7cc5
rename to ogg/ships/salvaging/deploy.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/draw.ogg_8e96430d b/ogg/ships/salvaging/draw.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/draw.ogg_8e96430d
rename to ogg/ships/salvaging/draw.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/dronegets.ogg_3307ba73 b/ogg/ships/salvaging/dronegets.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/dronegets.ogg_3307ba73
rename to ogg/ships/salvaging/dronegets.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/dronego.ogg_07187303 b/ogg/ships/salvaging/dronego.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/dronego.ogg_07187303
rename to ogg/ships/salvaging/dronego.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/dronego1.ogg_b9767d59 b/ogg/ships/salvaging/dronego1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/dronego1.ogg_b9767d59
rename to ogg/ships/salvaging/dronego1.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/dronego2.ogg_14770e5a b/ogg/ships/salvaging/dronego2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/dronego2.ogg_14770e5a
rename to ogg/ships/salvaging/dronego2.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/dronelaunch.ogg_ff0148fe b/ogg/ships/salvaging/dronelaunch.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/dronelaunch.ogg_ff0148fe
rename to ogg/ships/salvaging/dronelaunch.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/dronereturn.ogg_3a0d53f3 b/ogg/ships/salvaging/dronereturn.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/dronereturn.ogg_3a0d53f3
rename to ogg/ships/salvaging/dronereturn.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/droneswoosh.ogg_e291b71f b/ogg/ships/salvaging/droneswoosh.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/droneswoosh.ogg_e291b71f
rename to ogg/ships/salvaging/droneswoosh.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/salrat.ogg_739f3a63 b/ogg/ships/salvaging/salrat.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/salrat.ogg_739f3a63
rename to ogg/ships/salvaging/salrat.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/salvage1.ogg_0dcc8338 b/ogg/ships/salvaging/salvage1.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/salvage1.ogg_0dcc8338
rename to ogg/ships/salvaging/salvage1.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/salvage2.ogg_2dd39ee7 b/ogg/ships/salvaging/salvage2.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/salvage2.ogg_2dd39ee7
rename to ogg/ships/salvaging/salvage2.ogg
diff --git a/ogg/ships_1e7b5cfa/salvaging_2f4ebf27/salvage3.ogg_74cf895a b/ogg/ships/salvaging/salvage3.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/salvaging_2f4ebf27/salvage3.ogg_74cf895a
rename to ogg/ships/salvaging/salvage3.ogg
diff --git a/ogg/ships_1e7b5cfa/waypoints_d7ea0991/enginescream.ogg_25c4a0dc b/ogg/ships/waypoints/enginescream.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/waypoints_d7ea0991/enginescream.ogg_25c4a0dc
rename to ogg/ships/waypoints/enginescream.ogg
diff --git a/ogg/ships_1e7b5cfa/waypoints_d7ea0991/entersector.ogg_372e8a43 b/ogg/ships/waypoints/entersector.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/waypoints_d7ea0991/entersector.ogg_372e8a43
rename to ogg/ships/waypoints/entersector.ogg
diff --git a/ogg/ships_1e7b5cfa/waypoints_d7ea0991/jump.ogg_684c7130 b/ogg/ships/waypoints/jump.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/waypoints_d7ea0991/jump.ogg_684c7130
rename to ogg/ships/waypoints/jump.ogg
diff --git a/ogg/ships_1e7b5cfa/waypoints_d7ea0991/jumpgenerater.ogg_2bd09303 b/ogg/ships/waypoints/jumpgenerater.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/waypoints_d7ea0991/jumpgenerater.ogg_2bd09303
rename to ogg/ships/waypoints/jumpgenerater.ogg
diff --git a/ogg/ships_1e7b5cfa/waypoints_d7ea0991/launch.ogg_8063d5bf b/ogg/ships/waypoints/launch.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/waypoints_d7ea0991/launch.ogg_8063d5bf
rename to ogg/ships/waypoints/launch.ogg
diff --git a/ogg/ships_1e7b5cfa/waypoints_d7ea0991/siren.ogg_adeaeb01 b/ogg/ships/waypoints/siren.ogg
similarity index 100%
rename from ogg/ships_1e7b5cfa/waypoints_d7ea0991/siren.ogg_adeaeb01
rename to ogg/ships/waypoints/siren.ogg
diff --git a/ogg/vehicle_46c11788/accelerate.ogg_5379ffc8 b/ogg/vehicle/accelerate.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/accelerate.ogg_5379ffc8
rename to ogg/vehicle/accelerate.ogg
diff --git a/ogg/vehicle_46c11788/accelerate1.ogg_c78e399b b/ogg/vehicle/accelerate1.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/accelerate1.ogg_c78e399b
rename to ogg/vehicle/accelerate1.ogg
diff --git a/ogg/vehicle_46c11788/alarm.ogg_010cca58 b/ogg/vehicle/alarm.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/alarm.ogg_010cca58
rename to ogg/vehicle/alarm.ogg
diff --git a/ogg/vehicle_46c11788/beginrepair.ogg_bff5da28 b/ogg/vehicle/beginrepair.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/beginrepair.ogg_bff5da28
rename to ogg/vehicle/beginrepair.ogg
diff --git a/ogg/vehicle_46c11788/boatstart.ogg_7d783293 b/ogg/vehicle/boatstart.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/boatstart.ogg_7d783293
rename to ogg/vehicle/boatstart.ogg
diff --git a/ogg/vehicle_46c11788/button.ogg_3713235d b/ogg/vehicle/button.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/button.ogg_3713235d
rename to ogg/vehicle/button.ogg
diff --git a/ogg/vehicle_46c11788/caralarm.ogg_9c597ecd b/ogg/vehicle/caralarm.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/caralarm.ogg_9c597ecd
rename to ogg/vehicle/caralarm.ogg
diff --git a/ogg/vehicle_46c11788/chirponce.ogg_293ece79 b/ogg/vehicle/chirponce.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/chirponce.ogg_293ece79
rename to ogg/vehicle/chirponce.ogg
diff --git a/ogg/vehicle_46c11788/chirptwice.ogg_5cdf93ce b/ogg/vehicle/chirptwice.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/chirptwice.ogg_5cdf93ce
rename to ogg/vehicle/chirptwice.ogg
diff --git a/ogg/vehicle_46c11788/closedoor.ogg_a6b20038 b/ogg/vehicle/closedoor.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/closedoor.ogg_a6b20038
rename to ogg/vehicle/closedoor.ogg
diff --git a/ogg/vehicle_46c11788/closetop.ogg_a01e3c38 b/ogg/vehicle/closetop.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/closetop.ogg_a01e3c38
rename to ogg/vehicle/closetop.ogg
diff --git a/ogg/vehicle_46c11788/crash.ogg_14f4b915 b/ogg/vehicle/crash.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/crash.ogg_14f4b915
rename to ogg/vehicle/crash.ogg
diff --git a/ogg/vehicle_46c11788/decelerate.ogg_1a41f684 b/ogg/vehicle/decelerate.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/decelerate.ogg_1a41f684
rename to ogg/vehicle/decelerate.ogg
diff --git a/ogg/vehicle_46c11788/decelerate1.ogg_c1109ea0 b/ogg/vehicle/decelerate1.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/decelerate1.ogg_c1109ea0
rename to ogg/vehicle/decelerate1.ogg
diff --git a/ogg/vehicle_46c11788/door close.ogg_229e2c40 b/ogg/vehicle/door close.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/door close.ogg_229e2c40
rename to ogg/vehicle/door close.ogg
diff --git a/ogg/vehicle_46c11788/door open.ogg_5d7338e1 b/ogg/vehicle/door open.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/door open.ogg_5d7338e1
rename to ogg/vehicle/door open.ogg
diff --git a/ogg/vehicle_46c11788/dump.ogg_922da0e9 b/ogg/vehicle/dump.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/dump.ogg_922da0e9
rename to ogg/vehicle/dump.ogg
diff --git a/ogg/vehicle_46c11788/enginestop.ogg_958a304e b/ogg/vehicle/enginestop.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/enginestop.ogg_958a304e
rename to ogg/vehicle/enginestop.ogg
diff --git a/ogg/vehicle_46c11788/enter.ogg_e7d22e72 b/ogg/vehicle/enter.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/enter.ogg_e7d22e72
rename to ogg/vehicle/enter.ogg
diff --git a/ogg/vehicle_46c11788/exit vehicle.ogg_0bcc333a b/ogg/vehicle/exit vehicle.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/exit vehicle.ogg_0bcc333a
rename to ogg/vehicle/exit vehicle.ogg
diff --git a/ogg/vehicle_46c11788/horn.ogg_488965a8 b/ogg/vehicle/horn.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/horn.ogg_488965a8
rename to ogg/vehicle/horn.ogg
diff --git a/ogg/vehicle_46c11788/hose.ogg_cf8eaea0 b/ogg/vehicle/hose.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/hose.ogg_cf8eaea0
rename to ogg/vehicle/hose.ogg
diff --git a/ogg/vehicle_46c11788/land.ogg_551b2196 b/ogg/vehicle/land.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/land.ogg_551b2196
rename to ogg/vehicle/land.ogg
diff --git a/ogg/vehicle_46c11788/lever.ogg_b60e3ac2 b/ogg/vehicle/lever.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/lever.ogg_b60e3ac2
rename to ogg/vehicle/lever.ogg
diff --git a/ogg/vehicle_46c11788/opendoor.ogg_69b0d1be b/ogg/vehicle/opendoor.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/opendoor.ogg_69b0d1be
rename to ogg/vehicle/opendoor.ogg
diff --git a/ogg/vehicle_46c11788/opentop.ogg_2fd2f259 b/ogg/vehicle/opentop.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/opentop.ogg_2fd2f259
rename to ogg/vehicle/opentop.ogg
diff --git a/ogg/vehicle_46c11788/rechargebattery.ogg_b7df36c7 b/ogg/vehicle/rechargebattery.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/rechargebattery.ogg_b7df36c7
rename to ogg/vehicle/rechargebattery.ogg
diff --git a/ogg/vehicle_46c11788/repairloop.ogg_a2265c5c b/ogg/vehicle/repairloop.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/repairloop.ogg_a2265c5c
rename to ogg/vehicle/repairloop.ogg
diff --git a/ogg/vehicle_46c11788/repairstop.ogg_42bcc16c b/ogg/vehicle/repairstop.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/repairstop.ogg_42bcc16c
rename to ogg/vehicle/repairstop.ogg
diff --git a/ogg/vehicle_46c11788/seatbeltwarn.ogg_ff627075 b/ogg/vehicle/seatbeltwarn.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/seatbeltwarn.ogg_ff627075
rename to ogg/vehicle/seatbeltwarn.ogg
diff --git a/ogg/vehicle_46c11788/siren1.ogg_e73944b6 b/ogg/vehicle/siren1.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/siren1.ogg_e73944b6
rename to ogg/vehicle/siren1.ogg
diff --git a/ogg/vehicle_46c11788/siren2.ogg_bb54d435 b/ogg/vehicle/siren2.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/siren2.ogg_bb54d435
rename to ogg/vehicle/siren2.ogg
diff --git a/ogg/vehicle_46c11788/sirenoff.ogg_b7d7fe6d b/ogg/vehicle/sirenoff.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/sirenoff.ogg_b7d7fe6d
rename to ogg/vehicle/sirenoff.ogg
diff --git a/ogg/vehicle_46c11788/start.ogg_5c138867 b/ogg/vehicle/start.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/start.ogg_5c138867
rename to ogg/vehicle/start.ogg
diff --git a/ogg/vehicle_46c11788/transfer.ogg_1b847eca b/ogg/vehicle/transfer.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/transfer.ogg_1b847eca
rename to ogg/vehicle/transfer.ogg
diff --git a/ogg/vehicle_46c11788/tug.ogg_7f643c2b b/ogg/vehicle/tug.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/tug.ogg_7f643c2b
rename to ogg/vehicle/tug.ogg
diff --git a/ogg/vehicle_46c11788/vehicleexplode.ogg_85ac1209 b/ogg/vehicle/vehicleexplode.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/vehicleexplode.ogg_85ac1209
rename to ogg/vehicle/vehicleexplode.ogg
diff --git a/ogg/vehicle_46c11788/vehiclelaunch.ogg_86c4de59 b/ogg/vehicle/vehiclelaunch.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/vehiclelaunch.ogg_86c4de59
rename to ogg/vehicle/vehiclelaunch.ogg
diff --git a/ogg/vehicle_46c11788/vehiclelevel.ogg_61130fd8 b/ogg/vehicle/vehiclelevel.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/vehiclelevel.ogg_61130fd8
rename to ogg/vehicle/vehiclelevel.ogg
diff --git a/ogg/vehicle_46c11788/vehiclelock.ogg_d18f2058 b/ogg/vehicle/vehiclelock.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/vehiclelock.ogg_d18f2058
rename to ogg/vehicle/vehiclelock.ogg
diff --git a/ogg/vehicle_46c11788/vehicleoutofcharge.ogg_95eb2153 b/ogg/vehicle/vehicleoutofcharge.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/vehicleoutofcharge.ogg_95eb2153
rename to ogg/vehicle/vehicleoutofcharge.ogg
diff --git a/ogg/vehicle_46c11788/vehicleram.ogg_0fc6677e b/ogg/vehicle/vehicleram.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/vehicleram.ogg_0fc6677e
rename to ogg/vehicle/vehicleram.ogg
diff --git a/ogg/vehicle_46c11788/vehiclerelocate.ogg_588e365d b/ogg/vehicle/vehiclerelocate.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/vehiclerelocate.ogg_588e365d
rename to ogg/vehicle/vehiclerelocate.ogg
diff --git a/ogg/vehicle_46c11788/vehicleswipeid.ogg_285b34ee b/ogg/vehicle/vehicleswipeid.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/vehicleswipeid.ogg_285b34ee
rename to ogg/vehicle/vehicleswipeid.ogg
diff --git a/ogg/vehicle_46c11788/warn.ogg_ed6cde5e b/ogg/vehicle/warn.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/warn.ogg_ed6cde5e
rename to ogg/vehicle/warn.ogg
diff --git a/ogg/vehicle_46c11788/windowdown.ogg_aeba41d2 b/ogg/vehicle/windowdown.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/windowdown.ogg_aeba41d2
rename to ogg/vehicle/windowdown.ogg
diff --git a/ogg/vehicle_46c11788/windowpart1.ogg_094d66b0 b/ogg/vehicle/windowpart1.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/windowpart1.ogg_094d66b0
rename to ogg/vehicle/windowpart1.ogg
diff --git a/ogg/vehicle_46c11788/windowpart2.ogg_20a850fa b/ogg/vehicle/windowpart2.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/windowpart2.ogg_20a850fa
rename to ogg/vehicle/windowpart2.ogg
diff --git a/ogg/vehicle_46c11788/windowup.ogg_5f3c979c b/ogg/vehicle/windowup.ogg
similarity index 100%
rename from ogg/vehicle_46c11788/windowup.ogg_5f3c979c
rename to ogg/vehicle/windowup.ogg
diff --git a/ogg/wear_2e46c9b3/aboutbody.ogg_8563d638 b/ogg/wear/aboutbody.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/aboutbody.ogg_8563d638
rename to ogg/wear/aboutbody.ogg
diff --git a/ogg/wear_2e46c9b3/aboutbody.wav_2909c6c1 b/ogg/wear/aboutbody.wav
similarity index 100%
rename from ogg/wear_2e46c9b3/aboutbody.wav_2909c6c1
rename to ogg/wear/aboutbody.wav
diff --git a/ogg/wear_2e46c9b3/arms.ogg_553a96f0 b/ogg/wear/arms.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/arms.ogg_553a96f0
rename to ogg/wear/arms.ogg
diff --git a/ogg/wear_2e46c9b3/clip.ogg_fe190a1a b/ogg/wear/clip.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/clip.ogg_fe190a1a
rename to ogg/wear/clip.ogg
diff --git a/ogg/wear_2e46c9b3/feet.ogg_c5cba017 b/ogg/wear/feet.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/feet.ogg_c5cba017
rename to ogg/wear/feet.ogg
diff --git a/ogg/wear_2e46c9b3/gunt2.ogg_da0ed14a b/ogg/wear/gunt2.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/gunt2.ogg_da0ed14a
rename to ogg/wear/gunt2.ogg
diff --git a/ogg/wear_2e46c9b3/hands.ogg_7f0ff170 b/ogg/wear/hands.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/hands.ogg_7f0ff170
rename to ogg/wear/hands.ogg
diff --git a/ogg/wear_2e46c9b3/head.ogg_a61818bd b/ogg/wear/head.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/head.ogg_a61818bd
rename to ogg/wear/head.ogg
diff --git a/ogg/wear_2e46c9b3/hold.ogg_7c56f060 b/ogg/wear/hold.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/hold.ogg_7c56f060
rename to ogg/wear/hold.ogg
diff --git a/ogg/wear_2e46c9b3/legs.ogg_20963960 b/ogg/wear/legs.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/legs.ogg_20963960
rename to ogg/wear/legs.ogg
diff --git a/ogg/wear_2e46c9b3/neck.ogg_3e2b7f52 b/ogg/wear/neck.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/neck.ogg_3e2b7f52
rename to ogg/wear/neck.ogg
diff --git a/ogg/wear_2e46c9b3/onbody.ogg_d790d039 b/ogg/wear/onbody.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/onbody.ogg_d790d039
rename to ogg/wear/onbody.ogg
diff --git a/ogg/wear_2e46c9b3/ring.ogg_d4f14c58 b/ogg/wear/ring.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/ring.ogg_d4f14c58
rename to ogg/wear/ring.ogg
diff --git a/ogg/wear_2e46c9b3/shield.ogg_3470bf3d b/ogg/wear/shield.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/shield.ogg_3470bf3d
rename to ogg/wear/shield.ogg
diff --git a/ogg/wear_2e46c9b3/struggle.ogg_9652efdf b/ogg/wear/struggle.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/struggle.ogg_9652efdf
rename to ogg/wear/struggle.ogg
diff --git a/ogg/wear_2e46c9b3/suitremove.ogg_03d42e9b b/ogg/wear/suitremove.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/suitremove.ogg_03d42e9b
rename to ogg/wear/suitremove.ogg
diff --git a/ogg/wear_2e46c9b3/suitwear.ogg_e1f4b300 b/ogg/wear/suitwear.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/suitwear.ogg_e1f4b300
rename to ogg/wear/suitwear.ogg
diff --git a/ogg/wear_2e46c9b3/waist.ogg_1a68d5ef b/ogg/wear/waist.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/waist.ogg_1a68d5ef
rename to ogg/wear/waist.ogg
diff --git a/ogg/wear_2e46c9b3/wrist1.ogg_3b15ae82 b/ogg/wear/wrist1.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/wrist1.ogg_3b15ae82
rename to ogg/wear/wrist1.ogg
diff --git a/ogg/wear_2e46c9b3/wrist2.ogg_935c399e b/ogg/wear/wrist2.ogg
similarity index 100%
rename from ogg/wear_2e46c9b3/wrist2.ogg_935c399e
rename to ogg/wear/wrist2.ogg