diff --git a/celt b/celt
deleted file mode 160000
index cb73e5ca62f93f530e65b244cf52f905a727d04d..0000000000000000000000000000000000000000
--- a/celt
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cb73e5ca62f93f530e65b244cf52f905a727d04d
diff --git a/silk b/silk
deleted file mode 160000
index 8a8b76efeeccaccf402b0b2b4e469980d0a48311..0000000000000000000000000000000000000000
--- a/silk
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8a8b76efeeccaccf402b0b2b4e469980d0a48311
diff --git a/src_SigProc_FIX/SKP_Silk_A2NLSF.c b/silk/SKP_Silk_A2NLSF.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_A2NLSF.c
rename to silk/SKP_Silk_A2NLSF.c
diff --git a/src_common/SKP_Silk_CNG.c b/silk/SKP_Silk_CNG.c
similarity index 100%
rename from src_common/SKP_Silk_CNG.c
rename to silk/SKP_Silk_CNG.c
diff --git a/src_common/SKP_Silk_HP_variable_cutoff.c b/silk/SKP_Silk_HP_variable_cutoff.c
similarity index 100%
rename from src_common/SKP_Silk_HP_variable_cutoff.c
rename to silk/SKP_Silk_HP_variable_cutoff.c
diff --git a/src_SigProc_FIX/SKP_Silk_Inlines.h b/silk/SKP_Silk_Inlines.h
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_Inlines.h
rename to silk/SKP_Silk_Inlines.h
diff --git a/src_SigProc_FIX/SKP_Silk_LPC_analysis_filter.c b/silk/SKP_Silk_LPC_analysis_filter.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_LPC_analysis_filter.c
rename to silk/SKP_Silk_LPC_analysis_filter.c
diff --git a/src_FLP/SKP_Silk_LPC_analysis_filter_FLP.c b/silk/SKP_Silk_LPC_analysis_filter_FLP.c
similarity index 100%
rename from src_FLP/SKP_Silk_LPC_analysis_filter_FLP.c
rename to silk/SKP_Silk_LPC_analysis_filter_FLP.c
diff --git a/src_SigProc_FIX/SKP_Silk_LPC_inv_pred_gain.c b/silk/SKP_Silk_LPC_inv_pred_gain.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_LPC_inv_pred_gain.c
rename to silk/SKP_Silk_LPC_inv_pred_gain.c
diff --git a/src_SigProc_FLP/SKP_Silk_LPC_inv_pred_gain_FLP.c b/silk/SKP_Silk_LPC_inv_pred_gain_FLP.c
similarity index 100%
rename from src_SigProc_FLP/SKP_Silk_LPC_inv_pred_gain_FLP.c
rename to silk/SKP_Silk_LPC_inv_pred_gain_FLP.c
diff --git a/src_SigProc_FIX/SKP_Silk_LPC_stabilize.c b/silk/SKP_Silk_LPC_stabilize.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_LPC_stabilize.c
rename to silk/SKP_Silk_LPC_stabilize.c
diff --git a/src_SigProc_FIX/SKP_Silk_LPC_synthesis_filter.c b/silk/SKP_Silk_LPC_synthesis_filter.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_LPC_synthesis_filter.c
rename to silk/SKP_Silk_LPC_synthesis_filter.c
diff --git a/src_SigProc_FIX/SKP_Silk_LPC_synthesis_order16.c b/silk/SKP_Silk_LPC_synthesis_order16.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_LPC_synthesis_order16.c
rename to silk/SKP_Silk_LPC_synthesis_order16.c
diff --git a/src_common/SKP_Silk_LP_variable_cutoff.c b/silk/SKP_Silk_LP_variable_cutoff.c
similarity index 100%
rename from src_common/SKP_Silk_LP_variable_cutoff.c
rename to silk/SKP_Silk_LP_variable_cutoff.c
diff --git a/src_SigProc_FIX/SKP_Silk_LSF_cos_table.c b/silk/SKP_Silk_LSF_cos_table.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_LSF_cos_table.c
rename to silk/SKP_Silk_LSF_cos_table.c
diff --git a/src_FIX/SKP_Silk_LTP_analysis_filter_FIX.c b/silk/SKP_Silk_LTP_analysis_filter_FIX.c
similarity index 100%
rename from src_FIX/SKP_Silk_LTP_analysis_filter_FIX.c
rename to silk/SKP_Silk_LTP_analysis_filter_FIX.c
diff --git a/src_FLP/SKP_Silk_LTP_analysis_filter_FLP.c b/silk/SKP_Silk_LTP_analysis_filter_FLP.c
similarity index 100%
rename from src_FLP/SKP_Silk_LTP_analysis_filter_FLP.c
rename to silk/SKP_Silk_LTP_analysis_filter_FLP.c
diff --git a/src_FIX/SKP_Silk_LTP_scale_ctrl_FIX.c b/silk/SKP_Silk_LTP_scale_ctrl_FIX.c
similarity index 100%
rename from src_FIX/SKP_Silk_LTP_scale_ctrl_FIX.c
rename to silk/SKP_Silk_LTP_scale_ctrl_FIX.c
diff --git a/src_FLP/SKP_Silk_LTP_scale_ctrl_FLP.c b/silk/SKP_Silk_LTP_scale_ctrl_FLP.c
similarity index 100%
rename from src_FLP/SKP_Silk_LTP_scale_ctrl_FLP.c
rename to silk/SKP_Silk_LTP_scale_ctrl_FLP.c
diff --git a/src_SigProc_FIX/SKP_Silk_MacroCount.h b/silk/SKP_Silk_MacroCount.h
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_MacroCount.h
rename to silk/SKP_Silk_MacroCount.h
diff --git a/src_SigProc_FIX/SKP_Silk_MacroDebug.h b/silk/SKP_Silk_MacroDebug.h
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_MacroDebug.h
rename to silk/SKP_Silk_MacroDebug.h
diff --git a/src_SigProc_FIX/SKP_Silk_NLSF2A.c b/silk/SKP_Silk_NLSF2A.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_NLSF2A.c
rename to silk/SKP_Silk_NLSF2A.c
diff --git a/src_common/SKP_Silk_NLSF2A_stable.c b/silk/SKP_Silk_NLSF2A_stable.c
similarity index 100%
rename from src_common/SKP_Silk_NLSF2A_stable.c
rename to silk/SKP_Silk_NLSF2A_stable.c
diff --git a/src_common/SKP_Silk_NLSF_VQ.c b/silk/SKP_Silk_NLSF_VQ.c
similarity index 100%
rename from src_common/SKP_Silk_NLSF_VQ.c
rename to silk/SKP_Silk_NLSF_VQ.c
diff --git a/src_SigProc_FIX/SKP_Silk_NLSF_VQ_weights_laroia.c b/silk/SKP_Silk_NLSF_VQ_weights_laroia.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_NLSF_VQ_weights_laroia.c
rename to silk/SKP_Silk_NLSF_VQ_weights_laroia.c
diff --git a/src_common/SKP_Silk_NLSF_decode.c b/silk/SKP_Silk_NLSF_decode.c
similarity index 100%
rename from src_common/SKP_Silk_NLSF_decode.c
rename to silk/SKP_Silk_NLSF_decode.c
diff --git a/src_common/SKP_Silk_NLSF_del_dec_quant.c b/silk/SKP_Silk_NLSF_del_dec_quant.c
similarity index 100%
rename from src_common/SKP_Silk_NLSF_del_dec_quant.c
rename to silk/SKP_Silk_NLSF_del_dec_quant.c
diff --git a/src_common/SKP_Silk_NLSF_encode.c b/silk/SKP_Silk_NLSF_encode.c
similarity index 100%
rename from src_common/SKP_Silk_NLSF_encode.c
rename to silk/SKP_Silk_NLSF_encode.c
diff --git a/src_SigProc_FIX/SKP_Silk_NLSF_stabilize.c b/silk/SKP_Silk_NLSF_stabilize.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_NLSF_stabilize.c
rename to silk/SKP_Silk_NLSF_stabilize.c
diff --git a/src_common/SKP_Silk_NLSF_unpack.c b/silk/SKP_Silk_NLSF_unpack.c
similarity index 100%
rename from src_common/SKP_Silk_NLSF_unpack.c
rename to silk/SKP_Silk_NLSF_unpack.c
diff --git a/src_common/SKP_Silk_NSQ.c b/silk/SKP_Silk_NSQ.c
similarity index 100%
rename from src_common/SKP_Silk_NSQ.c
rename to silk/SKP_Silk_NSQ.c
diff --git a/src_common/SKP_Silk_NSQ_del_dec.c b/silk/SKP_Silk_NSQ_del_dec.c
similarity index 100%
rename from src_common/SKP_Silk_NSQ_del_dec.c
rename to silk/SKP_Silk_NSQ_del_dec.c
diff --git a/src_common/SKP_Silk_PLC.c b/silk/SKP_Silk_PLC.c
similarity index 100%
rename from src_common/SKP_Silk_PLC.c
rename to silk/SKP_Silk_PLC.c
diff --git a/src_common/SKP_Silk_PLC.h b/silk/SKP_Silk_PLC.h
similarity index 100%
rename from src_common/SKP_Silk_PLC.h
rename to silk/SKP_Silk_PLC.h
diff --git a/interface/SKP_Silk_SDK_API.h b/silk/SKP_Silk_SDK_API.h
similarity index 100%
rename from interface/SKP_Silk_SDK_API.h
rename to silk/SKP_Silk_SDK_API.h
diff --git a/src_SigProc_FIX/SKP_Silk_SigProc_FIX.h b/silk/SKP_Silk_SigProc_FIX.h
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_SigProc_FIX.h
rename to silk/SKP_Silk_SigProc_FIX.h
diff --git a/src_SigProc_FLP/SKP_Silk_SigProc_FLP.h b/silk/SKP_Silk_SigProc_FLP.h
similarity index 100%
rename from src_SigProc_FLP/SKP_Silk_SigProc_FLP.h
rename to silk/SKP_Silk_SigProc_FLP.h
diff --git a/src_common/SKP_Silk_VAD.c b/silk/SKP_Silk_VAD.c
similarity index 100%
rename from src_common/SKP_Silk_VAD.c
rename to silk/SKP_Silk_VAD.c
diff --git a/src_common/SKP_Silk_VQ_WMat_EC.c b/silk/SKP_Silk_VQ_WMat_EC.c
similarity index 100%
rename from src_common/SKP_Silk_VQ_WMat_EC.c
rename to silk/SKP_Silk_VQ_WMat_EC.c
diff --git a/src_SigProc_FIX/SKP_Silk_ana_filt_bank_1.c b/silk/SKP_Silk_ana_filt_bank_1.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_ana_filt_bank_1.c
rename to silk/SKP_Silk_ana_filt_bank_1.c
diff --git a/src_SigProc_FIX/SKP_Silk_apply_sine_window.c b/silk/SKP_Silk_apply_sine_window.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_apply_sine_window.c
rename to silk/SKP_Silk_apply_sine_window.c
diff --git a/src_FLP/SKP_Silk_apply_sine_window_FLP.c b/silk/SKP_Silk_apply_sine_window_FLP.c
similarity index 100%
rename from src_FLP/SKP_Silk_apply_sine_window_FLP.c
rename to silk/SKP_Silk_apply_sine_window_FLP.c
diff --git a/src_SigProc_FIX/SKP_Silk_array_maxabs.c b/silk/SKP_Silk_array_maxabs.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_array_maxabs.c
rename to silk/SKP_Silk_array_maxabs.c
diff --git a/src_FLP/SKP_Silk_assembler_FLP.h b/silk/SKP_Silk_assembler_FLP.h
similarity index 100%
rename from src_FLP/SKP_Silk_assembler_FLP.h
rename to silk/SKP_Silk_assembler_FLP.h
diff --git a/src_SigProc_FIX/SKP_Silk_autocorr.c b/silk/SKP_Silk_autocorr.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_autocorr.c
rename to silk/SKP_Silk_autocorr.c
diff --git a/src_SigProc_FLP/SKP_Silk_autocorrelation_FLP.c b/silk/SKP_Silk_autocorrelation_FLP.c
similarity index 100%
rename from src_SigProc_FLP/SKP_Silk_autocorrelation_FLP.c
rename to silk/SKP_Silk_autocorrelation_FLP.c
diff --git a/src_SigProc_FIX/SKP_Silk_biquad_alt.c b/silk/SKP_Silk_biquad_alt.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_biquad_alt.c
rename to silk/SKP_Silk_biquad_alt.c
diff --git a/src_SigProc_FIX/SKP_Silk_burg_modified.c b/silk/SKP_Silk_burg_modified.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_burg_modified.c
rename to silk/SKP_Silk_burg_modified.c
diff --git a/src_SigProc_FLP/SKP_Silk_burg_modified_FLP.c b/silk/SKP_Silk_burg_modified_FLP.c
similarity index 100%
rename from src_SigProc_FLP/SKP_Silk_burg_modified_FLP.c
rename to silk/SKP_Silk_burg_modified_FLP.c
diff --git a/src_SigProc_FIX/SKP_Silk_bwexpander.c b/silk/SKP_Silk_bwexpander.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_bwexpander.c
rename to silk/SKP_Silk_bwexpander.c
diff --git a/src_SigProc_FIX/SKP_Silk_bwexpander_32.c b/silk/SKP_Silk_bwexpander_32.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_bwexpander_32.c
rename to silk/SKP_Silk_bwexpander_32.c
diff --git a/src_SigProc_FLP/SKP_Silk_bwexpander_FLP.c b/silk/SKP_Silk_bwexpander_FLP.c
similarity index 100%
rename from src_SigProc_FLP/SKP_Silk_bwexpander_FLP.c
rename to silk/SKP_Silk_bwexpander_FLP.c
diff --git a/src_common/SKP_Silk_check_control_input.c b/silk/SKP_Silk_check_control_input.c
similarity index 100%
rename from src_common/SKP_Silk_check_control_input.c
rename to silk/SKP_Silk_check_control_input.c
diff --git a/src_common/SKP_Silk_code_signs.c b/silk/SKP_Silk_code_signs.c
similarity index 100%
rename from src_common/SKP_Silk_code_signs.c
rename to silk/SKP_Silk_code_signs.c
diff --git a/interface/SKP_Silk_control.h b/silk/SKP_Silk_control.h
similarity index 100%
rename from interface/SKP_Silk_control.h
rename to silk/SKP_Silk_control.h
diff --git a/src_common/SKP_Silk_control_SNR.c b/silk/SKP_Silk_control_SNR.c
similarity index 100%
rename from src_common/SKP_Silk_control_SNR.c
rename to silk/SKP_Silk_control_SNR.c
diff --git a/src_common/SKP_Silk_control_audio_bandwidth.c b/silk/SKP_Silk_control_audio_bandwidth.c
similarity index 100%
rename from src_common/SKP_Silk_control_audio_bandwidth.c
rename to silk/SKP_Silk_control_audio_bandwidth.c
diff --git a/src_common/SKP_Silk_control_codec.c b/silk/SKP_Silk_control_codec.c
similarity index 100%
rename from src_common/SKP_Silk_control_codec.c
rename to silk/SKP_Silk_control_codec.c
diff --git a/src_FIX/SKP_Silk_corrMatrix_FIX.c b/silk/SKP_Silk_corrMatrix_FIX.c
similarity index 100%
rename from src_FIX/SKP_Silk_corrMatrix_FIX.c
rename to silk/SKP_Silk_corrMatrix_FIX.c
diff --git a/src_FLP/SKP_Silk_corrMatrix_FLP.c b/silk/SKP_Silk_corrMatrix_FLP.c
similarity index 100%
rename from src_FLP/SKP_Silk_corrMatrix_FLP.c
rename to silk/SKP_Silk_corrMatrix_FLP.c
diff --git a/src_common/SKP_Silk_create_init_destroy.c b/silk/SKP_Silk_create_init_destroy.c
similarity index 100%
rename from src_common/SKP_Silk_create_init_destroy.c
rename to silk/SKP_Silk_create_init_destroy.c
diff --git a/src_SigProc_FIX/SKP_Silk_debug.c b/silk/SKP_Silk_debug.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_debug.c
rename to silk/SKP_Silk_debug.c
diff --git a/src_common/SKP_Silk_dec_API.c b/silk/SKP_Silk_dec_API.c
similarity index 100%
rename from src_common/SKP_Silk_dec_API.c
rename to silk/SKP_Silk_dec_API.c
diff --git a/src_common/SKP_Silk_decode_core.c b/silk/SKP_Silk_decode_core.c
similarity index 100%
rename from src_common/SKP_Silk_decode_core.c
rename to silk/SKP_Silk_decode_core.c
diff --git a/src_common/SKP_Silk_decode_frame.c b/silk/SKP_Silk_decode_frame.c
similarity index 100%
rename from src_common/SKP_Silk_decode_frame.c
rename to silk/SKP_Silk_decode_frame.c
diff --git a/src_common/SKP_Silk_decode_indices.c b/silk/SKP_Silk_decode_indices.c
similarity index 100%
rename from src_common/SKP_Silk_decode_indices.c
rename to silk/SKP_Silk_decode_indices.c
diff --git a/src_common/SKP_Silk_decode_parameters.c b/silk/SKP_Silk_decode_parameters.c
similarity index 100%
rename from src_common/SKP_Silk_decode_parameters.c
rename to silk/SKP_Silk_decode_parameters.c
diff --git a/src_SigProc_FIX/SKP_Silk_decode_pitch.c b/silk/SKP_Silk_decode_pitch.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_decode_pitch.c
rename to silk/SKP_Silk_decode_pitch.c
diff --git a/src_common/SKP_Silk_decode_pulses.c b/silk/SKP_Silk_decode_pulses.c
similarity index 100%
rename from src_common/SKP_Silk_decode_pulses.c
rename to silk/SKP_Silk_decode_pulses.c
diff --git a/src_common/SKP_Silk_decoder_set_fs.c b/silk/SKP_Silk_decoder_set_fs.c
similarity index 100%
rename from src_common/SKP_Silk_decoder_set_fs.c
rename to silk/SKP_Silk_decoder_set_fs.c
diff --git a/src_common/SKP_Silk_define.h b/silk/SKP_Silk_define.h
similarity index 100%
rename from src_common/SKP_Silk_define.h
rename to silk/SKP_Silk_define.h
diff --git a/src_common/SKP_Silk_enc_API.c b/silk/SKP_Silk_enc_API.c
similarity index 100%
rename from src_common/SKP_Silk_enc_API.c
rename to silk/SKP_Silk_enc_API.c
diff --git a/src_FIX/SKP_Silk_encode_frame_FIX.c b/silk/SKP_Silk_encode_frame_FIX.c
similarity index 100%
rename from src_FIX/SKP_Silk_encode_frame_FIX.c
rename to silk/SKP_Silk_encode_frame_FIX.c
diff --git a/src_FLP/SKP_Silk_encode_frame_FLP.c b/silk/SKP_Silk_encode_frame_FLP.c
similarity index 100%
rename from src_FLP/SKP_Silk_encode_frame_FLP.c
rename to silk/SKP_Silk_encode_frame_FLP.c
diff --git a/src_common/SKP_Silk_encode_indices.c b/silk/SKP_Silk_encode_indices.c
similarity index 100%
rename from src_common/SKP_Silk_encode_indices.c
rename to silk/SKP_Silk_encode_indices.c
diff --git a/src_common/SKP_Silk_encode_pulses.c b/silk/SKP_Silk_encode_pulses.c
similarity index 100%
rename from src_common/SKP_Silk_encode_pulses.c
rename to silk/SKP_Silk_encode_pulses.c
diff --git a/src_SigProc_FLP/SKP_Silk_energy_FLP.c b/silk/SKP_Silk_energy_FLP.c
similarity index 100%
rename from src_SigProc_FLP/SKP_Silk_energy_FLP.c
rename to silk/SKP_Silk_energy_FLP.c
diff --git a/interface/SKP_Silk_errors.h b/silk/SKP_Silk_errors.h
similarity index 100%
rename from interface/SKP_Silk_errors.h
rename to silk/SKP_Silk_errors.h
diff --git a/src_FIX/SKP_Silk_find_LPC_FIX.c b/silk/SKP_Silk_find_LPC_FIX.c
similarity index 100%
rename from src_FIX/SKP_Silk_find_LPC_FIX.c
rename to silk/SKP_Silk_find_LPC_FIX.c
diff --git a/src_FLP/SKP_Silk_find_LPC_FLP.c b/silk/SKP_Silk_find_LPC_FLP.c
similarity index 100%
rename from src_FLP/SKP_Silk_find_LPC_FLP.c
rename to silk/SKP_Silk_find_LPC_FLP.c
diff --git a/src_FIX/SKP_Silk_find_LTP_FIX.c b/silk/SKP_Silk_find_LTP_FIX.c
similarity index 100%
rename from src_FIX/SKP_Silk_find_LTP_FIX.c
rename to silk/SKP_Silk_find_LTP_FIX.c
diff --git a/src_FLP/SKP_Silk_find_LTP_FLP.c b/silk/SKP_Silk_find_LTP_FLP.c
similarity index 100%
rename from src_FLP/SKP_Silk_find_LTP_FLP.c
rename to silk/SKP_Silk_find_LTP_FLP.c
diff --git a/src_FIX/SKP_Silk_find_pitch_lags_FIX.c b/silk/SKP_Silk_find_pitch_lags_FIX.c
similarity index 100%
rename from src_FIX/SKP_Silk_find_pitch_lags_FIX.c
rename to silk/SKP_Silk_find_pitch_lags_FIX.c
diff --git a/src_FLP/SKP_Silk_find_pitch_lags_FLP.c b/silk/SKP_Silk_find_pitch_lags_FLP.c
similarity index 100%
rename from src_FLP/SKP_Silk_find_pitch_lags_FLP.c
rename to silk/SKP_Silk_find_pitch_lags_FLP.c
diff --git a/src_FIX/SKP_Silk_find_pred_coefs_FIX.c b/silk/SKP_Silk_find_pred_coefs_FIX.c
similarity index 100%
rename from src_FIX/SKP_Silk_find_pred_coefs_FIX.c
rename to silk/SKP_Silk_find_pred_coefs_FIX.c
diff --git a/src_FLP/SKP_Silk_find_pred_coefs_FLP.c b/silk/SKP_Silk_find_pred_coefs_FLP.c
similarity index 100%
rename from src_FLP/SKP_Silk_find_pred_coefs_FLP.c
rename to silk/SKP_Silk_find_pred_coefs_FLP.c
diff --git a/src_common/SKP_Silk_gain_quant.c b/silk/SKP_Silk_gain_quant.c
similarity index 100%
rename from src_common/SKP_Silk_gain_quant.c
rename to silk/SKP_Silk_gain_quant.c
diff --git a/src_common/SKP_Silk_init_encoder.c b/silk/SKP_Silk_init_encoder.c
similarity index 100%
rename from src_common/SKP_Silk_init_encoder.c
rename to silk/SKP_Silk_init_encoder.c
diff --git a/src_SigProc_FIX/SKP_Silk_inner_prod_aligned.c b/silk/SKP_Silk_inner_prod_aligned.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_inner_prod_aligned.c
rename to silk/SKP_Silk_inner_prod_aligned.c
diff --git a/src_SigProc_FLP/SKP_Silk_inner_product_FLP.c b/silk/SKP_Silk_inner_product_FLP.c
similarity index 100%
rename from src_SigProc_FLP/SKP_Silk_inner_product_FLP.c
rename to silk/SKP_Silk_inner_product_FLP.c
diff --git a/src_common/SKP_Silk_interpolate.c b/silk/SKP_Silk_interpolate.c
similarity index 100%
rename from src_common/SKP_Silk_interpolate.c
rename to silk/SKP_Silk_interpolate.c
diff --git a/src_SigProc_FIX/SKP_Silk_k2a.c b/silk/SKP_Silk_k2a.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_k2a.c
rename to silk/SKP_Silk_k2a.c
diff --git a/src_SigProc_FLP/SKP_Silk_k2a_FLP.c b/silk/SKP_Silk_k2a_FLP.c
similarity index 100%
rename from src_SigProc_FLP/SKP_Silk_k2a_FLP.c
rename to silk/SKP_Silk_k2a_FLP.c
diff --git a/src_SigProc_FIX/SKP_Silk_k2a_Q16.c b/silk/SKP_Silk_k2a_Q16.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_k2a_Q16.c
rename to silk/SKP_Silk_k2a_Q16.c
diff --git a/src_SigProc_FLP/SKP_Silk_levinsondurbin_FLP.c b/silk/SKP_Silk_levinsondurbin_FLP.c
similarity index 100%
rename from src_SigProc_FLP/SKP_Silk_levinsondurbin_FLP.c
rename to silk/SKP_Silk_levinsondurbin_FLP.c
diff --git a/src_SigProc_FIX/SKP_Silk_lin2log.c b/silk/SKP_Silk_lin2log.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_lin2log.c
rename to silk/SKP_Silk_lin2log.c
diff --git a/src_SigProc_FIX/SKP_Silk_log2lin.c b/silk/SKP_Silk_log2lin.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_log2lin.c
rename to silk/SKP_Silk_log2lin.c
diff --git a/src_SigProc_FIX/SKP_Silk_macros.h b/silk/SKP_Silk_macros.h
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_macros.h
rename to silk/SKP_Silk_macros.h
diff --git a/src_common/SKP_Silk_main.h b/silk/SKP_Silk_main.h
similarity index 100%
rename from src_common/SKP_Silk_main.h
rename to silk/SKP_Silk_main.h
diff --git a/src_FIX/SKP_Silk_main_FIX.h b/silk/SKP_Silk_main_FIX.h
similarity index 100%
rename from src_FIX/SKP_Silk_main_FIX.h
rename to silk/SKP_Silk_main_FIX.h
diff --git a/src_FLP/SKP_Silk_main_FLP.h b/silk/SKP_Silk_main_FLP.h
similarity index 100%
rename from src_FLP/SKP_Silk_main_FLP.h
rename to silk/SKP_Silk_main_FLP.h
diff --git a/src_FIX/SKP_Silk_noise_shape_analysis_FIX.c b/silk/SKP_Silk_noise_shape_analysis_FIX.c
similarity index 100%
rename from src_FIX/SKP_Silk_noise_shape_analysis_FIX.c
rename to silk/SKP_Silk_noise_shape_analysis_FIX.c
diff --git a/src_FLP/SKP_Silk_noise_shape_analysis_FLP.c b/silk/SKP_Silk_noise_shape_analysis_FLP.c
similarity index 100%
rename from src_FLP/SKP_Silk_noise_shape_analysis_FLP.c
rename to silk/SKP_Silk_noise_shape_analysis_FLP.c
diff --git a/src_SigProc_FIX/SKP_Silk_pitch_analysis_core.c b/silk/SKP_Silk_pitch_analysis_core.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_pitch_analysis_core.c
rename to silk/SKP_Silk_pitch_analysis_core.c
diff --git a/src_SigProc_FLP/SKP_Silk_pitch_analysis_core_FLP.c b/silk/SKP_Silk_pitch_analysis_core_FLP.c
similarity index 100%
rename from src_SigProc_FLP/SKP_Silk_pitch_analysis_core_FLP.c
rename to silk/SKP_Silk_pitch_analysis_core_FLP.c
diff --git a/src_SigProc_FIX/SKP_Silk_pitch_est_defines.h b/silk/SKP_Silk_pitch_est_defines.h
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_pitch_est_defines.h
rename to silk/SKP_Silk_pitch_est_defines.h
diff --git a/src_SigProc_FIX/SKP_Silk_pitch_est_tables.c b/silk/SKP_Silk_pitch_est_tables.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_pitch_est_tables.c
rename to silk/SKP_Silk_pitch_est_tables.c
diff --git a/src_FIX/SKP_Silk_prefilter_FIX.c b/silk/SKP_Silk_prefilter_FIX.c
similarity index 100%
rename from src_FIX/SKP_Silk_prefilter_FIX.c
rename to silk/SKP_Silk_prefilter_FIX.c
diff --git a/src_FLP/SKP_Silk_prefilter_FLP.c b/silk/SKP_Silk_prefilter_FLP.c
similarity index 100%
rename from src_FLP/SKP_Silk_prefilter_FLP.c
rename to silk/SKP_Silk_prefilter_FLP.c
diff --git a/src_common/SKP_Silk_process_NLSFs.c b/silk/SKP_Silk_process_NLSFs.c
similarity index 100%
rename from src_common/SKP_Silk_process_NLSFs.c
rename to silk/SKP_Silk_process_NLSFs.c
diff --git a/src_FIX/SKP_Silk_process_gains_FIX.c b/silk/SKP_Silk_process_gains_FIX.c
similarity index 100%
rename from src_FIX/SKP_Silk_process_gains_FIX.c
rename to silk/SKP_Silk_process_gains_FIX.c
diff --git a/src_FLP/SKP_Silk_process_gains_FLP.c b/silk/SKP_Silk_process_gains_FLP.c
similarity index 100%
rename from src_FLP/SKP_Silk_process_gains_FLP.c
rename to silk/SKP_Silk_process_gains_FLP.c
diff --git a/src_common/SKP_Silk_quant_LTP_gains.c b/silk/SKP_Silk_quant_LTP_gains.c
similarity index 100%
rename from src_common/SKP_Silk_quant_LTP_gains.c
rename to silk/SKP_Silk_quant_LTP_gains.c
diff --git a/src_FIX/SKP_Silk_regularize_correlations_FIX.c b/silk/SKP_Silk_regularize_correlations_FIX.c
similarity index 100%
rename from src_FIX/SKP_Silk_regularize_correlations_FIX.c
rename to silk/SKP_Silk_regularize_correlations_FIX.c
diff --git a/src_FLP/SKP_Silk_regularize_correlations_FLP.c b/silk/SKP_Silk_regularize_correlations_FLP.c
similarity index 100%
rename from src_FLP/SKP_Silk_regularize_correlations_FLP.c
rename to silk/SKP_Silk_regularize_correlations_FLP.c
diff --git a/src_SigProc_FIX/SKP_Silk_resampler.c b/silk/SKP_Silk_resampler.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_resampler.c
rename to silk/SKP_Silk_resampler.c
diff --git a/src_SigProc_FIX/SKP_Silk_resampler_down2.c b/silk/SKP_Silk_resampler_down2.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_resampler_down2.c
rename to silk/SKP_Silk_resampler_down2.c
diff --git a/src_SigProc_FIX/SKP_Silk_resampler_down2_3.c b/silk/SKP_Silk_resampler_down2_3.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_resampler_down2_3.c
rename to silk/SKP_Silk_resampler_down2_3.c
diff --git a/src_SigProc_FIX/SKP_Silk_resampler_down3.c b/silk/SKP_Silk_resampler_down3.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_resampler_down3.c
rename to silk/SKP_Silk_resampler_down3.c
diff --git a/src_SigProc_FIX/SKP_Silk_resampler_private.h b/silk/SKP_Silk_resampler_private.h
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_resampler_private.h
rename to silk/SKP_Silk_resampler_private.h
diff --git a/src_SigProc_FIX/SKP_Silk_resampler_private_AR2.c b/silk/SKP_Silk_resampler_private_AR2.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_resampler_private_AR2.c
rename to silk/SKP_Silk_resampler_private_AR2.c
diff --git a/src_SigProc_FIX/SKP_Silk_resampler_private_ARMA4.c b/silk/SKP_Silk_resampler_private_ARMA4.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_resampler_private_ARMA4.c
rename to silk/SKP_Silk_resampler_private_ARMA4.c
diff --git a/src_SigProc_FIX/SKP_Silk_resampler_private_IIR_FIR.c b/silk/SKP_Silk_resampler_private_IIR_FIR.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_resampler_private_IIR_FIR.c
rename to silk/SKP_Silk_resampler_private_IIR_FIR.c
diff --git a/src_SigProc_FIX/SKP_Silk_resampler_private_copy.c b/silk/SKP_Silk_resampler_private_copy.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_resampler_private_copy.c
rename to silk/SKP_Silk_resampler_private_copy.c
diff --git a/src_SigProc_FIX/SKP_Silk_resampler_private_down4.c b/silk/SKP_Silk_resampler_private_down4.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_resampler_private_down4.c
rename to silk/SKP_Silk_resampler_private_down4.c
diff --git a/src_SigProc_FIX/SKP_Silk_resampler_private_down_FIR.c b/silk/SKP_Silk_resampler_private_down_FIR.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_resampler_private_down_FIR.c
rename to silk/SKP_Silk_resampler_private_down_FIR.c
diff --git a/src_SigProc_FIX/SKP_Silk_resampler_private_up2_HQ.c b/silk/SKP_Silk_resampler_private_up2_HQ.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_resampler_private_up2_HQ.c
rename to silk/SKP_Silk_resampler_private_up2_HQ.c
diff --git a/src_SigProc_FIX/SKP_Silk_resampler_private_up4.c b/silk/SKP_Silk_resampler_private_up4.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_resampler_private_up4.c
rename to silk/SKP_Silk_resampler_private_up4.c
diff --git a/src_SigProc_FIX/SKP_Silk_resampler_rom.c b/silk/SKP_Silk_resampler_rom.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_resampler_rom.c
rename to silk/SKP_Silk_resampler_rom.c
diff --git a/src_SigProc_FIX/SKP_Silk_resampler_rom.h b/silk/SKP_Silk_resampler_rom.h
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_resampler_rom.h
rename to silk/SKP_Silk_resampler_rom.h
diff --git a/src_SigProc_FIX/SKP_Silk_resampler_structs.h b/silk/SKP_Silk_resampler_structs.h
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_resampler_structs.h
rename to silk/SKP_Silk_resampler_structs.h
diff --git a/src_SigProc_FIX/SKP_Silk_resampler_up2.c b/silk/SKP_Silk_resampler_up2.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_resampler_up2.c
rename to silk/SKP_Silk_resampler_up2.c
diff --git a/src_FIX/SKP_Silk_residual_energy16_FIX.c b/silk/SKP_Silk_residual_energy16_FIX.c
similarity index 100%
rename from src_FIX/SKP_Silk_residual_energy16_FIX.c
rename to silk/SKP_Silk_residual_energy16_FIX.c
diff --git a/src_FIX/SKP_Silk_residual_energy_FIX.c b/silk/SKP_Silk_residual_energy_FIX.c
similarity index 100%
rename from src_FIX/SKP_Silk_residual_energy_FIX.c
rename to silk/SKP_Silk_residual_energy_FIX.c
diff --git a/src_FLP/SKP_Silk_residual_energy_FLP.c b/silk/SKP_Silk_residual_energy_FLP.c
similarity index 100%
rename from src_FLP/SKP_Silk_residual_energy_FLP.c
rename to silk/SKP_Silk_residual_energy_FLP.c
diff --git a/src_SigProc_FIX/SKP_Silk_scale_copy_vector16.c b/silk/SKP_Silk_scale_copy_vector16.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_scale_copy_vector16.c
rename to silk/SKP_Silk_scale_copy_vector16.c
diff --git a/src_SigProc_FLP/SKP_Silk_scale_copy_vector_FLP.c b/silk/SKP_Silk_scale_copy_vector_FLP.c
similarity index 100%
rename from src_SigProc_FLP/SKP_Silk_scale_copy_vector_FLP.c
rename to silk/SKP_Silk_scale_copy_vector_FLP.c
diff --git a/src_SigProc_FIX/SKP_Silk_scale_vector.c b/silk/SKP_Silk_scale_vector.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_scale_vector.c
rename to silk/SKP_Silk_scale_vector.c
diff --git a/src_SigProc_FLP/SKP_Silk_scale_vector_FLP.c b/silk/SKP_Silk_scale_vector_FLP.c
similarity index 100%
rename from src_SigProc_FLP/SKP_Silk_scale_vector_FLP.c
rename to silk/SKP_Silk_scale_vector_FLP.c
diff --git a/src_SigProc_FIX/SKP_Silk_schur.c b/silk/SKP_Silk_schur.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_schur.c
rename to silk/SKP_Silk_schur.c
diff --git a/src_SigProc_FIX/SKP_Silk_schur64.c b/silk/SKP_Silk_schur64.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_schur64.c
rename to silk/SKP_Silk_schur64.c
diff --git a/src_SigProc_FLP/SKP_Silk_schur_FLP.c b/silk/SKP_Silk_schur_FLP.c
similarity index 100%
rename from src_SigProc_FLP/SKP_Silk_schur_FLP.c
rename to silk/SKP_Silk_schur_FLP.c
diff --git a/src_common/SKP_Silk_shell_coder.c b/silk/SKP_Silk_shell_coder.c
similarity index 100%
rename from src_common/SKP_Silk_shell_coder.c
rename to silk/SKP_Silk_shell_coder.c
diff --git a/src_SigProc_FIX/SKP_Silk_sigm_Q15.c b/silk/SKP_Silk_sigm_Q15.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_sigm_Q15.c
rename to silk/SKP_Silk_sigm_Q15.c
diff --git a/src_FIX/SKP_Silk_solve_LS_FIX.c b/silk/SKP_Silk_solve_LS_FIX.c
similarity index 100%
rename from src_FIX/SKP_Silk_solve_LS_FIX.c
rename to silk/SKP_Silk_solve_LS_FIX.c
diff --git a/src_FLP/SKP_Silk_solve_LS_FLP.c b/silk/SKP_Silk_solve_LS_FLP.c
similarity index 100%
rename from src_FLP/SKP_Silk_solve_LS_FLP.c
rename to silk/SKP_Silk_solve_LS_FLP.c
diff --git a/src_SigProc_FIX/SKP_Silk_sort.c b/silk/SKP_Silk_sort.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_sort.c
rename to silk/SKP_Silk_sort.c
diff --git a/src_SigProc_FLP/SKP_Silk_sort_FLP.c b/silk/SKP_Silk_sort_FLP.c
similarity index 100%
rename from src_SigProc_FLP/SKP_Silk_sort_FLP.c
rename to silk/SKP_Silk_sort_FLP.c
diff --git a/src_common/SKP_Silk_stereo_LR_to_MS.c b/silk/SKP_Silk_stereo_LR_to_MS.c
similarity index 100%
rename from src_common/SKP_Silk_stereo_LR_to_MS.c
rename to silk/SKP_Silk_stereo_LR_to_MS.c
diff --git a/src_common/SKP_Silk_stereo_MS_to_LR.c b/silk/SKP_Silk_stereo_MS_to_LR.c
similarity index 100%
rename from src_common/SKP_Silk_stereo_MS_to_LR.c
rename to silk/SKP_Silk_stereo_MS_to_LR.c
diff --git a/src_common/SKP_Silk_structs.h b/silk/SKP_Silk_structs.h
similarity index 100%
rename from src_common/SKP_Silk_structs.h
rename to silk/SKP_Silk_structs.h
diff --git a/src_FIX/SKP_Silk_structs_FIX.h b/silk/SKP_Silk_structs_FIX.h
similarity index 100%
rename from src_FIX/SKP_Silk_structs_FIX.h
rename to silk/SKP_Silk_structs_FIX.h
diff --git a/src_FLP/SKP_Silk_structs_FLP.h b/silk/SKP_Silk_structs_FLP.h
similarity index 100%
rename from src_FLP/SKP_Silk_structs_FLP.h
rename to silk/SKP_Silk_structs_FLP.h
diff --git a/src_SigProc_FIX/SKP_Silk_sum_sqr_shift.c b/silk/SKP_Silk_sum_sqr_shift.c
similarity index 100%
rename from src_SigProc_FIX/SKP_Silk_sum_sqr_shift.c
rename to silk/SKP_Silk_sum_sqr_shift.c
diff --git a/src_common/SKP_Silk_tables.h b/silk/SKP_Silk_tables.h
similarity index 100%
rename from src_common/SKP_Silk_tables.h
rename to silk/SKP_Silk_tables.h
diff --git a/src_common/SKP_Silk_tables_LTP.c b/silk/SKP_Silk_tables_LTP.c
similarity index 100%
rename from src_common/SKP_Silk_tables_LTP.c
rename to silk/SKP_Silk_tables_LTP.c
diff --git a/src_common/SKP_Silk_tables_NLSF_CB_NB_MB.c b/silk/SKP_Silk_tables_NLSF_CB_NB_MB.c
similarity index 100%
rename from src_common/SKP_Silk_tables_NLSF_CB_NB_MB.c
rename to silk/SKP_Silk_tables_NLSF_CB_NB_MB.c
diff --git a/src_common/SKP_Silk_tables_NLSF_CB_WB.c b/silk/SKP_Silk_tables_NLSF_CB_WB.c
similarity index 100%
rename from src_common/SKP_Silk_tables_NLSF_CB_WB.c
rename to silk/SKP_Silk_tables_NLSF_CB_WB.c
diff --git a/src_common/SKP_Silk_tables_gain.c b/silk/SKP_Silk_tables_gain.c
similarity index 100%
rename from src_common/SKP_Silk_tables_gain.c
rename to silk/SKP_Silk_tables_gain.c
diff --git a/src_common/SKP_Silk_tables_other.c b/silk/SKP_Silk_tables_other.c
similarity index 100%
rename from src_common/SKP_Silk_tables_other.c
rename to silk/SKP_Silk_tables_other.c
diff --git a/src_common/SKP_Silk_tables_pitch_lag.c b/silk/SKP_Silk_tables_pitch_lag.c
similarity index 100%
rename from src_common/SKP_Silk_tables_pitch_lag.c
rename to silk/SKP_Silk_tables_pitch_lag.c
diff --git a/src_common/SKP_Silk_tables_pulses_per_block.c b/silk/SKP_Silk_tables_pulses_per_block.c
similarity index 100%
rename from src_common/SKP_Silk_tables_pulses_per_block.c
rename to silk/SKP_Silk_tables_pulses_per_block.c
diff --git a/src_common/SKP_Silk_tuning_parameters.h b/silk/SKP_Silk_tuning_parameters.h
similarity index 100%
rename from src_common/SKP_Silk_tuning_parameters.h
rename to silk/SKP_Silk_tuning_parameters.h
diff --git a/interface/SKP_Silk_typedef.h b/silk/SKP_Silk_typedef.h
similarity index 100%
rename from interface/SKP_Silk_typedef.h
rename to silk/SKP_Silk_typedef.h
diff --git a/src_FIX/SKP_Silk_warped_autocorrelation_FIX.c b/silk/SKP_Silk_warped_autocorrelation_FIX.c
similarity index 100%
rename from src_FIX/SKP_Silk_warped_autocorrelation_FIX.c
rename to silk/SKP_Silk_warped_autocorrelation_FIX.c
diff --git a/src_FLP/SKP_Silk_warped_autocorrelation_FLP.c b/silk/SKP_Silk_warped_autocorrelation_FLP.c
similarity index 100%
rename from src_FLP/SKP_Silk_warped_autocorrelation_FLP.c
rename to silk/SKP_Silk_warped_autocorrelation_FLP.c
diff --git a/src_FLP/SKP_Silk_wrappers_FLP.c b/silk/SKP_Silk_wrappers_FLP.c
similarity index 100%
rename from src_FLP/SKP_Silk_wrappers_FLP.c
rename to silk/SKP_Silk_wrappers_FLP.c
diff --git a/interface/SKP_debug.h b/silk/SKP_debug.h
similarity index 100%
rename from interface/SKP_debug.h
rename to silk/SKP_debug.h
diff --git a/src_FIX/src_FIX.vcxproj b/silk/src_FIX.vcxproj
similarity index 100%
rename from src_FIX/src_FIX.vcxproj
rename to silk/src_FIX.vcxproj
diff --git a/src_FIX/src_FIX.vcxproj.filters b/silk/src_FIX.vcxproj.filters
similarity index 100%
rename from src_FIX/src_FIX.vcxproj.filters
rename to silk/src_FIX.vcxproj.filters
diff --git a/src_FLP/src_FLP.vcxproj b/silk/src_FLP.vcxproj
similarity index 100%
rename from src_FLP/src_FLP.vcxproj
rename to silk/src_FLP.vcxproj
diff --git a/src_FLP/src_FLP.vcxproj.filters b/silk/src_FLP.vcxproj.filters
similarity index 100%
rename from src_FLP/src_FLP.vcxproj.filters
rename to silk/src_FLP.vcxproj.filters
diff --git a/src_SigProc_FIX/src_SigProc_FIX.vcxproj b/silk/src_SigProc_FIX.vcxproj
similarity index 100%
rename from src_SigProc_FIX/src_SigProc_FIX.vcxproj
rename to silk/src_SigProc_FIX.vcxproj
diff --git a/src_SigProc_FIX/src_SigProc_FIX.vcxproj.filters b/silk/src_SigProc_FIX.vcxproj.filters
similarity index 100%
rename from src_SigProc_FIX/src_SigProc_FIX.vcxproj.filters
rename to silk/src_SigProc_FIX.vcxproj.filters
diff --git a/src_SigProc_FLP/src_SigProc_FLP.vcxproj b/silk/src_SigProc_FLP.vcxproj
similarity index 100%
rename from src_SigProc_FLP/src_SigProc_FLP.vcxproj
rename to silk/src_SigProc_FLP.vcxproj
diff --git a/src_SigProc_FLP/src_SigProc_FLP.vcxproj.filters b/silk/src_SigProc_FLP.vcxproj.filters
similarity index 100%
rename from src_SigProc_FLP/src_SigProc_FLP.vcxproj.filters
rename to silk/src_SigProc_FLP.vcxproj.filters
diff --git a/src_common/src_common.vcxproj b/silk/src_common.vcxproj
similarity index 100%
rename from src_common/src_common.vcxproj
rename to silk/src_common.vcxproj
diff --git a/src_common/src_common.vcxproj.filters b/silk/src_common.vcxproj.filters
similarity index 100%
rename from src_common/src_common.vcxproj.filters
rename to silk/src_common.vcxproj.filters
diff --git a/test_silk_dec/test_silk_dec.vcxproj b/test_silk_dec/test_silk_dec.vcxproj
deleted file mode 100644
index dddc378879cce10539642da61203d42561ebf747..0000000000000000000000000000000000000000
--- a/test_silk_dec/test_silk_dec.vcxproj
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{8CA2DBCB-F28E-4022-ACD7-E2C23A15827F}</ProjectGuid>
- <Keyword>Win32Proj</Keyword>
- <RootNamespace>test_silk_dec</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\interface;..\..\celt\libcelt;../../celt/msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcelt.lib;src_common.lib;src_FIX.lib;src_FLP.lib;src_SigProc_FIX.lib;src_SigProc_FLP.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\interface;..\..\celt\libcelt;../../celt/msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcelt.lib;src_common.lib;src_FIX.lib;src_FLP.lib;src_SigProc_FIX.lib;src_SigProc_FLP.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\test\Decoder.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\interface\SKP_Silk_SDK_API.h" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/test_silk_dec/test_silk_dec.vcxproj.filters b/test_silk_dec/test_silk_dec.vcxproj.filters
deleted file mode 100644
index bd33f587efc0a264f7013512bb37f2cafebdeafa..0000000000000000000000000000000000000000
--- a/test_silk_dec/test_silk_dec.vcxproj.filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\test\Decoder.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\interface\SKP_Silk_SDK_API.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/test_silk_enc/test_silk_enc.vcxproj b/test_silk_enc/test_silk_enc.vcxproj
deleted file mode 100644
index 96f216ddbd1de0587459b0b1ddfe5749b6033c53..0000000000000000000000000000000000000000
--- a/test_silk_enc/test_silk_enc.vcxproj
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{38945839-ADA4-40CA-9C43-092FD47960A0}</ProjectGuid>
- <Keyword>Win32Proj</Keyword>
- <RootNamespace>test_silk_enc</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\interface;..\..\celt\libcelt;../../celt/msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcelt.lib;src_common.lib;src_FIX.lib;src_FLP.lib;src_SigProc_FIX.lib;src_SigProc_FLP.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\interface;..\..\celt\libcelt;../../celt/msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libcelt.lib;src_common.lib;src_FIX.lib;src_FLP.lib;src_SigProc_FIX.lib;src_SigProc_FLP.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\test\Encoder.c" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/test_silk_enc/test_silk_enc.vcxproj.filters b/test_silk_enc/test_silk_enc.vcxproj.filters
deleted file mode 100644
index c83754490526791c7225d065a3424329d2b5d55f..0000000000000000000000000000000000000000
--- a/test_silk_enc/test_silk_enc.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\test\Encoder.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
-</Project>
\ No newline at end of file