diff --git a/silk/SKP_Silk_LTP_analysis_filter_FIX.c b/silk/fixed/SKP_Silk_LTP_analysis_filter_FIX.c
similarity index 100%
rename from silk/SKP_Silk_LTP_analysis_filter_FIX.c
rename to silk/fixed/SKP_Silk_LTP_analysis_filter_FIX.c
diff --git a/silk/SKP_Silk_LTP_scale_ctrl_FIX.c b/silk/fixed/SKP_Silk_LTP_scale_ctrl_FIX.c
similarity index 100%
rename from silk/SKP_Silk_LTP_scale_ctrl_FIX.c
rename to silk/fixed/SKP_Silk_LTP_scale_ctrl_FIX.c
diff --git a/silk/SKP_Silk_corrMatrix_FIX.c b/silk/fixed/SKP_Silk_corrMatrix_FIX.c
similarity index 100%
rename from silk/SKP_Silk_corrMatrix_FIX.c
rename to silk/fixed/SKP_Silk_corrMatrix_FIX.c
diff --git a/silk/SKP_Silk_encode_frame_FIX.c b/silk/fixed/SKP_Silk_encode_frame_FIX.c
similarity index 100%
rename from silk/SKP_Silk_encode_frame_FIX.c
rename to silk/fixed/SKP_Silk_encode_frame_FIX.c
diff --git a/silk/SKP_Silk_find_LPC_FIX.c b/silk/fixed/SKP_Silk_find_LPC_FIX.c
similarity index 100%
rename from silk/SKP_Silk_find_LPC_FIX.c
rename to silk/fixed/SKP_Silk_find_LPC_FIX.c
diff --git a/silk/SKP_Silk_find_LTP_FIX.c b/silk/fixed/SKP_Silk_find_LTP_FIX.c
similarity index 100%
rename from silk/SKP_Silk_find_LTP_FIX.c
rename to silk/fixed/SKP_Silk_find_LTP_FIX.c
diff --git a/silk/SKP_Silk_find_pitch_lags_FIX.c b/silk/fixed/SKP_Silk_find_pitch_lags_FIX.c
similarity index 100%
rename from silk/SKP_Silk_find_pitch_lags_FIX.c
rename to silk/fixed/SKP_Silk_find_pitch_lags_FIX.c
diff --git a/silk/SKP_Silk_find_pred_coefs_FIX.c b/silk/fixed/SKP_Silk_find_pred_coefs_FIX.c
similarity index 100%
rename from silk/SKP_Silk_find_pred_coefs_FIX.c
rename to silk/fixed/SKP_Silk_find_pred_coefs_FIX.c
diff --git a/silk/SKP_Silk_noise_shape_analysis_FIX.c b/silk/fixed/SKP_Silk_noise_shape_analysis_FIX.c
similarity index 100%
rename from silk/SKP_Silk_noise_shape_analysis_FIX.c
rename to silk/fixed/SKP_Silk_noise_shape_analysis_FIX.c
diff --git a/silk/SKP_Silk_prefilter_FIX.c b/silk/fixed/SKP_Silk_prefilter_FIX.c
similarity index 100%
rename from silk/SKP_Silk_prefilter_FIX.c
rename to silk/fixed/SKP_Silk_prefilter_FIX.c
diff --git a/silk/SKP_Silk_process_gains_FIX.c b/silk/fixed/SKP_Silk_process_gains_FIX.c
similarity index 100%
rename from silk/SKP_Silk_process_gains_FIX.c
rename to silk/fixed/SKP_Silk_process_gains_FIX.c
diff --git a/silk/SKP_Silk_regularize_correlations_FIX.c b/silk/fixed/SKP_Silk_regularize_correlations_FIX.c
similarity index 100%
rename from silk/SKP_Silk_regularize_correlations_FIX.c
rename to silk/fixed/SKP_Silk_regularize_correlations_FIX.c
diff --git a/silk/SKP_Silk_residual_energy16_FIX.c b/silk/fixed/SKP_Silk_residual_energy16_FIX.c
similarity index 100%
rename from silk/SKP_Silk_residual_energy16_FIX.c
rename to silk/fixed/SKP_Silk_residual_energy16_FIX.c
diff --git a/silk/SKP_Silk_residual_energy_FIX.c b/silk/fixed/SKP_Silk_residual_energy_FIX.c
similarity index 100%
rename from silk/SKP_Silk_residual_energy_FIX.c
rename to silk/fixed/SKP_Silk_residual_energy_FIX.c
diff --git a/silk/SKP_Silk_solve_LS_FIX.c b/silk/fixed/SKP_Silk_solve_LS_FIX.c
similarity index 100%
rename from silk/SKP_Silk_solve_LS_FIX.c
rename to silk/fixed/SKP_Silk_solve_LS_FIX.c
diff --git a/silk/SKP_Silk_warped_autocorrelation_FIX.c b/silk/fixed/SKP_Silk_warped_autocorrelation_FIX.c
similarity index 100%
rename from silk/SKP_Silk_warped_autocorrelation_FIX.c
rename to silk/fixed/SKP_Silk_warped_autocorrelation_FIX.c
diff --git a/silk/SKP_Silk_LPC_analysis_filter_FLP.c b/silk/float/SKP_Silk_LPC_analysis_filter_FLP.c
similarity index 100%
rename from silk/SKP_Silk_LPC_analysis_filter_FLP.c
rename to silk/float/SKP_Silk_LPC_analysis_filter_FLP.c
diff --git a/silk/SKP_Silk_LTP_analysis_filter_FLP.c b/silk/float/SKP_Silk_LTP_analysis_filter_FLP.c
similarity index 100%
rename from silk/SKP_Silk_LTP_analysis_filter_FLP.c
rename to silk/float/SKP_Silk_LTP_analysis_filter_FLP.c
diff --git a/silk/SKP_Silk_LTP_scale_ctrl_FLP.c b/silk/float/SKP_Silk_LTP_scale_ctrl_FLP.c
similarity index 100%
rename from silk/SKP_Silk_LTP_scale_ctrl_FLP.c
rename to silk/float/SKP_Silk_LTP_scale_ctrl_FLP.c
diff --git a/silk/SKP_Silk_apply_sine_window_FLP.c b/silk/float/SKP_Silk_apply_sine_window_FLP.c
similarity index 100%
rename from silk/SKP_Silk_apply_sine_window_FLP.c
rename to silk/float/SKP_Silk_apply_sine_window_FLP.c
diff --git a/silk/SKP_Silk_corrMatrix_FLP.c b/silk/float/SKP_Silk_corrMatrix_FLP.c
similarity index 100%
rename from silk/SKP_Silk_corrMatrix_FLP.c
rename to silk/float/SKP_Silk_corrMatrix_FLP.c
diff --git a/silk/SKP_Silk_encode_frame_FLP.c b/silk/float/SKP_Silk_encode_frame_FLP.c
similarity index 100%
rename from silk/SKP_Silk_encode_frame_FLP.c
rename to silk/float/SKP_Silk_encode_frame_FLP.c
diff --git a/silk/SKP_Silk_find_LPC_FLP.c b/silk/float/SKP_Silk_find_LPC_FLP.c
similarity index 100%
rename from silk/SKP_Silk_find_LPC_FLP.c
rename to silk/float/SKP_Silk_find_LPC_FLP.c
diff --git a/silk/SKP_Silk_find_LTP_FLP.c b/silk/float/SKP_Silk_find_LTP_FLP.c
similarity index 100%
rename from silk/SKP_Silk_find_LTP_FLP.c
rename to silk/float/SKP_Silk_find_LTP_FLP.c
diff --git a/silk/SKP_Silk_find_pitch_lags_FLP.c b/silk/float/SKP_Silk_find_pitch_lags_FLP.c
similarity index 100%
rename from silk/SKP_Silk_find_pitch_lags_FLP.c
rename to silk/float/SKP_Silk_find_pitch_lags_FLP.c
diff --git a/silk/SKP_Silk_find_pred_coefs_FLP.c b/silk/float/SKP_Silk_find_pred_coefs_FLP.c
similarity index 100%
rename from silk/SKP_Silk_find_pred_coefs_FLP.c
rename to silk/float/SKP_Silk_find_pred_coefs_FLP.c
diff --git a/silk/SKP_Silk_noise_shape_analysis_FLP.c b/silk/float/SKP_Silk_noise_shape_analysis_FLP.c
similarity index 100%
rename from silk/SKP_Silk_noise_shape_analysis_FLP.c
rename to silk/float/SKP_Silk_noise_shape_analysis_FLP.c
diff --git a/silk/SKP_Silk_prefilter_FLP.c b/silk/float/SKP_Silk_prefilter_FLP.c
similarity index 100%
rename from silk/SKP_Silk_prefilter_FLP.c
rename to silk/float/SKP_Silk_prefilter_FLP.c
diff --git a/silk/SKP_Silk_process_gains_FLP.c b/silk/float/SKP_Silk_process_gains_FLP.c
similarity index 100%
rename from silk/SKP_Silk_process_gains_FLP.c
rename to silk/float/SKP_Silk_process_gains_FLP.c
diff --git a/silk/SKP_Silk_regularize_correlations_FLP.c b/silk/float/SKP_Silk_regularize_correlations_FLP.c
similarity index 100%
rename from silk/SKP_Silk_regularize_correlations_FLP.c
rename to silk/float/SKP_Silk_regularize_correlations_FLP.c
diff --git a/silk/SKP_Silk_residual_energy_FLP.c b/silk/float/SKP_Silk_residual_energy_FLP.c
similarity index 100%
rename from silk/SKP_Silk_residual_energy_FLP.c
rename to silk/float/SKP_Silk_residual_energy_FLP.c
diff --git a/silk/SKP_Silk_solve_LS_FLP.c b/silk/float/SKP_Silk_solve_LS_FLP.c
similarity index 100%
rename from silk/SKP_Silk_solve_LS_FLP.c
rename to silk/float/SKP_Silk_solve_LS_FLP.c
diff --git a/silk/SKP_Silk_warped_autocorrelation_FLP.c b/silk/float/SKP_Silk_warped_autocorrelation_FLP.c
similarity index 100%
rename from silk/SKP_Silk_warped_autocorrelation_FLP.c
rename to silk/float/SKP_Silk_warped_autocorrelation_FLP.c
diff --git a/silk/SKP_Silk_wrappers_FLP.c b/silk/float/SKP_Silk_wrappers_FLP.c
similarity index 100%
rename from silk/SKP_Silk_wrappers_FLP.c
rename to silk/float/SKP_Silk_wrappers_FLP.c
diff --git a/silk_sources.mk b/silk_sources.mk
index 7a8e09429abc68df2f0ee5ac8d3a2f5fb08a3135..feb2d6312b031bcd59344b116d8fedfe8a6b3d1e 100644
--- a/silk_sources.mk
+++ b/silk_sources.mk
@@ -108,40 +108,40 @@ silk/SKP_Silk_sort_FLP.c
 
 ifdef FIXED_POINT
 SILK_SOURCES += \
