diff --git a/engine/audio/private/MPAFile.cpp b/engine/audio/MPAFile.cpp
similarity index 100%
rename from engine/audio/private/MPAFile.cpp
rename to engine/audio/MPAFile.cpp
diff --git a/engine/audio/private/MPAFile.h b/engine/audio/MPAFile.h
similarity index 100%
rename from engine/audio/private/MPAFile.h
rename to engine/audio/MPAFile.h
diff --git a/engine/audio/private/MPAHeader.cpp b/engine/audio/MPAHeader.cpp
similarity index 100%
rename from engine/audio/private/MPAHeader.cpp
rename to engine/audio/MPAHeader.cpp
diff --git a/engine/audio/private/MPAHeader.h b/engine/audio/MPAHeader.h
similarity index 100%
rename from engine/audio/private/MPAHeader.h
rename to engine/audio/MPAHeader.h
diff --git a/engine/audio/private/VBRHeader.cpp b/engine/audio/VBRHeader.cpp
similarity index 100%
rename from engine/audio/private/VBRHeader.cpp
rename to engine/audio/VBRHeader.cpp
diff --git a/engine/audio/private/VBRHeader.h b/engine/audio/VBRHeader.h
similarity index 100%
rename from engine/audio/private/VBRHeader.h
rename to engine/audio/VBRHeader.h
diff --git a/engine/audio/audio_pch.cpp b/engine/audio/audio_pch.cpp
deleted file mode 100644
index ca79d1f491..0000000000
--- a/engine/audio/audio_pch.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-//========= Copyright Valve Corporation, All rights reserved. ============//
-//
-// Purpose: 
-//
-// $Workfile:     $
-// $Date:         $
-// $NoKeywords: $
-//=============================================================================//
-
-#include "audio_pch.h"
diff --git a/engine/audio/audio_pch.h b/engine/audio/audio_pch.h
index 177e36a452..7ebe03dd8d 100644
--- a/engine/audio/audio_pch.h
+++ b/engine/audio/audio_pch.h
@@ -62,5 +62,5 @@
 #include "xbox/xbox_win32stubs.h"
 #include <xhv2.h>
 #elif POSIX
-#include "audio/private/posix_stubs.h"
+#include "audio/posix_stubs.h"
 #endif
