diff --git a/dl/armCOMM.h b/dl/api/armCOMM.h
similarity index 100%
rename from dl/armCOMM.h
rename to dl/api/armCOMM.h
diff --git a/dl/armCOMM_s.h b/dl/api/armCOMM_s.h
similarity index 100%
rename from dl/armCOMM_s.h
rename to dl/api/armCOMM_s.h
diff --git a/dl/armOMX.h b/dl/api/armOMX.h
similarity index 100%
rename from dl/armOMX.h
rename to dl/api/armOMX.h
diff --git a/dl/omxtypes.h b/dl/api/omxtypes.h
similarity index 100%
rename from dl/omxtypes.h
rename to dl/api/omxtypes.h
diff --git a/dl/omxtypes_s.h b/dl/api/omxtypes_s.h
similarity index 100%
rename from dl/omxtypes_s.h
rename to dl/api/omxtypes_s.h
diff --git a/dl/arm_fft.gyp b/dl/dl.gyp
similarity index 100%
rename from dl/arm_fft.gyp
rename to dl/dl.gyp
diff --git a/dl/armSP.h b/dl/sp/api/armSP.h
similarity index 100%
rename from dl/armSP.h
rename to dl/sp/api/armSP.h
diff --git a/dl/omxSP.h b/dl/sp/api/omxSP.h
similarity index 100%
rename from dl/omxSP.h
rename to dl/sp/api/omxSP.h
diff --git a/dl/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S b/dl/sp/src/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S
similarity index 100%
rename from dl/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S
rename to dl/sp/src/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S
diff --git a/dl/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S b/dl/sp/src/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S
similarity index 100%
rename from dl/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S
rename to dl/sp/src/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S
diff --git a/dl/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S
similarity index 100%
rename from dl/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S
rename to dl/sp/src/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S
diff --git a/dl/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S
similarity index 100%
rename from dl/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S
rename to dl/sp/src/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S
diff --git a/dl/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S
similarity index 100%
rename from dl/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S
rename to dl/sp/src/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S
diff --git a/dl/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S
similarity index 100%
rename from dl/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S
rename to dl/sp/src/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S
diff --git a/dl/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S
similarity index 100%
rename from dl/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S
rename to dl/sp/src/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S
diff --git a/dl/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S
similarity index 100%
rename from dl/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S
rename to dl/sp/src/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S
diff --git a/dl/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S
similarity index 100%
rename from dl/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S
rename to dl/sp/src/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S
diff --git a/dl/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S
similarity index 100%
rename from dl/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S
rename to dl/sp/src/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S
diff --git a/dl/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S
similarity index 100%
rename from dl/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S
rename to dl/sp/src/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S
diff --git a/dl/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S
similarity index 100%
rename from dl/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S
rename to dl/sp/src/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S
diff --git a/dl/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S
similarity index 100%
rename from dl/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S
rename to dl/sp/src/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S
diff --git a/dl/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S
similarity index 100%
rename from dl/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S
rename to dl/sp/src/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S
diff --git a/dl/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S
similarity index 100%
rename from dl/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S
rename to dl/sp/src/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S
diff --git a/dl/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S b/dl/sp/src/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S
similarity index 100%
rename from dl/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S
rename to dl/sp/src/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S
diff --git a/dl/armSP_FFT_F32TwiddleTable.c b/dl/sp/src/armSP_FFT_F32TwiddleTable.c
similarity index 100%
rename from dl/armSP_FFT_F32TwiddleTable.c
rename to dl/sp/src/armSP_FFT_F32TwiddleTable.c
diff --git a/dl/armSP_FFT_S32TwiddleTable.c b/dl/sp/src/armSP_FFT_S32TwiddleTable.c
similarity index 100%
rename from dl/armSP_FFT_S32TwiddleTable.c
rename to dl/sp/src/armSP_FFT_S32TwiddleTable.c
diff --git a/dl/omxSP_FFTFwd_CToC_FC32_Sfs_s.S b/dl/sp/src/omxSP_FFTFwd_CToC_FC32_Sfs_s.S
similarity index 100%
rename from dl/omxSP_FFTFwd_CToC_FC32_Sfs_s.S
rename to dl/sp/src/omxSP_FFTFwd_CToC_FC32_Sfs_s.S
diff --git a/dl/omxSP_FFTFwd_CToC_SC32_Sfs_s.S b/dl/sp/src/omxSP_FFTFwd_CToC_SC32_Sfs_s.S
similarity index 100%
rename from dl/omxSP_FFTFwd_CToC_SC32_Sfs_s.S
rename to dl/sp/src/omxSP_FFTFwd_CToC_SC32_Sfs_s.S
diff --git a/dl/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S b/dl/sp/src/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S
similarity index 100%
rename from dl/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S
rename to dl/sp/src/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S
diff --git a/dl/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S b/dl/sp/src/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S
similarity index 100%
rename from dl/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S
rename to dl/sp/src/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S
diff --git a/dl/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S b/dl/sp/src/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S
similarity index 100%
rename from dl/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S
rename to dl/sp/src/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S
diff --git a/dl/omxSP_FFTGetBufSize_C_FC32.c b/dl/sp/src/omxSP_FFTGetBufSize_C_FC32.c
similarity index 100%
rename from dl/omxSP_FFTGetBufSize_C_FC32.c
rename to dl/sp/src/omxSP_FFTGetBufSize_C_FC32.c
diff --git a/dl/omxSP_FFTGetBufSize_C_SC16.c b/dl/sp/src/omxSP_FFTGetBufSize_C_SC16.c
similarity index 100%
rename from dl/omxSP_FFTGetBufSize_C_SC16.c
rename to dl/sp/src/omxSP_FFTGetBufSize_C_SC16.c
diff --git a/dl/omxSP_FFTGetBufSize_C_SC32.c b/dl/sp/src/omxSP_FFTGetBufSize_C_SC32.c
similarity index 100%
rename from dl/omxSP_FFTGetBufSize_C_SC32.c
rename to dl/sp/src/omxSP_FFTGetBufSize_C_SC32.c
diff --git a/dl/omxSP_FFTGetBufSize_R_F32.c b/dl/sp/src/omxSP_FFTGetBufSize_R_F32.c
similarity index 100%
rename from dl/omxSP_FFTGetBufSize_R_F32.c
rename to dl/sp/src/omxSP_FFTGetBufSize_R_F32.c
diff --git a/dl/omxSP_FFTGetBufSize_R_S16S32.c b/dl/sp/src/omxSP_FFTGetBufSize_R_S16S32.c
similarity index 100%
rename from dl/omxSP_FFTGetBufSize_R_S16S32.c
rename to dl/sp/src/omxSP_FFTGetBufSize_R_S16S32.c
diff --git a/dl/omxSP_FFTGetBufSize_R_S32.c b/dl/sp/src/omxSP_FFTGetBufSize_R_S32.c
similarity index 100%
rename from dl/omxSP_FFTGetBufSize_R_S32.c
rename to dl/sp/src/omxSP_FFTGetBufSize_R_S32.c
diff --git a/dl/omxSP_FFTInit_C_FC32.c b/dl/sp/src/omxSP_FFTInit_C_FC32.c
similarity index 100%
rename from dl/omxSP_FFTInit_C_FC32.c
rename to dl/sp/src/omxSP_FFTInit_C_FC32.c
diff --git a/dl/omxSP_FFTInit_C_SC16.c b/dl/sp/src/omxSP_FFTInit_C_SC16.c
similarity index 100%
rename from dl/omxSP_FFTInit_C_SC16.c
rename to dl/sp/src/omxSP_FFTInit_C_SC16.c
diff --git a/dl/omxSP_FFTInit_C_SC32.c b/dl/sp/src/omxSP_FFTInit_C_SC32.c
similarity index 100%
rename from dl/omxSP_FFTInit_C_SC32.c
rename to dl/sp/src/omxSP_FFTInit_C_SC32.c
diff --git a/dl/omxSP_FFTInit_R_F32.c b/dl/sp/src/omxSP_FFTInit_R_F32.c
similarity index 100%
rename from dl/omxSP_FFTInit_R_F32.c
rename to dl/sp/src/omxSP_FFTInit_R_F32.c
diff --git a/dl/omxSP_FFTInit_R_S16S32.c b/dl/sp/src/omxSP_FFTInit_R_S16S32.c
similarity index 100%
rename from dl/omxSP_FFTInit_R_S16S32.c
rename to dl/sp/src/omxSP_FFTInit_R_S16S32.c
diff --git a/dl/omxSP_FFTInit_R_S32.c b/dl/sp/src/omxSP_FFTInit_R_S32.c
similarity index 100%
rename from dl/omxSP_FFTInit_R_S32.c
rename to dl/sp/src/omxSP_FFTInit_R_S32.c
diff --git a/dl/omxSP_FFTInv_CCSToR_F32_Sfs_s.S b/dl/sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_s.S
similarity index 100%
rename from dl/omxSP_FFTInv_CCSToR_F32_Sfs_s.S
rename to dl/sp/src/omxSP_FFTInv_CCSToR_F32_Sfs_s.S
diff --git a/dl/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S b/dl/sp/src/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S
similarity index 100%
rename from dl/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S
rename to dl/sp/src/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S
diff --git a/dl/omxSP_FFTInv_CCSToR_S32_Sfs_s.S b/dl/sp/src/omxSP_FFTInv_CCSToR_S32_Sfs_s.S
similarity index 100%
rename from dl/omxSP_FFTInv_CCSToR_S32_Sfs_s.S
rename to dl/sp/src/omxSP_FFTInv_CCSToR_S32_Sfs_s.S
diff --git a/dl/omxSP_FFTInv_CToC_FC32_Sfs_s.S b/dl/sp/src/omxSP_FFTInv_CToC_FC32_Sfs_s.S
similarity index 100%
rename from dl/omxSP_FFTInv_CToC_FC32_Sfs_s.S
rename to dl/sp/src/omxSP_FFTInv_CToC_FC32_Sfs_s.S
diff --git a/dl/omxSP_FFTInv_CToC_SC32_Sfs_s.S b/dl/sp/src/omxSP_FFTInv_CToC_SC32_Sfs_s.S
similarity index 100%
rename from dl/omxSP_FFTInv_CToC_SC32_Sfs_s.S
rename to dl/sp/src/omxSP_FFTInv_CToC_SC32_Sfs_s.S
diff --git a/dl/test/aligned_ptr.c b/dl/sp/src/test/aligned_ptr.c
similarity index 100%
rename from dl/test/aligned_ptr.c
rename to dl/sp/src/test/aligned_ptr.c
diff --git a/dl/test/aligned_ptr.h b/dl/sp/src/test/aligned_ptr.h
similarity index 100%
rename from dl/test/aligned_ptr.h
rename to dl/sp/src/test/aligned_ptr.h
diff --git a/dl/test/compare.c b/dl/sp/src/test/compare.c
similarity index 100%
rename from dl/test/compare.c
rename to dl/sp/src/test/compare.c
diff --git a/dl/test/compare.h b/dl/sp/src/test/compare.h
similarity index 100%
rename from dl/test/compare.h
rename to dl/sp/src/test/compare.h
diff --git a/dl/test/gensig.c b/dl/sp/src/test/gensig.c
similarity index 100%
rename from dl/test/gensig.c
rename to dl/sp/src/test/gensig.c
diff --git a/dl/test/gensig.h b/dl/sp/src/test/gensig.h
similarity index 100%
rename from dl/test/gensig.h
rename to dl/sp/src/test/gensig.h
diff --git a/dl/test/test_fft.gyp b/dl/sp/src/test/test_fft.gyp
similarity index 100%
rename from dl/test/test_fft.gyp
rename to dl/sp/src/test/test_fft.gyp
diff --git a/dl/test/test_fft32.c b/dl/sp/src/test/test_fft32.c
similarity index 100%
rename from dl/test/test_fft32.c
rename to dl/sp/src/test/test_fft32.c
diff --git a/dl/test/test_fft_time.c b/dl/sp/src/test/test_fft_time.c
similarity index 100%
rename from dl/test/test_fft_time.c
rename to dl/sp/src/test/test_fft_time.c
diff --git a/dl/test/test_float_fft.c b/dl/sp/src/test/test_float_fft.c
similarity index 100%
rename from dl/test/test_float_fft.c
rename to dl/sp/src/test/test_float_fft.c
diff --git a/dl/test/test_float_rfft.c b/dl/sp/src/test/test_float_rfft.c
similarity index 100%
rename from dl/test/test_float_rfft.c
rename to dl/sp/src/test/test_float_rfft.c
diff --git a/dl/test/test_rfft16.c b/dl/sp/src/test/test_rfft16.c
similarity index 100%
rename from dl/test/test_rfft16.c
rename to dl/sp/src/test/test_rfft16.c
diff --git a/dl/test/test_rfft32.c b/dl/sp/src/test/test_rfft32.c
similarity index 100%
rename from dl/test/test_rfft32.c
rename to dl/sp/src/test/test_rfft32.c
diff --git a/dl/test/test_util.c b/dl/sp/src/test/test_util.c
similarity index 100%
rename from dl/test/test_util.c
rename to dl/sp/src/test/test_util.c
diff --git a/dl/test/test_util.h b/dl/sp/src/test/test_util.h
similarity index 100%
rename from dl/test/test_util.h
rename to dl/sp/src/test/test_util.h
diff --git a/dl/armCOMM.c b/dl/src/armCOMM.c
similarity index 100%
rename from dl/armCOMM.c
rename to dl/src/armCOMM.c