-silk/SKP_Silk_LTP_analysis_filter_FIX.c \
-silk/SKP_Silk_LTP_scale_ctrl_FIX.c \
-silk/SKP_Silk_corrMatrix_FIX.c \
-silk/SKP_Silk_encode_frame_FIX.c \
-silk/SKP_Silk_find_LPC_FIX.c \
-silk/SKP_Silk_find_LTP_FIX.c \
-silk/SKP_Silk_find_pitch_lags_FIX.c \
-silk/SKP_Silk_find_pred_coefs_FIX.c \
-silk/SKP_Silk_noise_shape_analysis_FIX.c \
-silk/SKP_Silk_prefilter_FIX.c \
-silk/SKP_Silk_process_gains_FIX.c \
-silk/SKP_Silk_regularize_correlations_FIX.c \
-silk/SKP_Silk_residual_energy16_FIX.c \
-silk/SKP_Silk_residual_energy_FIX.c \
-silk/SKP_Silk_solve_LS_FIX.c \
-silk/SKP_Silk_warped_autocorrelation_FIX.c
+silk/fixed/SKP_Silk_LTP_analysis_filter_FIX.c \
+silk/fixed/SKP_Silk_LTP_scale_ctrl_FIX.c \
+silk/fixed/SKP_Silk_corrMatrix_FIX.c \
+silk/fixed/SKP_Silk_encode_frame_FIX.c \
+silk/fixed/SKP_Silk_find_LPC_FIX.c \
+silk/fixed/SKP_Silk_find_LTP_FIX.c \
+silk/fixed/SKP_Silk_find_pitch_lags_FIX.c \
+silk/fixed/SKP_Silk_find_pred_coefs_FIX.c \
+silk/fixed/SKP_Silk_noise_shape_analysis_FIX.c \
+silk/fixed/SKP_Silk_prefilter_FIX.c \
+silk/fixed/SKP_Silk_process_gains_FIX.c \
+silk/fixed/SKP_Silk_regularize_correlations_FIX.c \
+silk/fixed/SKP_Silk_residual_energy16_FIX.c \
+silk/fixed/SKP_Silk_residual_energy_FIX.c \
+silk/fixed/SKP_Silk_solve_LS_FIX.c \
+silk/fixed/SKP_Silk_warped_autocorrelation_FIX.c
 else
 SILK_SOURCES += \
