diff --git a/dl/api/armCOMM_s.h b/dl/api/arm/armCOMM_s.h
similarity index 100%
rename from dl/api/armCOMM_s.h
rename to dl/api/arm/armCOMM_s.h
diff --git a/dl/api/armOMX.h b/dl/api/arm/armOMX.h
similarity index 100%
rename from dl/api/armOMX.h
rename to dl/api/arm/armOMX.h
diff --git a/dl/api/omxtypes_s.h b/dl/api/arm/omxtypes_s.h
similarity index 100%
rename from dl/api/omxtypes_s.h
rename to dl/api/arm/omxtypes_s.h
diff --git a/dl/dl.gyp b/dl/dl.gyp
index 5ec5fc9..2c5acd4 100644
--- a/dl/dl.gyp
+++ b/dl/dl.gyp
@@ -32,10 +32,10 @@
         ],
       },
       'sources': [
-        'api/armCOMM_s.h',
-        'api/armOMX.h',
+        'api/arm/armCOMM_s.h',
+        'api/arm/armOMX.h',
+        'api/arm/omxtypes_s.h',
         'api/omxtypes.h',
-        'api/omxtypes_s.h',
         'sp/api/armSP.h',
         'sp/api/omxSP.h',
         # Common C code that can be shared between different
diff --git a/dl/sp/src/arm/neon/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S
index f375991..f9dd26e 100644
--- a/dl/sp/src/arm/neon/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S
@@ -22,8 +22,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/armSP_FFTInv_CCSToR_S16_preTwiddleRadix2_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFTInv_CCSToR_S16_preTwiddleRadix2_unsafe_s.S
index 31638dd..950defd 100644
--- a/dl/sp/src/arm/neon/armSP_FFTInv_CCSToR_S16_preTwiddleRadix2_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFTInv_CCSToR_S16_preTwiddleRadix2_unsafe_s.S
@@ -28,8 +28,8 @@
 @ formula.
 @ 
         
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
         
 @//Input Registers
 #define pSrc            r0
diff --git a/dl/sp/src/arm/neon/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S
index 57fef7a..9959f8f 100644
--- a/dl/sp/src/arm/neon/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S
@@ -30,8 +30,8 @@
         
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
         
         
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S
index 323eb83..88a08ff 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S
@@ -21,8 +21,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S
index 02f3888..85b8529 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S
@@ -21,8 +21,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S
index 73c1f4b..20c35e1 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S
@@ -21,8 +21,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S
index ff62dd1..dbe170c 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S
@@ -21,8 +21,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S
index 9d2e4ab..af86b91 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S
@@ -20,8 +20,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S
index ae450c5..8f63eb8 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S
@@ -21,8 +21,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S
index 4447e76..19a2f25 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S
@@ -20,8 +20,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_fs_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_fs_unsafe_s.S
index a16c79f..4bdbb52 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_fs_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_fs_unsafe_s.S
@@ -29,8 +29,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_ls_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_ls_unsafe_s.S
index 9f7b531..94b3d49 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_ls_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_ls_unsafe_s.S
@@ -29,8 +29,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_ps_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_ps_unsafe_s.S
index 666f4f3..2b34d99 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_ps_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_ps_unsafe_s.S
@@ -29,8 +29,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_unsafe_s.S
index f9bbebc..17e0415 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_unsafe_s.S
@@ -29,8 +29,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix4_fs_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix4_fs_unsafe_s.S
index 1b0217e..049621b 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix4_fs_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix4_fs_unsafe_s.S
@@ -29,8 +29,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix4_ls_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix4_ls_unsafe_s.S
index c5ef7a0..4e46a01 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix4_ls_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix4_ls_unsafe_s.S
@@ -29,8 +29,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix4_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix4_unsafe_s.S
index 0cb4701..7bdbe41 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix4_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix4_unsafe_s.S
@@ -29,8 +29,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 
 
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix8_fs_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix8_fs_unsafe_s.S
index ba7c344..f9ff37a 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix8_fs_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix8_fs_unsafe_s.S
@@ -29,8 +29,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S
index 3bc5f02..de589c9 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S
@@ -29,8 +29,8 @@
         
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
         
         
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S
index 30a8f56..eeb8c6e 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S
@@ -30,8 +30,8 @@
         
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
         
         
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S
index a9700ec..967d7b5 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S
@@ -29,8 +29,8 @@
         
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
         
         
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S
index 685f85b..412b64f 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S
@@ -29,8 +29,8 @@
         
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
         
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S
index 1b5478b..91e5299 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S
@@ -28,8 +28,8 @@
         
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
         
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S
index 3c23983..22efea4 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S
@@ -30,8 +30,8 @@
         
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
         
         
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S
index a5fb0e2..d4d4abb 100644
--- a/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S
+++ b/dl/sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S
@@ -30,8 +30,8 @@
         
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
         
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/arm/neon/omxSP_FFTFwd_CToC_FC32_Sfs_s.S b/dl/sp/src/arm/neon/omxSP_FFTFwd_CToC_FC32_Sfs_s.S
index da0c10f..aa76112 100644
--- a/dl/sp/src/arm/neon/omxSP_FFTFwd_CToC_FC32_Sfs_s.S
+++ b/dl/sp/src/arm/neon/omxSP_FFTFwd_CToC_FC32_Sfs_s.S
@@ -20,8 +20,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/arm/neon/omxSP_FFTFwd_CToC_SC16_Sfs_s.S b/dl/sp/src/arm/neon/omxSP_FFTFwd_CToC_SC16_Sfs_s.S
index ca15c6b..a3c21ac 100644
--- a/dl/sp/src/arm/neon/omxSP_FFTFwd_CToC_SC16_Sfs_s.S
+++ b/dl/sp/src/arm/neon/omxSP_FFTFwd_CToC_SC16_Sfs_s.S
@@ -29,8 +29,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/omxSP_FFTFwd_CToC_SC32_Sfs_s.S b/dl/sp/src/arm/neon/omxSP_FFTFwd_CToC_SC32_Sfs_s.S
index 90f969a..504ef95 100644
--- a/dl/sp/src/arm/neon/omxSP_FFTFwd_CToC_SC32_Sfs_s.S
+++ b/dl/sp/src/arm/neon/omxSP_FFTFwd_CToC_SC32_Sfs_s.S
@@ -27,8 +27,8 @@
         
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
         
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/arm/neon/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S b/dl/sp/src/arm/neon/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S
index fda1ae4..fda446c 100644
--- a/dl/sp/src/arm/neon/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S
+++ b/dl/sp/src/arm/neon/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S
@@ -20,8 +20,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S b/dl/sp/src/arm/neon/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S
index 84d2300..402885f 100644
--- a/dl/sp/src/arm/neon/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S
+++ b/dl/sp/src/arm/neon/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S
@@ -28,8 +28,8 @@
         
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
         
         
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/omxSP_FFTFwd_RToCCS_S16_Sfs_s.S b/dl/sp/src/arm/neon/omxSP_FFTFwd_RToCCS_S16_Sfs_s.S
index f97fe5a..e953077 100644
--- a/dl/sp/src/arm/neon/omxSP_FFTFwd_RToCCS_S16_Sfs_s.S
+++ b/dl/sp/src/arm/neon/omxSP_FFTFwd_RToCCS_S16_Sfs_s.S
@@ -25,8 +25,8 @@
 @ Compute a forward FFT for a real signal, using 16 bit complex FFT routines.
 @
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 .extern  armSP_FFTFwd_CToC_SC16_Sfs_Radix2_fs_OutOfPlace_unsafe
 .extern  armSP_FFTFwd_CToC_SC16_Radix2_fs_OutOfPlace_unsafe
diff --git a/dl/sp/src/arm/neon/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S b/dl/sp/src/arm/neon/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S
index a742162..c1385c0 100644
--- a/dl/sp/src/arm/neon/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S
+++ b/dl/sp/src/arm/neon/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S
@@ -29,8 +29,8 @@
         
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
         
         
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/omxSP_FFTInv_CCSToR_F32_Sfs_s.S b/dl/sp/src/arm/neon/omxSP_FFTInv_CCSToR_F32_Sfs_s.S
index 5deaf89..9c45b54 100644
--- a/dl/sp/src/arm/neon/omxSP_FFTInv_CCSToR_F32_Sfs_s.S
+++ b/dl/sp/src/arm/neon/omxSP_FFTInv_CCSToR_F32_Sfs_s.S
@@ -20,8 +20,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/omxSP_FFTInv_CCSToR_S16_Sfs_s.S b/dl/sp/src/arm/neon/omxSP_FFTInv_CCSToR_S16_Sfs_s.S
index 553f280..311dba9 100644
--- a/dl/sp/src/arm/neon/omxSP_FFTInv_CCSToR_S16_Sfs_s.S
+++ b/dl/sp/src/arm/neon/omxSP_FFTInv_CCSToR_S16_Sfs_s.S
@@ -26,8 +26,8 @@
 @ Compute an inverse FFT for a 16-bit real signal, with complex FFT routines.
 @
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 .extern  armSP_FFTInv_CToC_SC16_Sfs_Radix2_fs_OutOfPlace_unsafe
 .extern  armSP_FFTInv_CToC_SC16_Radix2_fs_OutOfPlace_unsafe
diff --git a/dl/sp/src/arm/neon/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S b/dl/sp/src/arm/neon/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S
index becc032..f2f2d02 100644
--- a/dl/sp/src/arm/neon/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S
+++ b/dl/sp/src/arm/neon/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S
@@ -29,8 +29,8 @@
         
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
         
         
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/omxSP_FFTInv_CCSToR_S32_Sfs_s.S b/dl/sp/src/arm/neon/omxSP_FFTInv_CCSToR_S32_Sfs_s.S
index 003d666..10ce047 100644
--- a/dl/sp/src/arm/neon/omxSP_FFTInv_CCSToR_S32_Sfs_s.S
+++ b/dl/sp/src/arm/neon/omxSP_FFTInv_CCSToR_S32_Sfs_s.S
@@ -29,8 +29,8 @@
         
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
         
         
 @// Import symbols required from other files
diff --git a/dl/sp/src/arm/neon/omxSP_FFTInv_CToC_FC32_Sfs_s.S b/dl/sp/src/arm/neon/omxSP_FFTInv_CToC_FC32_Sfs_s.S
index c2e86d2..73a6549 100644
--- a/dl/sp/src/arm/neon/omxSP_FFTInv_CToC_FC32_Sfs_s.S
+++ b/dl/sp/src/arm/neon/omxSP_FFTInv_CToC_FC32_Sfs_s.S
@@ -20,8 +20,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/arm/neon/omxSP_FFTInv_CToC_SC16_Sfs_s.S b/dl/sp/src/arm/neon/omxSP_FFTInv_CToC_SC16_Sfs_s.S
index ff85e2b..2388d0f 100644
--- a/dl/sp/src/arm/neon/omxSP_FFTInv_CToC_SC16_Sfs_s.S
+++ b/dl/sp/src/arm/neon/omxSP_FFTInv_CToC_SC16_Sfs_s.S
@@ -29,8 +29,8 @@
 
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
 
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/arm/neon/omxSP_FFTInv_CToC_SC32_Sfs_s.S b/dl/sp/src/arm/neon/omxSP_FFTInv_CToC_SC32_Sfs_s.S
index 09c461c..7df6243 100644
--- a/dl/sp/src/arm/neon/omxSP_FFTInv_CToC_SC32_Sfs_s.S
+++ b/dl/sp/src/arm/neon/omxSP_FFTInv_CToC_SC32_Sfs_s.S
@@ -28,8 +28,8 @@
         
 @// Include standard headers
 
-#include "dl/api/armCOMM_s.h"
-#include "dl/api/omxtypes_s.h"
+#include "dl/api/arm/armCOMM_s.h"
+#include "dl/api/arm/omxtypes_s.h"
         
 @// Import symbols required from other files
 @// (For example tables)
diff --git a/dl/sp/src/arm/omxSP_FFTGetBufSize_C_FC32.c b/dl/sp/src/arm/omxSP_FFTGetBufSize_C_FC32.c
index 081f237..6ac9de8 100644
--- a/dl/sp/src/arm/omxSP_FFTGetBufSize_C_FC32.c
+++ b/dl/sp/src/arm/omxSP_FFTGetBufSize_C_FC32.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "dl/api/armOMX.h"
+#include "dl/api/arm/armOMX.h"
 #include "dl/api/omxtypes.h"
 #include "dl/sp/api/armSP.h"
 #include "dl/sp/api/omxSP.h"
diff --git a/dl/sp/src/arm/omxSP_FFTGetBufSize_C_SC16.c b/dl/sp/src/arm/omxSP_FFTGetBufSize_C_SC16.c
index 288c76c..1fc4fe2 100644
--- a/dl/sp/src/arm/omxSP_FFTGetBufSize_C_SC16.c
+++ b/dl/sp/src/arm/omxSP_FFTGetBufSize_C_SC16.c
@@ -25,7 +25,7 @@
  * Compute the size of the specification structure required
  */
 
-#include "dl/api/armOMX.h"
+#include "dl/api/arm/armOMX.h"
 #include "dl/api/omxtypes.h"
 #include "dl/sp/api/armSP.h"
 #include "dl/sp/api/omxSP.h"
diff --git a/dl/sp/src/arm/omxSP_FFTGetBufSize_C_SC32.c b/dl/sp/src/arm/omxSP_FFTGetBufSize_C_SC32.c
index 0ca3b56..1765864 100644
--- a/dl/sp/src/arm/omxSP_FFTGetBufSize_C_SC32.c
+++ b/dl/sp/src/arm/omxSP_FFTGetBufSize_C_SC32.c
@@ -25,7 +25,7 @@
  * Compute the size of the specification structure required
  */
 
-#include "dl/api/armOMX.h"
+#include "dl/api/arm/armOMX.h"
 #include "dl/api/omxtypes.h"
 #include "dl/sp/api/armSP.h"
 #include "dl/sp/api/omxSP.h"
diff --git a/dl/sp/src/arm/omxSP_FFTGetBufSize_R_F32.c b/dl/sp/src/arm/omxSP_FFTGetBufSize_R_F32.c
index 19b16bb..046d069 100644
--- a/dl/sp/src/arm/omxSP_FFTGetBufSize_R_F32.c
+++ b/dl/sp/src/arm/omxSP_FFTGetBufSize_R_F32.c
@@ -9,7 +9,7 @@
  *
  */
 
-#include "dl/api/armOMX.h"
+#include "dl/api/arm/armOMX.h"
 #include "dl/api/omxtypes.h"
 #include "dl/sp/api/armSP.h"
 #include "dl/sp/api/omxSP.h"
diff --git a/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S16.c b/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S16.c
index cc318a3..7ad2750 100644
--- a/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S16.c
+++ b/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S16.c
@@ -18,7 +18,7 @@
  * Last Modified Date:
  */
 
-#include "dl/api/armOMX.h"
+#include "dl/api/arm/armOMX.h"
 #include "dl/api/omxtypes.h"
 #include "dl/sp/api/armSP.h"
 #include "dl/sp/api/omxSP.h"
diff --git a/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S16S32.c b/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S16S32.c
index 8465363..6ebdae1 100644
--- a/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S16S32.c
+++ b/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S16S32.c
@@ -25,7 +25,7 @@
  * Computes the size of the specification structure required.
  */
 
-#include "dl/api/armOMX.h"
+#include "dl/api/arm/armOMX.h"
 #include "dl/api/omxtypes.h"
 #include "dl/sp/api/armSP.h"
 #include "dl/sp/api/omxSP.h"
diff --git a/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S32.c b/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S32.c
index d572947..d5758d0 100644
--- a/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S32.c
+++ b/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S32.c
@@ -25,7 +25,7 @@
  * Computes the size of the specification structure required.
  */
 
-#include "dl/api/armOMX.h"
+#include "dl/api/arm/armOMX.h"
 #include "dl/api/omxtypes.h"
 #include "dl/sp/api/armSP.h"
 #include "dl/sp/api/omxSP.h"
diff --git a/dl/sp/src/arm/omxSP_FFTInit_C_FC32.c b/dl/sp/src/arm/omxSP_FFTInit_C_FC32.c
index cc53c59..4a68b6f 100644
--- a/dl/sp/src/arm/omxSP_FFTInit_C_FC32.c
+++ b/dl/sp/src/arm/omxSP_FFTInit_C_FC32.c
@@ -11,7 +11,7 @@
  *  complex float instead of SC32.
  */
 
-#include "dl/api/armOMX.h"
+#include "dl/api/arm/armOMX.h"
 #include "dl/api/omxtypes.h"
 #include "dl/sp/api/armSP.h"
 #include "dl/sp/api/omxSP.h"
diff --git a/dl/sp/src/arm/omxSP_FFTInit_C_SC16.c b/dl/sp/src/arm/omxSP_FFTInit_C_SC16.c
index f8248bb..0a23b8b 100644
--- a/dl/sp/src/arm/omxSP_FFTInit_C_SC16.c
+++ b/dl/sp/src/arm/omxSP_FFTInit_C_SC16.c
@@ -25,7 +25,7 @@
  * Initializes the specification structures required
  */
 
-#include "dl/api/armOMX.h"
+#include "dl/api/arm/armOMX.h"
 #include "dl/api/omxtypes.h"
 #include "dl/sp/api/armSP.h"
 #include "dl/sp/api/omxSP.h"
diff --git a/dl/sp/src/arm/omxSP_FFTInit_C_SC32.c b/dl/sp/src/arm/omxSP_FFTInit_C_SC32.c
index 9ea103f..0b4b537 100644
--- a/dl/sp/src/arm/omxSP_FFTInit_C_SC32.c
+++ b/dl/sp/src/arm/omxSP_FFTInit_C_SC32.c
@@ -25,7 +25,7 @@
  * Initializes the specification structures required
  */
 
-#include "dl/api/armOMX.h"
+#include "dl/api/arm/armOMX.h"
 #include "dl/api/omxtypes.h"
 #include "dl/sp/api/armSP.h"
 #include "dl/sp/api/omxSP.h"
diff --git a/dl/sp/src/arm/omxSP_FFTInit_R_F32.c b/dl/sp/src/arm/omxSP_FFTInit_R_F32.c
index 32d2223..b506783 100644
--- a/dl/sp/src/arm/omxSP_FFTInit_R_F32.c
+++ b/dl/sp/src/arm/omxSP_FFTInit_R_F32.c
@@ -11,7 +11,7 @@
  *  instead of S32.
  */
 
-#include "dl/api/armOMX.h"
+#include "dl/api/arm/armOMX.h"
 #include "dl/api/omxtypes.h"
 #include "dl/sp/api/armSP.h"
 #include "dl/sp/api/omxSP.h"
diff --git a/dl/sp/src/arm/omxSP_FFTInit_R_S16.c b/dl/sp/src/arm/omxSP_FFTInit_R_S16.c
index f44dff3..e3fc271 100644
--- a/dl/sp/src/arm/omxSP_FFTInit_R_S16.c
+++ b/dl/sp/src/arm/omxSP_FFTInit_R_S16.c
@@ -20,7 +20,7 @@
  * (c) Copyright 2007-2008 ARM Limited. All Rights Reserved.
  */
 
-#include "dl/api/armOMX.h"
+#include "dl/api/arm/armOMX.h"
 #include "dl/api/omxtypes.h"
 #include "dl/sp/api/armSP.h"
 #include "dl/sp/api/omxSP.h"
diff --git a/dl/sp/src/arm/omxSP_FFTInit_R_S16S32.c b/dl/sp/src/arm/omxSP_FFTInit_R_S16S32.c
index d157b34..9a66430 100644
--- a/dl/sp/src/arm/omxSP_FFTInit_R_S16S32.c
+++ b/dl/sp/src/arm/omxSP_FFTInit_R_S16S32.c
@@ -25,7 +25,7 @@
  * Initialize the real forward-FFT specification information struct.
  */
 
-#include "dl/api/armOMX.h"
+#include "dl/api/arm/armOMX.h"
 #include "dl/api/omxtypes.h"
 #include "dl/sp/api/armSP.h"
 #include "dl/sp/api/omxSP.h"
diff --git a/dl/sp/src/arm/omxSP_FFTInit_R_S32.c b/dl/sp/src/arm/omxSP_FFTInit_R_S32.c
index 337f2a2..d55ab06 100644
--- a/dl/sp/src/arm/omxSP_FFTInit_R_S32.c
+++ b/dl/sp/src/arm/omxSP_FFTInit_R_S32.c
@@ -25,7 +25,7 @@
  * Initialize the real forward-FFT specification information struct.
  */
 
-#include "dl/api/armOMX.h"
+#include "dl/api/arm/armOMX.h"
 #include "dl/api/omxtypes.h"
 #include "dl/sp/api/armSP.h"
 #include "dl/sp/api/omxSP.h"