diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb25724..c8bb2b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -159,9 +159,9 @@ include("cmake/CompileOptions.cmake")
 # Subdirectories
 #-------------------------------------------------------------------------------
 
-add_subdirectory("dep/speex")
-add_subdirectory("dep/silk")
-add_subdirectory("dep/opus")
-add_subdirectory("dep/rehlsdk")
-add_subdirectory("dep/metamod")
+add_subdirectory("external/speex")
+add_subdirectory("external/silk")
+add_subdirectory("external/opus")
+add_subdirectory("external/rehlsdk")
+add_subdirectory("external/metamod")
 add_subdirectory("revoice")
diff --git a/revoice/dist/revoice.cfg b/data/revoice.cfg
similarity index 100%
rename from revoice/dist/revoice.cfg
rename to data/revoice.cfg
diff --git a/dep/opus/CMakeLists.txt b/dep/opus/CMakeLists.txt
deleted file mode 100644
index 7a797b7..0000000
--- a/dep/opus/CMakeLists.txt
+++ /dev/null
@@ -1,280 +0,0 @@
-#-------------------------------------------------------------------------------
-# Project Definition
-#-------------------------------------------------------------------------------
-
-project("Opus")
-
-#-------------------------------------------------------------------------------
-# Target Definition
-#-------------------------------------------------------------------------------
-
-set(TARGET_NAME "opus")
-set(TARGET_ALIAS "Opus::${TARGET_NAME}")
-
-add_library("${TARGET_NAME}")
-add_library("${TARGET_ALIAS}" ALIAS "${TARGET_NAME}")
-
-#-------------------------------------------------------------------------------
-# Source Files
-#-------------------------------------------------------------------------------
-
-target_sources("${TARGET_NAME}"
-  PUBLIC
-    "include/opus_custom.h"
-    "include/opus_defines.h"
-    "include/opus_multistream.h"
-    "include/opus_types.h"
-    "include/opus.h"
-
-  PRIVATE
-    "src/analysis.c"
-    "src/analysis.h"
-    "src/mlp_data.c"
-    "src/mlp.c"
-    "src/mlp.h"
-    "src/opus_decoder.c"
-    "src/opus_encoder.c"
-    "src/opus_multistream_decoder.c"
-    "src/opus_multistream_encoder.c"
-    "src/opus_multistream.c"
-    "src/opus_private.h"
-    "src/opus.c"
-    "src/repacketizer.c"
-    "src/tansig_table.h"
-
-    "celt/_kiss_fft_guts.h"
-    "celt/arch.h"
-    "celt/bands.c"
-    "celt/bands.h"
-    "celt/celt_decoder.c"
-    "celt/celt_encoder.c"
-    "celt/celt_lpc.c"
-    "celt/celt_lpc.h"
-    "celt/celt.c"
-    "celt/celt.h"
-    "celt/cpu_support.h"
-    "celt/cwrs.c"
-    "celt/cwrs.h"
-    "celt/ecintrin.h"
-    "celt/entcode.c"
-    "celt/entcode.h"
-    "celt/entdec.c"
-    "celt/entdec.h"
-    "celt/entenc.c"
-    "celt/entenc.h"
-    "celt/fixed_debug.h"
-    "celt/fixed_generic.h"
-    "celt/float_cast.h"
-    "celt/kiss_fft.c"
-    "celt/kiss_fft.h"
-    "celt/laplace.c"
-    "celt/laplace.h"
-    "celt/mathops.c"
-    "celt/mathops.h"
-    "celt/mdct.c"
-    "celt/mdct.h"
-    "celt/mfrngcod.h"
-    "celt/modes.c"
-    "celt/modes.h"
-    "celt/os_support.h"
-    "celt/pitch.c"
-    "celt/pitch.h"
-    "celt/quant_bands.c"
-    "celt/quant_bands.h"
-    "celt/rate.c"
-    "celt/rate.h"
-    "celt/stack_alloc.h"
-    "celt/static_modes_fixed_arm_ne10.h"
-    "celt/static_modes_fixed.h"
-    "celt/static_modes_float_arm_ne10.h"
-    "celt/static_modes_float.h"
-    "celt/vq.c"
-    "celt/vq.h"
-    "celt/x86/celt_lpc_sse.c"
-    "celt/x86/celt_lpc_sse.h"
-    "celt/x86/pitch_sse.c"
-    "celt/x86/pitch_sse.h"
-    "celt/x86/pitch_sse2.c"
-    "celt/x86/pitch_sse4_1.c"
-    "celt/x86/x86_celt_map.c"
-    "celt/x86/x86cpu.c"
-    "celt/x86/x86cpu.h"
-
-    "silk/A2NLSF.c"
-    "silk/ana_filt_bank_1.c"
-    "silk/API.h"
-    "silk/biquad_alt.c"
-    "silk/bwexpander_32.c"
-    "silk/bwexpander.c"
-    "silk/check_control_input.c"
-    "silk/CNG.c"
-    "silk/code_signs.c"
-    "silk/control_audio_bandwidth.c"
-    "silk/control_codec.c"
-    "silk/control_SNR.c"
-    "silk/control.h"
-    "silk/debug.c"
-    "silk/debug.h"
-    "silk/dec_API.c"
-    "silk/decode_core.c"
-    "silk/decode_frame.c"
-    "silk/decode_indices.c"
-    "silk/decode_parameters.c"
-    "silk/decode_pitch.c"
-    "silk/decode_pulses.c"
-    "silk/decoder_set_fs.c"
-    "silk/define.h"
-    "silk/enc_API.c"
-    "silk/encode_indices.c"
-    "silk/encode_pulses.c"
-    "silk/errors.h"
-    "silk/gain_quant.c"
-    "silk/HP_variable_cutoff.c"
-    "silk/init_decoder.c"
-    "silk/init_encoder.c"
-    "silk/Inlines.h"
-    "silk/inner_prod_aligned.c"
-    "silk/interpolate.c"
-    "silk/lin2log.c"
-    "silk/log2lin.c"
-    "silk/LP_variable_cutoff.c"
-    "silk/LPC_analysis_filter.c"
-    "silk/LPC_inv_pred_gain.c"
-    "silk/MacroCount.h"
-    "silk/MacroDebug.h"
-    "silk/macros.h"
-    "silk/main.h"
-    "silk/NLSF_decode.c"
-    "silk/NLSF_del_dec_quant.c"
-    "silk/NLSF_encode.c"
-    "silk/NLSF_stabilize.c"
-    "silk/NLSF_unpack.c"
-    "silk/NLSF_VQ_weights_laroia.c"
-    "silk/NLSF_VQ.c"
-    "silk/NLSF2A.c"
-    "silk/NSQ_del_dec.c"
-    "silk/NSQ.c"
-    "silk/NSQ.h"
-    "silk/pitch_est_defines.h"
-    "silk/pitch_est_tables.c"
-    "silk/PLC.c"
-    "silk/PLC.h"
-    "silk/process_NLSFs.c"
-    "silk/quant_LTP_gains.c"
-    "silk/resampler_down2_3.c"
-    "silk/resampler_down2.c"
-    "silk/resampler_private_AR2.c"
-    "silk/resampler_private_down_FIR.c"
-    "silk/resampler_private_IIR_FIR.c"
-    "silk/resampler_private_up2_HQ.c"
-    "silk/resampler_private.h"
-    "silk/resampler_rom.c"
-    "silk/resampler_rom.h"
-    "silk/resampler_structs.h"
-    "silk/resampler.c"
-    "silk/shell_coder.c"
-    "silk/sigm_Q15.c"
-    "silk/SigProc_FIX.h"
-    "silk/sort.c"
-    "silk/stereo_decode_pred.c"
-    "silk/stereo_encode_pred.c"
-    "silk/stereo_find_predictor.c"
-    "silk/stereo_LR_to_MS.c"
-    "silk/stereo_MS_to_LR.c"
-    "silk/stereo_quant_pred.c"
-    "silk/structs.h"
-    "silk/sum_sqr_shift.c"
-    "silk/table_LSF_cos.c"
-    "silk/tables_gain.c"
-    "silk/tables_LTP.c"
-    "silk/tables_NLSF_CB_NB_MB.c"
-    "silk/tables_NLSF_CB_WB.c"
-    "silk/tables_other.c"
-    "silk/tables_pitch_lag.c"
-    "silk/tables_pulses_per_block.c"
-    "silk/tables.h"
-    "silk/tuning_parameters.h"
-    "silk/typedef.h"
-    "silk/VAD.c"
-    "silk/VQ_WMat_EC.c"
-    "silk/float/apply_sine_window_FLP.c"
-    "silk/float/autocorrelation_FLP.c"
-    "silk/float/burg_modified_FLP.c"
-    "silk/float/bwexpander_FLP.c"
-    "silk/float/corrMatrix_FLP.c"
-    "silk/float/encode_frame_FLP.c"
-    "silk/float/energy_FLP.c"
-    "silk/float/find_LPC_FLP.c"
-    "silk/float/find_LTP_FLP.c"
-    "silk/float/find_pitch_lags_FLP.c"
-    "silk/float/find_pred_coefs_FLP.c"
-    "silk/float/inner_product_FLP.c"
-    "silk/float/k2a_FLP.c"
-    "silk/float/levinsondurbin_FLP.c"
-    "silk/float/LPC_analysis_filter_FLP.c"
-    "silk/float/LPC_inv_pred_gain_FLP.c"
-    "silk/float/LTP_analysis_filter_FLP.c"
-    "silk/float/LTP_scale_ctrl_FLP.c"
-    "silk/float/main_FLP.h"
-    "silk/float/noise_shape_analysis_FLP.c"
-    "silk/float/pitch_analysis_core_FLP.c"
-    "silk/float/prefilter_FLP.c"
-    "silk/float/process_gains_FLP.c"
-    "silk/float/regularize_correlations_FLP.c"
-    "silk/float/residual_energy_FLP.c"
-    "silk/float/scale_copy_vector_FLP.c"
-    "silk/float/scale_vector_FLP.c"
-    "silk/float/schur_FLP.c"
-    "silk/float/SigProc_FLP.h"
-    "silk/float/solve_LS_FLP.c"
-    "silk/float/sort_FLP.c"
-    "silk/float/structs_FLP.h"
-    "silk/float/warped_autocorrelation_FLP.c"
-    "silk/float/wrappers_FLP.c"
-)
-
-#-------------------------------------------------------------------------------
-# Include Directories
-#-------------------------------------------------------------------------------
-
-target_include_directories("${TARGET_NAME}"
-  PUBLIC
-    "${PROJECT_SOURCE_DIR}/include"
-    "${PROJECT_SOURCE_DIR}/celt"
-    "${PROJECT_SOURCE_DIR}/silk"
-    "${PROJECT_SOURCE_DIR}/silk/float"
-)
-
-#-------------------------------------------------------------------------------
-# Target Properties
-#-------------------------------------------------------------------------------
-
-if(NOT WIN32)
-  set_target_properties("${TARGET_NAME}"
-    PROPERTIES
-      # Disable IPO as it causes some warnings
-      INTERPROCEDURAL_OPTIMIZATION OFF
-      INTERPROCEDURAL_OPTIMIZATION_MINSIZEREL OFF
-      INTERPROCEDURAL_OPTIMIZATION_RELEASE OFF
-      INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO OFF
-  )
-endif()
-
-#-------------------------------------------------------------------------------
-# Compile Definitions
-#-------------------------------------------------------------------------------
-
-target_compile_definitions("${TARGET_NAME}"
-  PRIVATE
-    OPUS_BUILD
-    USE_ALLOCA
-)
-
-#-------------------------------------------------------------------------------
-# Compile Options
-#-------------------------------------------------------------------------------
-
-target_compile_options("${TARGET_NAME}"
-  PRIVATE
-    $<IF:$<CXX_COMPILER_ID:MSVC>,/W0,-w>
-)
diff --git a/dep/rehlsdk/CMakeLists.txt b/dep/rehlsdk/CMakeLists.txt
deleted file mode 100644
index f840892..0000000
--- a/dep/rehlsdk/CMakeLists.txt
+++ /dev/null
@@ -1,177 +0,0 @@
-#-------------------------------------------------------------------------------
-# Project Definition
-#-------------------------------------------------------------------------------
-
-project("ReHLSDK")
-
-#-------------------------------------------------------------------------------
-# Target Definition
-#-------------------------------------------------------------------------------
-
-set(TARGET_NAME "rehlsdk")
-set(TARGET_ALIAS "ReHLSDK::${TARGET_NAME}")
-
-add_library("${TARGET_NAME}" INTERFACE)
-add_library("${TARGET_ALIAS}" ALIAS "${TARGET_NAME}")
-
-#-------------------------------------------------------------------------------
-# Source Files
-#-------------------------------------------------------------------------------
-
-target_sources("${TARGET_NAME}"
-  INTERFACE
-    "common/BaseSystemModule.h"
-    "common/beamdef.h"
-    "common/cl_entity.h"
-    "common/com_model.h"
-    "common/con_nprint.h"
-    "common/const.h"
-    "common/crc.h"
-    "common/cvardef.h"
-    "common/demo_api.h"
-    "common/director_cmds.h"
-    "common/dlight.h"
-    "common/dll_state.h"
-    "common/entity_state.h"
-    "common/entity_types.h"
-    "common/enums.h"
-    "common/event_api.h"
-    "common/event_args.h"
-    "common/event_flags.h"
-    "common/hltv.h"
-    "common/IAdminServer.h"
-    "common/IBaseSystem.h"
-    "common/IDemoPlayer.h"
-    "common/IEngineWrapper.h"
-    "common/IGameServerData.h"
-    "common/in_buttons.h"
-    "common/IObjectContainer.h"
-    "common/ISystemModule.h"
-    "common/IVGuiModule.h"
-    "common/ivoicetweak.h"
-    "common/kbutton.h"
-    "common/mathlib.h"
-    "common/md5.h"
-    "common/net_api.h"
-    "common/netadr.h"
-    "common/netapi.h"
-    "common/nowin.h"
-    "common/ObjectDictionary.h"
-    "common/ObjectList.h"
-    "common/parsemsg.h"
-    "common/particledef.h"
-    "common/pmtrace.h"
-    "common/port.h"
-    "common/qfont.h"
-    "common/qlimits.h"
-    "common/quakedef.h"
-    "common/r_efx.h"
-    "common/r_studioint.h"
-    "common/ref_params.h"
-    "common/screenfade.h"
-    "common/Sequence.h"
-    "common/SteamAppStartUp.h"
-    "common/SteamCommon.h"
-    "common/studio_event.h"
-    "common/textconsole.h"
-    "common/TextConsoleUnix.h"
-    "common/TextConsoleWin32.h"
-    "common/TokenLine.h"
-    "common/triangleapi.h"
-    "common/usercmd.h"
-    "common/vmodes.h"
-    "common/weaponinfo.h"
-    "common/winsani_in.h"
-    "common/winsani_out.h"
-
-    "dlls/activity.h"
-    "dlls/activitymap.h"
-    "dlls/animation.h"
-    "dlls/basemonster.h"
-    "dlls/cbase.h"
-    "dlls/cdll_dll.h"
-    "dlls/client.h"
-    "dlls/decals.h"
-    "dlls/doors.h"
-    "dlls/effects.h"
-    "dlls/enginecallback.h"
-    "dlls/explode.h"
-    "dlls/extdll.h"
-    "dlls/func_break.h"
-    "dlls/game.h"
-    "dlls/gamerules.h"
-    "dlls/hornet.h"
-    "dlls/items.h"
-    "dlls/maprules.h"
-    "dlls/monsterevent.h"
-    "dlls/monsters.h"
-    "dlls/nodes.h"
-    "dlls/plane.h"
-    "dlls/player.h"
-    "dlls/saverestore.h"
-    "dlls/schedule.h"
-    "dlls/scriptevent.h"
-    "dlls/skill.h"
-    "dlls/soundent.h"
-    "dlls/spectator.h"
-    "dlls/talkmonster.h"
-    "dlls/teamplay_gamerules.h"
-    "dlls/trains.h"
-    "dlls/util.h"
-    "dlls/vector.h"
-    "dlls/weapons.h"
-
-    "engine/archtypes.h"
-    "engine/bspfile.h"
-    "engine/cmd_rehlds.h"
-    "engine/common_rehlds.h"
-    "engine/crc32c.h"
-    "engine/custom.h"
-    "engine/customentity.h"
-    "engine/d_local.h"
-    "engine/edict.h"
-    "engine/eiface.h"
-    "engine/FlightRecorder.h"
-    "engine/hookchains.h"
-    "engine/keydefs.h"
-    "engine/maintypes.h"
-    "engine/model.h"
-    "engine/modelgen.h"
-    "engine/osconfig.h"
-    "engine/pr_dlls.h"
-    "engine/progdefs.h"
-    "engine/progs.h"
-    "engine/rehlds_api.h"
-    "engine/rehlds_interfaces.h"
-    "engine/Sequence.h"
-    "engine/shake.h"
-    "engine/spritegn.h"
-    "engine/static_map.h"
-    "engine/studio.h"
-    "engine/sys_shared.h"
-    "engine/userid_rehlds.h"
-
-    "pm_shared/pm_debug.h"
-    "pm_shared/pm_defs.h"
-    "pm_shared/pm_info.h"
-    "pm_shared/pm_materials.h"
-    "pm_shared/pm_movevars.h"
-    "pm_shared/pm_shared.h"
-
-    "public/commonmacros.h"
-    "public/FileSystem.h"
-    "public/interface.h"
-)
-
-#-------------------------------------------------------------------------------
-# Include Directories
-#-------------------------------------------------------------------------------
-
-target_include_directories("${TARGET_NAME}" SYSTEM
-  INTERFACE
-    "${PROJECT_SOURCE_DIR}/common"
-    "${PROJECT_SOURCE_DIR}/dlls"
-    "${PROJECT_SOURCE_DIR}/engine"
-    "${PROJECT_SOURCE_DIR}/pm_shared"
-    "${PROJECT_SOURCE_DIR}/public"
-)
diff --git a/dep/metamod/CMakeLists.txt b/external/metamod/CMakeLists.txt
similarity index 73%
rename from dep/metamod/CMakeLists.txt
rename to external/metamod/CMakeLists.txt
index d5a480c..6f03401 100644
--- a/dep/metamod/CMakeLists.txt
+++ b/external/metamod/CMakeLists.txt
@@ -20,19 +20,19 @@ add_library("${TARGET_ALIAS}" ALIAS "${TARGET_NAME}")
 
 target_sources("${TARGET_NAME}"
   INTERFACE
-    "dllapi.h"
-    "engine_api.h"
-    "enginecallbacks.h"
-    "h_export.h"
-    "log_meta.h"
-    "meta_api.h"
-    "mhook.h"
-    "mreg.h"
-    "mutil.h"
-    "osdep.h"
-    "plinfo.h"
-    "sdk_util.h"
-    "types_meta.h"
+    "include/metamod/dllapi.h"
+    "include/metamod/engine_api.h"
+    "include/metamod/enginecallbacks.h"
+    "include/metamod/h_export.h"
+    "include/metamod/log_meta.h"
+    "include/metamod/meta_api.h"
+    "include/metamod/mhook.h"
+    "include/metamod/mreg.h"
+    "include/metamod/mutil.h"
+    "include/metamod/osdep.h"
+    "include/metamod/plinfo.h"
+    "include/metamod/sdk_util.h"
+    "include/metamod/types_meta.h"
 )
 
 #-------------------------------------------------------------------------------