-silk/SKP_Silk_apply_sine_window_FLP.c \
-silk/SKP_Silk_corrMatrix_FLP.c \
-silk/SKP_Silk_encode_frame_FLP.c \
-silk/SKP_Silk_find_LPC_FLP.c \
-silk/SKP_Silk_find_LTP_FLP.c \
-silk/SKP_Silk_find_pitch_lags_FLP.c \
-silk/SKP_Silk_find_pred_coefs_FLP.c \
-silk/SKP_Silk_LPC_analysis_filter_FLP.c \
-silk/SKP_Silk_LTP_analysis_filter_FLP.c \
-silk/SKP_Silk_LTP_scale_ctrl_FLP.c \
-silk/SKP_Silk_noise_shape_analysis_FLP.c \
-silk/SKP_Silk_prefilter_FLP.c \
-silk/SKP_Silk_process_gains_FLP.c \
-silk/SKP_Silk_regularize_correlations_FLP.c \
-silk/SKP_Silk_residual_energy_FLP.c \
-silk/SKP_Silk_solve_LS_FLP.c \
-silk/SKP_Silk_warped_autocorrelation_FLP.c \
-silk/SKP_Silk_wrappers_FLP.c
+silk/float/SKP_Silk_apply_sine_window_FLP.c \
+silk/float/SKP_Silk_corrMatrix_FLP.c \
+silk/float/SKP_Silk_encode_frame_FLP.c \
+silk/float/SKP_Silk_find_LPC_FLP.c \
+silk/float/SKP_Silk_find_LTP_FLP.c \
+silk/float/SKP_Silk_find_pitch_lags_FLP.c \
+silk/float/SKP_Silk_find_pred_coefs_FLP.c \
+silk/float/SKP_Silk_LPC_analysis_filter_FLP.c \
+silk/float/SKP_Silk_LTP_analysis_filter_FLP.c \
+silk/float/SKP_Silk_LTP_scale_ctrl_FLP.c \
+silk/float/SKP_Silk_noise_shape_analysis_FLP.c \
+silk/float/SKP_Silk_prefilter_FLP.c \
+silk/float/SKP_Silk_process_gains_FLP.c \
+silk/float/SKP_Silk_regularize_correlations_FLP.c \
+silk/float/SKP_Silk_residual_energy_FLP.c \
+silk/float/SKP_Silk_solve_LS_FLP.c \
+silk/float/SKP_Silk_warped_autocorrelation_FLP.c \
+silk/float/SKP_Silk_wrappers_FLP.c
 endif