diff --git a/engine/audio/private/circularbuffer.cpp b/engine/audio/circularbuffer.cpp
similarity index 100%
rename from engine/audio/private/circularbuffer.cpp
rename to engine/audio/circularbuffer.cpp
diff --git a/engine/audio/private/circularbuffer.h b/engine/audio/circularbuffer.h
similarity index 100%
rename from engine/audio/private/circularbuffer.h
rename to engine/audio/circularbuffer.h
diff --git a/engine/audio/private/eax.h b/engine/audio/eax.h
similarity index 100%
rename from engine/audio/private/eax.h
rename to engine/audio/eax.h
diff --git a/engine/audio/private/posix_stubs.h b/engine/audio/posix_stubs.h
similarity index 100%
rename from engine/audio/private/posix_stubs.h
rename to engine/audio/posix_stubs.h
diff --git a/engine/audio/private/snd_channels.h b/engine/audio/snd_channels.h
similarity index 100%
rename from engine/audio/private/snd_channels.h
rename to engine/audio/snd_channels.h
diff --git a/engine/audio/private/snd_convars.h b/engine/audio/snd_convars.h
similarity index 100%
rename from engine/audio/private/snd_convars.h
rename to engine/audio/snd_convars.h
diff --git a/engine/audio/private/snd_dev_common.cpp b/engine/audio/snd_dev_common.cpp
similarity index 100%
rename from engine/audio/private/snd_dev_common.cpp
rename to engine/audio/snd_dev_common.cpp
diff --git a/engine/audio/private/snd_dev_common.h b/engine/audio/snd_dev_common.h
similarity index 100%
rename from engine/audio/private/snd_dev_common.h
rename to engine/audio/snd_dev_common.h
diff --git a/engine/audio/private/snd_dev_direct.cpp b/engine/audio/snd_dev_direct.cpp
similarity index 100%
rename from engine/audio/private/snd_dev_direct.cpp
rename to engine/audio/snd_dev_direct.cpp
diff --git a/engine/audio/private/snd_dev_direct.h b/engine/audio/snd_dev_direct.h
similarity index 100%
rename from engine/audio/private/snd_dev_direct.h
rename to engine/audio/snd_dev_direct.h
diff --git a/engine/audio/private/snd_dev_mac_audioqueue.cpp b/engine/audio/snd_dev_mac_audioqueue.cpp
similarity index 100%
rename from engine/audio/private/snd_dev_mac_audioqueue.cpp
rename to engine/audio/snd_dev_mac_audioqueue.cpp
diff --git a/engine/audio/private/snd_dev_mac_audioqueue.h b/engine/audio/snd_dev_mac_audioqueue.h
similarity index 100%
rename from engine/audio/private/snd_dev_mac_audioqueue.h
rename to engine/audio/snd_dev_mac_audioqueue.h
diff --git a/engine/audio/private/snd_dev_openal.cpp b/engine/audio/snd_dev_openal.cpp
similarity index 100%
rename from engine/audio/private/snd_dev_openal.cpp
rename to engine/audio/snd_dev_openal.cpp
diff --git a/engine/audio/private/snd_dev_openal.h b/engine/audio/snd_dev_openal.h
similarity index 100%
rename from engine/audio/private/snd_dev_openal.h
rename to engine/audio/snd_dev_openal.h
diff --git a/engine/audio/private/snd_dev_sdl.cpp b/engine/audio/snd_dev_sdl.cpp
similarity index 100%
rename from engine/audio/private/snd_dev_sdl.cpp
rename to engine/audio/snd_dev_sdl.cpp
diff --git a/engine/audio/private/snd_dev_sdl.h b/engine/audio/snd_dev_sdl.h
similarity index 100%
rename from engine/audio/private/snd_dev_sdl.h
rename to engine/audio/snd_dev_sdl.h
diff --git a/engine/audio/private/snd_dev_wave.cpp b/engine/audio/snd_dev_wave.cpp
similarity index 100%
rename from engine/audio/private/snd_dev_wave.cpp
rename to engine/audio/snd_dev_wave.cpp
diff --git a/engine/audio/private/snd_dev_wave.h b/engine/audio/snd_dev_wave.h
similarity index 100%
rename from engine/audio/private/snd_dev_wave.h
rename to engine/audio/snd_dev_wave.h
diff --git a/engine/audio/private/snd_dev_xaudio.cpp b/engine/audio/snd_dev_xaudio.cpp
similarity index 100%
rename from engine/audio/private/snd_dev_xaudio.cpp
rename to engine/audio/snd_dev_xaudio.cpp
diff --git a/engine/audio/private/snd_dev_xaudio.h b/engine/audio/snd_dev_xaudio.h
similarity index 100%
rename from engine/audio/private/snd_dev_xaudio.h
rename to engine/audio/snd_dev_xaudio.h
diff --git a/engine/audio/private/snd_dma.cpp b/engine/audio/snd_dma.cpp
similarity index 100%
rename from engine/audio/private/snd_dma.cpp
rename to engine/audio/snd_dma.cpp
diff --git a/engine/audio/private/snd_dma.h b/engine/audio/snd_dma.h
similarity index 100%
rename from engine/audio/private/snd_dma.h
rename to engine/audio/snd_dma.h
diff --git a/engine/audio/private/snd_dsp.cpp b/engine/audio/snd_dsp.cpp
similarity index 100%
rename from engine/audio/private/snd_dsp.cpp
rename to engine/audio/snd_dsp.cpp
diff --git a/engine/audio/private/snd_env_fx.h b/engine/audio/snd_env_fx.h
similarity index 100%
rename from engine/audio/private/snd_env_fx.h
rename to engine/audio/snd_env_fx.h
diff --git a/engine/audio/private/snd_fixedint.h b/engine/audio/snd_fixedint.h
similarity index 100%
rename from engine/audio/private/snd_fixedint.h
rename to engine/audio/snd_fixedint.h
diff --git a/engine/audio/private/snd_mix.cpp b/engine/audio/snd_mix.cpp
similarity index 100%
rename from engine/audio/private/snd_mix.cpp
rename to engine/audio/snd_mix.cpp
diff --git a/engine/audio/private/snd_mix_buf.h b/engine/audio/snd_mix_buf.h
similarity index 100%
rename from engine/audio/private/snd_mix_buf.h
rename to engine/audio/snd_mix_buf.h
diff --git a/engine/audio/private/snd_mp3_source.cpp b/engine/audio/snd_mp3_source.cpp
similarity index 100%
rename from engine/audio/private/snd_mp3_source.cpp
rename to engine/audio/snd_mp3_source.cpp
diff --git a/engine/audio/private/snd_mp3_source.h b/engine/audio/snd_mp3_source.h
similarity index 100%
rename from engine/audio/private/snd_mp3_source.h
rename to engine/audio/snd_mp3_source.h
diff --git a/engine/audio/private/snd_posix.cpp b/engine/audio/snd_posix.cpp
similarity index 100%
rename from engine/audio/private/snd_posix.cpp
rename to engine/audio/snd_posix.cpp
diff --git a/engine/audio/private/snd_sentence_mixer.cpp b/engine/audio/snd_sentence_mixer.cpp
similarity index 100%
rename from engine/audio/private/snd_sentence_mixer.cpp
rename to engine/audio/snd_sentence_mixer.cpp
diff --git a/engine/audio/private/snd_sfx.h b/engine/audio/snd_sfx.h
similarity index 100%
rename from engine/audio/private/snd_sfx.h
rename to engine/audio/snd_sfx.h
diff --git a/engine/audio/private/snd_stubs.cpp b/engine/audio/snd_stubs.cpp
similarity index 100%
rename from engine/audio/private/snd_stubs.cpp
rename to engine/audio/snd_stubs.cpp
diff --git a/engine/audio/private/snd_stubs.h b/engine/audio/snd_stubs.h
similarity index 100%
rename from engine/audio/private/snd_stubs.h
rename to engine/audio/snd_stubs.h
diff --git a/engine/audio/private/snd_wave_data.cpp b/engine/audio/snd_wave_data.cpp
similarity index 100%
rename from engine/audio/private/snd_wave_data.cpp
rename to engine/audio/snd_wave_data.cpp
diff --git a/engine/audio/private/snd_wave_data.h b/engine/audio/snd_wave_data.h
similarity index 100%
rename from engine/audio/private/snd_wave_data.h
rename to engine/audio/snd_wave_data.h
diff --git a/engine/audio/private/snd_wave_mixer.cpp b/engine/audio/snd_wave_mixer.cpp
similarity index 100%
rename from engine/audio/private/snd_wave_mixer.cpp
rename to engine/audio/snd_wave_mixer.cpp
diff --git a/engine/audio/private/snd_wave_mixer.h b/engine/audio/snd_wave_mixer.h
similarity index 100%
rename from engine/audio/private/snd_wave_mixer.h
rename to engine/audio/snd_wave_mixer.h
diff --git a/engine/audio/private/snd_wave_mixer_adpcm.cpp b/engine/audio/snd_wave_mixer_adpcm.cpp
similarity index 100%
rename from engine/audio/private/snd_wave_mixer_adpcm.cpp
rename to engine/audio/snd_wave_mixer_adpcm.cpp
diff --git a/engine/audio/private/snd_wave_mixer_adpcm.h b/engine/audio/snd_wave_mixer_adpcm.h
similarity index 100%
rename from engine/audio/private/snd_wave_mixer_adpcm.h
rename to engine/audio/snd_wave_mixer_adpcm.h
diff --git a/engine/audio/private/snd_wave_mixer_mp3.cpp b/engine/audio/snd_wave_mixer_mp3.cpp
similarity index 100%
rename from engine/audio/private/snd_wave_mixer_mp3.cpp
rename to engine/audio/snd_wave_mixer_mp3.cpp
diff --git a/engine/audio/private/snd_wave_mixer_mp3.h b/engine/audio/snd_wave_mixer_mp3.h
similarity index 100%
rename from engine/audio/private/snd_wave_mixer_mp3.h
rename to engine/audio/snd_wave_mixer_mp3.h
diff --git a/engine/audio/private/snd_wave_mixer_private.h b/engine/audio/snd_wave_mixer_private.h
similarity index 100%
rename from engine/audio/private/snd_wave_mixer_private.h
rename to engine/audio/snd_wave_mixer_private.h
diff --git a/engine/audio/private/snd_wave_mixer_xma.cpp b/engine/audio/snd_wave_mixer_xma.cpp
similarity index 100%
rename from engine/audio/private/snd_wave_mixer_xma.cpp
rename to engine/audio/snd_wave_mixer_xma.cpp
diff --git a/engine/audio/private/snd_wave_mixer_xma.h b/engine/audio/snd_wave_mixer_xma.h
similarity index 100%
rename from engine/audio/private/snd_wave_mixer_xma.h
rename to engine/audio/snd_wave_mixer_xma.h
diff --git a/engine/audio/private/snd_wave_source.cpp b/engine/audio/snd_wave_source.cpp
similarity index 100%
rename from engine/audio/private/snd_wave_source.cpp
rename to engine/audio/snd_wave_source.cpp
diff --git a/engine/audio/private/snd_wave_source.h b/engine/audio/snd_wave_source.h
similarity index 100%
rename from engine/audio/private/snd_wave_source.h
rename to engine/audio/snd_wave_source.h
diff --git a/engine/audio/private/snd_wave_temp.cpp b/engine/audio/snd_wave_temp.cpp
similarity index 100%
rename from engine/audio/private/snd_wave_temp.cpp
rename to engine/audio/snd_wave_temp.cpp
diff --git a/engine/audio/private/snd_wave_temp.h b/engine/audio/snd_wave_temp.h
similarity index 100%
rename from engine/audio/private/snd_wave_temp.h
rename to engine/audio/snd_wave_temp.h
diff --git a/engine/audio/private/snd_win.cpp b/engine/audio/snd_win.cpp
similarity index 99%
rename from engine/audio/private/snd_win.cpp
rename to engine/audio/snd_win.cpp
index 742f5591d3..818312e307 100644
--- a/engine/audio/private/snd_win.cpp
+++ b/engine/audio/snd_win.cpp
@@ -107,7 +107,6 @@ IAudioDevice *IAudioDevice::AutoDetectInit( bool waveOnly )
 #elif defined( USE_SDL )
 		DevMsg( "Trying SDL Audio Interface\n" );
 		pDevice = Audio_CreateSDLAudioDevice();