@@ -41,7 +41,7 @@ target_sources("${TARGET_NAME}"
 
 target_include_directories("${TARGET_NAME}"
   INTERFACE
-    "${PROJECT_SOURCE_DIR}"
+    "${PROJECT_SOURCE_DIR}/include"
 )
 
 #-------------------------------------------------------------------------------
diff --git a/dep/metamod/dllapi.h b/external/metamod/include/metamod/dllapi.h
similarity index 100%
rename from dep/metamod/dllapi.h
rename to external/metamod/include/metamod/dllapi.h
diff --git a/revoice/include/engine_api.h b/external/metamod/include/metamod/engine_api.h
similarity index 99%
rename from revoice/include/engine_api.h
rename to external/metamod/include/metamod/engine_api.h
index 3e46d28..922b687 100644
--- a/revoice/include/engine_api.h
+++ b/external/metamod/include/metamod/engine_api.h
@@ -34,7 +34,7 @@
 #ifndef ENGINE_API_H
 #define ENGINE_API_H
 
-#include <archtypes.h>
+#include <rehlsdk/engine/archtypes.h>
 
 // Plugin's GetEngineFunctions, called by metamod.
 typedef int (*GET_ENGINE_FUNCTIONS_FN) (enginefuncs_t *pengfuncsFromEngine, int *interfaceVersion);
@@ -458,4 +458,4 @@ typedef void (*FN_QUERYCLIENTCVARVALUE)(const edict_t *pEdict, const char *cvarN
 //Added 2005-11-22 (no SDK update)
 typedef void (*FN_QUERYCLIENTCVARVALUE2)(const edict_t *pEdict, const char *cvarName, int requestID);
 
-#endif /* ENGINE_API_H */
\ No newline at end of file
+#endif /* ENGINE_API_H */
diff --git a/revoice/include/enginecallbacks.h b/external/metamod/include/metamod/enginecallbacks.h
similarity index 96%
rename from revoice/include/enginecallbacks.h
rename to external/metamod/include/metamod/enginecallbacks.h
index 7045fbb..4be0a80 100644
--- a/revoice/include/enginecallbacks.h
+++ b/external/metamod/include/metamod/enginecallbacks.h
@@ -45,14 +45,14 @@
 // when compiling Metamod proper.
 
 #ifdef METAMOD_CORE
-#  include "meta_eiface.h"        // HL_enginefuncs_t
+#  include "meta_eiface.h"                  // HL_enginefuncs_t
 
 // Use a #define to bend the enginefuncs_t type to our HL_enginefuncs_t
 // type instead as we now use that for the global object g_engfuncs.
 #  define enginefuncs_t HL_enginefuncs_t
 #endif /* METAMOD_CORE */
 
-#include <enginecallback.h>		// ALERT, etc
+#include <rehlsdk/dlls/enginecallback.h>    // ALERT, etc
 
 #ifdef METAMOD_CORE
 #  undef enginefuncs_t
diff --git a/dep/metamod/h_export.h b/external/metamod/include/metamod/h_export.h
similarity index 100%
rename from dep/metamod/h_export.h
rename to external/metamod/include/metamod/h_export.h
diff --git a/dep/metamod/log_meta.h b/external/metamod/include/metamod/log_meta.h
similarity index 100%
rename from dep/metamod/log_meta.h
rename to external/metamod/include/metamod/log_meta.h
diff --git a/dep/metamod/meta_api.h b/external/metamod/include/metamod/meta_api.h
similarity index 100%
rename from dep/metamod/meta_api.h
rename to external/metamod/include/metamod/meta_api.h
diff --git a/dep/metamod/mhook.h b/external/metamod/include/metamod/mhook.h
similarity index 100%
rename from dep/metamod/mhook.h
rename to external/metamod/include/metamod/mhook.h
diff --git a/dep/metamod/mreg.h b/external/metamod/include/metamod/mreg.h
similarity index 100%
rename from dep/metamod/mreg.h
rename to external/metamod/include/metamod/mreg.h
diff --git a/dep/metamod/mutil.h b/external/metamod/include/metamod/mutil.h
similarity index 100%
rename from dep/metamod/mutil.h
rename to external/metamod/include/metamod/mutil.h
diff --git a/dep/metamod/osdep.h b/external/metamod/include/metamod/osdep.h
similarity index 100%
rename from dep/metamod/osdep.h
rename to external/metamod/include/metamod/osdep.h
diff --git a/dep/metamod/plinfo.h b/external/metamod/include/metamod/plinfo.h
similarity index 100%
rename from dep/metamod/plinfo.h
rename to external/metamod/include/metamod/plinfo.h
diff --git a/revoice/include/sdk_util.h b/external/metamod/include/metamod/sdk_util.h
similarity index 99%
rename from revoice/include/sdk_util.h
rename to external/metamod/include/metamod/sdk_util.h
index 5b70010..bfb45b8 100644
--- a/revoice/include/sdk_util.h
+++ b/external/metamod/include/metamod/sdk_util.h
@@ -49,7 +49,7 @@
 // defined.
 #include "enginecallbacks.h"
 
-#include <util.h>
+#include <rehlsdk/dlls/util.h>
 
 
 
diff --git a/dep/metamod/types_meta.h b/external/metamod/include/metamod/types_meta.h
similarity index 100%
rename from dep/metamod/types_meta.h
rename to external/metamod/include/metamod/types_meta.h
diff --git a/external/opus/CMakeLists.txt b/external/opus/CMakeLists.txt
new file mode 100644
index 0000000..495d8fd
--- /dev/null
+++ b/external/opus/CMakeLists.txt
@@ -0,0 +1,283 @@
+#-------------------------------------------------------------------------------
+# Project Definition
+#-------------------------------------------------------------------------------
+
+project("Opus")
+
+#-------------------------------------------------------------------------------
+# Target Definition
+#-------------------------------------------------------------------------------
+
+set(TARGET_NAME "opus")
+set(TARGET_ALIAS "Opus::${TARGET_NAME}")
+
+add_library("${TARGET_NAME}")
+add_library("${TARGET_ALIAS}" ALIAS "${TARGET_NAME}")
+
+#-------------------------------------------------------------------------------
+# Source Files
+#-------------------------------------------------------------------------------
+
+target_sources("${TARGET_NAME}"
+  PUBLIC
+    "include/opus/opus_custom.h"
+    "include/opus/opus_defines.h"
+    "include/opus/opus_multistream.h"
+    "include/opus/opus_types.h"
+    "include/opus/opus.h"
+
+  PRIVATE
+    "src/analysis.c"
+    "src/analysis.h"
+    "src/mlp_data.c"
+    "src/mlp.c"
+    "src/mlp.h"
+    "src/opus_decoder.c"
+    "src/opus_encoder.c"
+    "src/opus_multistream_decoder.c"
+    "src/opus_multistream_encoder.c"
+    "src/opus_multistream.c"
+    "src/opus_private.h"
+    "src/opus.c"
+    "src/repacketizer.c"
+    "src/tansig_table.h"
+
+    "src/celt/_kiss_fft_guts.h"
+    "src/celt/arch.h"
+    "src/celt/bands.c"
+    "src/celt/bands.h"
+    "src/celt/celt_decoder.c"
+    "src/celt/celt_encoder.c"
+    "src/celt/celt_lpc.c"
+    "src/celt/celt_lpc.h"
+    "src/celt/celt.c"
+    "src/celt/celt.h"
+    "src/celt/cpu_support.h"
+    "src/celt/cwrs.c"
+    "src/celt/cwrs.h"
+    "src/celt/ecintrin.h"
+    "src/celt/entcode.c"
+    "src/celt/entcode.h"
+    "src/celt/entdec.c"
+    "src/celt/entdec.h"
+    "src/celt/entenc.c"
+    "src/celt/entenc.h"
+    "src/celt/fixed_debug.h"
+    "src/celt/fixed_generic.h"
+    "src/celt/float_cast.h"
+    "src/celt/kiss_fft.c"
+    "src/celt/kiss_fft.h"
+    "src/celt/laplace.c"
+    "src/celt/laplace.h"
+    "src/celt/mathops.c"
+    "src/celt/mathops.h"
+    "src/celt/mdct.c"
+    "src/celt/mdct.h"
+    "src/celt/mfrngcod.h"
+    "src/celt/modes.c"
+    "src/celt/modes.h"
+    "src/celt/os_support.h"
+    "src/celt/pitch.c"
+    "src/celt/pitch.h"
+    "src/celt/quant_bands.c"
+    "src/celt/quant_bands.h"
+    "src/celt/rate.c"
+    "src/celt/rate.h"
+    "src/celt/stack_alloc.h"
+    "src/celt/static_modes_fixed_arm_ne10.h"
+    "src/celt/static_modes_fixed.h"
+    "src/celt/static_modes_float_arm_ne10.h"
+    "src/celt/static_modes_float.h"
+    "src/celt/vq.c"
+    "src/celt/vq.h"
+    "src/celt/x86/celt_lpc_sse.c"
+    "src/celt/x86/celt_lpc_sse.h"
+    "src/celt/x86/pitch_sse.c"
+    "src/celt/x86/pitch_sse.h"
+    "src/celt/x86/pitch_sse2.c"
+    "src/celt/x86/pitch_sse4_1.c"
+    "src/celt/x86/x86_celt_map.c"
+    "src/celt/x86/x86cpu.c"
+    "src/celt/x86/x86cpu.h"
+
+    "src/silk/A2NLSF.c"
+    "src/silk/ana_filt_bank_1.c"
+    "src/silk/API.h"
+    "src/silk/biquad_alt.c"
+    "src/silk/bwexpander_32.c"
+    "src/silk/bwexpander.c"
+    "src/silk/check_control_input.c"
+    "src/silk/CNG.c"
+    "src/silk/code_signs.c"
+    "src/silk/control_audio_bandwidth.c"
+    "src/silk/control_codec.c"
+    "src/silk/control_SNR.c"
+    "src/silk/control.h"
+    "src/silk/debug.c"
+    "src/silk/debug.h"
+    "src/silk/dec_API.c"
+    "src/silk/decode_core.c"
+    "src/silk/decode_frame.c"
+    "src/silk/decode_indices.c"
+    "src/silk/decode_parameters.c"
+    "src/silk/decode_pitch.c"
+    "src/silk/decode_pulses.c"
+    "src/silk/decoder_set_fs.c"
+    "src/silk/define.h"
+    "src/silk/enc_API.c"
+    "src/silk/encode_indices.c"
+    "src/silk/encode_pulses.c"
+    "src/silk/errors.h"
+    "src/silk/gain_quant.c"
+    "src/silk/HP_variable_cutoff.c"
+    "src/silk/init_decoder.c"
+    "src/silk/init_encoder.c"
+    "src/silk/Inlines.h"
+    "src/silk/inner_prod_aligned.c"
+    "src/silk/interpolate.c"
+    "src/silk/lin2log.c"
+    "src/silk/log2lin.c"
+    "src/silk/LP_variable_cutoff.c"
+    "src/silk/LPC_analysis_filter.c"
+    "src/silk/LPC_inv_pred_gain.c"
+    "src/silk/MacroCount.h"
+    "src/silk/MacroDebug.h"
+    "src/silk/macros.h"
+    "src/silk/main.h"
+    "src/silk/NLSF_decode.c"
+    "src/silk/NLSF_del_dec_quant.c"
+    "src/silk/NLSF_encode.c"
+    "src/silk/NLSF_stabilize.c"
+    "src/silk/NLSF_unpack.c"
+    "src/silk/NLSF_VQ_weights_laroia.c"
+    "src/silk/NLSF_VQ.c"
+    "src/silk/NLSF2A.c"
+    "src/silk/NSQ_del_dec.c"
+    "src/silk/NSQ.c"
+    "src/silk/NSQ.h"
+    "src/silk/pitch_est_defines.h"
+    "src/silk/pitch_est_tables.c"
+    "src/silk/PLC.c"
+    "src/silk/PLC.h"
+    "src/silk/process_NLSFs.c"
+    "src/silk/quant_LTP_gains.c"
+    "src/silk/resampler_down2_3.c"
+    "src/silk/resampler_down2.c"
+    "src/silk/resampler_private_AR2.c"
+    "src/silk/resampler_private_down_FIR.c"
+    "src/silk/resampler_private_IIR_FIR.c"
+    "src/silk/resampler_private_up2_HQ.c"
+    "src/silk/resampler_private.h"
+    "src/silk/resampler_rom.c"
+    "src/silk/resampler_rom.h"
+    "src/silk/resampler_structs.h"
+    "src/silk/resampler.c"
+    "src/silk/shell_coder.c"
+    "src/silk/sigm_Q15.c"
+    "src/silk/SigProc_FIX.h"
+    "src/silk/sort.c"
+    "src/silk/stereo_decode_pred.c"
+    "src/silk/stereo_encode_pred.c"
+    "src/silk/stereo_find_predictor.c"
+    "src/silk/stereo_LR_to_MS.c"
+    "src/silk/stereo_MS_to_LR.c"
+    "src/silk/stereo_quant_pred.c"
+    "src/silk/structs.h"
+    "src/silk/sum_sqr_shift.c"
+    "src/silk/table_LSF_cos.c"
+    "src/silk/tables_gain.c"
+    "src/silk/tables_LTP.c"
+    "src/silk/tables_NLSF_CB_NB_MB.c"
+    "src/silk/tables_NLSF_CB_WB.c"
+    "src/silk/tables_other.c"
+    "src/silk/tables_pitch_lag.c"
+    "src/silk/tables_pulses_per_block.c"
+    "src/silk/tables.h"
+    "src/silk/tuning_parameters.h"
+    "src/silk/typedef.h"
+    "src/silk/VAD.c"
+    "src/silk/VQ_WMat_EC.c"
+    "src/silk/float/apply_sine_window_FLP.c"
+    "src/silk/float/autocorrelation_FLP.c"
+    "src/silk/float/burg_modified_FLP.c"
+    "src/silk/float/bwexpander_FLP.c"
+    "src/silk/float/corrMatrix_FLP.c"
+    "src/silk/float/encode_frame_FLP.c"
+    "src/silk/float/energy_FLP.c"
+    "src/silk/float/find_LPC_FLP.c"
+    "src/silk/float/find_LTP_FLP.c"
+    "src/silk/float/find_pitch_lags_FLP.c"
+    "src/silk/float/find_pred_coefs_FLP.c"
+    "src/silk/float/inner_product_FLP.c"
+    "src/silk/float/k2a_FLP.c"
+    "src/silk/float/levinsondurbin_FLP.c"
+    "src/silk/float/LPC_analysis_filter_FLP.c"
+    "src/silk/float/LPC_inv_pred_gain_FLP.c"
+    "src/silk/float/LTP_analysis_filter_FLP.c"
+    "src/silk/float/LTP_scale_ctrl_FLP.c"
+    "src/silk/float/main_FLP.h"
+    "src/silk/float/noise_shape_analysis_FLP.c"
+    "src/silk/float/pitch_analysis_core_FLP.c"
+    "src/silk/float/prefilter_FLP.c"
+    "src/silk/float/process_gains_FLP.c"
+    "src/silk/float/regularize_correlations_FLP.c"
+    "src/silk/float/residual_energy_FLP.c"
+    "src/silk/float/scale_copy_vector_FLP.c"
+    "src/silk/float/scale_vector_FLP.c"
+    "src/silk/float/schur_FLP.c"
+    "src/silk/float/SigProc_FLP.h"
+    "src/silk/float/solve_LS_FLP.c"
+    "src/silk/float/sort_FLP.c"
+    "src/silk/float/structs_FLP.h"
+    "src/silk/float/warped_autocorrelation_FLP.c"
+    "src/silk/float/wrappers_FLP.c"
+)
+
+#-------------------------------------------------------------------------------
+# Include Directories
+#-------------------------------------------------------------------------------
+
+target_include_directories("${TARGET_NAME}"
+  PUBLIC
+    "${PROJECT_SOURCE_DIR}/include"
+
+  PRIVATE
+    "${PROJECT_SOURCE_DIR}/include/opus"
+    "${PROJECT_SOURCE_DIR}/src/celt"
+    "${PROJECT_SOURCE_DIR}/src/silk"
+    "${PROJECT_SOURCE_DIR}/src/silk/float"
+)
+
+#-------------------------------------------------------------------------------
+# Target Properties
+#-------------------------------------------------------------------------------
+
+if(NOT WIN32)
+  set_target_properties("${TARGET_NAME}"
+    PROPERTIES
+      # Disable IPO as it causes some warnings
+      INTERPROCEDURAL_OPTIMIZATION OFF
+      INTERPROCEDURAL_OPTIMIZATION_MINSIZEREL OFF
+      INTERPROCEDURAL_OPTIMIZATION_RELEASE OFF
+      INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO OFF
+  )
+endif()
+
+#-------------------------------------------------------------------------------
+# Compile Definitions
+#-------------------------------------------------------------------------------
+
+target_compile_definitions("${TARGET_NAME}"
+  PRIVATE
+    OPUS_BUILD
+    USE_ALLOCA
+)
+
+#-------------------------------------------------------------------------------
+# Compile Options
+#-------------------------------------------------------------------------------
+
+target_compile_options("${TARGET_NAME}"
+  PRIVATE
+    $<IF:$<CXX_COMPILER_ID:MSVC>,/W0,-w>
+)
diff --git a/dep/opus/include/opus.h b/external/opus/include/opus/opus.h
similarity index 100%
rename from dep/opus/include/opus.h
rename to external/opus/include/opus/opus.h
diff --git a/dep/opus/include/opus_custom.h b/external/opus/include/opus/opus_custom.h
similarity index 100%
rename from dep/opus/include/opus_custom.h
rename to external/opus/include/opus/opus_custom.h
diff --git a/dep/opus/include/opus_defines.h b/external/opus/include/opus/opus_defines.h
similarity index 100%
rename from dep/opus/include/opus_defines.h
rename to external/opus/include/opus/opus_defines.h
diff --git a/dep/opus/include/opus_multistream.h b/external/opus/include/opus/opus_multistream.h
similarity index 100%
rename from dep/opus/include/opus_multistream.h
rename to external/opus/include/opus/opus_multistream.h
diff --git a/dep/opus/include/opus_types.h b/external/opus/include/opus/opus_types.h
similarity index 100%
rename from dep/opus/include/opus_types.h
rename to external/opus/include/opus/opus_types.h
diff --git a/dep/opus/src/analysis.c b/external/opus/src/analysis.c
similarity index 100%
rename from dep/opus/src/analysis.c
rename to external/opus/src/analysis.c
diff --git a/dep/opus/src/analysis.h b/external/opus/src/analysis.h
similarity index 100%
rename from dep/opus/src/analysis.h
rename to external/opus/src/analysis.h
diff --git a/dep/opus/celt/_kiss_fft_guts.h b/external/opus/src/celt/_kiss_fft_guts.h
similarity index 100%
rename from dep/opus/celt/_kiss_fft_guts.h
rename to external/opus/src/celt/_kiss_fft_guts.h
diff --git a/dep/opus/celt/arch.h b/external/opus/src/celt/arch.h
similarity index 100%
rename from dep/opus/celt/arch.h
rename to external/opus/src/celt/arch.h
diff --git a/dep/opus/celt/bands.c b/external/opus/src/celt/bands.c
similarity index 100%
rename from dep/opus/celt/bands.c
rename to external/opus/src/celt/bands.c
diff --git a/dep/opus/celt/bands.h b/external/opus/src/celt/bands.h
similarity index 100%
rename from dep/opus/celt/bands.h
rename to external/opus/src/celt/bands.h
diff --git a/dep/opus/celt/celt.c b/external/opus/src/celt/celt.c
similarity index 100%
rename from dep/opus/celt/celt.c
rename to external/opus/src/celt/celt.c
diff --git a/dep/opus/celt/celt.h b/external/opus/src/celt/celt.h
similarity index 100%
rename from dep/opus/celt/celt.h
rename to external/opus/src/celt/celt.h
diff --git a/dep/opus/celt/celt_decoder.c b/external/opus/src/celt/celt_decoder.c
similarity index 100%
rename from dep/opus/celt/celt_decoder.c
rename to external/opus/src/celt/celt_decoder.c
diff --git a/dep/opus/celt/celt_encoder.c b/external/opus/src/celt/celt_encoder.c
similarity index 100%
rename from dep/opus/celt/celt_encoder.c
rename to external/opus/src/celt/celt_encoder.c
diff --git a/dep/opus/celt/celt_lpc.c b/external/opus/src/celt/celt_lpc.c
similarity index 100%
rename from dep/opus/celt/celt_lpc.c
rename to external/opus/src/celt/celt_lpc.c
diff --git a/dep/opus/celt/celt_lpc.h b/external/opus/src/celt/celt_lpc.h
similarity index 100%
rename from dep/opus/celt/celt_lpc.h
rename to external/opus/src/celt/celt_lpc.h
diff --git a/dep/opus/celt/cpu_support.h b/external/opus/src/celt/cpu_support.h
similarity index 100%
rename from dep/opus/celt/cpu_support.h
rename to external/opus/src/celt/cpu_support.h
diff --git a/dep/opus/celt/cwrs.c b/external/opus/src/celt/cwrs.c
similarity index 100%
rename from dep/opus/celt/cwrs.c
rename to external/opus/src/celt/cwrs.c
diff --git a/dep/opus/celt/cwrs.h b/external/opus/src/celt/cwrs.h
similarity index 100%
rename from dep/opus/celt/cwrs.h
rename to external/opus/src/celt/cwrs.h
diff --git a/dep/opus/celt/ecintrin.h b/external/opus/src/celt/ecintrin.h
similarity index 100%
rename from dep/opus/celt/ecintrin.h
rename to external/opus/src/celt/ecintrin.h
diff --git a/dep/opus/celt/entcode.c b/external/opus/src/celt/entcode.c
similarity index 100%
rename from dep/opus/celt/entcode.c
rename to external/opus/src/celt/entcode.c
diff --git a/dep/opus/celt/entcode.h b/external/opus/src/celt/entcode.h
similarity index 100%
rename from dep/opus/celt/entcode.h
rename to external/opus/src/celt/entcode.h
diff --git a/dep/opus/celt/entdec.c b/external/opus/src/celt/entdec.c
similarity index 100%
rename from dep/opus/celt/entdec.c
rename to external/opus/src/celt/entdec.c
diff --git a/dep/opus/celt/entdec.h b/external/opus/src/celt/entdec.h
similarity index 100%
rename from dep/opus/celt/entdec.h
rename to external/opus/src/celt/entdec.h
diff --git a/dep/opus/celt/entenc.c b/external/opus/src/celt/entenc.c
similarity index 100%
rename from dep/opus/celt/entenc.c
rename to external/opus/src/celt/entenc.c
diff --git a/dep/opus/celt/entenc.h b/external/opus/src/celt/entenc.h
similarity index 100%
rename from dep/opus/celt/entenc.h
rename to external/opus/src/celt/entenc.h
diff --git a/dep/opus/celt/fixed_debug.h b/external/opus/src/celt/fixed_debug.h
similarity index 100%
rename from dep/opus/celt/fixed_debug.h
rename to external/opus/src/celt/fixed_debug.h
diff --git a/dep/opus/celt/fixed_generic.h b/external/opus/src/celt/fixed_generic.h
similarity index 100%
rename from dep/opus/celt/fixed_generic.h
rename to external/opus/src/celt/fixed_generic.h
diff --git a/dep/opus/celt/float_cast.h b/external/opus/src/celt/float_cast.h
similarity index 100%
rename from dep/opus/celt/float_cast.h
rename to external/opus/src/celt/float_cast.h
diff --git a/dep/opus/celt/kiss_fft.c b/external/opus/src/celt/kiss_fft.c
similarity index 100%
rename from dep/opus/celt/kiss_fft.c
rename to external/opus/src/celt/kiss_fft.c
diff --git a/dep/opus/celt/kiss_fft.h b/external/opus/src/celt/kiss_fft.h
similarity index 100%
rename from dep/opus/celt/kiss_fft.h
rename to external/opus/src/celt/kiss_fft.h
diff --git a/dep/opus/celt/laplace.c b/external/opus/src/celt/laplace.c
similarity index 100%
rename from dep/opus/celt/laplace.c
rename to external/opus/src/celt/laplace.c
diff --git a/dep/opus/celt/laplace.h b/external/opus/src/celt/laplace.h
similarity index 100%
rename from dep/opus/celt/laplace.h
rename to external/opus/src/celt/laplace.h
diff --git a/dep/opus/celt/mathops.c b/external/opus/src/celt/mathops.c
similarity index 100%
rename from dep/opus/celt/mathops.c
rename to external/opus/src/celt/mathops.c
diff --git a/dep/opus/celt/mathops.h b/external/opus/src/celt/mathops.h
similarity index 100%
rename from dep/opus/celt/mathops.h
rename to external/opus/src/celt/mathops.h
diff --git a/dep/opus/celt/mdct.c b/external/opus/src/celt/mdct.c
similarity index 100%
rename from dep/opus/celt/mdct.c
rename to external/opus/src/celt/mdct.c
diff --git a/dep/opus/celt/mdct.h b/external/opus/src/celt/mdct.h
similarity index 100%
rename from dep/opus/celt/mdct.h
rename to external/opus/src/celt/mdct.h
diff --git a/dep/opus/celt/mfrngcod.h b/external/opus/src/celt/mfrngcod.h
similarity index 100%
rename from dep/opus/celt/mfrngcod.h
rename to external/opus/src/celt/mfrngcod.h
diff --git a/dep/opus/celt/modes.c b/external/opus/src/celt/modes.c
similarity index 100%
rename from dep/opus/celt/modes.c
rename to external/opus/src/celt/modes.c
diff --git a/dep/opus/celt/modes.h b/external/opus/src/celt/modes.h
similarity index 100%
rename from dep/opus/celt/modes.h
rename to external/opus/src/celt/modes.h
diff --git a/dep/opus/celt/os_support.h b/external/opus/src/celt/os_support.h
similarity index 100%
rename from dep/opus/celt/os_support.h
rename to external/opus/src/celt/os_support.h
diff --git a/dep/opus/celt/pitch.c b/external/opus/src/celt/pitch.c
similarity index 100%
rename from dep/opus/celt/pitch.c
rename to external/opus/src/celt/pitch.c
diff --git a/dep/opus/celt/pitch.h b/external/opus/src/celt/pitch.h
similarity index 100%
rename from dep/opus/celt/pitch.h
rename to external/opus/src/celt/pitch.h
diff --git a/dep/opus/celt/quant_bands.c b/external/opus/src/celt/quant_bands.c
similarity index 100%
rename from dep/opus/celt/quant_bands.c
rename to external/opus/src/celt/quant_bands.c
diff --git a/dep/opus/celt/quant_bands.h b/external/opus/src/celt/quant_bands.h
similarity index 100%
rename from dep/opus/celt/quant_bands.h
rename to external/opus/src/celt/quant_bands.h
diff --git a/dep/opus/celt/rate.c b/external/opus/src/celt/rate.c
similarity index 100%
rename from dep/opus/celt/rate.c
rename to external/opus/src/celt/rate.c
diff --git a/dep/opus/celt/rate.h b/external/opus/src/celt/rate.h
similarity index 100%
rename from dep/opus/celt/rate.h
rename to external/opus/src/celt/rate.h
diff --git a/dep/opus/celt/stack_alloc.h b/external/opus/src/celt/stack_alloc.h
similarity index 100%
rename from dep/opus/celt/stack_alloc.h
rename to external/opus/src/celt/stack_alloc.h
diff --git a/dep/opus/celt/static_modes_fixed.h b/external/opus/src/celt/static_modes_fixed.h
similarity index 100%
rename from dep/opus/celt/static_modes_fixed.h
rename to external/opus/src/celt/static_modes_fixed.h
diff --git a/dep/opus/celt/static_modes_fixed_arm_ne10.h b/external/opus/src/celt/static_modes_fixed_arm_ne10.h
similarity index 100%
rename from dep/opus/celt/static_modes_fixed_arm_ne10.h
rename to external/opus/src/celt/static_modes_fixed_arm_ne10.h
diff --git a/dep/opus/celt/static_modes_float.h b/external/opus/src/celt/static_modes_float.h
similarity index 100%
rename from dep/opus/celt/static_modes_float.h
rename to external/opus/src/celt/static_modes_float.h
diff --git a/dep/opus/celt/static_modes_float_arm_ne10.h b/external/opus/src/celt/static_modes_float_arm_ne10.h
similarity index 100%
rename from dep/opus/celt/static_modes_float_arm_ne10.h
rename to external/opus/src/celt/static_modes_float_arm_ne10.h
diff --git a/dep/opus/celt/vq.c b/external/opus/src/celt/vq.c
similarity index 100%
rename from dep/opus/celt/vq.c
rename to external/opus/src/celt/vq.c
diff --git a/dep/opus/celt/vq.h b/external/opus/src/celt/vq.h
similarity index 100%
rename from dep/opus/celt/vq.h
rename to external/opus/src/celt/vq.h
diff --git a/dep/opus/celt/x86/celt_lpc_sse.c b/external/opus/src/celt/x86/celt_lpc_sse.c
similarity index 100%
rename from dep/opus/celt/x86/celt_lpc_sse.c
rename to external/opus/src/celt/x86/celt_lpc_sse.c
diff --git a/dep/opus/celt/x86/celt_lpc_sse.h b/external/opus/src/celt/x86/celt_lpc_sse.h
similarity index 100%
rename from dep/opus/celt/x86/celt_lpc_sse.h
rename to external/opus/src/celt/x86/celt_lpc_sse.h
diff --git a/dep/opus/celt/x86/pitch_sse.c b/external/opus/src/celt/x86/pitch_sse.c
similarity index 100%
rename from dep/opus/celt/x86/pitch_sse.c
rename to external/opus/src/celt/x86/pitch_sse.c
diff --git a/dep/opus/celt/x86/pitch_sse.h b/external/opus/src/celt/x86/pitch_sse.h
similarity index 100%
rename from dep/opus/celt/x86/pitch_sse.h
rename to external/opus/src/celt/x86/pitch_sse.h
diff --git a/dep/opus/celt/x86/pitch_sse2.c b/external/opus/src/celt/x86/pitch_sse2.c
similarity index 100%
rename from dep/opus/celt/x86/pitch_sse2.c
rename to external/opus/src/celt/x86/pitch_sse2.c
diff --git a/dep/opus/celt/x86/pitch_sse4_1.c b/external/opus/src/celt/x86/pitch_sse4_1.c
similarity index 100%
rename from dep/opus/celt/x86/pitch_sse4_1.c
rename to external/opus/src/celt/x86/pitch_sse4_1.c
diff --git a/dep/opus/celt/x86/x86_celt_map.c b/external/opus/src/celt/x86/x86_celt_map.c
similarity index 100%
rename from dep/opus/celt/x86/x86_celt_map.c
rename to external/opus/src/celt/x86/x86_celt_map.c
diff --git a/dep/opus/celt/x86/x86cpu.c b/external/opus/src/celt/x86/x86cpu.c
similarity index 100%
rename from dep/opus/celt/x86/x86cpu.c
rename to external/opus/src/celt/x86/x86cpu.c
diff --git a/dep/opus/celt/x86/x86cpu.h b/external/opus/src/celt/x86/x86cpu.h
similarity index 100%
rename from dep/opus/celt/x86/x86cpu.h
rename to external/opus/src/celt/x86/x86cpu.h
diff --git a/dep/opus/src/mlp.c b/external/opus/src/mlp.c
similarity index 100%
rename from dep/opus/src/mlp.c
rename to external/opus/src/mlp.c
diff --git a/dep/opus/src/mlp.h b/external/opus/src/mlp.h
similarity index 100%
rename from dep/opus/src/mlp.h
rename to external/opus/src/mlp.h
diff --git a/dep/opus/src/mlp_data.c b/external/opus/src/mlp_data.c
similarity index 100%
rename from dep/opus/src/mlp_data.c
rename to external/opus/src/mlp_data.c
diff --git a/dep/opus/src/opus.c b/external/opus/src/opus.c
similarity index 100%
rename from dep/opus/src/opus.c
rename to external/opus/src/opus.c
diff --git a/dep/opus/src/opus_decoder.c b/external/opus/src/opus_decoder.c
similarity index 100%
rename from dep/opus/src/opus_decoder.c
rename to external/opus/src/opus_decoder.c
diff --git a/dep/opus/src/opus_encoder.c b/external/opus/src/opus_encoder.c
similarity index 100%
rename from dep/opus/src/opus_encoder.c
rename to external/opus/src/opus_encoder.c
diff --git a/dep/opus/src/opus_multistream.c b/external/opus/src/opus_multistream.c
similarity index 100%
rename from dep/opus/src/opus_multistream.c
rename to external/opus/src/opus_multistream.c
diff --git a/dep/opus/src/opus_multistream_decoder.c b/external/opus/src/opus_multistream_decoder.c
similarity index 100%
rename from dep/opus/src/opus_multistream_decoder.c
rename to external/opus/src/opus_multistream_decoder.c
diff --git a/dep/opus/src/opus_multistream_encoder.c b/external/opus/src/opus_multistream_encoder.c
similarity index 100%
rename from dep/opus/src/opus_multistream_encoder.c
rename to external/opus/src/opus_multistream_encoder.c
diff --git a/dep/opus/src/opus_private.h b/external/opus/src/opus_private.h
similarity index 100%
rename from dep/opus/src/opus_private.h
rename to external/opus/src/opus_private.h
diff --git a/dep/opus/src/repacketizer.c b/external/opus/src/repacketizer.c
similarity index 100%
rename from dep/opus/src/repacketizer.c
rename to external/opus/src/repacketizer.c
diff --git a/dep/opus/silk/A2NLSF.c b/external/opus/src/silk/A2NLSF.c
similarity index 100%
rename from dep/opus/silk/A2NLSF.c
rename to external/opus/src/silk/A2NLSF.c
diff --git a/dep/opus/silk/API.h b/external/opus/src/silk/API.h
similarity index 100%
rename from dep/opus/silk/API.h
rename to external/opus/src/silk/API.h
diff --git a/dep/opus/silk/CNG.c b/external/opus/src/silk/CNG.c
similarity index 100%
rename from dep/opus/silk/CNG.c
rename to external/opus/src/silk/CNG.c
diff --git a/dep/opus/silk/HP_variable_cutoff.c b/external/opus/src/silk/HP_variable_cutoff.c
similarity index 100%
rename from dep/opus/silk/HP_variable_cutoff.c
rename to external/opus/src/silk/HP_variable_cutoff.c
diff --git a/dep/opus/silk/Inlines.h b/external/opus/src/silk/Inlines.h
similarity index 100%
rename from dep/opus/silk/Inlines.h
rename to external/opus/src/silk/Inlines.h
diff --git a/dep/opus/silk/LPC_analysis_filter.c b/external/opus/src/silk/LPC_analysis_filter.c
similarity index 100%
rename from dep/opus/silk/LPC_analysis_filter.c
rename to external/opus/src/silk/LPC_analysis_filter.c
diff --git a/dep/opus/silk/LPC_inv_pred_gain.c b/external/opus/src/silk/LPC_inv_pred_gain.c
similarity index 100%
rename from dep/opus/silk/LPC_inv_pred_gain.c
rename to external/opus/src/silk/LPC_inv_pred_gain.c
diff --git a/dep/opus/silk/LP_variable_cutoff.c b/external/opus/src/silk/LP_variable_cutoff.c
similarity index 100%
rename from dep/opus/silk/LP_variable_cutoff.c
rename to external/opus/src/silk/LP_variable_cutoff.c
diff --git a/dep/opus/silk/MacroCount.h b/external/opus/src/silk/MacroCount.h
similarity index 100%
rename from dep/opus/silk/MacroCount.h
rename to external/opus/src/silk/MacroCount.h
diff --git a/dep/opus/silk/MacroDebug.h b/external/opus/src/silk/MacroDebug.h
similarity index 100%
rename from dep/opus/silk/MacroDebug.h
rename to external/opus/src/silk/MacroDebug.h
diff --git a/dep/opus/silk/NLSF2A.c b/external/opus/src/silk/NLSF2A.c
similarity index 100%
rename from dep/opus/silk/NLSF2A.c
rename to external/opus/src/silk/NLSF2A.c
diff --git a/dep/opus/silk/NLSF_VQ.c b/external/opus/src/silk/NLSF_VQ.c
similarity index 100%
rename from dep/opus/silk/NLSF_VQ.c
rename to external/opus/src/silk/NLSF_VQ.c
diff --git a/dep/opus/silk/NLSF_VQ_weights_laroia.c b/external/opus/src/silk/NLSF_VQ_weights_laroia.c
similarity index 100%
rename from dep/opus/silk/NLSF_VQ_weights_laroia.c
rename to external/opus/src/silk/NLSF_VQ_weights_laroia.c
diff --git a/dep/opus/silk/NLSF_decode.c b/external/opus/src/silk/NLSF_decode.c
similarity index 100%
rename from dep/opus/silk/NLSF_decode.c
rename to external/opus/src/silk/NLSF_decode.c
diff --git a/dep/opus/silk/NLSF_del_dec_quant.c b/external/opus/src/silk/NLSF_del_dec_quant.c
similarity index 100%
rename from dep/opus/silk/NLSF_del_dec_quant.c
rename to external/opus/src/silk/NLSF_del_dec_quant.c
diff --git a/dep/opus/silk/NLSF_encode.c b/external/opus/src/silk/NLSF_encode.c
similarity index 100%
rename from dep/opus/silk/NLSF_encode.c
rename to external/opus/src/silk/NLSF_encode.c
diff --git a/dep/opus/silk/NLSF_stabilize.c b/external/opus/src/silk/NLSF_stabilize.c
similarity index 100%
rename from dep/opus/silk/NLSF_stabilize.c
rename to external/opus/src/silk/NLSF_stabilize.c
diff --git a/dep/opus/silk/NLSF_unpack.c b/external/opus/src/silk/NLSF_unpack.c
similarity index 100%
rename from dep/opus/silk/NLSF_unpack.c
rename to external/opus/src/silk/NLSF_unpack.c
diff --git a/dep/opus/silk/NSQ.c b/external/opus/src/silk/NSQ.c
similarity index 100%
rename from dep/opus/silk/NSQ.c
rename to external/opus/src/silk/NSQ.c
diff --git a/dep/opus/silk/NSQ.h b/external/opus/src/silk/NSQ.h
similarity index 100%
rename from dep/opus/silk/NSQ.h
rename to external/opus/src/silk/NSQ.h
diff --git a/dep/opus/silk/NSQ_del_dec.c b/external/opus/src/silk/NSQ_del_dec.c
similarity index 100%
rename from dep/opus/silk/NSQ_del_dec.c
rename to external/opus/src/silk/NSQ_del_dec.c
diff --git a/dep/opus/silk/PLC.c b/external/opus/src/silk/PLC.c
similarity index 100%
rename from dep/opus/silk/PLC.c
rename to external/opus/src/silk/PLC.c
diff --git a/dep/opus/silk/PLC.h b/external/opus/src/silk/PLC.h
similarity index 100%
rename from dep/opus/silk/PLC.h
rename to external/opus/src/silk/PLC.h
diff --git a/dep/opus/silk/SigProc_FIX.h b/external/opus/src/silk/SigProc_FIX.h
similarity index 100%
rename from dep/opus/silk/SigProc_FIX.h
rename to external/opus/src/silk/SigProc_FIX.h
diff --git a/dep/opus/silk/VAD.c b/external/opus/src/silk/VAD.c
similarity index 100%
rename from dep/opus/silk/VAD.c
rename to external/opus/src/silk/VAD.c
diff --git a/dep/opus/silk/VQ_WMat_EC.c b/external/opus/src/silk/VQ_WMat_EC.c
similarity index 100%
rename from dep/opus/silk/VQ_WMat_EC.c
rename to external/opus/src/silk/VQ_WMat_EC.c
diff --git a/dep/opus/silk/ana_filt_bank_1.c b/external/opus/src/silk/ana_filt_bank_1.c
similarity index 100%
rename from dep/opus/silk/ana_filt_bank_1.c
rename to external/opus/src/silk/ana_filt_bank_1.c
diff --git a/dep/opus/silk/biquad_alt.c b/external/opus/src/silk/biquad_alt.c
similarity index 100%
rename from dep/opus/silk/biquad_alt.c
rename to external/opus/src/silk/biquad_alt.c
diff --git a/dep/opus/silk/bwexpander.c b/external/opus/src/silk/bwexpander.c
similarity index 100%
rename from dep/opus/silk/bwexpander.c
rename to external/opus/src/silk/bwexpander.c
diff --git a/dep/opus/silk/bwexpander_32.c b/external/opus/src/silk/bwexpander_32.c
similarity index 100%
rename from dep/opus/silk/bwexpander_32.c
rename to external/opus/src/silk/bwexpander_32.c
diff --git a/dep/opus/silk/check_control_input.c b/external/opus/src/silk/check_control_input.c
similarity index 100%
rename from dep/opus/silk/check_control_input.c
rename to external/opus/src/silk/check_control_input.c
diff --git a/dep/opus/silk/code_signs.c b/external/opus/src/silk/code_signs.c
similarity index 100%
rename from dep/opus/silk/code_signs.c
rename to external/opus/src/silk/code_signs.c
diff --git a/dep/opus/silk/control.h b/external/opus/src/silk/control.h
similarity index 100%
rename from dep/opus/silk/control.h
rename to external/opus/src/silk/control.h
diff --git a/dep/opus/silk/control_SNR.c b/external/opus/src/silk/control_SNR.c
similarity index 100%
rename from dep/opus/silk/control_SNR.c
rename to external/opus/src/silk/control_SNR.c
diff --git a/dep/opus/silk/control_audio_bandwidth.c b/external/opus/src/silk/control_audio_bandwidth.c
similarity index 100%
rename from dep/opus/silk/control_audio_bandwidth.c
rename to external/opus/src/silk/control_audio_bandwidth.c
diff --git a/dep/opus/silk/control_codec.c b/external/opus/src/silk/control_codec.c
similarity index 100%
rename from dep/opus/silk/control_codec.c
rename to external/opus/src/silk/control_codec.c
diff --git a/dep/opus/silk/debug.c b/external/opus/src/silk/debug.c
similarity index 100%
rename from dep/opus/silk/debug.c
rename to external/opus/src/silk/debug.c
diff --git a/dep/opus/silk/debug.h b/external/opus/src/silk/debug.h
similarity index 100%
rename from dep/opus/silk/debug.h
rename to external/opus/src/silk/debug.h
diff --git a/dep/opus/silk/dec_API.c b/external/opus/src/silk/dec_API.c
similarity index 100%
rename from dep/opus/silk/dec_API.c
rename to external/opus/src/silk/dec_API.c
diff --git a/dep/opus/silk/decode_core.c b/external/opus/src/silk/decode_core.c
similarity index 100%
rename from dep/opus/silk/decode_core.c
rename to external/opus/src/silk/decode_core.c
diff --git a/dep/opus/silk/decode_frame.c b/external/opus/src/silk/decode_frame.c
similarity index 100%
rename from dep/opus/silk/decode_frame.c
rename to external/opus/src/silk/decode_frame.c
diff --git a/dep/opus/silk/decode_indices.c b/external/opus/src/silk/decode_indices.c
similarity index 100%
rename from dep/opus/silk/decode_indices.c
rename to external/opus/src/silk/decode_indices.c
diff --git a/dep/opus/silk/decode_parameters.c b/external/opus/src/silk/decode_parameters.c
similarity index 100%
rename from dep/opus/silk/decode_parameters.c
rename to external/opus/src/silk/decode_parameters.c
diff --git a/dep/opus/silk/decode_pitch.c b/external/opus/src/silk/decode_pitch.c
similarity index 100%
rename from dep/opus/silk/decode_pitch.c
rename to external/opus/src/silk/decode_pitch.c
diff --git a/dep/opus/silk/decode_pulses.c b/external/opus/src/silk/decode_pulses.c
similarity index 100%
rename from dep/opus/silk/decode_pulses.c
rename to external/opus/src/silk/decode_pulses.c
diff --git a/dep/opus/silk/decoder_set_fs.c b/external/opus/src/silk/decoder_set_fs.c
similarity index 100%
rename from dep/opus/silk/decoder_set_fs.c
rename to external/opus/src/silk/decoder_set_fs.c
diff --git a/dep/opus/silk/define.h b/external/opus/src/silk/define.h
similarity index 100%
rename from dep/opus/silk/define.h
rename to external/opus/src/silk/define.h
diff --git a/dep/opus/silk/enc_API.c b/external/opus/src/silk/enc_API.c
similarity index 100%
rename from dep/opus/silk/enc_API.c
rename to external/opus/src/silk/enc_API.c
diff --git a/dep/opus/silk/encode_indices.c b/external/opus/src/silk/encode_indices.c
similarity index 100%
rename from dep/opus/silk/encode_indices.c
rename to external/opus/src/silk/encode_indices.c
diff --git a/dep/opus/silk/encode_pulses.c b/external/opus/src/silk/encode_pulses.c
similarity index 100%
rename from dep/opus/silk/encode_pulses.c
rename to external/opus/src/silk/encode_pulses.c
diff --git a/dep/opus/silk/errors.h b/external/opus/src/silk/errors.h
similarity index 100%
rename from dep/opus/silk/errors.h
rename to external/opus/src/silk/errors.h
diff --git a/dep/opus/silk/float/LPC_analysis_filter_FLP.c b/external/opus/src/silk/float/LPC_analysis_filter_FLP.c
similarity index 100%
rename from dep/opus/silk/float/LPC_analysis_filter_FLP.c
rename to external/opus/src/silk/float/LPC_analysis_filter_FLP.c
diff --git a/dep/opus/silk/float/LPC_inv_pred_gain_FLP.c b/external/opus/src/silk/float/LPC_inv_pred_gain_FLP.c
similarity index 100%
rename from dep/opus/silk/float/LPC_inv_pred_gain_FLP.c
rename to external/opus/src/silk/float/LPC_inv_pred_gain_FLP.c
diff --git a/dep/opus/silk/float/LTP_analysis_filter_FLP.c b/external/opus/src/silk/float/LTP_analysis_filter_FLP.c
similarity index 100%
rename from dep/opus/silk/float/LTP_analysis_filter_FLP.c
rename to external/opus/src/silk/float/LTP_analysis_filter_FLP.c
diff --git a/dep/opus/silk/float/LTP_scale_ctrl_FLP.c b/external/opus/src/silk/float/LTP_scale_ctrl_FLP.c
similarity index 100%
rename from dep/opus/silk/float/LTP_scale_ctrl_FLP.c
rename to external/opus/src/silk/float/LTP_scale_ctrl_FLP.c
diff --git a/dep/opus/silk/float/SigProc_FLP.h b/external/opus/src/silk/float/SigProc_FLP.h
similarity index 100%
rename from dep/opus/silk/float/SigProc_FLP.h
rename to external/opus/src/silk/float/SigProc_FLP.h
diff --git a/dep/opus/silk/float/apply_sine_window_FLP.c b/external/opus/src/silk/float/apply_sine_window_FLP.c
similarity index 100%
rename from dep/opus/silk/float/apply_sine_window_FLP.c
rename to external/opus/src/silk/float/apply_sine_window_FLP.c
diff --git a/dep/opus/silk/float/autocorrelation_FLP.c b/external/opus/src/silk/float/autocorrelation_FLP.c
similarity index 100%
rename from dep/opus/silk/float/autocorrelation_FLP.c
rename to external/opus/src/silk/float/autocorrelation_FLP.c
diff --git a/dep/opus/silk/float/burg_modified_FLP.c b/external/opus/src/silk/float/burg_modified_FLP.c
similarity index 100%
rename from dep/opus/silk/float/burg_modified_FLP.c
rename to external/opus/src/silk/float/burg_modified_FLP.c
diff --git a/dep/opus/silk/float/bwexpander_FLP.c b/external/opus/src/silk/float/bwexpander_FLP.c
similarity index 100%
rename from dep/opus/silk/float/bwexpander_FLP.c
rename to external/opus/src/silk/float/bwexpander_FLP.c
diff --git a/dep/opus/silk/float/corrMatrix_FLP.c b/external/opus/src/silk/float/corrMatrix_FLP.c
similarity index 100%
rename from dep/opus/silk/float/corrMatrix_FLP.c
rename to external/opus/src/silk/float/corrMatrix_FLP.c
diff --git a/dep/opus/silk/float/encode_frame_FLP.c b/external/opus/src/silk/float/encode_frame_FLP.c
similarity index 100%
rename from dep/opus/silk/float/encode_frame_FLP.c
rename to external/opus/src/silk/float/encode_frame_FLP.c
diff --git a/dep/opus/silk/float/energy_FLP.c b/external/opus/src/silk/float/energy_FLP.c
similarity index 100%
rename from dep/opus/silk/float/energy_FLP.c
rename to external/opus/src/silk/float/energy_FLP.c
diff --git a/dep/opus/silk/float/find_LPC_FLP.c b/external/opus/src/silk/float/find_LPC_FLP.c
similarity index 100%
rename from dep/opus/silk/float/find_LPC_FLP.c
rename to external/opus/src/silk/float/find_LPC_FLP.c
diff --git a/dep/opus/silk/float/find_LTP_FLP.c b/external/opus/src/silk/float/find_LTP_FLP.c
similarity index 100%
rename from dep/opus/silk/float/find_LTP_FLP.c
rename to external/opus/src/silk/float/find_LTP_FLP.c
diff --git a/dep/opus/silk/float/find_pitch_lags_FLP.c b/external/opus/src/silk/float/find_pitch_lags_FLP.c
similarity index 100%
rename from dep/opus/silk/float/find_pitch_lags_FLP.c
rename to external/opus/src/silk/float/find_pitch_lags_FLP.c
diff --git a/dep/opus/silk/float/find_pred_coefs_FLP.c b/external/opus/src/silk/float/find_pred_coefs_FLP.c
similarity index 100%
rename from dep/opus/silk/float/find_pred_coefs_FLP.c
rename to external/opus/src/silk/float/find_pred_coefs_FLP.c
diff --git a/dep/opus/silk/float/inner_product_FLP.c b/external/opus/src/silk/float/inner_product_FLP.c
similarity index 100%
rename from dep/opus/silk/float/inner_product_FLP.c
rename to external/opus/src/silk/float/inner_product_FLP.c
diff --git a/dep/opus/silk/float/k2a_FLP.c b/external/opus/src/silk/float/k2a_FLP.c
similarity index 100%
rename from dep/opus/silk/float/k2a_FLP.c
rename to external/opus/src/silk/float/k2a_FLP.c
diff --git a/dep/opus/silk/float/levinsondurbin_FLP.c b/external/opus/src/silk/float/levinsondurbin_FLP.c
similarity index 100%
rename from dep/opus/silk/float/levinsondurbin_FLP.c
rename to external/opus/src/silk/float/levinsondurbin_FLP.c
diff --git a/dep/opus/silk/float/main_FLP.h b/external/opus/src/silk/float/main_FLP.h
similarity index 100%
rename from dep/opus/silk/float/main_FLP.h
rename to external/opus/src/silk/float/main_FLP.h
diff --git a/dep/opus/silk/float/noise_shape_analysis_FLP.c b/external/opus/src/silk/float/noise_shape_analysis_FLP.c
similarity index 100%
rename from dep/opus/silk/float/noise_shape_analysis_FLP.c
rename to external/opus/src/silk/float/noise_shape_analysis_FLP.c
diff --git a/dep/opus/silk/float/pitch_analysis_core_FLP.c b/external/opus/src/silk/float/pitch_analysis_core_FLP.c
similarity index 100%
rename from dep/opus/silk/float/pitch_analysis_core_FLP.c
rename to external/opus/src/silk/float/pitch_analysis_core_FLP.c
diff --git a/dep/opus/silk/float/prefilter_FLP.c b/external/opus/src/silk/float/prefilter_FLP.c
similarity index 100%
rename from dep/opus/silk/float/prefilter_FLP.c
rename to external/opus/src/silk/float/prefilter_FLP.c
diff --git a/dep/opus/silk/float/process_gains_FLP.c b/external/opus/src/silk/float/process_gains_FLP.c
similarity index 100%
rename from dep/opus/silk/float/process_gains_FLP.c
rename to external/opus/src/silk/float/process_gains_FLP.c
diff --git a/dep/opus/silk/float/regularize_correlations_FLP.c b/external/opus/src/silk/float/regularize_correlations_FLP.c
similarity index 100%
rename from dep/opus/silk/float/regularize_correlations_FLP.c
rename to external/opus/src/silk/float/regularize_correlations_FLP.c
diff --git a/dep/opus/silk/float/residual_energy_FLP.c b/external/opus/src/silk/float/residual_energy_FLP.c
similarity index 100%
rename from dep/opus/silk/float/residual_energy_FLP.c
rename to external/opus/src/silk/float/residual_energy_FLP.c
diff --git a/dep/opus/silk/float/scale_copy_vector_FLP.c b/external/opus/src/silk/float/scale_copy_vector_FLP.c
similarity index 100%
rename from dep/opus/silk/float/scale_copy_vector_FLP.c
rename to external/opus/src/silk/float/scale_copy_vector_FLP.c
diff --git a/dep/opus/silk/float/scale_vector_FLP.c b/external/opus/src/silk/float/scale_vector_FLP.c
similarity index 100%
rename from dep/opus/silk/float/scale_vector_FLP.c
rename to external/opus/src/silk/float/scale_vector_FLP.c
diff --git a/dep/opus/silk/float/schur_FLP.c b/external/opus/src/silk/float/schur_FLP.c
similarity index 100%
rename from dep/opus/silk/float/schur_FLP.c
rename to external/opus/src/silk/float/schur_FLP.c
diff --git a/dep/opus/silk/float/solve_LS_FLP.c b/external/opus/src/silk/float/solve_LS_FLP.c
similarity index 100%
rename from dep/opus/silk/float/solve_LS_FLP.c
rename to external/opus/src/silk/float/solve_LS_FLP.c
diff --git a/dep/opus/silk/float/sort_FLP.c b/external/opus/src/silk/float/sort_FLP.c
similarity index 100%
rename from dep/opus/silk/float/sort_FLP.c
rename to external/opus/src/silk/float/sort_FLP.c
diff --git a/dep/opus/silk/float/structs_FLP.h b/external/opus/src/silk/float/structs_FLP.h
similarity index 100%
rename from dep/opus/silk/float/structs_FLP.h
rename to external/opus/src/silk/float/structs_FLP.h
diff --git a/dep/opus/silk/float/warped_autocorrelation_FLP.c b/external/opus/src/silk/float/warped_autocorrelation_FLP.c
similarity index 100%
rename from dep/opus/silk/float/warped_autocorrelation_FLP.c
rename to external/opus/src/silk/float/warped_autocorrelation_FLP.c
diff --git a/dep/opus/silk/float/wrappers_FLP.c b/external/opus/src/silk/float/wrappers_FLP.c
similarity index 100%
rename from dep/opus/silk/float/wrappers_FLP.c
rename to external/opus/src/silk/float/wrappers_FLP.c
diff --git a/dep/opus/silk/gain_quant.c b/external/opus/src/silk/gain_quant.c
similarity index 100%
rename from dep/opus/silk/gain_quant.c
rename to external/opus/src/silk/gain_quant.c
diff --git a/dep/opus/silk/init_decoder.c b/external/opus/src/silk/init_decoder.c
similarity index 100%
rename from dep/opus/silk/init_decoder.c
rename to external/opus/src/silk/init_decoder.c
diff --git a/dep/opus/silk/init_encoder.c b/external/opus/src/silk/init_encoder.c
similarity index 100%
rename from dep/opus/silk/init_encoder.c
rename to external/opus/src/silk/init_encoder.c
diff --git a/dep/opus/silk/inner_prod_aligned.c b/external/opus/src/silk/inner_prod_aligned.c
similarity index 100%
rename from dep/opus/silk/inner_prod_aligned.c
rename to external/opus/src/silk/inner_prod_aligned.c
diff --git a/dep/opus/silk/interpolate.c b/external/opus/src/silk/interpolate.c
similarity index 100%
rename from dep/opus/silk/interpolate.c
rename to external/opus/src/silk/interpolate.c
diff --git a/dep/opus/silk/lin2log.c b/external/opus/src/silk/lin2log.c
similarity index 100%
rename from dep/opus/silk/lin2log.c
rename to external/opus/src/silk/lin2log.c
diff --git a/dep/opus/silk/log2lin.c b/external/opus/src/silk/log2lin.c
similarity index 100%
rename from dep/opus/silk/log2lin.c
rename to external/opus/src/silk/log2lin.c
diff --git a/dep/opus/silk/macros.h b/external/opus/src/silk/macros.h
similarity index 100%
rename from dep/opus/silk/macros.h
rename to external/opus/src/silk/macros.h
diff --git a/dep/opus/silk/main.h b/external/opus/src/silk/main.h
similarity index 100%
rename from dep/opus/silk/main.h
rename to external/opus/src/silk/main.h
diff --git a/dep/opus/silk/pitch_est_defines.h b/external/opus/src/silk/pitch_est_defines.h
similarity index 100%
rename from dep/opus/silk/pitch_est_defines.h
rename to external/opus/src/silk/pitch_est_defines.h
diff --git a/dep/opus/silk/pitch_est_tables.c b/external/opus/src/silk/pitch_est_tables.c
similarity index 100%
rename from dep/opus/silk/pitch_est_tables.c
rename to external/opus/src/silk/pitch_est_tables.c
diff --git a/dep/opus/silk/process_NLSFs.c b/external/opus/src/silk/process_NLSFs.c
similarity index 100%
rename from dep/opus/silk/process_NLSFs.c
rename to external/opus/src/silk/process_NLSFs.c
diff --git a/dep/opus/silk/quant_LTP_gains.c b/external/opus/src/silk/quant_LTP_gains.c
similarity index 100%
rename from dep/opus/silk/quant_LTP_gains.c
rename to external/opus/src/silk/quant_LTP_gains.c
diff --git a/dep/opus/silk/resampler.c b/external/opus/src/silk/resampler.c
similarity index 100%
rename from dep/opus/silk/resampler.c
rename to external/opus/src/silk/resampler.c
diff --git a/dep/opus/silk/resampler_down2.c b/external/opus/src/silk/resampler_down2.c
similarity index 100%
rename from dep/opus/silk/resampler_down2.c
rename to external/opus/src/silk/resampler_down2.c
diff --git a/dep/opus/silk/resampler_down2_3.c b/external/opus/src/silk/resampler_down2_3.c
similarity index 100%
rename from dep/opus/silk/resampler_down2_3.c
rename to external/opus/src/silk/resampler_down2_3.c
diff --git a/dep/opus/silk/resampler_private.h b/external/opus/src/silk/resampler_private.h
similarity index 100%
rename from dep/opus/silk/resampler_private.h
rename to external/opus/src/silk/resampler_private.h
diff --git a/dep/opus/silk/resampler_private_AR2.c b/external/opus/src/silk/resampler_private_AR2.c
similarity index 100%
rename from dep/opus/silk/resampler_private_AR2.c
rename to external/opus/src/silk/resampler_private_AR2.c
diff --git a/dep/opus/silk/resampler_private_IIR_FIR.c b/external/opus/src/silk/resampler_private_IIR_FIR.c
similarity index 100%
rename from dep/opus/silk/resampler_private_IIR_FIR.c
rename to external/opus/src/silk/resampler_private_IIR_FIR.c
diff --git a/dep/opus/silk/resampler_private_down_FIR.c b/external/opus/src/silk/resampler_private_down_FIR.c
similarity index 100%
rename from dep/opus/silk/resampler_private_down_FIR.c
rename to external/opus/src/silk/resampler_private_down_FIR.c
diff --git a/dep/opus/silk/resampler_private_up2_HQ.c b/external/opus/src/silk/resampler_private_up2_HQ.c
similarity index 100%
rename from dep/opus/silk/resampler_private_up2_HQ.c
rename to external/opus/src/silk/resampler_private_up2_HQ.c
diff --git a/dep/opus/silk/resampler_rom.c b/external/opus/src/silk/resampler_rom.c
similarity index 100%
rename from dep/opus/silk/resampler_rom.c
rename to external/opus/src/silk/resampler_rom.c
diff --git a/dep/opus/silk/resampler_rom.h b/external/opus/src/silk/resampler_rom.h
similarity index 100%
rename from dep/opus/silk/resampler_rom.h
rename to external/opus/src/silk/resampler_rom.h
diff --git a/dep/opus/silk/resampler_structs.h b/external/opus/src/silk/resampler_structs.h
similarity index 100%
rename from dep/opus/silk/resampler_structs.h
rename to external/opus/src/silk/resampler_structs.h
diff --git a/dep/opus/silk/shell_coder.c b/external/opus/src/silk/shell_coder.c
similarity index 100%
rename from dep/opus/silk/shell_coder.c
rename to external/opus/src/silk/shell_coder.c
diff --git a/dep/opus/silk/sigm_Q15.c b/external/opus/src/silk/sigm_Q15.c
similarity index 100%
rename from dep/opus/silk/sigm_Q15.c
rename to external/opus/src/silk/sigm_Q15.c
diff --git a/dep/opus/silk/sort.c b/external/opus/src/silk/sort.c
similarity index 100%
rename from dep/opus/silk/sort.c
rename to external/opus/src/silk/sort.c
diff --git a/dep/opus/silk/stereo_LR_to_MS.c b/external/opus/src/silk/stereo_LR_to_MS.c
similarity index 100%
rename from dep/opus/silk/stereo_LR_to_MS.c
rename to external/opus/src/silk/stereo_LR_to_MS.c
diff --git a/dep/opus/silk/stereo_MS_to_LR.c b/external/opus/src/silk/stereo_MS_to_LR.c
similarity index 100%
rename from dep/opus/silk/stereo_MS_to_LR.c
rename to external/opus/src/silk/stereo_MS_to_LR.c
diff --git a/dep/opus/silk/stereo_decode_pred.c b/external/opus/src/silk/stereo_decode_pred.c
similarity index 100%
rename from dep/opus/silk/stereo_decode_pred.c
rename to external/opus/src/silk/stereo_decode_pred.c
diff --git a/dep/opus/silk/stereo_encode_pred.c b/external/opus/src/silk/stereo_encode_pred.c
similarity index 100%
rename from dep/opus/silk/stereo_encode_pred.c
rename to external/opus/src/silk/stereo_encode_pred.c
diff --git a/dep/opus/silk/stereo_find_predictor.c b/external/opus/src/silk/stereo_find_predictor.c
similarity index 100%
rename from dep/opus/silk/stereo_find_predictor.c
rename to external/opus/src/silk/stereo_find_predictor.c
diff --git a/dep/opus/silk/stereo_quant_pred.c b/external/opus/src/silk/stereo_quant_pred.c
similarity index 100%
rename from dep/opus/silk/stereo_quant_pred.c
rename to external/opus/src/silk/stereo_quant_pred.c
diff --git a/dep/opus/silk/structs.h b/external/opus/src/silk/structs.h
similarity index 100%
rename from dep/opus/silk/structs.h
rename to external/opus/src/silk/structs.h
diff --git a/dep/opus/silk/sum_sqr_shift.c b/external/opus/src/silk/sum_sqr_shift.c
similarity index 100%
rename from dep/opus/silk/sum_sqr_shift.c
rename to external/opus/src/silk/sum_sqr_shift.c
diff --git a/dep/opus/silk/table_LSF_cos.c b/external/opus/src/silk/table_LSF_cos.c
similarity index 100%
rename from dep/opus/silk/table_LSF_cos.c
rename to external/opus/src/silk/table_LSF_cos.c
diff --git a/dep/opus/silk/tables.h b/external/opus/src/silk/tables.h
similarity index 100%
rename from dep/opus/silk/tables.h
rename to external/opus/src/silk/tables.h
diff --git a/dep/opus/silk/tables_LTP.c b/external/opus/src/silk/tables_LTP.c
similarity index 100%
rename from dep/opus/silk/tables_LTP.c
rename to external/opus/src/silk/tables_LTP.c
diff --git a/dep/opus/silk/tables_NLSF_CB_NB_MB.c b/external/opus/src/silk/tables_NLSF_CB_NB_MB.c
similarity index 100%
rename from dep/opus/silk/tables_NLSF_CB_NB_MB.c
rename to external/opus/src/silk/tables_NLSF_CB_NB_MB.c
diff --git a/dep/opus/silk/tables_NLSF_CB_WB.c b/external/opus/src/silk/tables_NLSF_CB_WB.c
similarity index 100%
rename from dep/opus/silk/tables_NLSF_CB_WB.c
rename to external/opus/src/silk/tables_NLSF_CB_WB.c
diff --git a/dep/opus/silk/tables_gain.c b/external/opus/src/silk/tables_gain.c
similarity index 100%
rename from dep/opus/silk/tables_gain.c
rename to external/opus/src/silk/tables_gain.c
diff --git a/dep/opus/silk/tables_other.c b/external/opus/src/silk/tables_other.c
similarity index 100%
rename from dep/opus/silk/tables_other.c
rename to external/opus/src/silk/tables_other.c
diff --git a/dep/opus/silk/tables_pitch_lag.c b/external/opus/src/silk/tables_pitch_lag.c
similarity index 100%
rename from dep/opus/silk/tables_pitch_lag.c
rename to external/opus/src/silk/tables_pitch_lag.c
diff --git a/dep/opus/silk/tables_pulses_per_block.c b/external/opus/src/silk/tables_pulses_per_block.c
similarity index 100%
rename from dep/opus/silk/tables_pulses_per_block.c
rename to external/opus/src/silk/tables_pulses_per_block.c
diff --git a/dep/opus/silk/tuning_parameters.h b/external/opus/src/silk/tuning_parameters.h
similarity index 100%
rename from dep/opus/silk/tuning_parameters.h
rename to external/opus/src/silk/tuning_parameters.h
diff --git a/dep/opus/silk/typedef.h b/external/opus/src/silk/typedef.h
similarity index 100%
rename from dep/opus/silk/typedef.h
rename to external/opus/src/silk/typedef.h
diff --git a/dep/opus/src/tansig_table.h b/external/opus/src/tansig_table.h
similarity index 100%
rename from dep/opus/src/tansig_table.h
rename to external/opus/src/tansig_table.h
diff --git a/external/rehlsdk/CMakeLists.txt b/external/rehlsdk/CMakeLists.txt
new file mode 100644
index 0000000..3416240
--- /dev/null
+++ b/external/rehlsdk/CMakeLists.txt
@@ -0,0 +1,190 @@
+#-------------------------------------------------------------------------------
+# Project Definition
+#-------------------------------------------------------------------------------
+
+project("ReHLSDK")
+
+#-------------------------------------------------------------------------------
+# Target Definition
+#-------------------------------------------------------------------------------
+
+set(TARGET_NAME "rehlsdk")
+set(TARGET_ALIAS "ReHLSDK::${TARGET_NAME}")
+
+add_library("${TARGET_NAME}")
+add_library("${TARGET_ALIAS}" ALIAS "${TARGET_NAME}")
+
+#-------------------------------------------------------------------------------
+# Source Files
+#-------------------------------------------------------------------------------
+
+target_sources("${TARGET_NAME}"
+  PUBLIC
+    "include/rehlsdk/common/BaseSystemModule.h"
+    "include/rehlsdk/common/beamdef.h"
+    "include/rehlsdk/common/cl_entity.h"
+    "include/rehlsdk/common/com_model.h"
+    "include/rehlsdk/common/con_nprint.h"
+    "include/rehlsdk/common/const.h"
+    "include/rehlsdk/common/crc.h"
+    "include/rehlsdk/common/cvardef.h"
+    "include/rehlsdk/common/demo_api.h"
+    "include/rehlsdk/common/director_cmds.h"
+    "include/rehlsdk/common/dlight.h"
+    "include/rehlsdk/common/dll_state.h"
+    "include/rehlsdk/common/entity_state.h"
+    "include/rehlsdk/common/entity_types.h"
+    "include/rehlsdk/common/enums.h"
+    "include/rehlsdk/common/event_api.h"
+    "include/rehlsdk/common/event_args.h"
+    "include/rehlsdk/common/event_flags.h"
+    "include/rehlsdk/common/hltv.h"
+    "include/rehlsdk/common/IAdminServer.h"
+    "include/rehlsdk/common/IBaseSystem.h"
+    "include/rehlsdk/common/IDemoPlayer.h"
+    "include/rehlsdk/common/IEngineWrapper.h"
+    "include/rehlsdk/common/IGameServerData.h"
+    "include/rehlsdk/common/in_buttons.h"
+    "include/rehlsdk/common/IObjectContainer.h"
+    "include/rehlsdk/common/ISystemModule.h"
+    "include/rehlsdk/common/IVGuiModule.h"
+    "include/rehlsdk/common/ivoicetweak.h"
+    "include/rehlsdk/common/kbutton.h"
+    "include/rehlsdk/common/mathlib.h"
+    "include/rehlsdk/common/md5.h"
+    "include/rehlsdk/common/net_api.h"
+    "include/rehlsdk/common/netadr.h"
+    "include/rehlsdk/common/netapi.h"
+    "include/rehlsdk/common/nowin.h"
+    "include/rehlsdk/common/ObjectDictionary.h"
+    "include/rehlsdk/common/ObjectList.h"
+    "include/rehlsdk/common/parsemsg.h"
+    "include/rehlsdk/common/particledef.h"
+    "include/rehlsdk/common/pmtrace.h"
+    "include/rehlsdk/common/port.h"
+    "include/rehlsdk/common/qfont.h"
+    "include/rehlsdk/common/qlimits.h"
+    "include/rehlsdk/common/quakedef.h"
+    "include/rehlsdk/common/r_efx.h"
+    "include/rehlsdk/common/r_studioint.h"
+    "include/rehlsdk/common/ref_params.h"
+    "include/rehlsdk/common/screenfade.h"
+    "include/rehlsdk/common/Sequence.h"
+    "include/rehlsdk/common/SteamAppStartUp.h"
+    "include/rehlsdk/common/SteamCommon.h"
+    "include/rehlsdk/common/studio_event.h"
+    "include/rehlsdk/common/textconsole.h"
+    "include/rehlsdk/common/TextConsoleUnix.h"
+    "include/rehlsdk/common/TextConsoleWin32.h"
+    "include/rehlsdk/common/TokenLine.h"
+    "include/rehlsdk/common/triangleapi.h"
+    "include/rehlsdk/common/usercmd.h"
+    "include/rehlsdk/common/vmodes.h"
+    "include/rehlsdk/common/weaponinfo.h"
+    "include/rehlsdk/common/winsani_in.h"
+    "include/rehlsdk/common/winsani_out.h"
+
+    "include/rehlsdk/dlls/activity.h"
+    "include/rehlsdk/dlls/activitymap.h"
+    "include/rehlsdk/dlls/animation.h"
+    "include/rehlsdk/dlls/basemonster.h"
+    "include/rehlsdk/dlls/cbase.h"
+    "include/rehlsdk/dlls/cdll_dll.h"
+    "include/rehlsdk/dlls/client.h"
+    "include/rehlsdk/dlls/decals.h"
+    "include/rehlsdk/dlls/doors.h"
+    "include/rehlsdk/dlls/effects.h"
+    "include/rehlsdk/dlls/enginecallback.h"
+    "include/rehlsdk/dlls/explode.h"
+    "include/rehlsdk/dlls/extdll.h"
+    "include/rehlsdk/dlls/func_break.h"
+    "include/rehlsdk/dlls/game.h"
+    "include/rehlsdk/dlls/gamerules.h"
+    "include/rehlsdk/dlls/hornet.h"
+    "include/rehlsdk/dlls/items.h"
+    "include/rehlsdk/dlls/maprules.h"
+    "include/rehlsdk/dlls/monsterevent.h"
+    "include/rehlsdk/dlls/monsters.h"
+    "include/rehlsdk/dlls/nodes.h"
+    "include/rehlsdk/dlls/plane.h"
+    "include/rehlsdk/dlls/player.h"
+    "include/rehlsdk/dlls/saverestore.h"
+    "include/rehlsdk/dlls/schedule.h"
+    "include/rehlsdk/dlls/scriptevent.h"
+    "include/rehlsdk/dlls/skill.h"
+    "include/rehlsdk/dlls/soundent.h"
+    "include/rehlsdk/dlls/spectator.h"
+    "include/rehlsdk/dlls/talkmonster.h"
+    "include/rehlsdk/dlls/teamplay_gamerules.h"
+    "include/rehlsdk/dlls/trains.h"
+    "include/rehlsdk/dlls/util.h"
+    "include/rehlsdk/dlls/vector.h"
+    "include/rehlsdk/dlls/weapons.h"
+
+    "include/rehlsdk/engine/archtypes.h"
+    "include/rehlsdk/engine/bspfile.h"
+    "include/rehlsdk/engine/cmd_rehlds.h"
+    "include/rehlsdk/engine/common_rehlds.h"
+    "include/rehlsdk/engine/crc32c.h"
+    "include/rehlsdk/engine/custom.h"
+    "include/rehlsdk/engine/customentity.h"
+    "include/rehlsdk/engine/d_local.h"
+    "include/rehlsdk/engine/edict.h"
+    "include/rehlsdk/engine/eiface.h"
+    "include/rehlsdk/engine/FlightRecorder.h"
+    "include/rehlsdk/engine/hookchains.h"
+    "include/rehlsdk/engine/keydefs.h"
+    "include/rehlsdk/engine/maintypes.h"
+    "include/rehlsdk/engine/model.h"
+    "include/rehlsdk/engine/modelgen.h"
+    "include/rehlsdk/engine/osconfig.h"
+    "include/rehlsdk/engine/pr_dlls.h"
+    "include/rehlsdk/engine/progdefs.h"
+    "include/rehlsdk/engine/progs.h"
+    "include/rehlsdk/engine/rehlds_api.h"
+    "include/rehlsdk/engine/rehlds_interfaces.h"
+    "include/rehlsdk/engine/Sequence.h"
+    "include/rehlsdk/engine/shake.h"
+    "include/rehlsdk/engine/spritegn.h"
+    "include/rehlsdk/engine/static_map.h"
+    "include/rehlsdk/engine/studio.h"
+    "include/rehlsdk/engine/sys_shared.h"
+    "include/rehlsdk/engine/userid_rehlds.h"
+
+    "include/rehlsdk/pm_shared/pm_debug.h"
+    "include/rehlsdk/pm_shared/pm_defs.h"
+    "include/rehlsdk/pm_shared/pm_info.h"
+    "include/rehlsdk/pm_shared/pm_materials.h"
+    "include/rehlsdk/pm_shared/pm_movevars.h"
+    "include/rehlsdk/pm_shared/pm_shared.h"
+
+    "include/rehlsdk/public/commonmacros.h"
+    "include/rehlsdk/public/FileSystem.h"
+    "include/rehlsdk/public/interface.h"
+
+  PRIVATE
+    "src/engine/crc32c.cpp"
+    "src/engine/sys_shared.cpp"
+    "src/public/interface.cpp"
+)
+
+#-------------------------------------------------------------------------------
+# Include Directories
+#-------------------------------------------------------------------------------
+
+target_include_directories("${TARGET_NAME}"
+  PUBLIC
+    "${PROJECT_SOURCE_DIR}/include"
+)
+
+#-------------------------------------------------------------------------------
+# Compile Definitions
+#-------------------------------------------------------------------------------
+
+target_compile_definitions("${TARGET_NAME}"
+  PRIVATE
+    $<$<PLATFORM_ID:Windows>:
+      _MBCS
+      _CRT_SECURE_NO_WARNINGS
+    >
+)
diff --git a/dep/rehlsdk/common/BaseSystemModule.h b/external/rehlsdk/include/rehlsdk/common/BaseSystemModule.h
similarity index 100%
rename from dep/rehlsdk/common/BaseSystemModule.h
rename to external/rehlsdk/include/rehlsdk/common/BaseSystemModule.h
diff --git a/dep/rehlsdk/common/IAdminServer.h b/external/rehlsdk/include/rehlsdk/common/IAdminServer.h
similarity index 98%
rename from dep/rehlsdk/common/IAdminServer.h
rename to external/rehlsdk/include/rehlsdk/common/IAdminServer.h
index ab367ce..9a7ce6f 100644
--- a/dep/rehlsdk/common/IAdminServer.h
+++ b/external/rehlsdk/include/rehlsdk/common/IAdminServer.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include "interface.h"
+#include "rehlsdk/public/interface.h"
 
 // handle to a game window
 typedef unsigned int ManageServerUIHandle_t;
diff --git a/dep/rehlsdk/common/IBaseSystem.h b/external/rehlsdk/include/rehlsdk/common/IBaseSystem.h
similarity index 100%
rename from dep/rehlsdk/common/IBaseSystem.h
rename to external/rehlsdk/include/rehlsdk/common/IBaseSystem.h
diff --git a/dep/rehlsdk/common/IDemoPlayer.h b/external/rehlsdk/include/rehlsdk/common/IDemoPlayer.h
similarity index 100%
rename from dep/rehlsdk/common/IDemoPlayer.h
rename to external/rehlsdk/include/rehlsdk/common/IDemoPlayer.h
diff --git a/dep/rehlsdk/common/IEngineWrapper.h b/external/rehlsdk/include/rehlsdk/common/IEngineWrapper.h
similarity index 100%
rename from dep/rehlsdk/common/IEngineWrapper.h
rename to external/rehlsdk/include/rehlsdk/common/IEngineWrapper.h
diff --git a/dep/rehlsdk/common/IGameServerData.h b/external/rehlsdk/include/rehlsdk/common/IGameServerData.h
similarity index 79%
rename from dep/rehlsdk/common/IGameServerData.h
rename to external/rehlsdk/include/rehlsdk/common/IGameServerData.h
index d431f00..0de3e0f 100644
--- a/dep/rehlsdk/common/IGameServerData.h
+++ b/external/rehlsdk/include/rehlsdk/common/IGameServerData.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "maintypes.h"
-#include "interface.h"
+#include "rehlsdk/engine/maintypes.h"
+#include "rehlsdk/public/interface.h"
 
 class IGameServerData : public IBaseInterface {
 public:
diff --git a/dep/rehlsdk/common/IObjectContainer.h b/external/rehlsdk/include/rehlsdk/common/IObjectContainer.h
similarity index 100%
rename from dep/rehlsdk/common/IObjectContainer.h
rename to external/rehlsdk/include/rehlsdk/common/IObjectContainer.h
diff --git a/dep/rehlsdk/common/ISystemModule.h b/external/rehlsdk/include/rehlsdk/common/ISystemModule.h
similarity index 98%
rename from dep/rehlsdk/common/ISystemModule.h
rename to external/rehlsdk/include/rehlsdk/common/ISystemModule.h
index 9004a95..86ee3dc 100644
--- a/dep/rehlsdk/common/ISystemModule.h
+++ b/external/rehlsdk/include/rehlsdk/common/ISystemModule.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include "interface.h"
+#include "rehlsdk/public/interface.h"
 
 class IBaseSystem;
 class ISystemModule;
diff --git a/dep/rehlsdk/common/IVGuiModule.h b/external/rehlsdk/include/rehlsdk/common/IVGuiModule.h
similarity index 98%
rename from dep/rehlsdk/common/IVGuiModule.h
rename to external/rehlsdk/include/rehlsdk/common/IVGuiModule.h
index e6864c8..dc75ece 100644
--- a/dep/rehlsdk/common/IVGuiModule.h
+++ b/external/rehlsdk/include/rehlsdk/common/IVGuiModule.h
@@ -29,7 +29,7 @@
 #pragma once
 
 #include <vgui/VGUI.h>
-#include "interface.h"
+#include "rehlsdk/public/interface.h"
 
 // Purpose: Standard interface to loading vgui modules
 class IVGuiModule: public IBaseInterface
diff --git a/dep/rehlsdk/common/ObjectDictionary.h b/external/rehlsdk/include/rehlsdk/common/ObjectDictionary.h
similarity index 100%
rename from dep/rehlsdk/common/ObjectDictionary.h
rename to external/rehlsdk/include/rehlsdk/common/ObjectDictionary.h
diff --git a/dep/rehlsdk/common/ObjectList.h b/external/rehlsdk/include/rehlsdk/common/ObjectList.h
similarity index 100%
rename from dep/rehlsdk/common/ObjectList.h
rename to external/rehlsdk/include/rehlsdk/common/ObjectList.h
diff --git a/dep/rehlsdk/common/Sequence.h b/external/rehlsdk/include/rehlsdk/common/Sequence.h
similarity index 100%
rename from dep/rehlsdk/common/Sequence.h
rename to external/rehlsdk/include/rehlsdk/common/Sequence.h
diff --git a/dep/rehlsdk/common/SteamAppStartUp.h b/external/rehlsdk/include/rehlsdk/common/SteamAppStartUp.h
similarity index 100%
rename from dep/rehlsdk/common/SteamAppStartUp.h
rename to external/rehlsdk/include/rehlsdk/common/SteamAppStartUp.h
diff --git a/dep/rehlsdk/common/SteamCommon.h b/external/rehlsdk/include/rehlsdk/common/SteamCommon.h
similarity index 100%
rename from dep/rehlsdk/common/SteamCommon.h
rename to external/rehlsdk/include/rehlsdk/common/SteamCommon.h
diff --git a/dep/rehlsdk/common/TextConsoleUnix.h b/external/rehlsdk/include/rehlsdk/common/TextConsoleUnix.h
similarity index 100%
rename from dep/rehlsdk/common/TextConsoleUnix.h
rename to external/rehlsdk/include/rehlsdk/common/TextConsoleUnix.h
diff --git a/dep/rehlsdk/common/TextConsoleWin32.h b/external/rehlsdk/include/rehlsdk/common/TextConsoleWin32.h
similarity index 100%
rename from dep/rehlsdk/common/TextConsoleWin32.h
rename to external/rehlsdk/include/rehlsdk/common/TextConsoleWin32.h
diff --git a/dep/rehlsdk/common/TokenLine.h b/external/rehlsdk/include/rehlsdk/common/TokenLine.h
similarity index 100%
rename from dep/rehlsdk/common/TokenLine.h
rename to external/rehlsdk/include/rehlsdk/common/TokenLine.h
diff --git a/dep/rehlsdk/common/beamdef.h b/external/rehlsdk/include/rehlsdk/common/beamdef.h
similarity index 100%
rename from dep/rehlsdk/common/beamdef.h
rename to external/rehlsdk/include/rehlsdk/common/beamdef.h
diff --git a/dep/rehlsdk/common/cl_entity.h b/external/rehlsdk/include/rehlsdk/common/cl_entity.h
similarity index 98%
rename from dep/rehlsdk/common/cl_entity.h
rename to external/rehlsdk/include/rehlsdk/common/cl_entity.h
index a7cd472..9c4eda8 100644
--- a/dep/rehlsdk/common/cl_entity.h
+++ b/external/rehlsdk/include/rehlsdk/common/cl_entity.h
@@ -69,7 +69,7 @@ typedef struct cl_entity_s cl_entity_t;
 #endif
 
 #if !defined( PROGS_H )
-#include "progs.h"
+#include "rehlsdk/engine/progs.h"
 #endif
 
 struct cl_entity_s
diff --git a/dep/rehlsdk/common/com_model.h b/external/rehlsdk/include/rehlsdk/common/com_model.h
similarity index 98%
rename from dep/rehlsdk/common/com_model.h
rename to external/rehlsdk/include/rehlsdk/common/com_model.h
index d6e3d42..f8856bc 100644
--- a/dep/rehlsdk/common/com_model.h
+++ b/external/rehlsdk/include/rehlsdk/common/com_model.h
@@ -1,4 +1,4 @@
-//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
+//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
 //
 // Purpose: 
 //
@@ -300,7 +300,7 @@ typedef struct auxvert_s
 	float	fv[3];		// viewspace x, y
 } auxvert_t;
 
-#include "custom.h"
+#include "rehlsdk/engine/custom.h"
 
 //#define MAX_SCOREBOARDNAME	32
 
diff --git a/dep/rehlsdk/common/con_nprint.h b/external/rehlsdk/include/rehlsdk/common/con_nprint.h
similarity index 100%
rename from dep/rehlsdk/common/con_nprint.h
rename to external/rehlsdk/include/rehlsdk/common/con_nprint.h
diff --git a/dep/rehlsdk/common/const.h b/external/rehlsdk/include/rehlsdk/common/const.h
similarity index 100%
rename from dep/rehlsdk/common/const.h
rename to external/rehlsdk/include/rehlsdk/common/const.h
diff --git a/dep/rehlsdk/common/crc.h b/external/rehlsdk/include/rehlsdk/common/crc.h
similarity index 100%
rename from dep/rehlsdk/common/crc.h
rename to external/rehlsdk/include/rehlsdk/common/crc.h
diff --git a/dep/rehlsdk/common/cvardef.h b/external/rehlsdk/include/rehlsdk/common/cvardef.h
similarity index 100%
rename from dep/rehlsdk/common/cvardef.h
rename to external/rehlsdk/include/rehlsdk/common/cvardef.h
diff --git a/dep/rehlsdk/common/demo_api.h b/external/rehlsdk/include/rehlsdk/common/demo_api.h
similarity index 100%
rename from dep/rehlsdk/common/demo_api.h
rename to external/rehlsdk/include/rehlsdk/common/demo_api.h
diff --git a/dep/rehlsdk/common/director_cmds.h b/external/rehlsdk/include/rehlsdk/common/director_cmds.h
similarity index 100%
rename from dep/rehlsdk/common/director_cmds.h
rename to external/rehlsdk/include/rehlsdk/common/director_cmds.h
diff --git a/dep/rehlsdk/common/dlight.h b/external/rehlsdk/include/rehlsdk/common/dlight.h
similarity index 100%
rename from dep/rehlsdk/common/dlight.h
rename to external/rehlsdk/include/rehlsdk/common/dlight.h
diff --git a/dep/rehlsdk/common/dll_state.h b/external/rehlsdk/include/rehlsdk/common/dll_state.h
similarity index 100%
rename from dep/rehlsdk/common/dll_state.h
rename to external/rehlsdk/include/rehlsdk/common/dll_state.h
diff --git a/dep/rehlsdk/common/entity_state.h b/external/rehlsdk/include/rehlsdk/common/entity_state.h
similarity index 99%
rename from dep/rehlsdk/common/entity_state.h
rename to external/rehlsdk/include/rehlsdk/common/entity_state.h
index 2fe67c9..1fddc91 100644
--- a/dep/rehlsdk/common/entity_state.h
+++ b/external/rehlsdk/include/rehlsdk/common/entity_state.h
@@ -127,7 +127,7 @@ struct entity_state_s
 	vec3_t		vuser4;
 };
 
-#include "pm_info.h"
+#include "rehlsdk/pm_shared/pm_info.h"
 
 typedef struct clientdata_s
 {
diff --git a/dep/rehlsdk/common/entity_types.h b/external/rehlsdk/include/rehlsdk/common/entity_types.h
similarity index 100%
rename from dep/rehlsdk/common/entity_types.h
rename to external/rehlsdk/include/rehlsdk/common/entity_types.h
diff --git a/dep/rehlsdk/common/enums.h b/external/rehlsdk/include/rehlsdk/common/enums.h
similarity index 100%
rename from dep/rehlsdk/common/enums.h
rename to external/rehlsdk/include/rehlsdk/common/enums.h
diff --git a/dep/rehlsdk/common/event_api.h b/external/rehlsdk/include/rehlsdk/common/event_api.h
similarity index 100%
rename from dep/rehlsdk/common/event_api.h
rename to external/rehlsdk/include/rehlsdk/common/event_api.h
diff --git a/dep/rehlsdk/common/event_args.h b/external/rehlsdk/include/rehlsdk/common/event_args.h
similarity index 100%
rename from dep/rehlsdk/common/event_args.h
rename to external/rehlsdk/include/rehlsdk/common/event_args.h
diff --git a/dep/rehlsdk/common/event_flags.h b/external/rehlsdk/include/rehlsdk/common/event_flags.h
similarity index 100%
rename from dep/rehlsdk/common/event_flags.h
rename to external/rehlsdk/include/rehlsdk/common/event_flags.h
diff --git a/dep/rehlsdk/common/hltv.h b/external/rehlsdk/include/rehlsdk/common/hltv.h
similarity index 100%
rename from dep/rehlsdk/common/hltv.h
rename to external/rehlsdk/include/rehlsdk/common/hltv.h
diff --git a/dep/rehlsdk/common/in_buttons.h b/external/rehlsdk/include/rehlsdk/common/in_buttons.h
similarity index 100%
rename from dep/rehlsdk/common/in_buttons.h
rename to external/rehlsdk/include/rehlsdk/common/in_buttons.h
diff --git a/dep/rehlsdk/common/ivoicetweak.h b/external/rehlsdk/include/rehlsdk/common/ivoicetweak.h
similarity index 100%
rename from dep/rehlsdk/common/ivoicetweak.h
rename to external/rehlsdk/include/rehlsdk/common/ivoicetweak.h
diff --git a/dep/rehlsdk/common/kbutton.h b/external/rehlsdk/include/rehlsdk/common/kbutton.h
similarity index 100%
rename from dep/rehlsdk/common/kbutton.h
rename to external/rehlsdk/include/rehlsdk/common/kbutton.h
diff --git a/dep/rehlsdk/common/mathlib.h b/external/rehlsdk/include/rehlsdk/common/mathlib.h
similarity index 100%
rename from dep/rehlsdk/common/mathlib.h
rename to external/rehlsdk/include/rehlsdk/common/mathlib.h
diff --git a/dep/rehlsdk/common/md5.h b/external/rehlsdk/include/rehlsdk/common/md5.h
similarity index 97%
rename from dep/rehlsdk/common/md5.h
rename to external/rehlsdk/include/rehlsdk/common/md5.h
index 637ba0f..1381f11 100644
--- a/dep/rehlsdk/common/md5.h
+++ b/external/rehlsdk/include/rehlsdk/common/md5.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <quakedef.h>
+#include "quakedef.h"
 
 // MD5 Hash
 typedef struct
diff --git a/dep/rehlsdk/common/net_api.h b/external/rehlsdk/include/rehlsdk/common/net_api.h
similarity index 100%
rename from dep/rehlsdk/common/net_api.h
rename to external/rehlsdk/include/rehlsdk/common/net_api.h
diff --git a/dep/rehlsdk/common/netadr.h b/external/rehlsdk/include/rehlsdk/common/netadr.h
similarity index 100%
rename from dep/rehlsdk/common/netadr.h
rename to external/rehlsdk/include/rehlsdk/common/netadr.h
diff --git a/dep/rehlsdk/common/netapi.h b/external/rehlsdk/include/rehlsdk/common/netapi.h
similarity index 100%
rename from dep/rehlsdk/common/netapi.h
rename to external/rehlsdk/include/rehlsdk/common/netapi.h
diff --git a/dep/rehlsdk/common/nowin.h b/external/rehlsdk/include/rehlsdk/common/nowin.h
similarity index 100%
rename from dep/rehlsdk/common/nowin.h
rename to external/rehlsdk/include/rehlsdk/common/nowin.h
diff --git a/dep/rehlsdk/common/parsemsg.h b/external/rehlsdk/include/rehlsdk/common/parsemsg.h
similarity index 100%
rename from dep/rehlsdk/common/parsemsg.h
rename to external/rehlsdk/include/rehlsdk/common/parsemsg.h
diff --git a/dep/rehlsdk/common/particledef.h b/external/rehlsdk/include/rehlsdk/common/particledef.h
similarity index 100%
rename from dep/rehlsdk/common/particledef.h
rename to external/rehlsdk/include/rehlsdk/common/particledef.h
diff --git a/dep/rehlsdk/common/pmtrace.h b/external/rehlsdk/include/rehlsdk/common/pmtrace.h
similarity index 100%
rename from dep/rehlsdk/common/pmtrace.h
rename to external/rehlsdk/include/rehlsdk/common/pmtrace.h
diff --git a/dep/rehlsdk/common/port.h b/external/rehlsdk/include/rehlsdk/common/port.h
similarity index 97%
rename from dep/rehlsdk/common/port.h
rename to external/rehlsdk/include/rehlsdk/common/port.h
index a0838a7..f652b59 100644
--- a/dep/rehlsdk/common/port.h
+++ b/external/rehlsdk/include/rehlsdk/common/port.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "archtypes.h"     // DAL
+#include "rehlsdk/engine/archtypes.h"     // DAL
 
 #ifdef _WIN32
 
diff --git a/dep/rehlsdk/common/qfont.h b/external/rehlsdk/include/rehlsdk/common/qfont.h
similarity index 100%
rename from dep/rehlsdk/common/qfont.h
rename to external/rehlsdk/include/rehlsdk/common/qfont.h
diff --git a/dep/rehlsdk/common/qlimits.h b/external/rehlsdk/include/rehlsdk/common/qlimits.h
similarity index 100%
rename from dep/rehlsdk/common/qlimits.h
rename to external/rehlsdk/include/rehlsdk/common/qlimits.h
diff --git a/dep/rehlsdk/common/quakedef.h b/external/rehlsdk/include/rehlsdk/common/quakedef.h
similarity index 100%
rename from dep/rehlsdk/common/quakedef.h
rename to external/rehlsdk/include/rehlsdk/common/quakedef.h
diff --git a/dep/rehlsdk/common/r_efx.h b/external/rehlsdk/include/rehlsdk/common/r_efx.h
similarity index 100%
rename from dep/rehlsdk/common/r_efx.h
rename to external/rehlsdk/include/rehlsdk/common/r_efx.h
diff --git a/dep/rehlsdk/common/r_studioint.h b/external/rehlsdk/include/rehlsdk/common/r_studioint.h
similarity index 100%
rename from dep/rehlsdk/common/r_studioint.h
rename to external/rehlsdk/include/rehlsdk/common/r_studioint.h
diff --git a/dep/rehlsdk/common/ref_params.h b/external/rehlsdk/include/rehlsdk/common/ref_params.h
similarity index 100%
rename from dep/rehlsdk/common/ref_params.h
rename to external/rehlsdk/include/rehlsdk/common/ref_params.h
diff --git a/dep/rehlsdk/common/screenfade.h b/external/rehlsdk/include/rehlsdk/common/screenfade.h
similarity index 100%
rename from dep/rehlsdk/common/screenfade.h
rename to external/rehlsdk/include/rehlsdk/common/screenfade.h
diff --git a/dep/rehlsdk/common/studio_event.h b/external/rehlsdk/include/rehlsdk/common/studio_event.h
similarity index 100%
rename from dep/rehlsdk/common/studio_event.h
rename to external/rehlsdk/include/rehlsdk/common/studio_event.h
diff --git a/dep/rehlsdk/common/textconsole.h b/external/rehlsdk/include/rehlsdk/common/textconsole.h
similarity index 100%
rename from dep/rehlsdk/common/textconsole.h
rename to external/rehlsdk/include/rehlsdk/common/textconsole.h
diff --git a/dep/rehlsdk/common/triangleapi.h b/external/rehlsdk/include/rehlsdk/common/triangleapi.h
similarity index 100%
rename from dep/rehlsdk/common/triangleapi.h
rename to external/rehlsdk/include/rehlsdk/common/triangleapi.h
diff --git a/dep/rehlsdk/common/usercmd.h b/external/rehlsdk/include/rehlsdk/common/usercmd.h
similarity index 100%
rename from dep/rehlsdk/common/usercmd.h
rename to external/rehlsdk/include/rehlsdk/common/usercmd.h
diff --git a/dep/rehlsdk/common/vmodes.h b/external/rehlsdk/include/rehlsdk/common/vmodes.h
similarity index 100%
rename from dep/rehlsdk/common/vmodes.h
rename to external/rehlsdk/include/rehlsdk/common/vmodes.h
diff --git a/dep/rehlsdk/common/weaponinfo.h b/external/rehlsdk/include/rehlsdk/common/weaponinfo.h
similarity index 100%
rename from dep/rehlsdk/common/weaponinfo.h
rename to external/rehlsdk/include/rehlsdk/common/weaponinfo.h
diff --git a/dep/rehlsdk/common/winsani_in.h b/external/rehlsdk/include/rehlsdk/common/winsani_in.h
similarity index 100%
rename from dep/rehlsdk/common/winsani_in.h
rename to external/rehlsdk/include/rehlsdk/common/winsani_in.h
diff --git a/dep/rehlsdk/common/winsani_out.h b/external/rehlsdk/include/rehlsdk/common/winsani_out.h
similarity index 100%
rename from dep/rehlsdk/common/winsani_out.h
rename to external/rehlsdk/include/rehlsdk/common/winsani_out.h
diff --git a/dep/rehlsdk/dlls/activity.h b/external/rehlsdk/include/rehlsdk/dlls/activity.h
similarity index 100%
rename from dep/rehlsdk/dlls/activity.h
rename to external/rehlsdk/include/rehlsdk/dlls/activity.h
diff --git a/dep/rehlsdk/dlls/activitymap.h b/external/rehlsdk/include/rehlsdk/dlls/activitymap.h
similarity index 100%
rename from dep/rehlsdk/dlls/activitymap.h
rename to external/rehlsdk/include/rehlsdk/dlls/activitymap.h
diff --git a/dep/rehlsdk/dlls/animation.h b/external/rehlsdk/include/rehlsdk/dlls/animation.h
similarity index 100%
rename from dep/rehlsdk/dlls/animation.h
rename to external/rehlsdk/include/rehlsdk/dlls/animation.h
diff --git a/dep/rehlsdk/dlls/basemonster.h b/external/rehlsdk/include/rehlsdk/dlls/basemonster.h
similarity index 100%
rename from dep/rehlsdk/dlls/basemonster.h
rename to external/rehlsdk/include/rehlsdk/dlls/basemonster.h
diff --git a/dep/rehlsdk/dlls/cbase.h b/external/rehlsdk/include/rehlsdk/dlls/cbase.h
similarity index 99%
rename from dep/rehlsdk/dlls/cbase.h
rename to external/rehlsdk/include/rehlsdk/dlls/cbase.h
index 87cb8fd..cf4f083 100644
--- a/dep/rehlsdk/dlls/cbase.h
+++ b/external/rehlsdk/include/rehlsdk/dlls/cbase.h
@@ -42,7 +42,7 @@ CBaseEntity
 // UNDONE: This will ignore transition volumes (trigger_transition), but not the PVS!!!
 #define		FCAP_FORCE_TRANSITION		0x00000080		// ALWAYS goes across transitions
 
-#include "archtypes.h"     // DAL
+#include "rehlsdk/engine/archtypes.h"   // DAL
 #include "saverestore.h"
 #include "schedule.h"
 
diff --git a/dep/rehlsdk/dlls/cdll_dll.h b/external/rehlsdk/include/rehlsdk/dlls/cdll_dll.h
similarity index 100%
rename from dep/rehlsdk/dlls/cdll_dll.h
rename to external/rehlsdk/include/rehlsdk/dlls/cdll_dll.h
diff --git a/dep/rehlsdk/dlls/client.h b/external/rehlsdk/include/rehlsdk/dlls/client.h
similarity index 100%
rename from dep/rehlsdk/dlls/client.h
rename to external/rehlsdk/include/rehlsdk/dlls/client.h
diff --git a/dep/rehlsdk/dlls/decals.h b/external/rehlsdk/include/rehlsdk/dlls/decals.h
similarity index 100%
rename from dep/rehlsdk/dlls/decals.h
rename to external/rehlsdk/include/rehlsdk/dlls/decals.h
diff --git a/dep/rehlsdk/dlls/doors.h b/external/rehlsdk/include/rehlsdk/dlls/doors.h
similarity index 100%
rename from dep/rehlsdk/dlls/doors.h
rename to external/rehlsdk/include/rehlsdk/dlls/doors.h
diff --git a/dep/rehlsdk/dlls/effects.h b/external/rehlsdk/include/rehlsdk/dlls/effects.h
similarity index 100%
rename from dep/rehlsdk/dlls/effects.h
rename to external/rehlsdk/include/rehlsdk/dlls/effects.h
diff --git a/dep/rehlsdk/dlls/enginecallback.h b/external/rehlsdk/include/rehlsdk/dlls/enginecallback.h
similarity index 99%
rename from dep/rehlsdk/dlls/enginecallback.h
rename to external/rehlsdk/include/rehlsdk/dlls/enginecallback.h
index ddca3d3..2e2ae22 100644
--- a/dep/rehlsdk/dlls/enginecallback.h
+++ b/external/rehlsdk/include/rehlsdk/dlls/enginecallback.h
@@ -18,7 +18,7 @@
 #pragma once
 #endif
 
-#include "event_flags.h"
+#include "rehlsdk/common/event_flags.h"
 
 // Must be provided by user of this code
 extern enginefuncs_t g_engfuncs;
diff --git a/dep/rehlsdk/dlls/explode.h b/external/rehlsdk/include/rehlsdk/dlls/explode.h
similarity index 100%
rename from dep/rehlsdk/dlls/explode.h
rename to external/rehlsdk/include/rehlsdk/dlls/explode.h
diff --git a/dep/rehlsdk/dlls/extdll.h b/external/rehlsdk/include/rehlsdk/dlls/extdll.h
similarity index 89%
rename from dep/rehlsdk/dlls/extdll.h
rename to external/rehlsdk/include/rehlsdk/dlls/extdll.h
index 2f8786c..5935128 100644
--- a/dep/rehlsdk/dlls/extdll.h
+++ b/external/rehlsdk/include/rehlsdk/dlls/extdll.h
@@ -32,7 +32,7 @@
 #pragma warning(disable : 4514)		// unreferenced inline function removed
 #pragma warning(disable : 4100)		// unreferenced formal parameter
 
-#include "archtypes.h"     // DAL
+#include "rehlsdk/engine/archtypes.h"   // DAL
 
 // Prevent tons of unused windows definitions
 #ifdef _WIN32
@@ -41,9 +41,9 @@
 #define NOSERVICE
 #define NOMCX
 #define NOIME
-#include "winsani_in.h"
+#include "rehlsdk/common/winsani_in.h"
 #include "windows.h"
-#include "winsani_out.h"
+#include "rehlsdk/common/winsani_out.h"
 #else // _WIN32
 #ifndef TRUE
 #define FALSE 0
@@ -84,12 +84,12 @@ typedef float vec_t;				// needed before including progdefs.h
 #define vec3_t Vector
 
 // Shared engine/DLL constants
-#include "const.h"
-#include "progdefs.h"
-#include "edict.h"
+#include "rehlsdk/common/const.h"
+#include "rehlsdk/engine/progdefs.h"
+#include "rehlsdk/engine/edict.h"
 
 // Shared header describing protocol between engine and DLLs
-#include "eiface.h"
+#include "rehlsdk/engine/eiface.h"
 
 // Shared header between the client DLL and the game DLLs
 #include "cdll_dll.h"
diff --git a/dep/rehlsdk/dlls/func_break.h b/external/rehlsdk/include/rehlsdk/dlls/func_break.h
similarity index 100%
rename from dep/rehlsdk/dlls/func_break.h
rename to external/rehlsdk/include/rehlsdk/dlls/func_break.h
diff --git a/dep/rehlsdk/dlls/game.h b/external/rehlsdk/include/rehlsdk/dlls/game.h
similarity index 100%
rename from dep/rehlsdk/dlls/game.h
rename to external/rehlsdk/include/rehlsdk/dlls/game.h
diff --git a/dep/rehlsdk/dlls/gamerules.h b/external/rehlsdk/include/rehlsdk/dlls/gamerules.h
similarity index 100%
rename from dep/rehlsdk/dlls/gamerules.h
rename to external/rehlsdk/include/rehlsdk/dlls/gamerules.h
diff --git a/dep/rehlsdk/dlls/hornet.h b/external/rehlsdk/include/rehlsdk/dlls/hornet.h
similarity index 100%
rename from dep/rehlsdk/dlls/hornet.h
rename to external/rehlsdk/include/rehlsdk/dlls/hornet.h
diff --git a/dep/rehlsdk/dlls/items.h b/external/rehlsdk/include/rehlsdk/dlls/items.h
similarity index 100%
rename from dep/rehlsdk/dlls/items.h
rename to external/rehlsdk/include/rehlsdk/dlls/items.h
diff --git a/dep/rehlsdk/dlls/maprules.h b/external/rehlsdk/include/rehlsdk/dlls/maprules.h
similarity index 100%
rename from dep/rehlsdk/dlls/maprules.h
rename to external/rehlsdk/include/rehlsdk/dlls/maprules.h
diff --git a/dep/rehlsdk/dlls/monsterevent.h b/external/rehlsdk/include/rehlsdk/dlls/monsterevent.h
similarity index 100%
rename from dep/rehlsdk/dlls/monsterevent.h
rename to external/rehlsdk/include/rehlsdk/dlls/monsterevent.h
diff --git a/dep/rehlsdk/dlls/monsters.h b/external/rehlsdk/include/rehlsdk/dlls/monsters.h
similarity index 100%
rename from dep/rehlsdk/dlls/monsters.h
rename to external/rehlsdk/include/rehlsdk/dlls/monsters.h
diff --git a/dep/rehlsdk/dlls/nodes.h b/external/rehlsdk/include/rehlsdk/dlls/nodes.h
similarity index 100%
rename from dep/rehlsdk/dlls/nodes.h
rename to external/rehlsdk/include/rehlsdk/dlls/nodes.h
diff --git a/dep/rehlsdk/dlls/plane.h b/external/rehlsdk/include/rehlsdk/dlls/plane.h
similarity index 100%
rename from dep/rehlsdk/dlls/plane.h
rename to external/rehlsdk/include/rehlsdk/dlls/plane.h
diff --git a/dep/rehlsdk/dlls/player.h b/external/rehlsdk/include/rehlsdk/dlls/player.h
similarity index 99%
rename from dep/rehlsdk/dlls/player.h
rename to external/rehlsdk/include/rehlsdk/dlls/player.h
index f760548..83434cc 100644
--- a/dep/rehlsdk/dlls/player.h
+++ b/external/rehlsdk/include/rehlsdk/dlls/player.h
@@ -16,7 +16,7 @@
 #define PLAYER_H
 
 
-#include "pm_materials.h"
+#include "rehlsdk/pm_shared/pm_materials.h"
 
 
 #define PLAYER_FATAL_FALL_SPEED		1024// approx 60 feet
diff --git a/dep/rehlsdk/dlls/saverestore.h b/external/rehlsdk/include/rehlsdk/dlls/saverestore.h
similarity index 100%
rename from dep/rehlsdk/dlls/saverestore.h
rename to external/rehlsdk/include/rehlsdk/dlls/saverestore.h
diff --git a/dep/rehlsdk/dlls/schedule.h b/external/rehlsdk/include/rehlsdk/dlls/schedule.h
similarity index 100%
rename from dep/rehlsdk/dlls/schedule.h
rename to external/rehlsdk/include/rehlsdk/dlls/schedule.h
diff --git a/dep/rehlsdk/dlls/scriptevent.h b/external/rehlsdk/include/rehlsdk/dlls/scriptevent.h
similarity index 100%
rename from dep/rehlsdk/dlls/scriptevent.h
rename to external/rehlsdk/include/rehlsdk/dlls/scriptevent.h
diff --git a/dep/rehlsdk/dlls/skill.h b/external/rehlsdk/include/rehlsdk/dlls/skill.h
similarity index 100%
rename from dep/rehlsdk/dlls/skill.h
rename to external/rehlsdk/include/rehlsdk/dlls/skill.h
diff --git a/dep/rehlsdk/dlls/soundent.h b/external/rehlsdk/include/rehlsdk/dlls/soundent.h
similarity index 100%
rename from dep/rehlsdk/dlls/soundent.h
rename to external/rehlsdk/include/rehlsdk/dlls/soundent.h
diff --git a/dep/rehlsdk/dlls/spectator.h b/external/rehlsdk/include/rehlsdk/dlls/spectator.h
similarity index 100%
rename from dep/rehlsdk/dlls/spectator.h
rename to external/rehlsdk/include/rehlsdk/dlls/spectator.h
diff --git a/dep/rehlsdk/dlls/talkmonster.h b/external/rehlsdk/include/rehlsdk/dlls/talkmonster.h
similarity index 100%
rename from dep/rehlsdk/dlls/talkmonster.h
rename to external/rehlsdk/include/rehlsdk/dlls/talkmonster.h
diff --git a/dep/rehlsdk/dlls/teamplay_gamerules.h b/external/rehlsdk/include/rehlsdk/dlls/teamplay_gamerules.h
similarity index 100%
rename from dep/rehlsdk/dlls/teamplay_gamerules.h
rename to external/rehlsdk/include/rehlsdk/dlls/teamplay_gamerules.h
diff --git a/dep/rehlsdk/dlls/trains.h b/external/rehlsdk/include/rehlsdk/dlls/trains.h
similarity index 100%
rename from dep/rehlsdk/dlls/trains.h
rename to external/rehlsdk/include/rehlsdk/dlls/trains.h
diff --git a/dep/rehlsdk/dlls/util.h b/external/rehlsdk/include/rehlsdk/dlls/util.h
similarity index 99%
rename from dep/rehlsdk/dlls/util.h
rename to external/rehlsdk/include/rehlsdk/dlls/util.h
index 6ab9b4f..cb1a764 100644
--- a/dep/rehlsdk/dlls/util.h
+++ b/external/rehlsdk/include/rehlsdk/dlls/util.h
@@ -12,7 +12,7 @@
 *   without written permission from Valve LLC.
 *
 ****/
-#include "archtypes.h"     // DAL
+#include "rehlsdk/engine/archtypes.h"     // DAL
 
 //
 // Misc utility code
diff --git a/dep/rehlsdk/dlls/vector.h b/external/rehlsdk/include/rehlsdk/dlls/vector.h
similarity index 100%
rename from dep/rehlsdk/dlls/vector.h
rename to external/rehlsdk/include/rehlsdk/dlls/vector.h
diff --git a/dep/rehlsdk/dlls/weapons.h b/external/rehlsdk/include/rehlsdk/dlls/weapons.h
similarity index 100%
rename from dep/rehlsdk/dlls/weapons.h
rename to external/rehlsdk/include/rehlsdk/dlls/weapons.h
diff --git a/dep/rehlsdk/engine/FlightRecorder.h b/external/rehlsdk/include/rehlsdk/engine/FlightRecorder.h
similarity index 100%
rename from dep/rehlsdk/engine/FlightRecorder.h
rename to external/rehlsdk/include/rehlsdk/engine/FlightRecorder.h
diff --git a/dep/rehlsdk/engine/Sequence.h b/external/rehlsdk/include/rehlsdk/engine/Sequence.h
similarity index 100%
rename from dep/rehlsdk/engine/Sequence.h
rename to external/rehlsdk/include/rehlsdk/engine/Sequence.h
diff --git a/dep/rehlsdk/engine/archtypes.h b/external/rehlsdk/include/rehlsdk/engine/archtypes.h
similarity index 100%
rename from dep/rehlsdk/engine/archtypes.h
rename to external/rehlsdk/include/rehlsdk/engine/archtypes.h
diff --git a/dep/rehlsdk/engine/bspfile.h b/external/rehlsdk/include/rehlsdk/engine/bspfile.h
similarity index 100%
rename from dep/rehlsdk/engine/bspfile.h
rename to external/rehlsdk/include/rehlsdk/engine/bspfile.h
diff --git a/dep/rehlsdk/engine/cmd_rehlds.h b/external/rehlsdk/include/rehlsdk/engine/cmd_rehlds.h
similarity index 100%
rename from dep/rehlsdk/engine/cmd_rehlds.h
rename to external/rehlsdk/include/rehlsdk/engine/cmd_rehlds.h
diff --git a/dep/rehlsdk/engine/common_rehlds.h b/external/rehlsdk/include/rehlsdk/engine/common_rehlds.h
similarity index 96%
rename from dep/rehlsdk/engine/common_rehlds.h
rename to external/rehlsdk/include/rehlsdk/engine/common_rehlds.h
index 64a5d18..e9ad372 100644
--- a/dep/rehlsdk/engine/common_rehlds.h
+++ b/external/rehlsdk/include/rehlsdk/engine/common_rehlds.h
@@ -27,8 +27,8 @@
 */
 #pragma once
 
-#include "const.h"
-#include "qlimits.h"
+#include "rehlsdk/common/const.h"
+#include "rehlsdk/common/qlimits.h"
 
 #ifdef REHLDS_FIXES
 #define COM_TOKEN_LEN	2048
diff --git a/dep/rehlsdk/engine/crc32c.h b/external/rehlsdk/include/rehlsdk/engine/crc32c.h
similarity index 100%
rename from dep/rehlsdk/engine/crc32c.h
rename to external/rehlsdk/include/rehlsdk/engine/crc32c.h
diff --git a/dep/rehlsdk/engine/custom.h b/external/rehlsdk/include/rehlsdk/engine/custom.h
similarity index 98%
rename from dep/rehlsdk/engine/custom.h
rename to external/rehlsdk/include/rehlsdk/engine/custom.h
index 333a4a0..ed02b5b 100644
--- a/dep/rehlsdk/engine/custom.h
+++ b/external/rehlsdk/include/rehlsdk/engine/custom.h
@@ -15,7 +15,7 @@
 // Customization.h
 #pragma once
 
-#include "const.h"
+#include "rehlsdk/common/const.h"
 
 #define MAX_QPATH 64    // Must match value in quakedefs.h
 #define MAX_RESOURCE_LIST	1280
@@ -59,7 +59,7 @@ typedef struct resourceinfo_s
 #define RES_UNK_6          (1<<6)   // TODO: what is it?
 #define RES_CHECKFILE	   (1<<7)	// check file on client
 
-#include "crc.h"
+#include "rehlsdk/common/crc.h"
 
 typedef struct resource_s
 {
diff --git a/dep/rehlsdk/engine/customentity.h b/external/rehlsdk/include/rehlsdk/engine/customentity.h
similarity index 100%
rename from dep/rehlsdk/engine/customentity.h
rename to external/rehlsdk/include/rehlsdk/engine/customentity.h
diff --git a/dep/rehlsdk/engine/d_local.h b/external/rehlsdk/include/rehlsdk/engine/d_local.h
similarity index 100%
rename from dep/rehlsdk/engine/d_local.h
rename to external/rehlsdk/include/rehlsdk/engine/d_local.h
diff --git a/dep/rehlsdk/engine/edict.h b/external/rehlsdk/include/rehlsdk/engine/edict.h
similarity index 100%
rename from dep/rehlsdk/engine/edict.h
rename to external/rehlsdk/include/rehlsdk/engine/edict.h
diff --git a/dep/rehlsdk/engine/eiface.h b/external/rehlsdk/include/rehlsdk/engine/eiface.h
similarity index 99%
rename from dep/rehlsdk/engine/eiface.h
rename to external/rehlsdk/include/rehlsdk/engine/eiface.h
index 63f3b3c..1ff0b29 100644
--- a/dep/rehlsdk/engine/eiface.h
+++ b/external/rehlsdk/include/rehlsdk/engine/eiface.h
@@ -24,7 +24,7 @@
 
 #include <stdio.h>
 #include "custom.h"
-#include "cvardef.h"
+#include "rehlsdk/common/cvardef.h"
 #include "Sequence.h"
 //
 // Defines entity interface between engine and DLLs.
diff --git a/dep/rehlsdk/engine/hookchains.h b/external/rehlsdk/include/rehlsdk/engine/hookchains.h
similarity index 100%
rename from dep/rehlsdk/engine/hookchains.h
rename to external/rehlsdk/include/rehlsdk/engine/hookchains.h
diff --git a/dep/rehlsdk/engine/keydefs.h b/external/rehlsdk/include/rehlsdk/engine/keydefs.h
similarity index 100%
rename from dep/rehlsdk/engine/keydefs.h
rename to external/rehlsdk/include/rehlsdk/engine/keydefs.h
diff --git a/dep/rehlsdk/engine/maintypes.h b/external/rehlsdk/include/rehlsdk/engine/maintypes.h
similarity index 98%
rename from dep/rehlsdk/engine/maintypes.h
rename to external/rehlsdk/include/rehlsdk/engine/maintypes.h
index f55bac9..225de85 100644
--- a/dep/rehlsdk/engine/maintypes.h
+++ b/external/rehlsdk/include/rehlsdk/engine/maintypes.h
@@ -33,7 +33,7 @@
 #endif
 
 #include "osconfig.h"
-#include "mathlib.h"
+#include "rehlsdk/common/mathlib.h"
 
 // Has no references on server side.
 #define NOXREF
diff --git a/dep/rehlsdk/engine/model.h b/external/rehlsdk/include/rehlsdk/engine/model.h
similarity index 98%
rename from dep/rehlsdk/engine/model.h
rename to external/rehlsdk/include/rehlsdk/engine/model.h
index 354a815..7f2fecb 100644
--- a/dep/rehlsdk/engine/model.h
+++ b/external/rehlsdk/include/rehlsdk/engine/model.h
@@ -27,13 +27,13 @@
 */
 #pragma once
 
-#include "const.h"
+#include "rehlsdk/common/const.h"
 #include "modelgen.h"
 #include "spritegn.h"
 #include "bspfile.h"
-#include "crc.h"
-#include "com_model.h"
-#include "commonmacros.h"
+#include "rehlsdk/common/crc.h"
+#include "rehlsdk/common/com_model.h"
+#include "rehlsdk/public/commonmacros.h"
 
 // header
 #define ALIAS_MODEL_VERSION	0x006
diff --git a/dep/rehlsdk/engine/modelgen.h b/external/rehlsdk/include/rehlsdk/engine/modelgen.h
similarity index 100%
rename from dep/rehlsdk/engine/modelgen.h
rename to external/rehlsdk/include/rehlsdk/engine/modelgen.h
diff --git a/dep/rehlsdk/engine/osconfig.h b/external/rehlsdk/include/rehlsdk/engine/osconfig.h
similarity index 100%
rename from dep/rehlsdk/engine/osconfig.h
rename to external/rehlsdk/include/rehlsdk/engine/osconfig.h
diff --git a/dep/rehlsdk/engine/pr_dlls.h b/external/rehlsdk/include/rehlsdk/engine/pr_dlls.h
similarity index 100%
rename from dep/rehlsdk/engine/pr_dlls.h
rename to external/rehlsdk/include/rehlsdk/engine/pr_dlls.h
diff --git a/dep/rehlsdk/engine/progdefs.h b/external/rehlsdk/include/rehlsdk/engine/progdefs.h
similarity index 100%
rename from dep/rehlsdk/engine/progdefs.h
rename to external/rehlsdk/include/rehlsdk/engine/progdefs.h
diff --git a/dep/rehlsdk/engine/progs.h b/external/rehlsdk/include/rehlsdk/engine/progs.h
similarity index 100%
rename from dep/rehlsdk/engine/progs.h
rename to external/rehlsdk/include/rehlsdk/engine/progs.h
diff --git a/dep/rehlsdk/engine/rehlds_api.h b/external/rehlsdk/include/rehlsdk/engine/rehlds_api.h
similarity index 99%
rename from dep/rehlsdk/engine/rehlds_api.h
rename to external/rehlsdk/include/rehlsdk/engine/rehlds_api.h
index 1c272e4..61ea6de 100644
--- a/dep/rehlsdk/engine/rehlds_api.h
+++ b/external/rehlsdk/include/rehlsdk/engine/rehlds_api.h
@@ -31,9 +31,9 @@
 #include "rehlds_interfaces.h"
 #include "hookchains.h"
 #include "FlightRecorder.h"
-#include "interface.h"
+#include "rehlsdk/public/interface.h"
 #include "model.h"
-#include "ObjectList.h"
+#include "rehlsdk/common/ObjectList.h"
 #include "pr_dlls.h"
 
 #define REHLDS_API_VERSION_MAJOR 3
diff --git a/dep/rehlsdk/engine/rehlds_interfaces.h b/external/rehlsdk/include/rehlsdk/engine/rehlds_interfaces.h
similarity index 98%
rename from dep/rehlsdk/engine/rehlds_interfaces.h
rename to external/rehlsdk/include/rehlsdk/engine/rehlds_interfaces.h
index e2b909f..6205caa 100644
--- a/dep/rehlsdk/engine/rehlds_interfaces.h
+++ b/external/rehlsdk/include/rehlsdk/engine/rehlds_interfaces.h
@@ -31,8 +31,8 @@ class INetChan;
 class IGameClient;
 
 #include "archtypes.h"
-#include "const.h"
-#include "netadr.h"
+#include "rehlsdk/common/const.h"
+#include "rehlsdk/common/netadr.h"
 
 #include "common_rehlds.h"
 #include "userid_rehlds.h"
diff --git a/dep/rehlsdk/engine/shake.h b/external/rehlsdk/include/rehlsdk/engine/shake.h
similarity index 100%
rename from dep/rehlsdk/engine/shake.h
rename to external/rehlsdk/include/rehlsdk/engine/shake.h
diff --git a/dep/rehlsdk/engine/spritegn.h b/external/rehlsdk/include/rehlsdk/engine/spritegn.h
similarity index 98%
rename from dep/rehlsdk/engine/spritegn.h
rename to external/rehlsdk/include/rehlsdk/engine/spritegn.h
index f6145d7..7d2bbef 100644
--- a/dep/rehlsdk/engine/spritegn.h
+++ b/external/rehlsdk/include/rehlsdk/engine/spritegn.h
@@ -33,7 +33,7 @@
 #endif
 
 #include "modelgen.h"
-#include "commonmacros.h"
+#include "rehlsdk/public/commonmacros.h"
 
 #define SPRITE_VERSION		2				// Half-Life sprites
 #define IDSPRITEHEADER		MAKEID('I', 'D', 'S', 'P')	// little-endian "IDSP"
diff --git a/dep/rehlsdk/engine/static_map.h b/external/rehlsdk/include/rehlsdk/engine/static_map.h
similarity index 100%
rename from dep/rehlsdk/engine/static_map.h
rename to external/rehlsdk/include/rehlsdk/engine/static_map.h
diff --git a/dep/rehlsdk/engine/studio.h b/external/rehlsdk/include/rehlsdk/engine/studio.h
similarity index 99%
rename from dep/rehlsdk/engine/studio.h
rename to external/rehlsdk/include/rehlsdk/engine/studio.h
index 412543e..57c7731 100644
--- a/dep/rehlsdk/engine/studio.h
+++ b/external/rehlsdk/include/rehlsdk/engine/studio.h
@@ -192,7 +192,7 @@ typedef struct
 } mstudioseqdesc_t;
 
 // events
-#include "studio_event.h"
+#include "rehlsdk/common/studio_event.h"
 /*
 typedef struct 
 {
diff --git a/dep/rehlsdk/engine/sys_shared.h b/external/rehlsdk/include/rehlsdk/engine/sys_shared.h
similarity index 98%
rename from dep/rehlsdk/engine/sys_shared.h
rename to external/rehlsdk/include/rehlsdk/engine/sys_shared.h
index 5b5da98..1a4ba09 100644
--- a/dep/rehlsdk/engine/sys_shared.h
+++ b/external/rehlsdk/include/rehlsdk/engine/sys_shared.h
@@ -27,7 +27,7 @@
 */
 #pragma once
 
-#include <archtypes.h>
+#include "archtypes.h"
 
 typedef struct cpuinfo_s
 {
diff --git a/dep/rehlsdk/engine/userid_rehlds.h b/external/rehlsdk/include/rehlsdk/engine/userid_rehlds.h
similarity index 100%
rename from dep/rehlsdk/engine/userid_rehlds.h
rename to external/rehlsdk/include/rehlsdk/engine/userid_rehlds.h
diff --git a/dep/rehlsdk/pm_shared/pm_debug.h b/external/rehlsdk/include/rehlsdk/pm_shared/pm_debug.h
similarity index 100%
rename from dep/rehlsdk/pm_shared/pm_debug.h
rename to external/rehlsdk/include/rehlsdk/pm_shared/pm_debug.h
diff --git a/dep/rehlsdk/pm_shared/pm_defs.h b/external/rehlsdk/include/rehlsdk/pm_shared/pm_defs.h
similarity index 100%
rename from dep/rehlsdk/pm_shared/pm_defs.h
rename to external/rehlsdk/include/rehlsdk/pm_shared/pm_defs.h
diff --git a/dep/rehlsdk/pm_shared/pm_info.h b/external/rehlsdk/include/rehlsdk/pm_shared/pm_info.h
similarity index 100%
rename from dep/rehlsdk/pm_shared/pm_info.h
rename to external/rehlsdk/include/rehlsdk/pm_shared/pm_info.h
diff --git a/dep/rehlsdk/pm_shared/pm_materials.h b/external/rehlsdk/include/rehlsdk/pm_shared/pm_materials.h
similarity index 100%
rename from dep/rehlsdk/pm_shared/pm_materials.h
rename to external/rehlsdk/include/rehlsdk/pm_shared/pm_materials.h
diff --git a/dep/rehlsdk/pm_shared/pm_movevars.h b/external/rehlsdk/include/rehlsdk/pm_shared/pm_movevars.h
similarity index 100%
rename from dep/rehlsdk/pm_shared/pm_movevars.h
rename to external/rehlsdk/include/rehlsdk/pm_shared/pm_movevars.h
diff --git a/dep/rehlsdk/pm_shared/pm_shared.h b/external/rehlsdk/include/rehlsdk/pm_shared/pm_shared.h
similarity index 100%
rename from dep/rehlsdk/pm_shared/pm_shared.h
rename to external/rehlsdk/include/rehlsdk/pm_shared/pm_shared.h
diff --git a/dep/rehlsdk/public/FileSystem.h b/external/rehlsdk/include/rehlsdk/public/FileSystem.h
similarity index 100%
rename from dep/rehlsdk/public/FileSystem.h
rename to external/rehlsdk/include/rehlsdk/public/FileSystem.h
diff --git a/dep/rehlsdk/public/commonmacros.h b/external/rehlsdk/include/rehlsdk/public/commonmacros.h
similarity index 96%
rename from dep/rehlsdk/public/commonmacros.h
rename to external/rehlsdk/include/rehlsdk/public/commonmacros.h
index e82bfd6..e71d2da 100644
--- a/dep/rehlsdk/public/commonmacros.h
+++ b/external/rehlsdk/include/rehlsdk/public/commonmacros.h
@@ -12,7 +12,7 @@
 //
 // -------------------------------------------------------
 
-#include "osconfig.h"
+#include "rehlsdk/engine/osconfig.h"
 // Makes a 4-byte "packed ID" int out of 4 characters
 #define MAKEID(d,c,b,a)					( ((int)(a) << 24) | ((int)(b) << 16) | ((int)(c) << 8) | ((int)(d)) )
 
diff --git a/dep/rehlsdk/public/interface.h b/external/rehlsdk/include/rehlsdk/public/interface.h
similarity index 100%
rename from dep/rehlsdk/public/interface.h
rename to external/rehlsdk/include/rehlsdk/public/interface.h
diff --git a/dep/rehlsdk/common/BaseSystemModule.cpp b/external/rehlsdk/src/common/BaseSystemModule.cpp
similarity index 100%
rename from dep/rehlsdk/common/BaseSystemModule.cpp
rename to external/rehlsdk/src/common/BaseSystemModule.cpp
diff --git a/dep/rehlsdk/common/ObjectDictionary.cpp b/external/rehlsdk/src/common/ObjectDictionary.cpp
similarity index 100%
rename from dep/rehlsdk/common/ObjectDictionary.cpp
rename to external/rehlsdk/src/common/ObjectDictionary.cpp
diff --git a/dep/rehlsdk/common/ObjectList.cpp b/external/rehlsdk/src/common/ObjectList.cpp
similarity index 100%
rename from dep/rehlsdk/common/ObjectList.cpp
rename to external/rehlsdk/src/common/ObjectList.cpp
diff --git a/dep/rehlsdk/common/SteamAppStartUp.cpp b/external/rehlsdk/src/common/SteamAppStartUp.cpp
similarity index 100%
rename from dep/rehlsdk/common/SteamAppStartUp.cpp
rename to external/rehlsdk/src/common/SteamAppStartUp.cpp
diff --git a/dep/rehlsdk/common/TextConsoleUnix.cpp b/external/rehlsdk/src/common/TextConsoleUnix.cpp
similarity index 100%
rename from dep/rehlsdk/common/TextConsoleUnix.cpp
rename to external/rehlsdk/src/common/TextConsoleUnix.cpp
diff --git a/dep/rehlsdk/common/TextConsoleWin32.cpp b/external/rehlsdk/src/common/TextConsoleWin32.cpp
similarity index 100%
rename from dep/rehlsdk/common/TextConsoleWin32.cpp
rename to external/rehlsdk/src/common/TextConsoleWin32.cpp
diff --git a/dep/rehlsdk/common/TokenLine.cpp b/external/rehlsdk/src/common/TokenLine.cpp
similarity index 100%
rename from dep/rehlsdk/common/TokenLine.cpp
rename to external/rehlsdk/src/common/TokenLine.cpp
diff --git a/dep/rehlsdk/common/commandline.cpp b/external/rehlsdk/src/common/commandline.cpp
similarity index 100%
rename from dep/rehlsdk/common/commandline.cpp
rename to external/rehlsdk/src/common/commandline.cpp
diff --git a/dep/rehlsdk/common/netapi.cpp b/external/rehlsdk/src/common/netapi.cpp
similarity index 100%
rename from dep/rehlsdk/common/netapi.cpp
rename to external/rehlsdk/src/common/netapi.cpp
diff --git a/dep/rehlsdk/common/parsemsg.cpp b/external/rehlsdk/src/common/parsemsg.cpp
similarity index 100%
rename from dep/rehlsdk/common/parsemsg.cpp
rename to external/rehlsdk/src/common/parsemsg.cpp
diff --git a/dep/rehlsdk/common/stdc++compat.cpp b/external/rehlsdk/src/common/stdc++compat.cpp
similarity index 100%
rename from dep/rehlsdk/common/stdc++compat.cpp
rename to external/rehlsdk/src/common/stdc++compat.cpp
diff --git a/dep/rehlsdk/common/textconsole.cpp b/external/rehlsdk/src/common/textconsole.cpp
similarity index 100%
rename from dep/rehlsdk/common/textconsole.cpp
rename to external/rehlsdk/src/common/textconsole.cpp
diff --git a/dep/rehlsdk/engine/crc32c.cpp b/external/rehlsdk/src/engine/crc32c.cpp
similarity index 98%
rename from dep/rehlsdk/engine/crc32c.cpp
rename to external/rehlsdk/src/engine/crc32c.cpp
index 7e09002..fa72890 100644
--- a/dep/rehlsdk/engine/crc32c.cpp
+++ b/external/rehlsdk/src/engine/crc32c.cpp
@@ -12,8 +12,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "crc32c.h"
-#include "sys_shared.h"
+#include "rehlsdk/engine/crc32c.h"
+#include "rehlsdk/engine/osconfig.h"
+#include "rehlsdk/engine/sys_shared.h"
 #include "immintrin.h"
 
 /*****************************************************************/
diff --git a/dep/rehlsdk/engine/sys_shared.cpp b/external/rehlsdk/src/engine/sys_shared.cpp
similarity index 98%
rename from dep/rehlsdk/engine/sys_shared.cpp
rename to external/rehlsdk/src/engine/sys_shared.cpp
index b9a5033..61995a9 100644
--- a/dep/rehlsdk/engine/sys_shared.cpp
+++ b/external/rehlsdk/src/engine/sys_shared.cpp
@@ -25,7 +25,7 @@
 *    version.
 *
 */
-#include "sys_shared.h"
+#include "rehlsdk/engine/sys_shared.h"
 
 #if defined(__GNUC__)
 #include <cpuid.h>
diff --git a/dep/rehlsdk/public/interface.cpp b/external/rehlsdk/src/public/interface.cpp
similarity index 98%
rename from dep/rehlsdk/public/interface.cpp
rename to external/rehlsdk/src/public/interface.cpp
index 08fa937..816a099 100644
--- a/dep/rehlsdk/public/interface.cpp
+++ b/external/rehlsdk/src/public/interface.cpp
@@ -1,5 +1,6 @@
-#include "interface.h"
-
+#include <stdio.h>
+#include <string.h>
+#include "rehlsdk/public/interface.h"
 
 #if !defined ( _WIN32 )
 // Linux doesn't have this function so this emulates its functionality
diff --git a/dep/silk/CMakeLists.txt b/external/silk/CMakeLists.txt
similarity index 97%
rename from dep/silk/CMakeLists.txt
rename to external/silk/CMakeLists.txt
index 2dee328..a490465 100644
--- a/dep/silk/CMakeLists.txt
+++ b/external/silk/CMakeLists.txt
@@ -20,10 +20,10 @@ add_library("${TARGET_ALIAS}" ALIAS "${TARGET_NAME}")
 
 target_sources("${TARGET_NAME}"
   PUBLIC
-    "include/SKP_Silk_control.h"
-    "include/SKP_Silk_errors.h"
-    "include/SKP_Silk_SDK_API.h"
-    "include/SKP_Silk_typedef.h"
+    "include/silk/SKP_Silk_control.h"
+    "include/silk/SKP_Silk_errors.h"
+    "include/silk/SKP_Silk_SDK_API.h"
+    "include/silk/SKP_Silk_typedef.h"
 
   PRIVATE
     "src/SKP_Silk_A2NLSF.c"
@@ -183,6 +183,9 @@ target_sources("${TARGET_NAME}"
 target_include_directories("${TARGET_NAME}"
   PUBLIC
     "${PROJECT_SOURCE_DIR}/include"
+
+  RPIVATE
+    "${PROJECT_SOURCE_DIR}/include/silk"
 )
 
 #-------------------------------------------------------------------------------
diff --git a/dep/silk/include/SKP_Silk_SDK_API.h b/external/silk/include/silk/SKP_Silk_SDK_API.h
similarity index 100%
rename from dep/silk/include/SKP_Silk_SDK_API.h
rename to external/silk/include/silk/SKP_Silk_SDK_API.h
diff --git a/dep/silk/include/SKP_Silk_control.h b/external/silk/include/silk/SKP_Silk_control.h
similarity index 100%
rename from dep/silk/include/SKP_Silk_control.h
rename to external/silk/include/silk/SKP_Silk_control.h
diff --git a/dep/silk/include/SKP_Silk_errors.h b/external/silk/include/silk/SKP_Silk_errors.h
similarity index 100%
rename from dep/silk/include/SKP_Silk_errors.h
rename to external/silk/include/silk/SKP_Silk_errors.h
diff --git a/dep/silk/include/SKP_Silk_typedef.h b/external/silk/include/silk/SKP_Silk_typedef.h
similarity index 100%
rename from dep/silk/include/SKP_Silk_typedef.h
rename to external/silk/include/silk/SKP_Silk_typedef.h
diff --git a/dep/silk/src/SKP_Silk_A2NLSF.c b/external/silk/src/SKP_Silk_A2NLSF.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_A2NLSF.c
rename to external/silk/src/SKP_Silk_A2NLSF.c
diff --git a/dep/silk/src/SKP_Silk_CNG.c b/external/silk/src/SKP_Silk_CNG.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_CNG.c
rename to external/silk/src/SKP_Silk_CNG.c
diff --git a/dep/silk/src/SKP_Silk_HP_variable_cutoff_FLP.c b/external/silk/src/SKP_Silk_HP_variable_cutoff_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_HP_variable_cutoff_FLP.c
rename to external/silk/src/SKP_Silk_HP_variable_cutoff_FLP.c
diff --git a/dep/silk/src/SKP_Silk_Inlines.h b/external/silk/src/SKP_Silk_Inlines.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_Inlines.h
rename to external/silk/src/SKP_Silk_Inlines.h
diff --git a/dep/silk/src/SKP_Silk_LBRR_reset.c b/external/silk/src/SKP_Silk_LBRR_reset.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_LBRR_reset.c
rename to external/silk/src/SKP_Silk_LBRR_reset.c
diff --git a/dep/silk/src/SKP_Silk_LPC_analysis_filter_FLP.c b/external/silk/src/SKP_Silk_LPC_analysis_filter_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_LPC_analysis_filter_FLP.c
rename to external/silk/src/SKP_Silk_LPC_analysis_filter_FLP.c
diff --git a/dep/silk/src/SKP_Silk_LPC_inv_pred_gain.c b/external/silk/src/SKP_Silk_LPC_inv_pred_gain.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_LPC_inv_pred_gain.c
rename to external/silk/src/SKP_Silk_LPC_inv_pred_gain.c
diff --git a/dep/silk/src/SKP_Silk_LPC_inv_pred_gain_FLP.c b/external/silk/src/SKP_Silk_LPC_inv_pred_gain_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_LPC_inv_pred_gain_FLP.c
rename to external/silk/src/SKP_Silk_LPC_inv_pred_gain_FLP.c
diff --git a/dep/silk/src/SKP_Silk_LPC_synthesis_filter.c b/external/silk/src/SKP_Silk_LPC_synthesis_filter.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_LPC_synthesis_filter.c
rename to external/silk/src/SKP_Silk_LPC_synthesis_filter.c
diff --git a/dep/silk/src/SKP_Silk_LPC_synthesis_order16.c b/external/silk/src/SKP_Silk_LPC_synthesis_order16.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_LPC_synthesis_order16.c
rename to external/silk/src/SKP_Silk_LPC_synthesis_order16.c
diff --git a/dep/silk/src/SKP_Silk_LP_variable_cutoff.c b/external/silk/src/SKP_Silk_LP_variable_cutoff.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_LP_variable_cutoff.c
rename to external/silk/src/SKP_Silk_LP_variable_cutoff.c
diff --git a/dep/silk/src/SKP_Silk_LSF_cos_table.c b/external/silk/src/SKP_Silk_LSF_cos_table.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_LSF_cos_table.c
rename to external/silk/src/SKP_Silk_LSF_cos_table.c
diff --git a/dep/silk/src/SKP_Silk_LTP_analysis_filter_FLP.c b/external/silk/src/SKP_Silk_LTP_analysis_filter_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_LTP_analysis_filter_FLP.c
rename to external/silk/src/SKP_Silk_LTP_analysis_filter_FLP.c
diff --git a/dep/silk/src/SKP_Silk_LTP_scale_ctrl_FLP.c b/external/silk/src/SKP_Silk_LTP_scale_ctrl_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_LTP_scale_ctrl_FLP.c
rename to external/silk/src/SKP_Silk_LTP_scale_ctrl_FLP.c
diff --git a/dep/silk/src/SKP_Silk_MA.c b/external/silk/src/SKP_Silk_MA.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_MA.c
rename to external/silk/src/SKP_Silk_MA.c
diff --git a/dep/silk/src/SKP_Silk_NLSF2A.c b/external/silk/src/SKP_Silk_NLSF2A.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_NLSF2A.c
rename to external/silk/src/SKP_Silk_NLSF2A.c
diff --git a/dep/silk/src/SKP_Silk_NLSF2A_stable.c b/external/silk/src/SKP_Silk_NLSF2A_stable.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_NLSF2A_stable.c
rename to external/silk/src/SKP_Silk_NLSF2A_stable.c
diff --git a/dep/silk/src/SKP_Silk_NLSF_MSVQ_decode.c b/external/silk/src/SKP_Silk_NLSF_MSVQ_decode.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_NLSF_MSVQ_decode.c
rename to external/silk/src/SKP_Silk_NLSF_MSVQ_decode.c
diff --git a/dep/silk/src/SKP_Silk_NLSF_MSVQ_decode_FLP.c b/external/silk/src/SKP_Silk_NLSF_MSVQ_decode_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_NLSF_MSVQ_decode_FLP.c
rename to external/silk/src/SKP_Silk_NLSF_MSVQ_decode_FLP.c
diff --git a/dep/silk/src/SKP_Silk_NLSF_MSVQ_encode_FLP.c b/external/silk/src/SKP_Silk_NLSF_MSVQ_encode_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_NLSF_MSVQ_encode_FLP.c
rename to external/silk/src/SKP_Silk_NLSF_MSVQ_encode_FLP.c
diff --git a/dep/silk/src/SKP_Silk_NLSF_VQ_rate_distortion_FLP.c b/external/silk/src/SKP_Silk_NLSF_VQ_rate_distortion_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_NLSF_VQ_rate_distortion_FLP.c
rename to external/silk/src/SKP_Silk_NLSF_VQ_rate_distortion_FLP.c
diff --git a/dep/silk/src/SKP_Silk_NLSF_VQ_sum_error_FLP.c b/external/silk/src/SKP_Silk_NLSF_VQ_sum_error_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_NLSF_VQ_sum_error_FLP.c
rename to external/silk/src/SKP_Silk_NLSF_VQ_sum_error_FLP.c
diff --git a/dep/silk/src/SKP_Silk_NLSF_VQ_weights_laroia_FLP.c b/external/silk/src/SKP_Silk_NLSF_VQ_weights_laroia_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_NLSF_VQ_weights_laroia_FLP.c
rename to external/silk/src/SKP_Silk_NLSF_VQ_weights_laroia_FLP.c
diff --git a/dep/silk/src/SKP_Silk_NLSF_stabilize.c b/external/silk/src/SKP_Silk_NLSF_stabilize.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_NLSF_stabilize.c
rename to external/silk/src/SKP_Silk_NLSF_stabilize.c
diff --git a/dep/silk/src/SKP_Silk_NSQ.c b/external/silk/src/SKP_Silk_NSQ.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_NSQ.c
rename to external/silk/src/SKP_Silk_NSQ.c
diff --git a/dep/silk/src/SKP_Silk_NSQ_del_dec.c b/external/silk/src/SKP_Silk_NSQ_del_dec.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_NSQ_del_dec.c
rename to external/silk/src/SKP_Silk_NSQ_del_dec.c
diff --git a/dep/silk/src/SKP_Silk_PLC.c b/external/silk/src/SKP_Silk_PLC.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_PLC.c
rename to external/silk/src/SKP_Silk_PLC.c
diff --git a/dep/silk/src/SKP_Silk_PLC.h b/external/silk/src/SKP_Silk_PLC.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_PLC.h
rename to external/silk/src/SKP_Silk_PLC.h
diff --git a/dep/silk/src/SKP_Silk_SigProc_FIX.h b/external/silk/src/SKP_Silk_SigProc_FIX.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_SigProc_FIX.h
rename to external/silk/src/SKP_Silk_SigProc_FIX.h
diff --git a/dep/silk/src/SKP_Silk_SigProc_FLP.h b/external/silk/src/SKP_Silk_SigProc_FLP.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_SigProc_FLP.h
rename to external/silk/src/SKP_Silk_SigProc_FLP.h
diff --git a/dep/silk/src/SKP_Silk_VAD.c b/external/silk/src/SKP_Silk_VAD.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_VAD.c
rename to external/silk/src/SKP_Silk_VAD.c
diff --git a/dep/silk/src/SKP_Silk_VQ_nearest_neighbor_FLP.c b/external/silk/src/SKP_Silk_VQ_nearest_neighbor_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_VQ_nearest_neighbor_FLP.c
rename to external/silk/src/SKP_Silk_VQ_nearest_neighbor_FLP.c
diff --git a/dep/silk/src/SKP_Silk_allpass_int.c b/external/silk/src/SKP_Silk_allpass_int.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_allpass_int.c
rename to external/silk/src/SKP_Silk_allpass_int.c
diff --git a/dep/silk/src/SKP_Silk_allpass_int_FLP.c b/external/silk/src/SKP_Silk_allpass_int_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_allpass_int_FLP.c
rename to external/silk/src/SKP_Silk_allpass_int_FLP.c
diff --git a/dep/silk/src/SKP_Silk_ana_filt_bank_1.c b/external/silk/src/SKP_Silk_ana_filt_bank_1.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_ana_filt_bank_1.c
rename to external/silk/src/SKP_Silk_ana_filt_bank_1.c
diff --git a/dep/silk/src/SKP_Silk_apply_sine_window_FLP.c b/external/silk/src/SKP_Silk_apply_sine_window_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_apply_sine_window_FLP.c
rename to external/silk/src/SKP_Silk_apply_sine_window_FLP.c
diff --git a/dep/silk/src/SKP_Silk_autocorrelation_FLP.c b/external/silk/src/SKP_Silk_autocorrelation_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_autocorrelation_FLP.c
rename to external/silk/src/SKP_Silk_autocorrelation_FLP.c
diff --git a/dep/silk/src/SKP_Silk_biquad.c b/external/silk/src/SKP_Silk_biquad.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_biquad.c
rename to external/silk/src/SKP_Silk_biquad.c
diff --git a/dep/silk/src/SKP_Silk_biquad_alt.c b/external/silk/src/SKP_Silk_biquad_alt.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_biquad_alt.c
rename to external/silk/src/SKP_Silk_biquad_alt.c
diff --git a/dep/silk/src/SKP_Silk_burg_modified_FLP.c b/external/silk/src/SKP_Silk_burg_modified_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_burg_modified_FLP.c
rename to external/silk/src/SKP_Silk_burg_modified_FLP.c
diff --git a/dep/silk/src/SKP_Silk_bwexpander.c b/external/silk/src/SKP_Silk_bwexpander.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_bwexpander.c
rename to external/silk/src/SKP_Silk_bwexpander.c
diff --git a/dep/silk/src/SKP_Silk_bwexpander_32.c b/external/silk/src/SKP_Silk_bwexpander_32.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_bwexpander_32.c
rename to external/silk/src/SKP_Silk_bwexpander_32.c
diff --git a/dep/silk/src/SKP_Silk_bwexpander_FLP.c b/external/silk/src/SKP_Silk_bwexpander_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_bwexpander_FLP.c
rename to external/silk/src/SKP_Silk_bwexpander_FLP.c
diff --git a/dep/silk/src/SKP_Silk_code_signs.c b/external/silk/src/SKP_Silk_code_signs.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_code_signs.c
rename to external/silk/src/SKP_Silk_code_signs.c
diff --git a/dep/silk/src/SKP_Silk_common_pitch_est_defines.h b/external/silk/src/SKP_Silk_common_pitch_est_defines.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_common_pitch_est_defines.h
rename to external/silk/src/SKP_Silk_common_pitch_est_defines.h
diff --git a/dep/silk/src/SKP_Silk_control_audio_bandwidth.c b/external/silk/src/SKP_Silk_control_audio_bandwidth.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_control_audio_bandwidth.c
rename to external/silk/src/SKP_Silk_control_audio_bandwidth.c
diff --git a/dep/silk/src/SKP_Silk_control_codec_FLP.c b/external/silk/src/SKP_Silk_control_codec_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_control_codec_FLP.c
rename to external/silk/src/SKP_Silk_control_codec_FLP.c
diff --git a/dep/silk/src/SKP_Silk_corrMatrix_FLP.c b/external/silk/src/SKP_Silk_corrMatrix_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_corrMatrix_FLP.c
rename to external/silk/src/SKP_Silk_corrMatrix_FLP.c
diff --git a/dep/silk/src/SKP_Silk_create_init_destroy.c b/external/silk/src/SKP_Silk_create_init_destroy.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_create_init_destroy.c
rename to external/silk/src/SKP_Silk_create_init_destroy.c
diff --git a/dep/silk/src/SKP_Silk_dec_API.c b/external/silk/src/SKP_Silk_dec_API.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_dec_API.c
rename to external/silk/src/SKP_Silk_dec_API.c
diff --git a/dep/silk/src/SKP_Silk_decimate2_coarse_FLP.c b/external/silk/src/SKP_Silk_decimate2_coarse_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_decimate2_coarse_FLP.c
rename to external/silk/src/SKP_Silk_decimate2_coarse_FLP.c
diff --git a/dep/silk/src/SKP_Silk_decimate2_coarsest_FLP.c b/external/silk/src/SKP_Silk_decimate2_coarsest_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_decimate2_coarsest_FLP.c
rename to external/silk/src/SKP_Silk_decimate2_coarsest_FLP.c
diff --git a/dep/silk/src/SKP_Silk_decode_core.c b/external/silk/src/SKP_Silk_decode_core.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_decode_core.c
rename to external/silk/src/SKP_Silk_decode_core.c
diff --git a/dep/silk/src/SKP_Silk_decode_frame.c b/external/silk/src/SKP_Silk_decode_frame.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_decode_frame.c
rename to external/silk/src/SKP_Silk_decode_frame.c
diff --git a/dep/silk/src/SKP_Silk_decode_parameters.c b/external/silk/src/SKP_Silk_decode_parameters.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_decode_parameters.c
rename to external/silk/src/SKP_Silk_decode_parameters.c
diff --git a/dep/silk/src/SKP_Silk_decode_pitch.c b/external/silk/src/SKP_Silk_decode_pitch.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_decode_pitch.c
rename to external/silk/src/SKP_Silk_decode_pitch.c
diff --git a/dep/silk/src/SKP_Silk_decode_pulses.c b/external/silk/src/SKP_Silk_decode_pulses.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_decode_pulses.c
rename to external/silk/src/SKP_Silk_decode_pulses.c
diff --git a/dep/silk/src/SKP_Silk_decoder_set_fs.c b/external/silk/src/SKP_Silk_decoder_set_fs.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_decoder_set_fs.c
rename to external/silk/src/SKP_Silk_decoder_set_fs.c
diff --git a/dep/silk/src/SKP_Silk_define.h b/external/silk/src/SKP_Silk_define.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_define.h
rename to external/silk/src/SKP_Silk_define.h
diff --git a/dep/silk/src/SKP_Silk_detect_SWB_input.c b/external/silk/src/SKP_Silk_detect_SWB_input.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_detect_SWB_input.c
rename to external/silk/src/SKP_Silk_detect_SWB_input.c
diff --git a/dep/silk/src/SKP_Silk_enc_API.c b/external/silk/src/SKP_Silk_enc_API.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_enc_API.c
rename to external/silk/src/SKP_Silk_enc_API.c
diff --git a/dep/silk/src/SKP_Silk_encode_frame_FLP.c b/external/silk/src/SKP_Silk_encode_frame_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_encode_frame_FLP.c
rename to external/silk/src/SKP_Silk_encode_frame_FLP.c
diff --git a/dep/silk/src/SKP_Silk_encode_parameters.c b/external/silk/src/SKP_Silk_encode_parameters.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_encode_parameters.c
rename to external/silk/src/SKP_Silk_encode_parameters.c
diff --git a/dep/silk/src/SKP_Silk_encode_pulses.c b/external/silk/src/SKP_Silk_encode_pulses.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_encode_pulses.c
rename to external/silk/src/SKP_Silk_encode_pulses.c
diff --git a/dep/silk/src/SKP_Silk_energy_FLP.c b/external/silk/src/SKP_Silk_energy_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_energy_FLP.c
rename to external/silk/src/SKP_Silk_energy_FLP.c
diff --git a/dep/silk/src/SKP_Silk_find_LPC_FLP.c b/external/silk/src/SKP_Silk_find_LPC_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_find_LPC_FLP.c
rename to external/silk/src/SKP_Silk_find_LPC_FLP.c
diff --git a/dep/silk/src/SKP_Silk_find_LTP_FLP.c b/external/silk/src/SKP_Silk_find_LTP_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_find_LTP_FLP.c
rename to external/silk/src/SKP_Silk_find_LTP_FLP.c
diff --git a/dep/silk/src/SKP_Silk_find_pitch_lags_FLP.c b/external/silk/src/SKP_Silk_find_pitch_lags_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_find_pitch_lags_FLP.c
rename to external/silk/src/SKP_Silk_find_pitch_lags_FLP.c
diff --git a/dep/silk/src/SKP_Silk_find_pred_coefs_FLP.c b/external/silk/src/SKP_Silk_find_pred_coefs_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_find_pred_coefs_FLP.c
rename to external/silk/src/SKP_Silk_find_pred_coefs_FLP.c
diff --git a/dep/silk/src/SKP_Silk_gain_quant.c b/external/silk/src/SKP_Silk_gain_quant.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_gain_quant.c
rename to external/silk/src/SKP_Silk_gain_quant.c
diff --git a/dep/silk/src/SKP_Silk_init_encoder_FLP.c b/external/silk/src/SKP_Silk_init_encoder_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_init_encoder_FLP.c
rename to external/silk/src/SKP_Silk_init_encoder_FLP.c
diff --git a/dep/silk/src/SKP_Silk_inner_product_FLP.c b/external/silk/src/SKP_Silk_inner_product_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_inner_product_FLP.c
rename to external/silk/src/SKP_Silk_inner_product_FLP.c
diff --git a/dep/silk/src/SKP_Silk_interpolate.c b/external/silk/src/SKP_Silk_interpolate.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_interpolate.c
rename to external/silk/src/SKP_Silk_interpolate.c
diff --git a/dep/silk/src/SKP_Silk_k2a_FLP.c b/external/silk/src/SKP_Silk_k2a_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_k2a_FLP.c
rename to external/silk/src/SKP_Silk_k2a_FLP.c
diff --git a/dep/silk/src/SKP_Silk_levinsondurbin_FLP.c b/external/silk/src/SKP_Silk_levinsondurbin_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_levinsondurbin_FLP.c
rename to external/silk/src/SKP_Silk_levinsondurbin_FLP.c
diff --git a/dep/silk/src/SKP_Silk_lin2log.c b/external/silk/src/SKP_Silk_lin2log.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_lin2log.c
rename to external/silk/src/SKP_Silk_lin2log.c
diff --git a/dep/silk/src/SKP_Silk_log2lin.c b/external/silk/src/SKP_Silk_log2lin.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_log2lin.c
rename to external/silk/src/SKP_Silk_log2lin.c
diff --git a/dep/silk/src/SKP_Silk_lowpass_int.c b/external/silk/src/SKP_Silk_lowpass_int.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_lowpass_int.c
rename to external/silk/src/SKP_Silk_lowpass_int.c
diff --git a/dep/silk/src/SKP_Silk_lowpass_short.c b/external/silk/src/SKP_Silk_lowpass_short.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_lowpass_short.c
rename to external/silk/src/SKP_Silk_lowpass_short.c
diff --git a/dep/silk/src/SKP_Silk_macros.h b/external/silk/src/SKP_Silk_macros.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_macros.h
rename to external/silk/src/SKP_Silk_macros.h
diff --git a/dep/silk/src/SKP_Silk_main.h b/external/silk/src/SKP_Silk_main.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_main.h
rename to external/silk/src/SKP_Silk_main.h
diff --git a/dep/silk/src/SKP_Silk_main_FLP.h b/external/silk/src/SKP_Silk_main_FLP.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_main_FLP.h
rename to external/silk/src/SKP_Silk_main_FLP.h
diff --git a/dep/silk/src/SKP_Silk_noise_shape_analysis_FLP.c b/external/silk/src/SKP_Silk_noise_shape_analysis_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_noise_shape_analysis_FLP.c
rename to external/silk/src/SKP_Silk_noise_shape_analysis_FLP.c
diff --git a/dep/silk/src/SKP_Silk_pitch_analysis_core_FLP.c b/external/silk/src/SKP_Silk_pitch_analysis_core_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_pitch_analysis_core_FLP.c
rename to external/silk/src/SKP_Silk_pitch_analysis_core_FLP.c
diff --git a/dep/silk/src/SKP_Silk_pitch_est_defines.h b/external/silk/src/SKP_Silk_pitch_est_defines.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_pitch_est_defines.h
rename to external/silk/src/SKP_Silk_pitch_est_defines.h
diff --git a/dep/silk/src/SKP_Silk_pitch_est_defines_FLP.h b/external/silk/src/SKP_Silk_pitch_est_defines_FLP.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_pitch_est_defines_FLP.h
rename to external/silk/src/SKP_Silk_pitch_est_defines_FLP.h
diff --git a/dep/silk/src/SKP_Silk_pitch_est_tables.c b/external/silk/src/SKP_Silk_pitch_est_tables.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_pitch_est_tables.c
rename to external/silk/src/SKP_Silk_pitch_est_tables.c
diff --git a/dep/silk/src/SKP_Silk_prefilter_FLP.c b/external/silk/src/SKP_Silk_prefilter_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_prefilter_FLP.c
rename to external/silk/src/SKP_Silk_prefilter_FLP.c
diff --git a/dep/silk/src/SKP_Silk_process_NLSFs_FLP.c b/external/silk/src/SKP_Silk_process_NLSFs_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_process_NLSFs_FLP.c
rename to external/silk/src/SKP_Silk_process_NLSFs_FLP.c
diff --git a/dep/silk/src/SKP_Silk_process_gains_FLP.c b/external/silk/src/SKP_Silk_process_gains_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_process_gains_FLP.c
rename to external/silk/src/SKP_Silk_process_gains_FLP.c
diff --git a/dep/silk/src/SKP_Silk_quant_LTP_gains_FLP.c b/external/silk/src/SKP_Silk_quant_LTP_gains_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_quant_LTP_gains_FLP.c
rename to external/silk/src/SKP_Silk_quant_LTP_gains_FLP.c
diff --git a/dep/silk/src/SKP_Silk_range_coder.c b/external/silk/src/SKP_Silk_range_coder.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_range_coder.c
rename to external/silk/src/SKP_Silk_range_coder.c
diff --git a/dep/silk/src/SKP_Silk_regularize_correlations_FLP.c b/external/silk/src/SKP_Silk_regularize_correlations_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_regularize_correlations_FLP.c
rename to external/silk/src/SKP_Silk_regularize_correlations_FLP.c
diff --git a/dep/silk/src/SKP_Silk_resampler.c b/external/silk/src/SKP_Silk_resampler.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_resampler.c
rename to external/silk/src/SKP_Silk_resampler.c
diff --git a/dep/silk/src/SKP_Silk_resampler_down2.c b/external/silk/src/SKP_Silk_resampler_down2.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_resampler_down2.c
rename to external/silk/src/SKP_Silk_resampler_down2.c
diff --git a/dep/silk/src/SKP_Silk_resampler_down2_3.c b/external/silk/src/SKP_Silk_resampler_down2_3.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_resampler_down2_3.c
rename to external/silk/src/SKP_Silk_resampler_down2_3.c
diff --git a/dep/silk/src/SKP_Silk_resampler_down3.c b/external/silk/src/SKP_Silk_resampler_down3.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_resampler_down3.c
rename to external/silk/src/SKP_Silk_resampler_down3.c
diff --git a/dep/silk/src/SKP_Silk_resampler_private.h b/external/silk/src/SKP_Silk_resampler_private.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_resampler_private.h
rename to external/silk/src/SKP_Silk_resampler_private.h
diff --git a/dep/silk/src/SKP_Silk_resampler_private_AR2.c b/external/silk/src/SKP_Silk_resampler_private_AR2.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_resampler_private_AR2.c
rename to external/silk/src/SKP_Silk_resampler_private_AR2.c
diff --git a/dep/silk/src/SKP_Silk_resampler_private_ARMA4.c b/external/silk/src/SKP_Silk_resampler_private_ARMA4.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_resampler_private_ARMA4.c
rename to external/silk/src/SKP_Silk_resampler_private_ARMA4.c
diff --git a/dep/silk/src/SKP_Silk_resampler_private_IIR_FIR.c b/external/silk/src/SKP_Silk_resampler_private_IIR_FIR.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_resampler_private_IIR_FIR.c
rename to external/silk/src/SKP_Silk_resampler_private_IIR_FIR.c
diff --git a/dep/silk/src/SKP_Silk_resampler_private_copy.c b/external/silk/src/SKP_Silk_resampler_private_copy.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_resampler_private_copy.c
rename to external/silk/src/SKP_Silk_resampler_private_copy.c
diff --git a/dep/silk/src/SKP_Silk_resampler_private_down4.c b/external/silk/src/SKP_Silk_resampler_private_down4.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_resampler_private_down4.c
rename to external/silk/src/SKP_Silk_resampler_private_down4.c
diff --git a/dep/silk/src/SKP_Silk_resampler_private_down_FIR.c b/external/silk/src/SKP_Silk_resampler_private_down_FIR.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_resampler_private_down_FIR.c
rename to external/silk/src/SKP_Silk_resampler_private_down_FIR.c
diff --git a/dep/silk/src/SKP_Silk_resampler_private_up2_HQ.c b/external/silk/src/SKP_Silk_resampler_private_up2_HQ.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_resampler_private_up2_HQ.c
rename to external/silk/src/SKP_Silk_resampler_private_up2_HQ.c
diff --git a/dep/silk/src/SKP_Silk_resampler_private_up4.c b/external/silk/src/SKP_Silk_resampler_private_up4.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_resampler_private_up4.c
rename to external/silk/src/SKP_Silk_resampler_private_up4.c
diff --git a/dep/silk/src/SKP_Silk_resampler_rom.c b/external/silk/src/SKP_Silk_resampler_rom.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_resampler_rom.c
rename to external/silk/src/SKP_Silk_resampler_rom.c
diff --git a/dep/silk/src/SKP_Silk_resampler_rom.h b/external/silk/src/SKP_Silk_resampler_rom.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_resampler_rom.h
rename to external/silk/src/SKP_Silk_resampler_rom.h
diff --git a/dep/silk/src/SKP_Silk_resampler_structs.h b/external/silk/src/SKP_Silk_resampler_structs.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_resampler_structs.h
rename to external/silk/src/SKP_Silk_resampler_structs.h
diff --git a/dep/silk/src/SKP_Silk_resampler_up2.c b/external/silk/src/SKP_Silk_resampler_up2.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_resampler_up2.c
rename to external/silk/src/SKP_Silk_resampler_up2.c
diff --git a/dep/silk/src/SKP_Silk_residual_energy_FLP.c b/external/silk/src/SKP_Silk_residual_energy_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_residual_energy_FLP.c
rename to external/silk/src/SKP_Silk_residual_energy_FLP.c
diff --git a/dep/silk/src/SKP_Silk_scale_copy_vector_FLP.c b/external/silk/src/SKP_Silk_scale_copy_vector_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_scale_copy_vector_FLP.c
rename to external/silk/src/SKP_Silk_scale_copy_vector_FLP.c
diff --git a/dep/silk/src/SKP_Silk_scale_vector_FLP.c b/external/silk/src/SKP_Silk_scale_vector_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_scale_vector_FLP.c
rename to external/silk/src/SKP_Silk_scale_vector_FLP.c
diff --git a/dep/silk/src/SKP_Silk_schur_FLP.c b/external/silk/src/SKP_Silk_schur_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_schur_FLP.c
rename to external/silk/src/SKP_Silk_schur_FLP.c
diff --git a/dep/silk/src/SKP_Silk_setup_complexity.h b/external/silk/src/SKP_Silk_setup_complexity.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_setup_complexity.h
rename to external/silk/src/SKP_Silk_setup_complexity.h
diff --git a/dep/silk/src/SKP_Silk_shell_coder.c b/external/silk/src/SKP_Silk_shell_coder.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_shell_coder.c
rename to external/silk/src/SKP_Silk_shell_coder.c
diff --git a/dep/silk/src/SKP_Silk_sigm_Q15.c b/external/silk/src/SKP_Silk_sigm_Q15.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_sigm_Q15.c
rename to external/silk/src/SKP_Silk_sigm_Q15.c
diff --git a/dep/silk/src/SKP_Silk_solve_LS_FLP.c b/external/silk/src/SKP_Silk_solve_LS_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_solve_LS_FLP.c
rename to external/silk/src/SKP_Silk_solve_LS_FLP.c
diff --git a/dep/silk/src/SKP_Silk_sort.c b/external/silk/src/SKP_Silk_sort.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_sort.c
rename to external/silk/src/SKP_Silk_sort.c
diff --git a/dep/silk/src/SKP_Silk_sort_FLP.c b/external/silk/src/SKP_Silk_sort_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_sort_FLP.c
rename to external/silk/src/SKP_Silk_sort_FLP.c
diff --git a/dep/silk/src/SKP_Silk_structs.h b/external/silk/src/SKP_Silk_structs.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_structs.h
rename to external/silk/src/SKP_Silk_structs.h
diff --git a/dep/silk/src/SKP_Silk_structs_FLP.h b/external/silk/src/SKP_Silk_structs_FLP.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_structs_FLP.h
rename to external/silk/src/SKP_Silk_structs_FLP.h
diff --git a/dep/silk/src/SKP_Silk_sum_sqr_shift.c b/external/silk/src/SKP_Silk_sum_sqr_shift.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_sum_sqr_shift.c
rename to external/silk/src/SKP_Silk_sum_sqr_shift.c
diff --git a/dep/silk/src/SKP_Silk_tables.h b/external/silk/src/SKP_Silk_tables.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables.h
rename to external/silk/src/SKP_Silk_tables.h
diff --git a/dep/silk/src/SKP_Silk_tables_FLP.h b/external/silk/src/SKP_Silk_tables_FLP.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_FLP.h
rename to external/silk/src/SKP_Silk_tables_FLP.h
diff --git a/dep/silk/src/SKP_Silk_tables_LTP.c b/external/silk/src/SKP_Silk_tables_LTP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_LTP.c
rename to external/silk/src/SKP_Silk_tables_LTP.c
diff --git a/dep/silk/src/SKP_Silk_tables_NLSF_CB0_10.c b/external/silk/src/SKP_Silk_tables_NLSF_CB0_10.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_NLSF_CB0_10.c
rename to external/silk/src/SKP_Silk_tables_NLSF_CB0_10.c
diff --git a/dep/silk/src/SKP_Silk_tables_NLSF_CB0_10.h b/external/silk/src/SKP_Silk_tables_NLSF_CB0_10.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_NLSF_CB0_10.h
rename to external/silk/src/SKP_Silk_tables_NLSF_CB0_10.h
diff --git a/dep/silk/src/SKP_Silk_tables_NLSF_CB0_10_FLP.c b/external/silk/src/SKP_Silk_tables_NLSF_CB0_10_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_NLSF_CB0_10_FLP.c
rename to external/silk/src/SKP_Silk_tables_NLSF_CB0_10_FLP.c
diff --git a/dep/silk/src/SKP_Silk_tables_NLSF_CB0_16.c b/external/silk/src/SKP_Silk_tables_NLSF_CB0_16.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_NLSF_CB0_16.c
rename to external/silk/src/SKP_Silk_tables_NLSF_CB0_16.c
diff --git a/dep/silk/src/SKP_Silk_tables_NLSF_CB0_16.h b/external/silk/src/SKP_Silk_tables_NLSF_CB0_16.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_NLSF_CB0_16.h
rename to external/silk/src/SKP_Silk_tables_NLSF_CB0_16.h
diff --git a/dep/silk/src/SKP_Silk_tables_NLSF_CB0_16_FLP.c b/external/silk/src/SKP_Silk_tables_NLSF_CB0_16_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_NLSF_CB0_16_FLP.c
rename to external/silk/src/SKP_Silk_tables_NLSF_CB0_16_FLP.c
diff --git a/dep/silk/src/SKP_Silk_tables_NLSF_CB1_10.c b/external/silk/src/SKP_Silk_tables_NLSF_CB1_10.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_NLSF_CB1_10.c
rename to external/silk/src/SKP_Silk_tables_NLSF_CB1_10.c
diff --git a/dep/silk/src/SKP_Silk_tables_NLSF_CB1_10.h b/external/silk/src/SKP_Silk_tables_NLSF_CB1_10.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_NLSF_CB1_10.h
rename to external/silk/src/SKP_Silk_tables_NLSF_CB1_10.h
diff --git a/dep/silk/src/SKP_Silk_tables_NLSF_CB1_10_FLP.c b/external/silk/src/SKP_Silk_tables_NLSF_CB1_10_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_NLSF_CB1_10_FLP.c
rename to external/silk/src/SKP_Silk_tables_NLSF_CB1_10_FLP.c
diff --git a/dep/silk/src/SKP_Silk_tables_NLSF_CB1_16.c b/external/silk/src/SKP_Silk_tables_NLSF_CB1_16.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_NLSF_CB1_16.c
rename to external/silk/src/SKP_Silk_tables_NLSF_CB1_16.c
diff --git a/dep/silk/src/SKP_Silk_tables_NLSF_CB1_16.h b/external/silk/src/SKP_Silk_tables_NLSF_CB1_16.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_NLSF_CB1_16.h
rename to external/silk/src/SKP_Silk_tables_NLSF_CB1_16.h
diff --git a/dep/silk/src/SKP_Silk_tables_NLSF_CB1_16_FLP.c b/external/silk/src/SKP_Silk_tables_NLSF_CB1_16_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_NLSF_CB1_16_FLP.c
rename to external/silk/src/SKP_Silk_tables_NLSF_CB1_16_FLP.c
diff --git a/dep/silk/src/SKP_Silk_tables_gain.c b/external/silk/src/SKP_Silk_tables_gain.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_gain.c
rename to external/silk/src/SKP_Silk_tables_gain.c
diff --git a/dep/silk/src/SKP_Silk_tables_other.c b/external/silk/src/SKP_Silk_tables_other.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_other.c
rename to external/silk/src/SKP_Silk_tables_other.c
diff --git a/dep/silk/src/SKP_Silk_tables_other_FLP.c b/external/silk/src/SKP_Silk_tables_other_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_other_FLP.c
rename to external/silk/src/SKP_Silk_tables_other_FLP.c
diff --git a/dep/silk/src/SKP_Silk_tables_pitch_lag.c b/external/silk/src/SKP_Silk_tables_pitch_lag.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_pitch_lag.c
rename to external/silk/src/SKP_Silk_tables_pitch_lag.c
diff --git a/dep/silk/src/SKP_Silk_tables_pulses_per_block.c b/external/silk/src/SKP_Silk_tables_pulses_per_block.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_pulses_per_block.c
rename to external/silk/src/SKP_Silk_tables_pulses_per_block.c
diff --git a/dep/silk/src/SKP_Silk_tables_sign.c b/external/silk/src/SKP_Silk_tables_sign.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_sign.c
rename to external/silk/src/SKP_Silk_tables_sign.c
diff --git a/dep/silk/src/SKP_Silk_tables_type_offset.c b/external/silk/src/SKP_Silk_tables_type_offset.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_tables_type_offset.c
rename to external/silk/src/SKP_Silk_tables_type_offset.c
diff --git a/dep/silk/src/SKP_Silk_tuning_parameters.h b/external/silk/src/SKP_Silk_tuning_parameters.h
similarity index 100%
rename from dep/silk/src/SKP_Silk_tuning_parameters.h
rename to external/silk/src/SKP_Silk_tuning_parameters.h
diff --git a/dep/silk/src/SKP_Silk_warped_autocorrelation_FLP.c b/external/silk/src/SKP_Silk_warped_autocorrelation_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_warped_autocorrelation_FLP.c
rename to external/silk/src/SKP_Silk_warped_autocorrelation_FLP.c
diff --git a/dep/silk/src/SKP_Silk_wrappers_FLP.c b/external/silk/src/SKP_Silk_wrappers_FLP.c
similarity index 100%
rename from dep/silk/src/SKP_Silk_wrappers_FLP.c
rename to external/silk/src/SKP_Silk_wrappers_FLP.c
diff --git a/dep/speex/CMakeLists.txt b/external/speex/CMakeLists.txt
similarity index 74%
rename from dep/speex/CMakeLists.txt
rename to external/speex/CMakeLists.txt
index 72004ca..c68f849 100644
--- a/dep/speex/CMakeLists.txt
+++ b/external/speex/CMakeLists.txt
@@ -20,27 +20,27 @@ add_library("${TARGET_ALIAS}" ALIAS "${TARGET_NAME}")
 
 target_sources("${TARGET_NAME}"
   PUBLIC
-    "include/cb_search.h"
-    "include/filters_sse.h"
-    "include/filters.h"
-    "include/lpc.h"
-    "include/lsp.h"
-    "include/ltp_sse.h"
-    "include/ltp.h"
-    "include/math_approx.h"
-    "include/misc.h"
-    "include/modes.h"
-    "include/nb_celp.h"
-    "include/quant_lsp.h"
-    "include/sb_celp.h"
-    "include/speex_bits.h"
-    "include/speex_callbacks.h"
-    "include/speex_header.h"
-    "include/speex_stereo.h"
-    "include/speex.h"
-    "include/stack_alloc.h"
-    "include/vbr.h"
-    "include/vq.h"
+    "include/speex/cb_search.h"
+    "include/speex/filters_sse.h"
+    "include/speex/filters.h"
+    "include/speex/lpc.h"
+    "include/speex/lsp.h"
+    "include/speex/ltp_sse.h"
+    "include/speex/ltp.h"
+    "include/speex/math_approx.h"
+    "include/speex/misc.h"
+    "include/speex/modes.h"
+    "include/speex/nb_celp.h"
+    "include/speex/quant_lsp.h"
+    "include/speex/sb_celp.h"
+    "include/speex/speex_bits.h"
+    "include/speex/speex_callbacks.h"
+    "include/speex/speex_header.h"
+    "include/speex/speex_stereo.h"
+    "include/speex/speex.h"
+    "include/speex/stack_alloc.h"
+    "include/speex/vbr.h"
+    "include/speex/vq.h"
 
   PRIVATE
     "src/bits.c"
@@ -81,6 +81,9 @@ target_sources("${TARGET_NAME}"
 target_include_directories("${TARGET_NAME}"
   PUBLIC
     "${PROJECT_SOURCE_DIR}/include"
+
+  PRIVATE
+    "${PROJECT_SOURCE_DIR}/include/speex"
 )
 
 #-------------------------------------------------------------------------------
diff --git a/dep/speex/include/cb_search.h b/external/speex/include/speex/cb_search.h
similarity index 100%
rename from dep/speex/include/cb_search.h
rename to external/speex/include/speex/cb_search.h
diff --git a/dep/speex/include/filters.h b/external/speex/include/speex/filters.h
similarity index 100%
rename from dep/speex/include/filters.h
rename to external/speex/include/speex/filters.h
diff --git a/dep/speex/include/filters_sse.h b/external/speex/include/speex/filters_sse.h
similarity index 100%
rename from dep/speex/include/filters_sse.h
rename to external/speex/include/speex/filters_sse.h
diff --git a/dep/speex/include/lpc.h b/external/speex/include/speex/lpc.h
similarity index 100%
rename from dep/speex/include/lpc.h
rename to external/speex/include/speex/lpc.h
diff --git a/dep/speex/include/lsp.h b/external/speex/include/speex/lsp.h
similarity index 100%
rename from dep/speex/include/lsp.h
rename to external/speex/include/speex/lsp.h
diff --git a/dep/speex/include/ltp.h b/external/speex/include/speex/ltp.h
similarity index 100%
rename from dep/speex/include/ltp.h
rename to external/speex/include/speex/ltp.h
diff --git a/dep/speex/include/ltp_sse.h b/external/speex/include/speex/ltp_sse.h
similarity index 100%
rename from dep/speex/include/ltp_sse.h
rename to external/speex/include/speex/ltp_sse.h
diff --git a/dep/speex/include/math_approx.h b/external/speex/include/speex/math_approx.h
similarity index 100%
rename from dep/speex/include/math_approx.h
rename to external/speex/include/speex/math_approx.h
diff --git a/dep/speex/include/misc.h b/external/speex/include/speex/misc.h
similarity index 100%
rename from dep/speex/include/misc.h
rename to external/speex/include/speex/misc.h
diff --git a/dep/speex/include/modes.h b/external/speex/include/speex/modes.h
similarity index 100%
rename from dep/speex/include/modes.h
rename to external/speex/include/speex/modes.h
diff --git a/dep/speex/include/nb_celp.h b/external/speex/include/speex/nb_celp.h
similarity index 100%
rename from dep/speex/include/nb_celp.h
rename to external/speex/include/speex/nb_celp.h
diff --git a/dep/speex/include/quant_lsp.h b/external/speex/include/speex/quant_lsp.h
similarity index 100%
rename from dep/speex/include/quant_lsp.h
rename to external/speex/include/speex/quant_lsp.h
diff --git a/dep/speex/include/sb_celp.h b/external/speex/include/speex/sb_celp.h
similarity index 100%
rename from dep/speex/include/sb_celp.h
rename to external/speex/include/speex/sb_celp.h
diff --git a/dep/speex/include/speex.h b/external/speex/include/speex/speex.h
similarity index 100%
rename from dep/speex/include/speex.h
rename to external/speex/include/speex/speex.h
diff --git a/dep/speex/include/speex_bits.h b/external/speex/include/speex/speex_bits.h
similarity index 100%
rename from dep/speex/include/speex_bits.h
rename to external/speex/include/speex/speex_bits.h
diff --git a/dep/speex/include/speex_callbacks.h b/external/speex/include/speex/speex_callbacks.h
similarity index 100%
rename from dep/speex/include/speex_callbacks.h
rename to external/speex/include/speex/speex_callbacks.h
diff --git a/dep/speex/include/speex_header.h b/external/speex/include/speex/speex_header.h
similarity index 100%
rename from dep/speex/include/speex_header.h
rename to external/speex/include/speex/speex_header.h
diff --git a/dep/speex/include/speex_stereo.h b/external/speex/include/speex/speex_stereo.h
similarity index 100%
rename from dep/speex/include/speex_stereo.h
rename to external/speex/include/speex/speex_stereo.h
diff --git a/dep/speex/include/stack_alloc.h b/external/speex/include/speex/stack_alloc.h
similarity index 100%
rename from dep/speex/include/stack_alloc.h
rename to external/speex/include/speex/stack_alloc.h
diff --git a/dep/speex/include/vbr.h b/external/speex/include/speex/vbr.h
similarity index 100%
rename from dep/speex/include/vbr.h
rename to external/speex/include/speex/vbr.h
diff --git a/dep/speex/include/vq.h b/external/speex/include/speex/vq.h
similarity index 100%
rename from dep/speex/include/vq.h
rename to external/speex/include/speex/vq.h
diff --git a/dep/speex/src/bits.c b/external/speex/src/bits.c
similarity index 100%
rename from dep/speex/src/bits.c
rename to external/speex/src/bits.c
diff --git a/dep/speex/src/cb_search.c b/external/speex/src/cb_search.c
similarity index 100%
rename from dep/speex/src/cb_search.c
rename to external/speex/src/cb_search.c
diff --git a/dep/speex/src/exc_10_16_table.c b/external/speex/src/exc_10_16_table.c
similarity index 100%
rename from dep/speex/src/exc_10_16_table.c
rename to external/speex/src/exc_10_16_table.c
diff --git a/dep/speex/src/exc_10_32_table.c b/external/speex/src/exc_10_32_table.c
similarity index 100%
rename from dep/speex/src/exc_10_32_table.c
rename to external/speex/src/exc_10_32_table.c
diff --git a/dep/speex/src/exc_20_32_table.c b/external/speex/src/exc_20_32_table.c
similarity index 100%
rename from dep/speex/src/exc_20_32_table.c
rename to external/speex/src/exc_20_32_table.c
diff --git a/dep/speex/src/exc_5_256_table.c b/external/speex/src/exc_5_256_table.c
similarity index 100%
rename from dep/speex/src/exc_5_256_table.c
rename to external/speex/src/exc_5_256_table.c
diff --git a/dep/speex/src/exc_5_64_table.c b/external/speex/src/exc_5_64_table.c
similarity index 100%
rename from dep/speex/src/exc_5_64_table.c
rename to external/speex/src/exc_5_64_table.c
diff --git a/dep/speex/src/exc_8_128_table.c b/external/speex/src/exc_8_128_table.c
similarity index 100%
rename from dep/speex/src/exc_8_128_table.c
rename to external/speex/src/exc_8_128_table.c
diff --git a/dep/speex/src/filters.c b/external/speex/src/filters.c
similarity index 100%
rename from dep/speex/src/filters.c
rename to external/speex/src/filters.c
diff --git a/dep/speex/src/gain_table.c b/external/speex/src/gain_table.c
similarity index 100%
rename from dep/speex/src/gain_table.c
rename to external/speex/src/gain_table.c
diff --git a/dep/speex/src/gain_table_lbr.c b/external/speex/src/gain_table_lbr.c
similarity index 100%
rename from dep/speex/src/gain_table_lbr.c
rename to external/speex/src/gain_table_lbr.c
diff --git a/dep/speex/src/hexc_10_32_table.c b/external/speex/src/hexc_10_32_table.c
similarity index 100%
rename from dep/speex/src/hexc_10_32_table.c
rename to external/speex/src/hexc_10_32_table.c
diff --git a/dep/speex/src/hexc_table.c b/external/speex/src/hexc_table.c
similarity index 100%
rename from dep/speex/src/hexc_table.c
rename to external/speex/src/hexc_table.c
diff --git a/dep/speex/src/high_lsp_tables.c b/external/speex/src/high_lsp_tables.c
similarity index 100%
rename from dep/speex/src/high_lsp_tables.c
rename to external/speex/src/high_lsp_tables.c
diff --git a/dep/speex/src/lpc.c b/external/speex/src/lpc.c
similarity index 100%
rename from dep/speex/src/lpc.c
rename to external/speex/src/lpc.c
diff --git a/dep/speex/src/lsp.c b/external/speex/src/lsp.c
similarity index 100%
rename from dep/speex/src/lsp.c
rename to external/speex/src/lsp.c
diff --git a/dep/speex/src/lsp_tables_nb.c b/external/speex/src/lsp_tables_nb.c
similarity index 100%
rename from dep/speex/src/lsp_tables_nb.c
rename to external/speex/src/lsp_tables_nb.c
diff --git a/dep/speex/src/ltp.c b/external/speex/src/ltp.c
similarity index 100%
rename from dep/speex/src/ltp.c
rename to external/speex/src/ltp.c
diff --git a/dep/speex/src/math_approx.c b/external/speex/src/math_approx.c
similarity index 100%
rename from dep/speex/src/math_approx.c
rename to external/speex/src/math_approx.c
diff --git a/dep/speex/src/misc.c b/external/speex/src/misc.c
similarity index 100%
rename from dep/speex/src/misc.c
rename to external/speex/src/misc.c
diff --git a/dep/speex/src/modes.c b/external/speex/src/modes.c
similarity index 100%
rename from dep/speex/src/modes.c
rename to external/speex/src/modes.c
diff --git a/dep/speex/src/nb_celp.c b/external/speex/src/nb_celp.c
similarity index 100%
rename from dep/speex/src/nb_celp.c
rename to external/speex/src/nb_celp.c
diff --git a/dep/speex/src/quant_lsp.c b/external/speex/src/quant_lsp.c
similarity index 100%
rename from dep/speex/src/quant_lsp.c
rename to external/speex/src/quant_lsp.c
diff --git a/dep/speex/src/sb_celp.c b/external/speex/src/sb_celp.c
similarity index 100%
rename from dep/speex/src/sb_celp.c
rename to external/speex/src/sb_celp.c
diff --git a/dep/speex/src/speex_callbacks.c b/external/speex/src/speex_callbacks.c
similarity index 100%
rename from dep/speex/src/speex_callbacks.c
rename to external/speex/src/speex_callbacks.c
diff --git a/dep/speex/src/speex_header.c b/external/speex/src/speex_header.c
similarity index 100%
rename from dep/speex/src/speex_header.c
rename to external/speex/src/speex_header.c
diff --git a/dep/speex/src/stereo.c b/external/speex/src/stereo.c
similarity index 100%
rename from dep/speex/src/stereo.c
rename to external/speex/src/stereo.c
diff --git a/dep/speex/src/vbr.c b/external/speex/src/vbr.c
similarity index 100%
rename from dep/speex/src/vbr.c
rename to external/speex/src/vbr.c
diff --git a/dep/speex/src/vq.c b/external/speex/src/vq.c
similarity index 100%
rename from dep/speex/src/vq.c
rename to external/speex/src/vq.c
diff --git a/revoice/CMakeLists.txt b/revoice/CMakeLists.txt
index 2d8b702..5c2c467 100644
--- a/revoice/CMakeLists.txt
+++ b/revoice/CMakeLists.txt
@@ -38,36 +38,28 @@ target_precompile_headers("${TARGET_NAME}"
 target_sources("${TARGET_NAME}"
   PRIVATE
     "${APP_VERSION_FILE}"
-
-    "include/dllapi.h"
-    "include/engine_api.h"
-    "include/enginecallbacks.h"
-    "include/h_export.h"
-    "include/log_meta.h"
-    "include/meta_api.h"
-    "include/mhook.h"
-    "include/mreg.h"
-    "include/mutil.h"
-    "include/osdep.h"
-    "include/plinfo.h"
-    "include/sdk_util.h"
-    "include/types_meta.h"
-
-    "public/IVoiceCodec.h"
-    "public/reunion_api.h"
-    "public/utlbuffer.cpp"
-    "public/utlbuffer.h"
-    "public/utlmemory.h"
-
     "src/dllapi.cpp"
+    "src/dllapi.h"
     "src/engine_api.cpp"
+    "src/engine_api.h"
+    "src/enginecallbacks.h"
     "src/h_export.cpp"
+    "src/h_export.h"
     "src/iframeencoder.h"
+    "src/IVoiceCodec.h"
+    "src/log_meta.h"
     "src/meta_api.cpp"
+    "src/meta_api.h"
+    "src/mhook.h"
+    "src/mreg.h"
+    "src/mutil.h"
     "src/osconf.h"
+    "src/osdep.h"
+    "src/plinfo.h"
     "src/precompiled.cpp"
     "src/precompiled.h"
     "src/public_amalgamation.cpp"
+    "src/reunion_api.h"
     "src/revoice_cfg.cpp"
     "src/revoice_cfg.h"
     "src/revoice_main.cpp"
@@ -81,8 +73,13 @@ target_sources("${TARGET_NAME}"
     "src/revoice_shared.h"
     "src/revoice_utils.cpp"
     "src/sdk_util.cpp"
+    "src/sdk_util.h"
     "src/SteamP2PCodec.cpp"
     "src/SteamP2PCodec.h"
+    "src/types_meta.h"
+    "src/utlbuffer.cpp"
+    "src/utlbuffer.h"
+    "src/utlmemory.h"
     "src/voice_codec_frame.cpp"
     "src/voice_codec_frame.h"
     "src/VoiceEncoder_Opus.cpp"
@@ -117,9 +114,6 @@ endif()
 target_include_directories("${TARGET_NAME}"
   PRIVATE
     "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>"
-    "${PROJECT_SOURCE_DIR}/include"
-    "${PROJECT_SOURCE_DIR}/public"
-    "${PROJECT_SOURCE_DIR}/src"
 )
 
 #-------------------------------------------------------------------------------
diff --git a/revoice/public/IVoiceCodec.h b/revoice/src/IVoiceCodec.h
similarity index 97%
rename from revoice/public/IVoiceCodec.h
rename to revoice/src/IVoiceCodec.h
index c45a41a..090f353 100644
--- a/revoice/public/IVoiceCodec.h
+++ b/revoice/src/IVoiceCodec.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "interface.h"
+#include <rehlsdk/public/interface.h>
 
 class IGameClient;
 class IVoiceCodec: public IBaseInterface {
diff --git a/revoice/src/VoiceEncoder_Opus.h b/revoice/src/VoiceEncoder_Opus.h
index 2ba3f9c..717d6fb 100644
--- a/revoice/src/VoiceEncoder_Opus.h
+++ b/revoice/src/VoiceEncoder_Opus.h
@@ -2,7 +2,7 @@
 
 #include "IVoiceCodec.h"
 #include "utlbuffer.h"
-#include "opus.h"
+#include <opus/opus.h>
 
 const int MAX_CHANNELS = 1;
 const int FRAME_SIZE = 160;
diff --git a/revoice/src/VoiceEncoder_Speex.h b/revoice/src/VoiceEncoder_Speex.h
index 3b522e1..c5244e9 100644
--- a/revoice/src/VoiceEncoder_Speex.h
+++ b/revoice/src/VoiceEncoder_Speex.h
@@ -2,7 +2,7 @@
 
 #include "IVoiceCodec.h"
 #include "iframeencoder.h"
-#include "speex.h"
+#include <speex/speex.h>
 
 class VoiceEncoder_Speex: public IFrameEncoder {
 protected:
diff --git a/revoice/include/dllapi.h b/revoice/src/dllapi.h
similarity index 100%
rename from revoice/include/dllapi.h
rename to revoice/src/dllapi.h
diff --git a/dep/metamod/engine_api.h b/revoice/src/engine_api.h
similarity index 100%
rename from dep/metamod/engine_api.h
rename to revoice/src/engine_api.h
diff --git a/dep/metamod/enginecallbacks.h b/revoice/src/enginecallbacks.h
similarity index 100%
rename from dep/metamod/enginecallbacks.h
rename to revoice/src/enginecallbacks.h
diff --git a/revoice/include/h_export.h b/revoice/src/h_export.h
similarity index 100%
rename from revoice/include/h_export.h
rename to revoice/src/h_export.h
diff --git a/revoice/include/log_meta.h b/revoice/src/log_meta.h
similarity index 100%
rename from revoice/include/log_meta.h
rename to revoice/src/log_meta.h
diff --git a/revoice/include/meta_api.h b/revoice/src/meta_api.h
similarity index 100%
rename from revoice/include/meta_api.h
rename to revoice/src/meta_api.h
diff --git a/revoice/include/mhook.h b/revoice/src/mhook.h
similarity index 100%
rename from revoice/include/mhook.h
rename to revoice/src/mhook.h
diff --git a/revoice/include/mreg.h b/revoice/src/mreg.h
similarity index 100%
rename from revoice/include/mreg.h
rename to revoice/src/mreg.h
diff --git a/revoice/include/mutil.h b/revoice/src/mutil.h
similarity index 100%
rename from revoice/include/mutil.h
rename to revoice/src/mutil.h
diff --git a/revoice/include/osdep.h b/revoice/src/osdep.h
similarity index 100%
rename from revoice/include/osdep.h
rename to revoice/src/osdep.h
diff --git a/revoice/include/plinfo.h b/revoice/src/plinfo.h
similarity index 100%
rename from revoice/include/plinfo.h
rename to revoice/src/plinfo.h
diff --git a/revoice/src/precompiled.h b/revoice/src/precompiled.h
index cebbb24..aa3c589 100644
--- a/revoice/src/precompiled.h
+++ b/revoice/src/precompiled.h
@@ -1,19 +1,19 @@
 #pragma once
 
 #include "osconf.h"
-#include "sys_shared.h"
-#include "crc32c.h"
+#include <rehlsdk/engine/sys_shared.h>
+#include <rehlsdk/engine/crc32c.h>
 
 #include <time.h>
 
-#include <extdll.h>
-#include "rehlds_api.h"
-#include <enginecallback.h>		// ALERT()
-#include "osdep.h"				// win32 vsnprintf, etc
-#include <dllapi.h>
-#include <meta_api.h>
-#include <h_export.h>
-#include "sdk_util.h"			// UTIL_LogPrintf, etc
+#include <rehlsdk/dlls/extdll.h>
+#include <rehlsdk/engine/rehlds_api.h>
+#include <rehlsdk/dlls/enginecallback.h>    // ALERT()
+#include <metamod/osdep.h>                  // win32 vsnprintf, etc
+#include <metamod/dllapi.h>
+#include <metamod/meta_api.h>
+#include <metamod/h_export.h>
+#include <metamod/sdk_util.h>               // UTIL_LogPrintf, etc
 
 #include "revoice_shared.h"
 #include "revoice_cfg.h"
@@ -26,7 +26,7 @@
 #include "revoice_player.h"
 #include "revoice_main.h"
 
-#include "interface.h"
+#include <rehlsdk/public/interface.h>
 #include "utlbuffer.h"
 #include "reunion_api.h"
 #include "revoice_reunion_api.h"
diff --git a/revoice/src/public_amalgamation.cpp b/revoice/src/public_amalgamation.cpp
index d3e05c7..fef0861 100644
--- a/revoice/src/public_amalgamation.cpp
+++ b/revoice/src/public_amalgamation.cpp
@@ -1,5 +1,5 @@
 #include "precompiled.h"
 
-#include "sys_shared.cpp"
-#include "interface.cpp"
-#include "crc32c.cpp"
+//#include "sys_shared.cpp"
+//#include "interface.cpp"
+//#include "crc32c.cpp"
diff --git a/revoice/public/reunion_api.h b/revoice/src/reunion_api.h
similarity index 100%
rename from revoice/public/reunion_api.h
rename to revoice/src/reunion_api.h
diff --git a/revoice/src/revoice_shared.h b/revoice/src/revoice_shared.h
index 2511ef8..01510df 100644
--- a/revoice/src/revoice_shared.h
+++ b/revoice/src/revoice_shared.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "rehlds_api.h"
+#include <rehlsdk/engine/rehlds_api.h>
 
 #define MAX_PLAYERS					32
 
diff --git a/dep/metamod/sdk_util.h b/revoice/src/sdk_util.h
similarity index 100%
rename from dep/metamod/sdk_util.h
rename to revoice/src/sdk_util.h
diff --git a/revoice/include/types_meta.h b/revoice/src/types_meta.h
similarity index 100%
rename from revoice/include/types_meta.h
rename to revoice/src/types_meta.h
diff --git a/revoice/public/utlbuffer.cpp b/revoice/src/utlbuffer.cpp
similarity index 100%
rename from revoice/public/utlbuffer.cpp
rename to revoice/src/utlbuffer.cpp
diff --git a/revoice/public/utlbuffer.h b/revoice/src/utlbuffer.h
similarity index 100%
rename from revoice/public/utlbuffer.h
rename to revoice/src/utlbuffer.h
diff --git a/revoice/public/utlmemory.h b/revoice/src/utlmemory.h
similarity index 100%
rename from revoice/public/utlmemory.h
rename to revoice/src/utlmemory.h