diff --git a/packages/audio/sounds/ambience/authors.txt b/packages/audio/ambience/authors.txt similarity index 100% rename from packages/audio/sounds/ambience/authors.txt rename to packages/audio/ambience/authors.txt diff --git a/packages/audio/sounds/ambience/cavedrip.ogg b/packages/audio/ambience/cavedrip.ogg similarity index 100% rename from packages/audio/sounds/ambience/cavedrip.ogg rename to packages/audio/ambience/cavedrip.ogg diff --git a/packages/audio/sounds/ambience/citynoisebirds.ogg b/packages/audio/ambience/citynoisebirds.ogg similarity index 100% rename from packages/audio/sounds/ambience/citynoisebirds.ogg rename to packages/audio/ambience/citynoisebirds.ogg diff --git a/packages/audio/sounds/ambience/deserthawk.ogg b/packages/audio/ambience/deserthawk.ogg similarity index 100% rename from packages/audio/sounds/ambience/deserthawk.ogg rename to packages/audio/ambience/deserthawk.ogg diff --git a/packages/audio/sounds/ambience/distant_cars.ogg b/packages/audio/ambience/distant_cars.ogg similarity index 100% rename from packages/audio/sounds/ambience/distant_cars.ogg rename to packages/audio/ambience/distant_cars.ogg diff --git a/packages/audio/sounds/ambience/flies.ogg b/packages/audio/ambience/flies.ogg similarity index 100% rename from packages/audio/sounds/ambience/flies.ogg rename to packages/audio/ambience/flies.ogg diff --git a/packages/audio/sounds/ambience/hum01.ogg b/packages/audio/ambience/hum01.ogg similarity index 100% rename from packages/audio/sounds/ambience/hum01.ogg rename to packages/audio/ambience/hum01.ogg diff --git a/packages/audio/sounds/ambience/hum02.ogg b/packages/audio/ambience/hum02.ogg similarity index 100% rename from packages/audio/sounds/ambience/hum02.ogg rename to packages/audio/ambience/hum02.ogg diff --git a/packages/audio/sounds/ambience/night_crickets.ogg b/packages/audio/ambience/night_crickets.ogg similarity index 100% rename from packages/audio/sounds/ambience/night_crickets.ogg rename to packages/audio/ambience/night_crickets.ogg diff --git a/packages/audio/sounds/ambience/owl.ogg b/packages/audio/ambience/owl.ogg similarity index 100% rename from packages/audio/sounds/ambience/owl.ogg rename to packages/audio/ambience/owl.ogg diff --git a/packages/audio/sounds/ambience/t_aircond.ogg b/packages/audio/ambience/t_aircond.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_aircond.ogg rename to packages/audio/ambience/t_aircond.ogg diff --git a/packages/audio/sounds/ambience/t_alarm01.ogg b/packages/audio/ambience/t_alarm01.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_alarm01.ogg rename to packages/audio/ambience/t_alarm01.ogg diff --git a/packages/audio/sounds/ambience/t_compressor.ogg b/packages/audio/ambience/t_compressor.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_compressor.ogg rename to packages/audio/ambience/t_compressor.ogg diff --git a/packages/audio/sounds/ambience/t_crow.ogg b/packages/audio/ambience/t_crow.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_crow.ogg rename to packages/audio/ambience/t_crow.ogg diff --git a/packages/audio/sounds/ambience/t_dogs01.ogg b/packages/audio/ambience/t_dogs01.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_dogs01.ogg rename to packages/audio/ambience/t_dogs01.ogg diff --git a/packages/audio/sounds/ambience/t_electricbuzz.ogg b/packages/audio/ambience/t_electricbuzz.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_electricbuzz.ogg rename to packages/audio/ambience/t_electricbuzz.ogg diff --git a/packages/audio/sounds/ambience/t_factory01.ogg b/packages/audio/ambience/t_factory01.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_factory01.ogg rename to packages/audio/ambience/t_factory01.ogg diff --git a/packages/audio/sounds/ambience/t_gastank.ogg b/packages/audio/ambience/t_gastank.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_gastank.ogg rename to packages/audio/ambience/t_gastank.ogg diff --git a/packages/audio/sounds/ambience/t_generator.ogg b/packages/audio/ambience/t_generator.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_generator.ogg rename to packages/audio/ambience/t_generator.ogg diff --git a/packages/audio/sounds/ambience/t_helicopter.ogg b/packages/audio/ambience/t_helicopter.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_helicopter.ogg rename to packages/audio/ambience/t_helicopter.ogg diff --git a/packages/audio/sounds/ambience/t_hum01.ogg b/packages/audio/ambience/t_hum01.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_hum01.ogg rename to packages/audio/ambience/t_hum01.ogg diff --git a/packages/audio/sounds/ambience/t_hum02.ogg b/packages/audio/ambience/t_hum02.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_hum02.ogg rename to packages/audio/ambience/t_hum02.ogg diff --git a/packages/audio/sounds/ambience/t_hum03.ogg b/packages/audio/ambience/t_hum03.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_hum03.ogg rename to packages/audio/ambience/t_hum03.ogg diff --git a/packages/audio/sounds/ambience/t_hum04.ogg b/packages/audio/ambience/t_hum04.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_hum04.ogg rename to packages/audio/ambience/t_hum04.ogg diff --git a/packages/audio/sounds/ambience/t_keyboard.ogg b/packages/audio/ambience/t_keyboard.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_keyboard.ogg rename to packages/audio/ambience/t_keyboard.ogg diff --git a/packages/audio/sounds/ambience/t_night01.ogg b/packages/audio/ambience/t_night01.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_night01.ogg rename to packages/audio/ambience/t_night01.ogg diff --git a/packages/audio/sounds/ambience/t_night02.ogg b/packages/audio/ambience/t_night02.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_night02.ogg rename to packages/audio/ambience/t_night02.ogg diff --git a/packages/audio/sounds/ambience/t_night_dog.ogg b/packages/audio/ambience/t_night_dog.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_night_dog.ogg rename to packages/audio/ambience/t_night_dog.ogg diff --git a/packages/audio/sounds/ambience/t_radio_comms.ogg b/packages/audio/ambience/t_radio_comms.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_radio_comms.ogg rename to packages/audio/ambience/t_radio_comms.ogg diff --git a/packages/audio/sounds/ambience/t_radio_static.ogg b/packages/audio/ambience/t_radio_static.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_radio_static.ogg rename to packages/audio/ambience/t_radio_static.ogg diff --git a/packages/audio/sounds/ambience/t_satcoms.ogg b/packages/audio/ambience/t_satcoms.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_satcoms.ogg rename to packages/audio/ambience/t_satcoms.ogg diff --git a/packages/audio/sounds/ambience/t_sludge.ogg b/packages/audio/ambience/t_sludge.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_sludge.ogg rename to packages/audio/ambience/t_sludge.ogg diff --git a/packages/audio/sounds/ambience/t_static01.ogg b/packages/audio/ambience/t_static01.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_static01.ogg rename to packages/audio/ambience/t_static01.ogg diff --git a/packages/audio/sounds/ambience/t_static02.ogg b/packages/audio/ambience/t_static02.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_static02.ogg rename to packages/audio/ambience/t_static02.ogg diff --git a/packages/audio/sounds/ambience/t_vent01.ogg b/packages/audio/ambience/t_vent01.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_vent01.ogg rename to packages/audio/ambience/t_vent01.ogg diff --git a/packages/audio/sounds/ambience/t_vent02.ogg b/packages/audio/ambience/t_vent02.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_vent02.ogg rename to packages/audio/ambience/t_vent02.ogg diff --git a/packages/audio/sounds/ambience/t_vents.ogg b/packages/audio/ambience/t_vents.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_vents.ogg rename to packages/audio/ambience/t_vents.ogg diff --git a/packages/audio/sounds/ambience/t_water01.ogg b/packages/audio/ambience/t_water01.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_water01.ogg rename to packages/audio/ambience/t_water01.ogg diff --git a/packages/audio/sounds/ambience/t_water_owl.ogg b/packages/audio/ambience/t_water_owl.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_water_owl.ogg rename to packages/audio/ambience/t_water_owl.ogg diff --git a/packages/audio/sounds/ambience/t_waterdrip.ogg b/packages/audio/ambience/t_waterdrip.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_waterdrip.ogg rename to packages/audio/ambience/t_waterdrip.ogg diff --git a/packages/audio/sounds/ambience/t_waterfront.ogg b/packages/audio/ambience/t_waterfront.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_waterfront.ogg rename to packages/audio/ambience/t_waterfront.ogg diff --git a/packages/audio/sounds/ambience/t_waterpipe01.ogg b/packages/audio/ambience/t_waterpipe01.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_waterpipe01.ogg rename to packages/audio/ambience/t_waterpipe01.ogg diff --git a/packages/audio/sounds/ambience/t_waterpipe02.ogg b/packages/audio/ambience/t_waterpipe02.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_waterpipe02.ogg rename to packages/audio/ambience/t_waterpipe02.ogg diff --git a/packages/audio/sounds/ambience/t_wind.ogg b/packages/audio/ambience/t_wind.ogg similarity index 100% rename from packages/audio/sounds/ambience/t_wind.ogg rename to packages/audio/ambience/t_wind.ogg diff --git a/packages/audio/sounds/ambience/warningalarm01.ogg b/packages/audio/ambience/warningalarm01.ogg similarity index 100% rename from packages/audio/sounds/ambience/warningalarm01.ogg rename to packages/audio/ambience/warningalarm01.ogg diff --git a/packages/audio/sounds/ambience/water.ogg b/packages/audio/ambience/water.ogg similarity index 100% rename from packages/audio/sounds/ambience/water.ogg rename to packages/audio/ambience/water.ogg diff --git a/packages/audio/sounds/ambience/wind.ogg b/packages/audio/ambience/wind.ogg similarity index 100% rename from packages/audio/sounds/ambience/wind.ogg rename to packages/audio/ambience/wind.ogg diff --git a/packages/audio/sounds/ctf/flagdrop.ogg b/packages/audio/ctf/flagdrop.ogg similarity index 100% rename from packages/audio/sounds/ctf/flagdrop.ogg rename to packages/audio/ctf/flagdrop.ogg diff --git a/packages/audio/sounds/ctf/flagpickup.ogg b/packages/audio/ctf/flagpickup.ogg similarity index 100% rename from packages/audio/sounds/ctf/flagpickup.ogg rename to packages/audio/ctf/flagpickup.ogg diff --git a/packages/audio/sounds/ctf/flagreturn.ogg b/packages/audio/ctf/flagreturn.ogg similarity index 100% rename from packages/audio/sounds/ctf/flagreturn.ogg rename to packages/audio/ctf/flagreturn.ogg diff --git a/packages/audio/sounds/ctf/flagscore.ogg b/packages/audio/ctf/flagscore.ogg similarity index 100% rename from packages/audio/sounds/ctf/flagscore.ogg rename to packages/audio/ctf/flagscore.ogg diff --git a/packages/audio/sounds/misc/change_gun.ogg b/packages/audio/misc/change_gun.ogg similarity index 100% rename from packages/audio/sounds/misc/change_gun.ogg rename to packages/audio/misc/change_gun.ogg diff --git a/packages/audio/sounds/misc/headshot.ogg b/packages/audio/misc/headshot.ogg similarity index 100% rename from packages/audio/sounds/misc/headshot.ogg rename to packages/audio/misc/headshot.ogg diff --git a/packages/audio/sounds/misc/impact_h.ogg b/packages/audio/misc/impact_h.ogg similarity index 100% rename from packages/audio/sounds/misc/impact_h.ogg rename to packages/audio/misc/impact_h.ogg diff --git a/packages/audio/sounds/misc/impact_t.ogg b/packages/audio/misc/impact_t.ogg similarity index 100% rename from packages/audio/sounds/misc/impact_t.ogg rename to packages/audio/misc/impact_t.ogg diff --git a/packages/audio/sounds/misc/menu_click1.ogg b/packages/audio/misc/menu_click1.ogg similarity index 100% rename from packages/audio/sounds/misc/menu_click1.ogg rename to packages/audio/misc/menu_click1.ogg diff --git a/packages/audio/sounds/misc/menu_click2.ogg b/packages/audio/misc/menu_click2.ogg similarity index 100% rename from packages/audio/sounds/misc/menu_click2.ogg rename to packages/audio/misc/menu_click2.ogg diff --git a/packages/audio/sounds/misc/pickup_ammo_clip.ogg b/packages/audio/misc/pickup_ammo_clip.ogg similarity index 100% rename from packages/audio/sounds/misc/pickup_ammo_clip.ogg rename to packages/audio/misc/pickup_ammo_clip.ogg diff --git a/packages/audio/sounds/misc/pickup_armour.ogg b/packages/audio/misc/pickup_armour.ogg similarity index 100% rename from packages/audio/sounds/misc/pickup_armour.ogg rename to packages/audio/misc/pickup_armour.ogg diff --git a/packages/audio/sounds/misc/pickup_health.ogg b/packages/audio/misc/pickup_health.ogg similarity index 100% rename from packages/audio/sounds/misc/pickup_health.ogg rename to packages/audio/misc/pickup_health.ogg diff --git a/packages/audio/sounds/misc/tick11.ogg b/packages/audio/misc/tick11.ogg similarity index 100% rename from packages/audio/sounds/misc/tick11.ogg rename to packages/audio/misc/tick11.ogg diff --git a/packages/audio/sounds/misc/tick9.ogg b/packages/audio/misc/tick9.ogg similarity index 100% rename from packages/audio/sounds/misc/tick9.ogg rename to packages/audio/misc/tick9.ogg diff --git a/packages/audio/sounds/misc/tinnitus.ogg b/packages/audio/misc/tinnitus.ogg similarity index 100% rename from packages/audio/sounds/misc/tinnitus.ogg rename to packages/audio/misc/tinnitus.ogg diff --git a/packages/audio/sounds/misc/vote/readme.txt b/packages/audio/misc/vote/readme.txt similarity index 100% rename from packages/audio/sounds/misc/vote/readme.txt rename to packages/audio/misc/vote/readme.txt diff --git a/packages/audio/sounds/misc/vote/vote_call.ogg b/packages/audio/misc/vote/vote_call.ogg similarity index 100% rename from packages/audio/sounds/misc/vote/vote_call.ogg rename to packages/audio/misc/vote/vote_call.ogg diff --git a/packages/audio/sounds/misc/vote/vote_fail.ogg b/packages/audio/misc/vote/vote_fail.ogg similarity index 100% rename from packages/audio/sounds/misc/vote/vote_fail.ogg rename to packages/audio/misc/vote/vote_fail.ogg diff --git a/packages/audio/sounds/misc/vote/vote_pass.ogg b/packages/audio/misc/vote/vote_pass.ogg similarity index 100% rename from packages/audio/sounds/misc/vote/vote_pass.ogg rename to packages/audio/misc/vote/vote_pass.ogg diff --git a/packages/audio/sounds/player/crouch.ogg b/packages/audio/player/crouch.ogg similarity index 100% rename from packages/audio/sounds/player/crouch.ogg rename to packages/audio/player/crouch.ogg diff --git a/packages/audio/sounds/player/crouch_in.ogg b/packages/audio/player/crouch_in.ogg similarity index 100% rename from packages/audio/sounds/player/crouch_in.ogg rename to packages/audio/player/crouch_in.ogg diff --git a/packages/audio/sounds/player/crouch_out.ogg b/packages/audio/player/crouch_out.ogg similarity index 100% rename from packages/audio/sounds/player/crouch_out.ogg rename to packages/audio/player/crouch_out.ogg diff --git a/packages/audio/sounds/player/die1.ogg b/packages/audio/player/die1.ogg similarity index 100% rename from packages/audio/sounds/player/die1.ogg rename to packages/audio/player/die1.ogg diff --git a/packages/audio/sounds/player/die2.ogg b/packages/audio/player/die2.ogg similarity index 100% rename from packages/audio/sounds/player/die2.ogg rename to packages/audio/player/die2.ogg diff --git a/packages/audio/sounds/player/footsteps.ogg b/packages/audio/player/footsteps.ogg similarity index 100% rename from packages/audio/sounds/player/footsteps.ogg rename to packages/audio/player/footsteps.ogg diff --git a/packages/audio/sounds/player/gib-wav.txt b/packages/audio/player/gib-wav.txt similarity index 100% rename from packages/audio/sounds/player/gib-wav.txt rename to packages/audio/player/gib-wav.txt diff --git a/packages/audio/sounds/player/gib.ogg b/packages/audio/player/gib.ogg similarity index 100% rename from packages/audio/sounds/player/gib.ogg rename to packages/audio/player/gib.ogg diff --git a/packages/audio/sounds/player/jump.ogg b/packages/audio/player/jump.ogg similarity index 100% rename from packages/audio/sounds/player/jump.ogg rename to packages/audio/player/jump.ogg diff --git a/packages/audio/sounds/player/land.ogg b/packages/audio/player/land.ogg similarity index 100% rename from packages/audio/sounds/player/land.ogg rename to packages/audio/player/land.ogg diff --git a/packages/audio/sounds/player/pain1.ogg b/packages/audio/player/pain1.ogg similarity index 100% rename from packages/audio/sounds/player/pain1.ogg rename to packages/audio/player/pain1.ogg diff --git a/packages/audio/sounds/player/pain2.ogg b/packages/audio/player/pain2.ogg similarity index 100% rename from packages/audio/sounds/player/pain2.ogg rename to packages/audio/player/pain2.ogg diff --git a/packages/audio/sounds/player/pain3.ogg b/packages/audio/player/pain3.ogg similarity index 100% rename from packages/audio/sounds/player/pain3.ogg rename to packages/audio/player/pain3.ogg diff --git a/packages/audio/sounds/player/pain4.ogg b/packages/audio/player/pain4.ogg similarity index 100% rename from packages/audio/sounds/player/pain4.ogg rename to packages/audio/player/pain4.ogg diff --git a/packages/audio/sounds/player/pain5.ogg b/packages/audio/player/pain5.ogg similarity index 100% rename from packages/audio/sounds/player/pain5.ogg rename to packages/audio/player/pain5.ogg diff --git a/packages/audio/sounds/player/pain6.ogg b/packages/audio/player/pain6.ogg similarity index 100% rename from packages/audio/sounds/player/pain6.ogg rename to packages/audio/player/pain6.ogg diff --git a/packages/audio/sounds/player/splash1.ogg b/packages/audio/player/splash1.ogg similarity index 100% rename from packages/audio/sounds/player/splash1.ogg rename to packages/audio/player/splash1.ogg diff --git a/packages/audio/sounds/player/splash2.ogg b/packages/audio/player/splash2.ogg similarity index 100% rename from packages/audio/sounds/player/splash2.ogg rename to packages/audio/player/splash2.ogg diff --git a/packages/audio/sounds/player/step.ogg b/packages/audio/player/step.ogg similarity index 100% rename from packages/audio/sounds/player/step.ogg rename to packages/audio/player/step.ogg diff --git a/packages/audio/sounds/player/underwater.ogg b/packages/audio/player/underwater.ogg similarity index 100% rename from packages/audio/sounds/player/underwater.ogg rename to packages/audio/player/underwater.ogg diff --git a/packages/audio/sounds/player/watercrouch.ogg b/packages/audio/player/watercrouch.ogg similarity index 100% rename from packages/audio/sounds/player/watercrouch.ogg rename to packages/audio/player/watercrouch.ogg diff --git a/packages/audio/sounds/player/watersteps.ogg b/packages/audio/player/watersteps.ogg similarity index 100% rename from packages/audio/sounds/player/watersteps.ogg rename to packages/audio/player/watersteps.ogg diff --git a/packages/audio/sounds/voicecom/affirmative.ogg b/packages/audio/voicecom/affirmative.ogg similarity index 100% rename from packages/audio/sounds/voicecom/affirmative.ogg rename to packages/audio/voicecom/affirmative.ogg diff --git a/packages/audio/sounds/voicecom/allrightsir.ogg b/packages/audio/voicecom/allrightsir.ogg similarity index 100% rename from packages/audio/sounds/voicecom/allrightsir.ogg rename to packages/audio/voicecom/allrightsir.ogg diff --git a/packages/audio/sounds/voicecom/awesome_1.ogg b/packages/audio/voicecom/awesome_1.ogg similarity index 100% rename from packages/audio/sounds/voicecom/awesome_1.ogg rename to packages/audio/voicecom/awesome_1.ogg diff --git a/packages/audio/sounds/voicecom/awesome_2.ogg b/packages/audio/voicecom/awesome_2.ogg similarity index 100% rename from packages/audio/sounds/voicecom/awesome_2.ogg rename to packages/audio/voicecom/awesome_2.ogg diff --git a/packages/audio/sounds/voicecom/comeonmove.ogg b/packages/audio/voicecom/comeonmove.ogg similarity index 100% rename from packages/audio/sounds/voicecom/comeonmove.ogg rename to packages/audio/voicecom/comeonmove.ogg diff --git a/packages/audio/sounds/voicecom/cominginwiththeflag.ogg b/packages/audio/voicecom/cominginwiththeflag.ogg similarity index 100% rename from packages/audio/sounds/voicecom/cominginwiththeflag.ogg rename to packages/audio/voicecom/cominginwiththeflag.ogg diff --git a/packages/audio/sounds/voicecom/coverme.ogg b/packages/audio/voicecom/coverme.ogg similarity index 100% rename from packages/audio/sounds/voicecom/coverme.ogg rename to packages/audio/voicecom/coverme.ogg diff --git a/packages/audio/sounds/voicecom/defendtheflag.ogg b/packages/audio/voicecom/defendtheflag.ogg similarity index 100% rename from packages/audio/sounds/voicecom/defendtheflag.ogg rename to packages/audio/voicecom/defendtheflag.ogg diff --git a/packages/audio/sounds/voicecom/enemydown.ogg b/packages/audio/voicecom/enemydown.ogg similarity index 100% rename from packages/audio/sounds/voicecom/enemydown.ogg rename to packages/audio/voicecom/enemydown.ogg diff --git a/packages/audio/sounds/voicecom/gogetemboys.ogg b/packages/audio/voicecom/gogetemboys.ogg similarity index 100% rename from packages/audio/sounds/voicecom/gogetemboys.ogg rename to packages/audio/voicecom/gogetemboys.ogg diff --git a/packages/audio/sounds/voicecom/goodjobteam.ogg b/packages/audio/voicecom/goodjobteam.ogg similarity index 100% rename from packages/audio/sounds/voicecom/goodjobteam.ogg rename to packages/audio/voicecom/goodjobteam.ogg diff --git a/packages/audio/sounds/voicecom/igotone.ogg b/packages/audio/voicecom/igotone.ogg similarity index 100% rename from packages/audio/sounds/voicecom/igotone.ogg rename to packages/audio/voicecom/igotone.ogg diff --git a/packages/audio/sounds/voicecom/igotyoucovered.ogg b/packages/audio/voicecom/igotyoucovered.ogg similarity index 100% rename from packages/audio/sounds/voicecom/igotyoucovered.ogg rename to packages/audio/voicecom/igotyoucovered.ogg diff --git a/packages/audio/sounds/voicecom/igotyourback.ogg b/packages/audio/voicecom/igotyourback.ogg similarity index 100% rename from packages/audio/sounds/voicecom/igotyourback.ogg rename to packages/audio/voicecom/igotyourback.ogg diff --git a/packages/audio/sounds/voicecom/imadecontact.ogg b/packages/audio/voicecom/imadecontact.ogg similarity index 100% rename from packages/audio/sounds/voicecom/imadecontact.ogg rename to packages/audio/voicecom/imadecontact.ogg diff --git a/packages/audio/sounds/voicecom/imattacking.ogg b/packages/audio/voicecom/imattacking.ogg similarity index 100% rename from packages/audio/sounds/voicecom/imattacking.ogg rename to packages/audio/voicecom/imattacking.ogg diff --git a/packages/audio/sounds/voicecom/imondefense.ogg b/packages/audio/voicecom/imondefense.ogg similarity index 100% rename from packages/audio/sounds/voicecom/imondefense.ogg rename to packages/audio/voicecom/imondefense.ogg diff --git a/packages/audio/sounds/voicecom/imonyourteamman.ogg b/packages/audio/voicecom/imonyourteamman.ogg similarity index 100% rename from packages/audio/sounds/voicecom/imonyourteamman.ogg rename to packages/audio/voicecom/imonyourteamman.ogg diff --git a/packages/audio/sounds/voicecom/inposition_1.ogg b/packages/audio/voicecom/inposition_1.ogg similarity index 100% rename from packages/audio/sounds/voicecom/inposition_1.ogg rename to packages/audio/voicecom/inposition_1.ogg diff --git a/packages/audio/sounds/voicecom/inposition_2.ogg b/packages/audio/voicecom/inposition_2.ogg similarity index 100% rename from packages/audio/sounds/voicecom/inposition_2.ogg rename to packages/audio/voicecom/inposition_2.ogg diff --git a/packages/audio/sounds/voicecom/negative.ogg b/packages/audio/voicecom/negative.ogg similarity index 100% rename from packages/audio/sounds/voicecom/negative.ogg rename to packages/audio/voicecom/negative.ogg diff --git a/packages/audio/sounds/voicecom/niceshot.ogg b/packages/audio/voicecom/niceshot.ogg similarity index 100% rename from packages/audio/sounds/voicecom/niceshot.ogg rename to packages/audio/voicecom/niceshot.ogg diff --git a/packages/audio/sounds/voicecom/nocando.ogg b/packages/audio/voicecom/nocando.ogg similarity index 100% rename from packages/audio/sounds/voicecom/nocando.ogg rename to packages/audio/voicecom/nocando.ogg diff --git a/packages/audio/sounds/voicecom/onthemove_1.ogg b/packages/audio/voicecom/onthemove_1.ogg similarity index 100% rename from packages/audio/sounds/voicecom/onthemove_1.ogg rename to packages/audio/voicecom/onthemove_1.ogg diff --git a/packages/audio/sounds/voicecom/onthemove_2.ogg b/packages/audio/voicecom/onthemove_2.ogg similarity index 100% rename from packages/audio/sounds/voicecom/onthemove_2.ogg rename to packages/audio/voicecom/onthemove_2.ogg diff --git a/packages/audio/sounds/voicecom/recovertheflag.ogg b/packages/audio/voicecom/recovertheflag.ogg similarity index 100% rename from packages/audio/sounds/voicecom/recovertheflag.ogg rename to packages/audio/voicecom/recovertheflag.ogg diff --git a/packages/audio/sounds/voicecom/reportin.ogg b/packages/audio/voicecom/reportin.ogg similarity index 100% rename from packages/audio/sounds/voicecom/reportin.ogg rename to packages/audio/voicecom/reportin.ogg diff --git a/packages/audio/sounds/voicecom/sorry.ogg b/packages/audio/voicecom/sorry.ogg similarity index 100% rename from packages/audio/sounds/voicecom/sorry.ogg rename to packages/audio/voicecom/sorry.ogg diff --git a/packages/audio/sounds/voicecom/spreadout.ogg b/packages/audio/voicecom/spreadout.ogg similarity index 100% rename from packages/audio/sounds/voicecom/spreadout.ogg rename to packages/audio/voicecom/spreadout.ogg diff --git a/packages/audio/sounds/voicecom/stayhere.ogg b/packages/audio/voicecom/stayhere.ogg similarity index 100% rename from packages/audio/sounds/voicecom/stayhere.ogg rename to packages/audio/voicecom/stayhere.ogg diff --git a/packages/audio/sounds/voicecom/staytogether.ogg b/packages/audio/voicecom/staytogether.ogg similarity index 100% rename from packages/audio/sounds/voicecom/staytogether.ogg rename to packages/audio/voicecom/staytogether.ogg diff --git a/packages/audio/sounds/voicecom/thanks_1.ogg b/packages/audio/voicecom/thanks_1.ogg similarity index 100% rename from packages/audio/sounds/voicecom/thanks_1.ogg rename to packages/audio/voicecom/thanks_1.ogg diff --git a/packages/audio/sounds/voicecom/thanks_2.ogg b/packages/audio/voicecom/thanks_2.ogg similarity index 100% rename from packages/audio/sounds/voicecom/thanks_2.ogg rename to packages/audio/voicecom/thanks_2.ogg diff --git a/packages/audio/sounds/voicecom/theresnowaysir.ogg b/packages/audio/voicecom/theresnowaysir.ogg similarity index 100% rename from packages/audio/sounds/voicecom/theresnowaysir.ogg rename to packages/audio/voicecom/theresnowaysir.ogg diff --git a/packages/audio/sounds/voicecom/wedidit.ogg b/packages/audio/voicecom/wedidit.ogg similarity index 100% rename from packages/audio/sounds/voicecom/wedidit.ogg rename to packages/audio/voicecom/wedidit.ogg diff --git a/packages/audio/sounds/voicecom/yes.ogg b/packages/audio/voicecom/yes.ogg similarity index 100% rename from packages/audio/sounds/voicecom/yes.ogg rename to packages/audio/voicecom/yes.ogg diff --git a/packages/audio/sounds/weapon/auto.ogg b/packages/audio/weapon/auto.ogg similarity index 100% rename from packages/audio/sounds/weapon/auto.ogg rename to packages/audio/weapon/auto.ogg diff --git a/packages/audio/sounds/weapon/auto_reload.ogg b/packages/audio/weapon/auto_reload.ogg similarity index 100% rename from packages/audio/sounds/weapon/auto_reload.ogg rename to packages/audio/weapon/auto_reload.ogg diff --git a/packages/audio/sounds/weapon/clip_empty.ogg b/packages/audio/weapon/clip_empty.ogg similarity index 100% rename from packages/audio/sounds/weapon/clip_empty.ogg rename to packages/audio/weapon/clip_empty.ogg diff --git a/packages/audio/sounds/weapon/grenade_bounce1.ogg b/packages/audio/weapon/grenade_bounce1.ogg similarity index 100% rename from packages/audio/sounds/weapon/grenade_bounce1.ogg rename to packages/audio/weapon/grenade_bounce1.ogg diff --git a/packages/audio/sounds/weapon/grenade_bounce2.ogg b/packages/audio/weapon/grenade_bounce2.ogg similarity index 100% rename from packages/audio/sounds/weapon/grenade_bounce2.ogg rename to packages/audio/weapon/grenade_bounce2.ogg diff --git a/packages/audio/sounds/weapon/grenade_exp.ogg b/packages/audio/weapon/grenade_exp.ogg similarity index 100% rename from packages/audio/sounds/weapon/grenade_exp.ogg rename to packages/audio/weapon/grenade_exp.ogg diff --git a/packages/audio/sounds/weapon/grenade_pull.ogg b/packages/audio/weapon/grenade_pull.ogg similarity index 100% rename from packages/audio/sounds/weapon/grenade_pull.ogg rename to packages/audio/weapon/grenade_pull.ogg diff --git a/packages/audio/sounds/weapon/grenade_throw.ogg b/packages/audio/weapon/grenade_throw.ogg similarity index 100% rename from packages/audio/sounds/weapon/grenade_throw.ogg rename to packages/audio/weapon/grenade_throw.ogg diff --git a/packages/audio/sounds/weapon/knife.ogg b/packages/audio/weapon/knife.ogg similarity index 100% rename from packages/audio/sounds/weapon/knife.ogg rename to packages/audio/weapon/knife.ogg diff --git a/packages/audio/sounds/weapon/pistol_akreload.ogg b/packages/audio/weapon/pistol_akreload.ogg similarity index 100% rename from packages/audio/sounds/weapon/pistol_akreload.ogg rename to packages/audio/weapon/pistol_akreload.ogg diff --git a/packages/audio/sounds/weapon/pistol_reload.ogg b/packages/audio/weapon/pistol_reload.ogg similarity index 100% rename from packages/audio/sounds/weapon/pistol_reload.ogg rename to packages/audio/weapon/pistol_reload.ogg diff --git a/packages/audio/sounds/weapon/ric1.ogg b/packages/audio/weapon/ric1.ogg similarity index 100% rename from packages/audio/sounds/weapon/ric1.ogg rename to packages/audio/weapon/ric1.ogg diff --git a/packages/audio/sounds/weapon/ric2.ogg b/packages/audio/weapon/ric2.ogg similarity index 100% rename from packages/audio/sounds/weapon/ric2.ogg rename to packages/audio/weapon/ric2.ogg diff --git a/packages/audio/sounds/weapon/ric3.ogg b/packages/audio/weapon/ric3.ogg similarity index 100% rename from packages/audio/sounds/weapon/ric3.ogg rename to packages/audio/weapon/ric3.ogg diff --git a/packages/audio/sounds/weapon/rifle.ogg b/packages/audio/weapon/rifle.ogg similarity index 100% rename from packages/audio/sounds/weapon/rifle.ogg rename to packages/audio/weapon/rifle.ogg diff --git a/packages/audio/sounds/weapon/rifle_reload.ogg b/packages/audio/weapon/rifle_reload.ogg similarity index 100% rename from packages/audio/sounds/weapon/rifle_reload.ogg rename to packages/audio/weapon/rifle_reload.ogg diff --git a/packages/audio/sounds/weapon/shotgun.ogg b/packages/audio/weapon/shotgun.ogg similarity index 100% rename from packages/audio/sounds/weapon/shotgun.ogg rename to packages/audio/weapon/shotgun.ogg diff --git a/packages/audio/sounds/weapon/shotgun_reload.ogg b/packages/audio/weapon/shotgun_reload.ogg similarity index 100% rename from packages/audio/sounds/weapon/shotgun_reload.ogg rename to packages/audio/weapon/shotgun_reload.ogg diff --git a/packages/audio/sounds/weapon/sniper.ogg b/packages/audio/weapon/sniper.ogg similarity index 100% rename from packages/audio/sounds/weapon/sniper.ogg rename to packages/audio/weapon/sniper.ogg diff --git a/packages/audio/sounds/weapon/sniper_reload.ogg b/packages/audio/weapon/sniper_reload.ogg similarity index 100% rename from packages/audio/sounds/weapon/sniper_reload.ogg rename to packages/audio/weapon/sniper_reload.ogg diff --git a/packages/audio/sounds/weapon/sub.ogg b/packages/audio/weapon/sub.ogg similarity index 100% rename from packages/audio/sounds/weapon/sub.ogg rename to packages/audio/weapon/sub.ogg diff --git a/packages/audio/sounds/weapon/sub_reload.ogg b/packages/audio/weapon/sub_reload.ogg similarity index 100% rename from packages/audio/sounds/weapon/sub_reload.ogg rename to packages/audio/weapon/sub_reload.ogg diff --git a/packages/audio/sounds/weapon/usp.ogg b/packages/audio/weapon/usp.ogg similarity index 100% rename from packages/audio/sounds/weapon/usp.ogg rename to packages/audio/weapon/usp.ogg diff --git a/packages/audio/sounds/weapon/waterimpact.ogg b/packages/audio/weapon/waterimpact.ogg similarity index 100% rename from packages/audio/sounds/weapon/waterimpact.ogg rename to packages/audio/weapon/waterimpact.ogg diff --git a/source/src/openal.cpp b/source/src/openal.cpp index 5322eb20..693d573a 100644 --- a/source/src/openal.cpp +++ b/source/src/openal.cpp @@ -266,7 +266,7 @@ bool sbuffer::load() string filepath; loopi(sizeof(exts)/sizeof(exts[0])) { - formatstring(filepath)("packages/audio/sounds/%s%s", name, exts[i]); + formatstring(filepath)("packages/audio/%s%s", name, exts[i]); stream *f = openfile(path(filepath), "rb"); if(!f) continue; diff --git a/source/src/worldio.cpp b/source/src/worldio.cpp index 2076f267..46deae05 100644 --- a/source/src/worldio.cpp +++ b/source/src/worldio.cpp @@ -264,7 +264,7 @@ void checkmapdependencies(bool silent = false, bool details = false) // find req else if(mapsounds[i].buf && mapsounds[i].buf->name) { used++; - USEFILENAME("packages/audio/sounds/%s", mapsounds[i].buf->name, msuse[i]); + USEFILENAME("packages/audio/%s", mapsounds[i].buf->name, msuse[i]); } } if(!silent) conoutf("used: %d mapsound slots", used); @@ -805,7 +805,7 @@ void listmapdependencies(char *mapname) // print map dependencies to file else if(mapsounds[i].buf && mapsounds[i].buf->name) { used++; - ADDFILENAME("packages/audio/sounds/%s", mapsounds[i].buf->name, msuse[i]); + ADDFILENAME("packages/audio/%s", mapsounds[i].buf->name, msuse[i]); f->printf(" mapsound slot %3d used %4d times, \"%s\"\n", i, msuse[i], fullname); } }