-
 #ifdef NEVER
 		// Jul 2012. mikesart. E-mail exchange with Ryan Gordon after figuring out that
 		// Audio_CreatePulseAudioDevice() wasn't working on Ubuntu 12.04 (lots of stuttering).
diff --git a/engine/audio/private/sound_private.h b/engine/audio/sound_private.h
similarity index 100%
rename from engine/audio/private/sound_private.h
rename to engine/audio/sound_private.h
diff --git a/engine/audio/private/voice.cpp b/engine/audio/voice.cpp
similarity index 100%
rename from engine/audio/private/voice.cpp
rename to engine/audio/voice.cpp
diff --git a/engine/audio/private/voice_gain.cpp b/engine/audio/voice_gain.cpp
similarity index 100%
rename from engine/audio/private/voice_gain.cpp
rename to engine/audio/voice_gain.cpp
diff --git a/engine/audio/private/voice_gain.h b/engine/audio/voice_gain.h
similarity index 100%
rename from engine/audio/private/voice_gain.h
rename to engine/audio/voice_gain.h
diff --git a/engine/audio/private/voice_mixer_controls.cpp b/engine/audio/voice_mixer_controls.cpp
similarity index 100%
rename from engine/audio/private/voice_mixer_controls.cpp
rename to engine/audio/voice_mixer_controls.cpp
diff --git a/engine/audio/private/voice_mixer_controls.h b/engine/audio/voice_mixer_controls.h
similarity index 100%
rename from engine/audio/private/voice_mixer_controls.h
rename to engine/audio/voice_mixer_controls.h
diff --git a/engine/audio/private/voice_mixer_controls_openal.cpp b/engine/audio/voice_mixer_controls_openal.cpp
similarity index 100%
rename from engine/audio/private/voice_mixer_controls_openal.cpp
rename to engine/audio/voice_mixer_controls_openal.cpp
diff --git a/engine/audio/private/voice_record_dsound.cpp b/engine/audio/voice_record_dsound.cpp
similarity index 100%
rename from engine/audio/private/voice_record_dsound.cpp
rename to engine/audio/voice_record_dsound.cpp
diff --git a/engine/audio/private/voice_record_mac_audioqueue.cpp b/engine/audio/voice_record_mac_audioqueue.cpp
similarity index 100%
rename from engine/audio/private/voice_record_mac_audioqueue.cpp
rename to engine/audio/voice_record_mac_audioqueue.cpp
diff --git a/engine/audio/private/voice_record_openal.cpp b/engine/audio/voice_record_openal.cpp
similarity index 100%
rename from engine/audio/private/voice_record_openal.cpp
rename to engine/audio/voice_record_openal.cpp
diff --git a/engine/audio/private/voice_record_sdl.cpp b/engine/audio/voice_record_sdl.cpp
similarity index 100%
rename from engine/audio/private/voice_record_sdl.cpp
rename to engine/audio/voice_record_sdl.cpp
diff --git a/engine/audio/private/voice_sound_engine_interface.cpp b/engine/audio/voice_sound_engine_interface.cpp
similarity index 100%
rename from engine/audio/private/voice_sound_engine_interface.cpp
rename to engine/audio/voice_sound_engine_interface.cpp
diff --git a/engine/audio/private/voice_sound_engine_interface.h b/engine/audio/voice_sound_engine_interface.h
similarity index 100%
rename from engine/audio/private/voice_sound_engine_interface.h
rename to engine/audio/voice_sound_engine_interface.h
diff --git a/engine/audio/private/voice_wavefile.cpp b/engine/audio/voice_wavefile.cpp
similarity index 100%
rename from engine/audio/private/voice_wavefile.cpp
rename to engine/audio/voice_wavefile.cpp
diff --git a/engine/audio/private/voice_wavefile.h b/engine/audio/voice_wavefile.h
similarity index 100%
rename from engine/audio/private/voice_wavefile.h
rename to engine/audio/voice_wavefile.h
diff --git a/engine/audio/private/vox.cpp b/engine/audio/vox.cpp
similarity index 100%
rename from engine/audio/private/vox.cpp
rename to engine/audio/vox.cpp
diff --git a/engine/audio/private/vox_private.h b/engine/audio/vox_private.h
similarity index 100%
rename from engine/audio/private/vox_private.h
rename to engine/audio/vox_private.h
diff --git a/engine/audio/public/ivoicecodec.h b/public/engine/audio/ivoicecodec.h
similarity index 100%
rename from engine/audio/public/ivoicecodec.h
rename to public/engine/audio/ivoicecodec.h
diff --git a/engine/audio/public/ivoicerecord.h b/public/engine/audio/ivoicerecord.h
similarity index 100%
rename from engine/audio/public/ivoicerecord.h
rename to public/engine/audio/ivoicerecord.h
diff --git a/engine/audio/public/snd_audio_source.h b/public/engine/audio/snd_audio_source.h
similarity index 100%
rename from engine/audio/public/snd_audio_source.h
rename to public/engine/audio/snd_audio_source.h
diff --git a/engine/audio/public/snd_device.h b/public/engine/audio/snd_device.h
similarity index 100%
rename from engine/audio/public/snd_device.h
rename to public/engine/audio/snd_device.h
diff --git a/engine/audio/public/snd_io.h b/public/engine/audio/snd_io.h
similarity index 100%
rename from engine/audio/public/snd_io.h
rename to public/engine/audio/snd_io.h
diff --git a/engine/audio/public/sound.h b/public/engine/audio/sound.h
similarity index 100%
rename from engine/audio/public/sound.h
rename to public/engine/audio/sound.h
diff --git a/engine/audio/public/soundservice.h b/public/engine/audio/soundservice.h
similarity index 100%
rename from engine/audio/public/soundservice.h
rename to public/engine/audio/soundservice.h
diff --git a/engine/audio/public/voice.h b/public/engine/audio/voice.h
similarity index 100%
rename from engine/audio/public/voice.h
rename to public/engine/audio/voice.h
diff --git a/engine/audio/public/vox.h b/public/engine/audio/vox.h
similarity index 100%
rename from engine/audio/public/vox.h
rename to public/engine/audio/vox.h