diff --git a/Source/BasicMathFunctions/arm_scale_q15.c b/Source/BasicMathFunctions/arm_scale_q15.c
index fbad607f..95a35421 100644
--- a/Source/BasicMathFunctions/arm_scale_q15.c
+++ b/Source/BasicMathFunctions/arm_scale_q15.c
@@ -65,7 +65,7 @@ void arm_scale_q15(
     uint32_t  blkCnt;           /* loop counters */
     q15x8_t vecSrc;
     q15x8_t vecDst;
-
+    q31x4_t low, high;
 
     /* Compute 8 outputs at a time */
     blkCnt = blockSize >> 3;
@@ -77,8 +77,14 @@ void arm_scale_q15(
          * Scale the input and then store the result in the destination buffer.
          */
         vecSrc = vld1q(pSrc);
-        vecDst = vmulhq(vecSrc, vdupq_n_s16(scaleFract));
-        vecDst = vqshlq_r(vecDst, shift + 1);
+        low = vmullbq_int(vecSrc, vdupq_n_s16(scaleFract));
+        low = vqshlq_r(low, shift);
+        vecDst = vqshrnbq_n_s32(vecDst,low,15);
+
+        high = vmulltq_int(vecSrc, vdupq_n_s16(scaleFract));
+        high = vqshlq_r(high, shift);
+        vecDst = vqshrntq_n_s32(vecDst,high,15);
+
         vst1q(pDst, vecDst);
         /*
          * Decrement the blockSize loop counter
@@ -96,10 +102,15 @@ void arm_scale_q15(
     blkCnt = blockSize & 7;
     if (blkCnt > 0U)
     {
-        mve_pred16_t p0 = vctp16q(blkCnt);;
+        mve_pred16_t p0 = vctp16q(blkCnt);
         vecSrc = vld1q(pSrc);
-        vecDst = vmulhq(vecSrc, vdupq_n_s16(scaleFract));
-        vecDst = vqshlq_r(vecDst, shift + 1);
+        low = vmullbq_int(vecSrc, vdupq_n_s16(scaleFract));
+        low = vqshlq_r(low, shift);
+        vecDst = vqshrnbq_n_s32(vecDst,low,15);
+
+        high = vmulltq_int(vecSrc, vdupq_n_s16(scaleFract));
+        high = vqshlq_r(high, shift);
+        vecDst = vqshrntq_n_s32(vecDst,high,15);
         vstrhq_p(pDst, vecDst, p0);
     }
 
diff --git a/Source/BasicMathFunctions/arm_scale_q31.c b/Source/BasicMathFunctions/arm_scale_q31.c
index 4e28441b..5f086bad 100644
--- a/Source/BasicMathFunctions/arm_scale_q31.c
+++ b/Source/BasicMathFunctions/arm_scale_q31.c
@@ -48,7 +48,12 @@
 
   @par           Scaling and Overflow Behavior
                    The input data <code>*pSrc</code> and <code>scaleFract</code> are in 1.31 format.
-                   These are multiplied to yield a 2.62 intermediate result and this is shifted with saturation to 1.31 format.
+                   These are multiplied to yield a 2.62 intermediate result and this is shifted 
+                   with saturation to 1.31 format.
+                   There is an intermediate shift by 32 to go from the
+                   2.62 to 1.31 format. 
+                   The shift argument is applied on the 1.31 result and not to the intermediate
+                   2.62 format. 
  */
 
 #if defined(ARM_MATH_MVEI) && !defined(ARM_MATH_AUTOVECTORIZE)
diff --git a/Source/BasicMathFunctions/arm_scale_q7.c b/Source/BasicMathFunctions/arm_scale_q7.c
index 5bb4580f..c8ba5053 100644
--- a/Source/BasicMathFunctions/arm_scale_q7.c
+++ b/Source/BasicMathFunctions/arm_scale_q7.c
@@ -55,7 +55,6 @@
 
 #include "arm_helium_utils.h"
 
-
 void arm_scale_q7(
     const q7_t * pSrc,
     q7_t   scaleFract,
@@ -66,6 +65,7 @@ void arm_scale_q7(
     uint32_t  blkCnt;           /* loop counters */
     q7x16_t vecSrc;
     q7x16_t vecDst;
+    q15x8_t low, high;
 
 
     /* Compute 16 outputs at a time */
@@ -78,8 +78,14 @@ void arm_scale_q7(
          * Scale the input and then store the result in the destination buffer.
          */
         vecSrc = vld1q(pSrc);
-        vecDst = vmulhq(vecSrc, vdupq_n_s8(scaleFract));
-        vecDst = vqshlq_r(vecDst, shift + 1);
+
+        low = vmullbq_int(vecSrc, vdupq_n_s8(scaleFract));
+        low = vqshlq_r(low, shift);
+        vecDst = vqshrnbq_n_s16(vecDst,low,7);
+        high = vmulltq_int(vecSrc, vdupq_n_s8(scaleFract));
+        high = vqshlq_r(high, shift);
+        vecDst = vqshrntq_n_s16(vecDst,high,7);
+
         vst1q(pDst, vecDst);
         /*
          * Decrement the blockSize loop counter
@@ -99,9 +105,16 @@ void arm_scale_q7(
     {
         mve_pred16_t p0 = vctp8q(blkCnt);
         vecSrc = vld1q(pSrc);
-        vecDst = vmulhq(vecSrc, vdupq_n_s8(scaleFract));
-        vecDst = vqshlq_r(vecDst, shift + 1);
-        vstrbq_p(pDst, vecDst, p0);
+        low = vmullbq_int_s8(vecSrc, vdupq_n_s8(scaleFract));
+        low = vqshlq_r(low, shift);
+        vecDst = vqshrnbq_n_s16(vecDst,low,7);
+
+        high = vmulltq_int_s8(vecSrc, vdupq_n_s8(scaleFract));
+        high = vqshlq_r(high, shift);
+        vecDst = vqshrntq_n_s16(vecDst,high,7);
+
+        /* narrowing & merge */
+        vstrbq_p_s8(pDst, vecDst, p0);
     }
 
 }
diff --git a/Testing/cmsis_build/.gitignore b/Testing/cmsis_build/.gitignore
new file mode 100644
index 00000000..631ea102
--- /dev/null
+++ b/Testing/cmsis_build/.gitignore
@@ -0,0 +1,3 @@
+out/
+results*.txt
+*.html
diff --git a/Testing/cmsis_build/RTE/_test.Release_VHT_M7_UNROLLED/RTE_Components.h b/Testing/cmsis_build/RTE/_test.Release_VHT_M7_UNROLLED/RTE_Components.h
new file mode 100644
index 00000000..3e726945
--- /dev/null
+++ b/Testing/cmsis_build/RTE/_test.Release_VHT_M7_UNROLLED/RTE_Components.h
@@ -0,0 +1,21 @@
+
+/*
+ * Auto generated Run-Time-Environment Configuration File
+ *      *** Do not modify ! ***
+ *
+ * Project: 'test.Release+VHT_M7_UNROLLED' 
+ * Target:  'test.Release+VHT_M7_UNROLLED' 
+ */
+
+#ifndef RTE_COMPONENTS_H
+#define RTE_COMPONENTS_H
+
+
+/*
+ * Define the Device Header File: 
+ */
+#define CMSIS_device_header "ARMCM7_DP.h"
+
+
+
+#endif /* RTE_COMPONENTS_H */
diff --git a/Testing/cmsis_build/boot.clayer.yml b/Testing/cmsis_build/boot.clayer.yml
new file mode 100644
index 00000000..7696bbc0
--- /dev/null
+++ b/Testing/cmsis_build/boot.clayer.yml
@@ -0,0 +1,49 @@
+layer:  
+  # name: boot
+  description: Boot code for Virtual Hardware
+
+  
+
+  components:
+    - component: Device:Startup&C Startup
+      not-for-type: 
+        - +VHT-Corstone-300 
+        - +VHT-Corstone-310
+        - +FVP_A5Neon
+        - +FVP_A7Neon
+        - +FVP_A9Neon
+    - component: Device:Startup
+      for-type: 
+        - +FVP_A5Neon
+        - +FVP_A7Neon
+        - +FVP_A9Neon
+    - component: Device:IRQ Controller
+      for-type: 
+        - +FVP_A5Neon
+        - +FVP_A7Neon
+        - +FVP_A9Neon
+    - component: Device:OS Tick
+      for-type: 
+        - +FVP_A5Neon
+        - +FVP_A7Neon
+        - +FVP_A9Neon
+    - component: ARM::Device:Definition
+      for-type: 
+        - +VHT-Corstone-300 
+        - +VHT-Corstone-310
+    - component: ARM::Device:Startup&Baremetal
+      for-type: 
+        - +VHT-Corstone-300 
+        - +VHT-Corstone-310
+    - component: ARM::Native Driver:Timeout
+      for-type: 
+        - +VHT-Corstone-300 
+        - +VHT-Corstone-310
+    - component: ARM::Native Driver:SysCounter
+      for-type: 
+        - +VHT-Corstone-300 
+        - +VHT-Corstone-310
+    - component: ARM::Native Driver:SysTimer
+      for-type: 
+        - +VHT-Corstone-300 
+        - +VHT-Corstone-310
diff --git a/Testing/cmsis_build/build.bat b/Testing/cmsis_build/build.bat
new file mode 100644
index 00000000..3f9d4db7
--- /dev/null
+++ b/Testing/cmsis_build/build.bat
@@ -0,0 +1,14 @@
+ECHO OFF
+cbuild "test.Release+VHT_M0P.cprj"  
+cbuild "test.Release+VHT_M23.cprj"  
+cbuild "test.Release+VHT_M3.cprj" 
+cbuild "test.Release+VHT_M4.cprj" 
+cbuild "test.Release+VHT_M7.cprj"  
+cbuild "test.Release+VHT_M7_UNROLLED.cprj"  
+cbuild "test.Release+VHT_M33.cprj" 
+cbuild "test.Release+VHT-Corstone-300.cprj" 
+cbuild "test.Release+VHT-Corstone-310.cprj"  
+cbuild "test.Release+FVP_M55.cprj" 
+REM cbuild "test.Release+FVP_A5Neon.cprj"  
+REM cbuild "test.Release+FVP_A7Neon.cprj"  
+REM cbuild "test.Release+FVP_A9Neon.cprj"  
diff --git a/Testing/cmsis_build/build.sh b/Testing/cmsis_build/build.sh
deleted file mode 100644
index ac618d1a..00000000
--- a/Testing/cmsis_build/build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-# cbuild "test.Release+VHT_M0P.cprj"  --outdir=Objects --intdir=Tmp
-# cbuild "test.Release+VHT_M23.cprj"  --outdir=Objects --intdir=Tmp
-# cbuild "test.Release+VHT_M3.cprj"  --outdir=Objects --intdir=Tmp
-# cbuild "test.Release+VHT_M4.cprj"  --outdir=Objects --intdir=Tmp
-# cbuild "test.Release+VHT_M7.cprj"  --outdir=Objects --intdir=Tmp
-# cbuild "test.Release+VHT_M33.cprj" --outdir=Objects --intdir=Tmp
-cbuild "test.Release+VHT-Corstone-300.cprj"  --outdir=Objects --intdir=Tmp
-# cbuild "test.Release+VHT-Corstone-310.cprj"  --outdir=Objects --intdir=Tmp
-# cbuild "test.Release+FVP_M55.cprj"  --outdir=Objects --intdir=Tmp
-
-#cbuild "test.Release+FVP_A5Neon.cprj"  --outdir=Objects --intdir=Tmp
-#cbuild "test.Release+FVP_A7Neon.cprj"  --outdir=Objects --intdir=Tmp
-#cbuild "test.Release+FVP_A9Neon.cprj"  --outdir=Objects --intdir=Tmp
diff --git a/Testing/cmsis_build/buildsolution.bat b/Testing/cmsis_build/buildsolution.bat
new file mode 100644
index 00000000..b9beb208
--- /dev/null
+++ b/Testing/cmsis_build/buildsolution.bat
@@ -0,0 +1,3 @@
+ECHO OFF
+csolution convert -s testac6.csolution.yml
+REM csolution convert -s testgcc.csolution.yml
diff --git a/Testing/cmsis_build/buildsolution.sh b/Testing/cmsis_build/buildsolution.sh
deleted file mode 100644
index e8518ba6..00000000
--- a/Testing/cmsis_build/buildsolution.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-csolution convert -s test.csolution_ac6.yml
-csolution convert -s test.csolution_gcc.yml
diff --git a/Testing/cmsis_build/check.bat b/Testing/cmsis_build/check.bat
new file mode 100644
index 00000000..538a5aba
--- /dev/null
+++ b/Testing/cmsis_build/check.bat
@@ -0,0 +1,30 @@
+ECHO OFF
+ECHO "M0P"
+python ..\processResult.py  -f ..\Output.pickle -e -r results_m0p.txt -html > m0p.html
+
+ECHO "M23"
+python ..\processResult.py  -f ..\Output.pickle -e -r results_m23.txt -html > m23.html
+
+ECHO "M3"
+python ..\processResult.py  -f ..\Output.pickle -e -r results_m3.txt  -html  > m3.html
+
+ECHO "M4"
+python ..\processResult.py  -f ..\Output.pickle -e -r results_m4.txt -html > m4.html
+
+ECHO "M7"
+python ..\processResult.py  -f ..\Output.pickle -e -r results_m7.txt -html > m7.html
+
+ECHO "M7 unrolled"
+python ..\processResult.py  -f ..\Output.pickle -e -r results_m7_unrolled.txt -html > m7_unrolled.html
+
+ECHO "M33"
+python ..\processResult.py  -f ..\Output.pickle -e -r results_m33.txt -html > m33.html
+
+ECHO "CS300"
+python ..\processResult.py  -f ..\Output.pickle -e -r results_cs300.txt     -html   > cs300.html
+
+ECHO "CS300 U55"
+python ..\processResult.py  -f ..\Output.pickle -e -r results_cs300_u55.txt   -html > cs300_u55.html
+
+ECHO "CS310"
+python ..\processResult.py  -f ..\Output.pickle -e -r results_cs310.txt  -html > cs310.html
\ No newline at end of file
diff --git a/Testing/cmsis_build/dsp.clayer.yml b/Testing/cmsis_build/dsp.clayer.yml
new file mode 100644
index 00000000..fbcacf38
--- /dev/null
+++ b/Testing/cmsis_build/dsp.clayer.yml
@@ -0,0 +1,40 @@
+layer:  
+  description: CMSIS-DSP
+
+
+  add-path:
+    - ../../Include 
+    - ../../PrivateInclude
+
+  groups:
+    - group: CMSIS-DSP
+      files:
+        - file: ../../Source/BasicMathFunctions/BasicMathFunctions.c
+        - file: ../../Source/BasicMathFunctions/BasicMathFunctionsF16.c
+        - file: ../../Source/DistanceFunctions/DistanceFunctions.c
+        - file: ../../Source/DistanceFunctions/DistanceFunctionsF16.c
+        - file: ../../Source/MatrixFunctions/MatrixFunctions.c
+        - file: ../../Source/MatrixFunctions/MatrixFunctionsF16.c
+        - file: ../../Source/BayesFunctions/BayesFunctions.c
+        - file: ../../Source/BayesFunctions/BayesFunctionsF16.c
+        - file: ../../Source/FastMathFunctions/FastMathFunctions.c
+        - file: ../../Source/FastMathFunctions/FastMathFunctionsF16.c
+        - file: ../../Source/QuaternionMathFunctions/QuaternionMathFunctions.c
+        - file: ../../Source/StatisticsFunctions/StatisticsFunctions.c
+        - file: ../../Source/StatisticsFunctions/StatisticsFunctionsF16.c
+        - file: ../../Source/CommonTables/CommonTables.c
+        - file: ../../Source/CommonTables/CommonTablesF16.c
+        - file: ../../Source/FilteringFunctions/FilteringFunctions.c
+        - file: ../../Source/FilteringFunctions/FilteringFunctionsF16.c
+        - file: ../../Source/SupportFunctions/SupportFunctions.c
+        - file: ../../Source/SupportFunctions/SupportFunctionsF16.c
+        - file: ../../Source/ComplexMathFunctions/ComplexMathFunctions.c
+        - file: ../../Source/ComplexMathFunctions/ComplexMathFunctionsF16.c
+        - file: ../../Source/SVMFunctions/SVMFunctions.c
+        - file: ../../Source/SVMFunctions/SVMFunctionsF16.c
+        - file: ../../Source/InterpolationFunctions/InterpolationFunctions.c
+        - file: ../../Source/InterpolationFunctions/InterpolationFunctionsF16.c
+        - file: ../../Source/TransformFunctions/TransformFunctions.c
+        - file: ../../Source/TransformFunctions/TransformFunctionsF16.c
+        - file: ../../Source/ControllerFunctions/ControllerFunctions.c
+     
\ No newline at end of file
diff --git a/Testing/cmsis_build/runarmds.bat b/Testing/cmsis_build/runarmds.bat
index d0b5ccf6..ad01d0c3 100644
--- a/Testing/cmsis_build/runarmds.bat
+++ b/Testing/cmsis_build/runarmds.bat
@@ -1,11 +1,11 @@
-REM "C:\Program Files\ARM\Development Studio 2022.0\bin\FVP_VE_Cortex-A5x1.exe" ^
-REM     -f configs/ARMCA5neon_config.txt ^
-REM     Objects\test.Release+FVP_A5Neon.axf
+"C:\Program Files\ARM\Development Studio 2022.0\bin\FVP_VE_Cortex-A5x1.exe" ^
+    -f configs/ARMCA5neon_config.txt ^
+    Objects\test.Release+FVP_A5Neon.axf > results_a5.txt
 
-REM "C:\Program Files\ARM\Development Studio 2022.0\bin\FVP_VE_Cortex-A7x1.exe" ^
-REM     -f configs/ARMCA7neon_config.txt ^
-REM     Objects\test.Release+FVP_A7Neon.axf
+"C:\Program Files\ARM\Development Studio 2022.0\bin\FVP_VE_Cortex-A7x1.exe" ^
+    -f configs/ARMCA7neon_config.txt ^
+    Objects\test.Release+FVP_A7Neon.axf > results_a7.txt
 
 "C:\Program Files\ARM\Development Studio 2022.0\bin\FVP_VE_Cortex-A9x1.exe" ^
     -f configs/ARMCA9neon_config.txt ^
-    Objects\test.Release+FVP_A9Neon.axf
\ No newline at end of file
+    Objects\test.Release+FVP_A9Neon.axf > results_a9.txt
\ No newline at end of file
diff --git a/Testing/cmsis_build/runkeil.bat b/Testing/cmsis_build/runkeil.bat
index e6ea2aba..812e14e8 100644
--- a/Testing/cmsis_build/runkeil.bat
+++ b/Testing/cmsis_build/runkeil.bat
@@ -1,40 +1,42 @@
-REM C:\Keil_v5\ARM\VHT\VHT_MPS2_Cortex-M0plus.exe ^
-REM    -f configs/ARM_VHT_MPS2_M0plus_config.txt ^
-REM    Objects\test.Release+VHT_M0P.axf 
+ECHO OFF
+C:\Keil_v5\ARM\VHT\VHT_MPS2_Cortex-M0plus.exe ^
+   -f configs/ARM_VHT_MPS2_M0plus_config.txt ^
+   out\test\VHT_M0P\Release\test.Release+VHT_M0P.axf > results_m0p.txt
 
-REM C:\Keil_v5\ARM\VHT\VHT_MPS2_Cortex-M23.exe ^
-REM    -f configs/ARM_VHT_MPS2_M23_config.txt ^
-REM    Objects\test.Release+VHT_M23.axf 
+C:\Keil_v5\ARM\VHT\VHT_MPS2_Cortex-M23.exe ^
+   -f configs/ARM_VHT_MPS2_M23_config.txt ^
+   out\test\VHT_M23\Release\test.Release+VHT_M23.axf > results_m23.txt
 
-REM C:\Keil_v5\ARM\VHT\VHT_MPS2_Cortex-M3.exe ^
-REM    -f configs/ARM_VHT_MPS2_M3_config.txt ^
-REM    Objects\test.Release+VHT_M3.axf 
+C:\Keil_v5\ARM\VHT\VHT_MPS2_Cortex-M3.exe ^
+   -f configs/ARM_VHT_MPS2_M3_config.txt ^
+   out\test\VHT_M3\Release\test.Release+VHT_M3.axf > results_m3.txt
 
-REM C:\Keil_v5\ARM\VHT\VHT_MPS2_Cortex-M4.exe ^
-REM    -f configs/ARM_VHT_MPS2_M4FP_config.txt ^
-REM    Objects\test.Release+VHT_M4.axf 
+C:\Keil_v5\ARM\VHT\VHT_MPS2_Cortex-M4.exe ^
+   -f configs/ARM_VHT_MPS2_M4FP_config.txt ^
+   out\test\VHT_M4\Release\test.Release+VHT_M4.axf > results_m4.txt
 
-REM C:\Keil_v5\ARM\VHT\VHT_MPS2_Cortex-M7.exe ^
-REM    -f configs/ARM_VHT_MPS2_M7DP_config.txt ^
-REM    Objects\test.Release+VHT_M7.axf 
+C:\Keil_v5\ARM\VHT\VHT_MPS2_Cortex-M7.exe ^
+   -f configs/ARM_VHT_MPS2_M7DP_config.txt ^
+   out\test\VHT_M7\Release\test.Release+VHT_M7.axf > results_m7.txt
 
-REM C:\Keil_v5\ARM\VHT\VHT_MPS2_Cortex-M33.exe ^
-REM    -f configs/ARM_VHT_MPS2_M33_DSP_FP_config.txt ^
-REM    -a cpu0="Objects\test.Release+VHT_M33.axf" 
+C:\Keil_v5\ARM\VHT\VHT_MPS2_Cortex-M7.exe ^
+   -f configs/ARM_VHT_MPS2_M7DP_config.txt ^
+   out\test\VHT_M7_UNROLLED\Release\test.Release+VHT_M7_UNROLLED.axf > results_m7_unrolled.txt
 
-REM C:\Keil_v5\ARM\VHT\VHT_MPS3_Corstone_SSE-300.exe ^
-REM   -f configs/ARM_VHT_Corstone_300_config.txt ^
-REM   -a cpu0="Objects\test.Release+VHT-Corstone-300.axf" 
 
+C:\Keil_v5\ARM\VHT\VHT_MPS2_Cortex-M33.exe ^
+   -f configs/ARM_VHT_MPS2_M33_DSP_FP_config.txt ^
+   -a cpu0="out\test\VHT_M33\Release\test.Release+VHT_M33.axf" > results_m33.txt
+
+C:\Keil_v5\ARM\VHT\VHT_MPS3_Corstone_SSE-300.exe ^
+  -f configs/ARM_VHT_Corstone_300_config.txt ^
+  -a cpu0="out\test\VHT-Corstone-300\Release\test.Release+VHT-Corstone-300.axf" > results_cs300.txt
 
-REM C:\Keil_v5\ARM\VHT\VHT_Corstone_SSE-310.exe ^
-REM   -f configs/ARM_VHT_Corstone_310_config.txt ^
-REM   -a cpu0="Objects\test.Release+VHT-Corstone-310.axf" 
+
+C:\Keil_v5\ARM\VHT\VHT_Corstone_SSE-310.exe ^
+  -f configs/ARM_VHT_Corstone_310_config.txt ^
+  -a cpu0="out\test\VHT-Corstone-310\Release\test.Release+VHT-Corstone-310.axf" > results_cs310.txt
 
 C:\Keil_v5\ARM\VHT\VHT_Corstone_SSE-300_Ethos-U55.exe ^
   -f configs/ARM_VHT_Corstone_300_config.txt ^
-  -a cpu0="Objects\test.Release+VHT-Corstone-300.axf" 
-
-REM C:\Keil_v5\ARM\FVP\MPS2_Cortex-M\FVP_MPS2_Cortex-M55_MDK.exe ^
-REM    -f configs/ARM_VHT_MPS2_M55_config.txt ^
-REM    Objects\test.Release+FVP_M55.axf 
\ No newline at end of file
+  -a cpu0="out\test\VHT-Corstone-300\Release\test.Release+VHT-Corstone-300.axf" > results_cs300_u55.txt
diff --git a/Testing/cmsis_build/test.Release+FVP_A5Neon.cprj b/Testing/cmsis_build/test.Release+FVP_A5Neon.cprj
index 5b4531b6..ba0deb8d 100644
--- a/Testing/cmsis_build/test.Release+FVP_A5Neon.cprj
+++ b/Testing/cmsis_build/test.Release+FVP_A5Neon.cprj
@@ -1,42 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2022-08-03T08:32:02" tool="csolution 0.9.6"/>
+  <created timestamp="2022-10-21T07:15:38" tool="csolution 1.1.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
   </info>
 
   <packages>
-    <package name="CMSIS-DSP" vendor="ARM" version="1.11.0:1.11.0"/>
-    <package name="CMSIS" vendor="ARM" version="5.9.1:5.9.1"/>
+    <package name="CMSIS" vendor="ARM" version="5.9.0:5.9.0"/>
   </packages>
 
   <compilers>
-    <compiler name="GCC" version="10.2.1"/>
+    <compiler name="AC6" version="6.18.0"/>
   </compilers>
 
   <target Dfpu="DP_FPU" Dname="ARMCA5" Dsecure="Non-secure" Dvendor="ARM:82">
-    <output intdir="test.Release+FVP_A5Neon_IntDir/" name="test.Release+FVP_A5Neon" outdir="test.Release+FVP_A5Neon_OutDir/" type="exe"/>
-    <asflags add="-masm=auto" compiler="GCC"/>
-    <cflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c11 -Ofast -ffast-math  -flax-vector-conversions" compiler="GCC"/>
-    <cxxflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections  -std=c++11 -Ofast -ffast-math  -flax-vector-conversions -Wno-unused-parameter" compiler="GCC"/>
-    <ldflags add="--specs=nano.specs --specs=rdimon.specs --entry=Reset_Handler -Wl,--gc-sections" compiler="GCC" file="RTE/Device/ARMCA5/ARMCA5.ld"/>
+    <output intdir="tmp/test/FVP_A5Neon/Release" name="test.Release+FVP_A5Neon" outdir="out/test/FVP_A5Neon/Release" rtedir="RTE" type="exe"/>
+    <asflags add="-masm=auto" compiler="AC6"/>
+    <cflags add="-std=c11 -Ofast -ffast-math" compiler="AC6"/>
+    <cxxflags add="-std=c++11 -Ofast -ffast-math" compiler="AC6"/>
+    <ldflags add="--entry=Reset_Handler --info=summarysizes --info=sizes --info=totals --info=unused --info=veneers" compiler="AC6" file="RTE/Device/ARMCA5/ARMCA5.sct"/>
     <defines>EMBEDDED;NORMALFVP;CORTEXA</defines>
-    <includes>../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
+    <includes>../../Include;../../PrivateInclude;../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
   </target>
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="1.2.1"/>
-    <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Source" Cvendor="ARM" Cversion="1.11.0">
-      <defines>ARM_MATH_NEON;DISABLEFLOAT16</defines>
-    </component>
     <component Cclass="Device" Cgroup="IRQ Controller" Csub="GIC" Cvendor="ARM" Cversion="1.0.1"/>
     <component Cclass="Device" Cgroup="OS Tick" Csub="Private Timer" Cvendor="ARM" Cversion="1.0.2"/>
     <component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.0.1">
       <file attr="config" category="header" name="Device/ARM/ARMCA5/Config/mem_ARMCA5.h" version="1.1.0"/>
       <file attr="config" category="header" name="Device/ARM/ARMCA5/Config/system_ARMCA5.h" version="1.0.0"/>
-      <file attr="config" category="linkerScript" name="Device/ARM/ARMCA5/Source/GCC/ARMCA5.ld" version="1.0.0"/>
-      <file attr="config" category="sourceC" name="Device/ARM/ARMCA5/Source/GCC/startup_ARMCA5.c" version="1.0.1"/>
+      <file attr="config" category="linkerScript" name="Device/ARM/ARMCA5/Source/AC6/ARMCA5.sct" version="1.0.0"/>
+      <file attr="config" category="sourceC" name="Device/ARM/ARMCA5/Source/AC6/startup_ARMCA5.c" version="1.0.1"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCA5/Source/mmu_ARMCA5.c" version="1.2.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCA5/Source/system_ARMCA5.c" version="1.0.1"/>
     </component>
@@ -162,6 +158,36 @@
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ15.cpp"/>
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ31.cpp"/>
     </group>
+    <group name="CMSIS-DSP">
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctions.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctions.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctions.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/QuaternionMathFunctions/QuaternionMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTables.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTablesF16.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctions.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctions.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctions.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctions.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctions.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ControllerFunctions/ControllerFunctions.c"/>
+    </group>
   </files>
 </cprj>
 
diff --git a/Testing/cmsis_build/test.Release+FVP_A7Neon.cprj b/Testing/cmsis_build/test.Release+FVP_A7Neon.cprj
index 5fdfb82c..afa3437c 100644
--- a/Testing/cmsis_build/test.Release+FVP_A7Neon.cprj
+++ b/Testing/cmsis_build/test.Release+FVP_A7Neon.cprj
@@ -1,42 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2022-08-03T08:32:02" tool="csolution 0.9.6"/>
+  <created timestamp="2022-10-21T07:15:38" tool="csolution 1.1.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
   </info>
 
   <packages>
-    <package name="CMSIS-DSP" vendor="ARM" version="1.11.0:1.11.0"/>
-    <package name="CMSIS" vendor="ARM" version="5.9.1:5.9.1"/>
+    <package name="CMSIS" vendor="ARM" version="5.9.0:5.9.0"/>
   </packages>
 
   <compilers>
-    <compiler name="GCC" version="10.2.1"/>
+    <compiler name="AC6" version="6.18.0"/>
   </compilers>
 
   <target Dfpu="DP_FPU" Dname="ARMCA7" Dsecure="Non-secure" Dvendor="ARM:82">
-    <output intdir="test.Release+FVP_A7Neon_IntDir/" name="test.Release+FVP_A7Neon" outdir="test.Release+FVP_A7Neon_OutDir/" type="exe"/>
-    <asflags add="-masm=auto" compiler="GCC"/>
-    <cflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c11 -Ofast -ffast-math  -flax-vector-conversions" compiler="GCC"/>
-    <cxxflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections  -std=c++11 -Ofast -ffast-math  -flax-vector-conversions -Wno-unused-parameter" compiler="GCC"/>
-    <ldflags add="--specs=nano.specs --specs=rdimon.specs --entry=Reset_Handler -Wl,--gc-sections" compiler="GCC" file="RTE/Device/ARMCA7/ARMCA7.ld"/>
+    <output intdir="tmp/test/FVP_A7Neon/Release" name="test.Release+FVP_A7Neon" outdir="out/test/FVP_A7Neon/Release" rtedir="RTE" type="exe"/>
+    <asflags add="-masm=auto" compiler="AC6"/>
+    <cflags add="-std=c11 -Ofast -ffast-math" compiler="AC6"/>
+    <cxxflags add="-std=c++11 -Ofast -ffast-math" compiler="AC6"/>
+    <ldflags add="--entry=Reset_Handler --info=summarysizes --info=sizes --info=totals --info=unused --info=veneers" compiler="AC6" file="RTE/Device/ARMCA7/ARMCA7.sct"/>
     <defines>EMBEDDED;NORMALFVP;CORTEXA</defines>
-    <includes>../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
+    <includes>../../Include;../../PrivateInclude;../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
   </target>
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="1.2.1"/>
-    <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Source" Cvendor="ARM" Cversion="1.11.0">
-      <defines>ARM_MATH_NEON;DISABLEFLOAT16</defines>
-    </component>
     <component Cclass="Device" Cgroup="IRQ Controller" Csub="GIC" Cvendor="ARM" Cversion="1.0.1"/>
     <component Cclass="Device" Cgroup="OS Tick" Csub="Generic Physical Timer" Cvendor="ARM" Cversion="1.0.1"/>
     <component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.0.1">
       <file attr="config" category="header" name="Device/ARM/ARMCA7/Config/mem_ARMCA7.h" version="1.1.0"/>
       <file attr="config" category="header" name="Device/ARM/ARMCA7/Config/system_ARMCA7.h" version="1.0.0"/>
-      <file attr="config" category="linkerScript" name="Device/ARM/ARMCA7/Source/GCC/ARMCA7.ld" version="1.0.0"/>
-      <file attr="config" category="sourceC" name="Device/ARM/ARMCA7/Source/GCC/startup_ARMCA7.c" version="1.0.1"/>
+      <file attr="config" category="linkerScript" name="Device/ARM/ARMCA7/Source/AC6/ARMCA7.sct" version="1.0.0"/>
+      <file attr="config" category="sourceC" name="Device/ARM/ARMCA7/Source/AC6/startup_ARMCA7.c" version="1.0.1"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCA7/Source/mmu_ARMCA7.c" version="1.2.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCA7/Source/system_ARMCA7.c" version="1.0.1"/>
     </component>
@@ -162,6 +158,36 @@
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ15.cpp"/>
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ31.cpp"/>
     </group>
+    <group name="CMSIS-DSP">
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctions.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctions.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctions.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/QuaternionMathFunctions/QuaternionMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTables.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTablesF16.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctions.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctions.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctions.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctions.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctions.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ControllerFunctions/ControllerFunctions.c"/>
+    </group>
   </files>
 </cprj>
 
diff --git a/Testing/cmsis_build/test.Release+FVP_A9Neon.cprj b/Testing/cmsis_build/test.Release+FVP_A9Neon.cprj
index 898dcb5b..eb33778c 100644
--- a/Testing/cmsis_build/test.Release+FVP_A9Neon.cprj
+++ b/Testing/cmsis_build/test.Release+FVP_A9Neon.cprj
@@ -1,42 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2022-08-03T08:32:03" tool="csolution 0.9.6"/>
+  <created timestamp="2022-10-21T07:15:38" tool="csolution 1.1.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
   </info>
 
   <packages>
-    <package name="CMSIS-DSP" vendor="ARM" version="1.11.0:1.11.0"/>
-    <package name="CMSIS" vendor="ARM" version="5.9.1:5.9.1"/>
+    <package name="CMSIS" vendor="ARM" version="5.9.0:5.9.0"/>
   </packages>
 
   <compilers>
-    <compiler name="GCC" version="10.2.1"/>
+    <compiler name="AC6" version="6.18.0"/>
   </compilers>
 
   <target Dfpu="DP_FPU" Dname="ARMCA9" Dsecure="Non-secure" Dvendor="ARM:82">
-    <output intdir="test.Release+FVP_A9Neon_IntDir/" name="test.Release+FVP_A9Neon" outdir="test.Release+FVP_A9Neon_OutDir/" type="exe"/>
-    <asflags add="-masm=auto" compiler="GCC"/>
-    <cflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c11 -Ofast -ffast-math  -flax-vector-conversions" compiler="GCC"/>
-    <cxxflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections  -std=c++11 -Ofast -ffast-math  -flax-vector-conversions -Wno-unused-parameter" compiler="GCC"/>
-    <ldflags add="--specs=nano.specs --specs=rdimon.specs --entry=Reset_Handler -Wl,--gc-sections" compiler="GCC" file="RTE/Device/ARMCA9/ARMCA9.ld"/>
+    <output intdir="tmp/test/FVP_A9Neon/Release" name="test.Release+FVP_A9Neon" outdir="out/test/FVP_A9Neon/Release" rtedir="RTE" type="exe"/>
+    <asflags add="-masm=auto" compiler="AC6"/>
+    <cflags add="-std=c11 -Ofast -ffast-math" compiler="AC6"/>
+    <cxxflags add="-std=c++11 -Ofast -ffast-math" compiler="AC6"/>
+    <ldflags add="--entry=Reset_Handler --info=summarysizes --info=sizes --info=totals --info=unused --info=veneers" compiler="AC6" file="RTE/Device/ARMCA9/ARMCA9.sct"/>
     <defines>EMBEDDED;NORMALFVP;CORTEXA</defines>
-    <includes>../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
+    <includes>../../Include;../../PrivateInclude;../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
   </target>
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="1.2.1"/>
-    <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Source" Cvendor="ARM" Cversion="1.11.0">
-      <defines>ARM_MATH_AUTOVECTORIZE;DISABLEFLOAT16</defines>
-    </component>
     <component Cclass="Device" Cgroup="IRQ Controller" Csub="GIC" Cvendor="ARM" Cversion="1.0.1"/>
     <component Cclass="Device" Cgroup="OS Tick" Csub="Private Timer" Cvendor="ARM" Cversion="1.0.2"/>
     <component Cclass="Device" Cgroup="Startup" Cvendor="ARM" Cversion="1.0.2">
       <file attr="config" category="header" name="Device/ARM/ARMCA9/Config/mem_ARMCA9.h" version="1.1.0"/>
       <file attr="config" category="header" name="Device/ARM/ARMCA9/Config/system_ARMCA9.h" version="1.0.0"/>
-      <file attr="config" category="linkerScript" name="Device/ARM/ARMCA9/Source/GCC/ARMCA9.ld" version="1.0.0"/>
-      <file attr="config" category="sourceC" name="Device/ARM/ARMCA9/Source/GCC/startup_ARMCA9.c" version="1.0.1"/>
+      <file attr="config" category="linkerScript" name="Device/ARM/ARMCA9/Source/AC6/ARMCA9.sct" version="1.0.0"/>
+      <file attr="config" category="sourceC" name="Device/ARM/ARMCA9/Source/AC6/startup_ARMCA9.c" version="1.0.1"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCA9/Source/mmu_ARMCA9.c" version="1.2.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCA9/Source/system_ARMCA9.c" version="1.0.1"/>
     </component>
@@ -162,6 +158,36 @@
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ15.cpp"/>
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ31.cpp"/>
     </group>
+    <group name="CMSIS-DSP">
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctions.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctions.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctions.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/QuaternionMathFunctions/QuaternionMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTables.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTablesF16.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctions.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctions.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctions.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctions.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctions.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ControllerFunctions/ControllerFunctions.c"/>
+    </group>
   </files>
 </cprj>
 
diff --git a/Testing/cmsis_build/test.Release+FVP_M55.cprj b/Testing/cmsis_build/test.Release+FVP_M55.cprj
index 83eaf8ad..e52e129f 100644
--- a/Testing/cmsis_build/test.Release+FVP_M55.cprj
+++ b/Testing/cmsis_build/test.Release+FVP_M55.cprj
@@ -1,35 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2022-08-03T08:32:03" tool="csolution 0.9.6"/>
+  <created timestamp="2022-10-21T07:15:38" tool="csolution 1.1.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
   </info>
 
   <packages>
-    <package name="CMSIS-DSP" vendor="ARM" version="1.11.0:1.11.0"/>
-    <package name="CMSIS" vendor="ARM" version="5.9.1:5.9.1"/>
+    <package name="CMSIS" vendor="ARM" version="5.9.0:5.9.0"/>
   </packages>
 
   <compilers>
-    <compiler name="GCC" version="10.2.1"/>
+    <compiler name="AC6" version="6.18.0"/>
   </compilers>
 
   <target Ddsp="DSP" Dfpu="DP_FPU" Dmve="FP_MVE" Dname="ARMCM55" Dsecure="Non-secure" Dtz="TZ" Dvendor="ARM:82">
-    <output intdir="test.Release+FVP_M55_IntDir/" name="test.Release+FVP_M55" outdir="test.Release+FVP_M55_OutDir/" type="exe"/>
-    <asflags add="-masm=auto" compiler="GCC"/>
-    <cflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c11 -Ofast -ffast-math  -flax-vector-conversions" compiler="GCC"/>
-    <cxxflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections  -std=c++11 -Ofast -ffast-math  -flax-vector-conversions -Wno-unused-parameter" compiler="GCC"/>
-    <ldflags add="--specs=nano.specs --specs=rdimon.specs --entry=Reset_Handler -Wl,--gc-sections" compiler="GCC" file="RTE/Device/ARMCM55/gcc_arm.ld"/>
+    <output intdir="tmp/test/FVP_M55/Release" name="test.Release+FVP_M55" outdir="out/test/FVP_M55/Release" rtedir="RTE" type="exe"/>
+    <asflags add="-masm=auto" compiler="AC6"/>
+    <cflags add="-std=c11 -Ofast -ffast-math" compiler="AC6"/>
+    <cxxflags add="-std=c++11 -Ofast -ffast-math" compiler="AC6"/>
+    <ldflags add="--entry=Reset_Handler --info=summarysizes --info=sizes --info=totals --info=unused --info=veneers" compiler="AC6" file="RTE/Device/ARMCM55/ARMCM55_ac6.sct"/>
     <defines>EMBEDDED;NORMALFVP;CORTEXM</defines>
-    <includes>../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
+    <includes>../../Include;../../PrivateInclude;../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
   </target>
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Source" Cvendor="ARM" Cversion="1.11.0"/>
     <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="1.1.0">
-      <file attr="config" category="linkerScript" name="Device/ARM/ARMCM55/Source/GCC/gcc_arm.ld" version="2.2.0"/>
+      <file attr="config" category="linkerScript" name="Device/ARM/ARMCM55/Source/ARM/ARMCM55_ac6.sct" version="1.1.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM55/Source/startup_ARMCM55.c" version="1.1.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM55/Source/system_ARMCM55.c" version="1.1.0"/>
     </component>
@@ -155,6 +153,36 @@
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ15.cpp"/>
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ31.cpp"/>
     </group>
+    <group name="CMSIS-DSP">
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctions.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctions.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctions.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/QuaternionMathFunctions/QuaternionMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTables.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTablesF16.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctions.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctions.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctions.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctions.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctions.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ControllerFunctions/ControllerFunctions.c"/>
+    </group>
   </files>
 </cprj>
 
diff --git a/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj b/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj
index dff38564..efefa0a1 100644
--- a/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj
+++ b/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2022-08-03T08:32:01" tool="csolution 0.9.6"/>
+  <created timestamp="2022-10-21T07:15:38" tool="csolution 1.1.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
   </info>
 
   <packages>
-    <package name="CMSIS-DSP" vendor="ARM" version="1.11.0:1.11.0"/>
     <package name="CMSIS" vendor="ARM" version="5.9.0:5.9.0"/>
     <package name="V2M_MPS3_SSE_300_BSP" vendor="ARM" version="1.3.0:1.3.0"/>
   </packages>
@@ -17,18 +16,17 @@
   </compilers>
 
   <target Ddsp="DSP" Dfpu="DP_FPU" Dmve="FP_MVE" Dname="SSE-300-MPS3" Dsecure="Non-secure" Dtz="TZ" Dvendor="ARM:82">
-    <output intdir="test.Release+VHT-Corstone-300_IntDir/" name="test.Release+VHT-Corstone-300" outdir="test.Release+VHT-Corstone-300_OutDir/" type="exe"/>
+    <output intdir="tmp/test/VHT-Corstone-300/Release" name="test.Release+VHT-Corstone-300" outdir="out/test/VHT-Corstone-300/Release" rtedir="RTE" type="exe"/>
     <asflags add="-masm=auto" compiler="AC6"/>
     <cflags add="-std=c11 -Ofast -ffast-math" compiler="AC6"/>
     <cxxflags add="-std=c++11 -Ofast -ffast-math" compiler="AC6"/>
     <ldflags add="--entry=Reset_Handler --info=summarysizes --info=sizes --info=totals --info=unused --info=veneers" compiler="AC6" file="RTE/Device/SSE-300-MPS3/fvp_sse300_mps3_s.sct"/>
     <defines>EMBEDDED;NORMALFVP;CORTEXM</defines>
-    <includes>../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
+    <includes>../../Include;../../PrivateInclude;../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
   </target>
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Source" Cvendor="ARM" Cversion="1.11.0"/>
     <component Cclass="Device" Cgroup="Definition" Cvendor="ARM" Cversion="1.2.0">
       <file attr="config" category="header" name="Board/Platform/platform_base_address.h" version="1.1.2"/>
     </component>
@@ -168,6 +166,36 @@
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ15.cpp"/>
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ31.cpp"/>
     </group>
+    <group name="CMSIS-DSP">
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctions.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctions.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctions.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/QuaternionMathFunctions/QuaternionMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTables.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTablesF16.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctions.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctions.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctions.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctions.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctions.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ControllerFunctions/ControllerFunctions.c"/>
+    </group>
   </files>
 </cprj>
 
diff --git a/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj b/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj
index 1d4a66e8..8f8b84dd 100644
--- a/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj
+++ b/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2022-08-03T08:32:01" tool="csolution 0.9.6"/>
+  <created timestamp="2022-10-21T07:15:38" tool="csolution 1.1.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
   </info>
 
   <packages>
-    <package name="CMSIS-DSP" vendor="ARM" version="1.11.0:1.11.0"/>
     <package name="CMSIS" vendor="ARM" version="5.9.0:5.9.0"/>
     <package name="V2M_MPS3_SSE_310_BSP" vendor="ARM" version="1.0.0:1.0.0"/>
   </packages>
@@ -17,18 +16,17 @@
   </compilers>
 
   <target Ddsp="DSP" Dfpu="DP_FPU" Dmve="FP_MVE" Dname="SSE-310-MPS3" Dsecure="Non-secure" Dtz="TZ" Dvendor="ARM:82">
-    <output intdir="test.Release+VHT-Corstone-310_IntDir/" name="test.Release+VHT-Corstone-310" outdir="test.Release+VHT-Corstone-310_OutDir/" type="exe"/>
+    <output intdir="tmp/test/VHT-Corstone-310/Release" name="test.Release+VHT-Corstone-310" outdir="out/test/VHT-Corstone-310/Release" rtedir="RTE" type="exe"/>
     <asflags add="-masm=auto" compiler="AC6"/>
     <cflags add="-std=c11 -Ofast -ffast-math" compiler="AC6"/>
     <cxxflags add="-std=c++11 -Ofast -ffast-math" compiler="AC6"/>
     <ldflags add="--entry=Reset_Handler --info=summarysizes --info=sizes --info=totals --info=unused --info=veneers" compiler="AC6" file="RTE/Device/SSE-310-MPS3/corstone310_mps3_s.sct"/>
     <defines>EMBEDDED;NORMALFVP;CORTEXM</defines>
-    <includes>../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
+    <includes>../../Include;../../PrivateInclude;../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
   </target>
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Source" Cvendor="ARM" Cversion="1.11.0"/>
     <component Cclass="Device" Cgroup="Definition" Cvendor="ARM" Cversion="1.0.0">
       <file attr="config" category="header" name="Board/Platform/platform_base_address.h" version="1.0.0"/>
     </component>
@@ -168,6 +166,36 @@
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ15.cpp"/>
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ31.cpp"/>
     </group>
+    <group name="CMSIS-DSP">
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctions.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctions.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctions.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/QuaternionMathFunctions/QuaternionMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTables.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTablesF16.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctions.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctions.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctions.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctions.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctions.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ControllerFunctions/ControllerFunctions.c"/>
+    </group>
   </files>
 </cprj>
 
diff --git a/Testing/cmsis_build/test.Release+VHT_M0P.cprj b/Testing/cmsis_build/test.Release+VHT_M0P.cprj
index 372feac0..b276440b 100644
--- a/Testing/cmsis_build/test.Release+VHT_M0P.cprj
+++ b/Testing/cmsis_build/test.Release+VHT_M0P.cprj
@@ -1,35 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2022-08-03T08:32:03" tool="csolution 0.9.6"/>
+  <created timestamp="2022-10-21T07:15:38" tool="csolution 1.1.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
   </info>
 
   <packages>
-    <package name="CMSIS-DSP" vendor="ARM" version="1.11.0:1.11.0"/>
-    <package name="CMSIS" vendor="ARM" version="5.9.1:5.9.1"/>
+    <package name="CMSIS" vendor="ARM" version="5.9.0:5.9.0"/>
   </packages>
 
   <compilers>
-    <compiler name="GCC" version="10.2.1"/>
+    <compiler name="AC6" version="6.18.0"/>
   </compilers>
 
   <target Dfpu="NO_FPU" Dname="ARMCM0P" Dsecure="Non-secure" Dvendor="ARM:82">
-    <output intdir="test.Release+VHT_M0P_IntDir/" name="test.Release+VHT_M0P" outdir="test.Release+VHT_M0P_OutDir/" type="exe"/>
-    <asflags add="-masm=auto" compiler="GCC"/>
-    <cflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c11 -Ofast -ffast-math  -flax-vector-conversions" compiler="GCC"/>
-    <cxxflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections  -std=c++11 -Ofast -ffast-math  -flax-vector-conversions -Wno-unused-parameter" compiler="GCC"/>
-    <ldflags add="--specs=nano.specs --specs=rdimon.specs --entry=Reset_Handler -Wl,--gc-sections" compiler="GCC" file="RTE/Device/ARMCM0P/gcc_arm.ld"/>
+    <output intdir="tmp/test/VHT_M0P/Release" name="test.Release+VHT_M0P" outdir="out/test/VHT_M0P/Release" rtedir="RTE" type="exe"/>
+    <asflags add="-masm=auto" compiler="AC6"/>
+    <cflags add="-std=c11 -Ofast -ffast-math" compiler="AC6"/>
+    <cxxflags add="-std=c++11 -Ofast -ffast-math" compiler="AC6"/>
+    <ldflags add="--entry=Reset_Handler --info=summarysizes --info=sizes --info=totals --info=unused --info=veneers" compiler="AC6" file="RTE/Device/ARMCM0P/ARMCM0plus_ac6.sct"/>
     <defines>EMBEDDED;NORMALFVP;CORTEXM</defines>
-    <includes>../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
+    <includes>../../Include;../../PrivateInclude;../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
   </target>
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Source" Cvendor="ARM" Cversion="1.11.0"/>
     <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.0.3">
-      <file attr="config" category="linkerScript" name="Device/ARM/ARMCM0plus/Source/GCC/gcc_arm.ld" version="2.1.0"/>
+      <file attr="config" category="linkerScript" name="Device/ARM/ARMCM0plus/Source/ARM/ARMCM0plus_ac6.sct" version="1.0.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM0plus/Source/startup_ARMCM0plus.c" version="2.0.3"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM0plus/Source/system_ARMCM0plus.c" version="1.0.0"/>
     </component>
@@ -155,6 +153,36 @@
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ15.cpp"/>
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ31.cpp"/>
     </group>
+    <group name="CMSIS-DSP">
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctions.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctions.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctions.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/QuaternionMathFunctions/QuaternionMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTables.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTablesF16.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctions.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctions.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctions.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctions.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctions.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ControllerFunctions/ControllerFunctions.c"/>
+    </group>
   </files>
 </cprj>
 
diff --git a/Testing/cmsis_build/test.Release+VHT_M23.cprj b/Testing/cmsis_build/test.Release+VHT_M23.cprj
index 4daa5f9a..956a63f6 100644
--- a/Testing/cmsis_build/test.Release+VHT_M23.cprj
+++ b/Testing/cmsis_build/test.Release+VHT_M23.cprj
@@ -1,35 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2022-08-03T08:32:03" tool="csolution 0.9.6"/>
+  <created timestamp="2022-10-21T07:15:38" tool="csolution 1.1.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
   </info>
 
   <packages>
-    <package name="CMSIS-DSP" vendor="ARM" version="1.11.0:1.11.0"/>
-    <package name="CMSIS" vendor="ARM" version="5.9.1:5.9.1"/>
+    <package name="CMSIS" vendor="ARM" version="5.9.0:5.9.0"/>
   </packages>
 
   <compilers>
-    <compiler name="GCC" version="10.2.1"/>
+    <compiler name="AC6" version="6.18.0"/>
   </compilers>
 
   <target Dfpu="NO_FPU" Dname="ARMCM23" Dsecure="Non-secure" Dtz="NO_TZ" Dvendor="ARM:82">
-    <output intdir="test.Release+VHT_M23_IntDir/" name="test.Release+VHT_M23" outdir="test.Release+VHT_M23_OutDir/" type="exe"/>
-    <asflags add="-masm=auto" compiler="GCC"/>
-    <cflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c11 -Ofast -ffast-math  -flax-vector-conversions" compiler="GCC"/>
-    <cxxflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections  -std=c++11 -Ofast -ffast-math  -flax-vector-conversions -Wno-unused-parameter" compiler="GCC"/>
-    <ldflags add="--specs=nano.specs --specs=rdimon.specs --entry=Reset_Handler -Wl,--gc-sections" compiler="GCC" file="RTE/Device/ARMCM23/gcc_arm.ld"/>
+    <output intdir="tmp/test/VHT_M23/Release" name="test.Release+VHT_M23" outdir="out/test/VHT_M23/Release" rtedir="RTE" type="exe"/>
+    <asflags add="-masm=auto" compiler="AC6"/>
+    <cflags add="-std=c11 -Ofast -ffast-math" compiler="AC6"/>
+    <cxxflags add="-std=c++11 -Ofast -ffast-math" compiler="AC6"/>
+    <ldflags add="--entry=Reset_Handler --info=summarysizes --info=sizes --info=totals --info=unused --info=veneers" compiler="AC6" file="RTE/Device/ARMCM23/ARMCM23_ac6.sct"/>
     <defines>EMBEDDED;NORMALFVP;CORTEXM</defines>
-    <includes>../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
+    <includes>../../Include;../../PrivateInclude;../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
   </target>
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Source" Cvendor="ARM" Cversion="1.11.0"/>
     <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.1.0">
-      <file attr="config" category="linkerScript" name="Device/ARM/ARMCM23/Source/GCC/gcc_arm.ld" version="2.2.0"/>
+      <file attr="config" category="linkerScript" name="Device/ARM/ARMCM23/Source/ARM/ARMCM23_ac6.sct" version="1.1.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM23/Source/startup_ARMCM23.c" version="2.1.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM23/Source/system_ARMCM23.c" version="1.0.1"/>
     </component>
@@ -155,6 +153,36 @@
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ15.cpp"/>
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ31.cpp"/>
     </group>
+    <group name="CMSIS-DSP">
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctions.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctions.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctions.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/QuaternionMathFunctions/QuaternionMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTables.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTablesF16.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctions.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctions.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctions.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctions.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctions.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ControllerFunctions/ControllerFunctions.c"/>
+    </group>
   </files>
 </cprj>
 
diff --git a/Testing/cmsis_build/test.Release+VHT_M3.cprj b/Testing/cmsis_build/test.Release+VHT_M3.cprj
index 2174e92e..1379ba80 100644
--- a/Testing/cmsis_build/test.Release+VHT_M3.cprj
+++ b/Testing/cmsis_build/test.Release+VHT_M3.cprj
@@ -1,35 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2022-08-03T08:32:03" tool="csolution 0.9.6"/>
+  <created timestamp="2022-10-21T07:15:38" tool="csolution 1.1.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
   </info>
 
   <packages>
-    <package name="CMSIS-DSP" vendor="ARM" version="1.11.0:1.11.0"/>
-    <package name="CMSIS" vendor="ARM" version="5.9.1:5.9.1"/>
+    <package name="CMSIS" vendor="ARM" version="5.9.0:5.9.0"/>
   </packages>
 
   <compilers>
-    <compiler name="GCC" version="10.2.1"/>
+    <compiler name="AC6" version="6.18.0"/>
   </compilers>
 
   <target Dfpu="NO_FPU" Dname="ARMCM3" Dsecure="Non-secure" Dvendor="ARM:82">
-    <output intdir="test.Release+VHT_M3_IntDir/" name="test.Release+VHT_M3" outdir="test.Release+VHT_M3_OutDir/" type="exe"/>
-    <asflags add="-masm=auto" compiler="GCC"/>
-    <cflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c11 -Ofast -ffast-math  -flax-vector-conversions" compiler="GCC"/>
-    <cxxflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections  -std=c++11 -Ofast -ffast-math  -flax-vector-conversions -Wno-unused-parameter" compiler="GCC"/>
-    <ldflags add="--specs=nano.specs --specs=rdimon.specs --entry=Reset_Handler -Wl,--gc-sections" compiler="GCC" file="RTE/Device/ARMCM3/gcc_arm.ld"/>
+    <output intdir="tmp/test/VHT_M3/Release" name="test.Release+VHT_M3" outdir="out/test/VHT_M3/Release" rtedir="RTE" type="exe"/>
+    <asflags add="-masm=auto" compiler="AC6"/>
+    <cflags add="-std=c11 -Ofast -ffast-math" compiler="AC6"/>
+    <cxxflags add="-std=c++11 -Ofast -ffast-math" compiler="AC6"/>
+    <ldflags add="--entry=Reset_Handler --info=summarysizes --info=sizes --info=totals --info=unused --info=veneers" compiler="AC6" file="RTE/Device/ARMCM3/ARMCM3_ac6.sct"/>
     <defines>EMBEDDED;NORMALFVP;CORTEXM</defines>
-    <includes>../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
+    <includes>../../Include;../../PrivateInclude;../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
   </target>
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Source" Cvendor="ARM" Cversion="1.11.0"/>
     <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.0.3">
-      <file attr="config" category="linkerScript" name="Device/ARM/ARMCM3/Source/GCC/gcc_arm.ld" version="2.1.0"/>
+      <file attr="config" category="linkerScript" name="Device/ARM/ARMCM3/Source/ARM/ARMCM3_ac6.sct" version="1.0.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM3/Source/startup_ARMCM3.c" version="2.0.3"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM3/Source/system_ARMCM3.c" version="1.0.1"/>
     </component>
@@ -155,6 +153,36 @@
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ15.cpp"/>
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ31.cpp"/>
     </group>
+    <group name="CMSIS-DSP">
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctions.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctions.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctions.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/QuaternionMathFunctions/QuaternionMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTables.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTablesF16.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctions.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctions.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctions.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctions.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctions.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ControllerFunctions/ControllerFunctions.c"/>
+    </group>
   </files>
 </cprj>
 
diff --git a/Testing/cmsis_build/test.Release+VHT_M33.cprj b/Testing/cmsis_build/test.Release+VHT_M33.cprj
index 5ab8b8c5..6329efbf 100644
--- a/Testing/cmsis_build/test.Release+VHT_M33.cprj
+++ b/Testing/cmsis_build/test.Release+VHT_M33.cprj
@@ -1,35 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2022-08-03T08:32:03" tool="csolution 0.9.6"/>
+  <created timestamp="2022-10-21T07:15:38" tool="csolution 1.1.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
   </info>
 
   <packages>
-    <package name="CMSIS-DSP" vendor="ARM" version="1.11.0:1.11.0"/>
-    <package name="CMSIS" vendor="ARM" version="5.9.1:5.9.1"/>
+    <package name="CMSIS" vendor="ARM" version="5.9.0:5.9.0"/>
   </packages>
 
   <compilers>
-    <compiler name="GCC" version="10.2.1"/>
+    <compiler name="AC6" version="6.18.0"/>
   </compilers>
 
   <target Ddsp="DSP" Dfpu="SP_FPU" Dname="ARMCM33_DSP_FP" Dsecure="Non-secure" Dtz="NO_TZ" Dvendor="ARM:82">
-    <output intdir="test.Release+VHT_M33_IntDir/" name="test.Release+VHT_M33" outdir="test.Release+VHT_M33_OutDir/" type="exe"/>
-    <asflags add="-masm=auto" compiler="GCC"/>
-    <cflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c11 -Ofast -ffast-math  -flax-vector-conversions" compiler="GCC"/>
-    <cxxflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections  -std=c++11 -Ofast -ffast-math  -flax-vector-conversions -Wno-unused-parameter" compiler="GCC"/>
-    <ldflags add="--specs=nano.specs --specs=rdimon.specs --entry=Reset_Handler -Wl,--gc-sections" compiler="GCC" file="RTE/Device/ARMCM33_DSP_FP/gcc_arm.ld"/>
+    <output intdir="tmp/test/VHT_M33/Release" name="test.Release+VHT_M33" outdir="out/test/VHT_M33/Release" rtedir="RTE" type="exe"/>
+    <asflags add="-masm=auto" compiler="AC6"/>
+    <cflags add="-std=c11 -Ofast -ffast-math" compiler="AC6"/>
+    <cxxflags add="-std=c++11 -Ofast -ffast-math" compiler="AC6"/>
+    <ldflags add="--entry=Reset_Handler --info=summarysizes --info=sizes --info=totals --info=unused --info=veneers" compiler="AC6" file="RTE/Device/ARMCM33_DSP_FP/ARMCM33_ac6.sct"/>
     <defines>EMBEDDED;NORMALFVP;CORTEXM</defines>
-    <includes>../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
+    <includes>../../Include;../../PrivateInclude;../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
   </target>
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Source" Cvendor="ARM" Cversion="1.11.0"/>
     <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.1.0">
-      <file attr="config" category="linkerScript" name="Device/ARM/ARMCM33/Source/GCC/gcc_arm.ld" version="2.2.0"/>
+      <file attr="config" category="linkerScript" name="Device/ARM/ARMCM33/Source/ARM/ARMCM33_ac6.sct" version="1.1.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM33/Source/startup_ARMCM33.c" version="2.1.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM33/Source/system_ARMCM33.c" version="1.0.1"/>
     </component>
@@ -155,6 +153,36 @@
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ15.cpp"/>
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ31.cpp"/>
     </group>
+    <group name="CMSIS-DSP">
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctions.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctions.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctions.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/QuaternionMathFunctions/QuaternionMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTables.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTablesF16.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctions.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctions.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctions.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctions.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctions.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ControllerFunctions/ControllerFunctions.c"/>
+    </group>
   </files>
 </cprj>
 
diff --git a/Testing/cmsis_build/test.Release+VHT_M4.cprj b/Testing/cmsis_build/test.Release+VHT_M4.cprj
index 0242c98e..ea798cc8 100644
--- a/Testing/cmsis_build/test.Release+VHT_M4.cprj
+++ b/Testing/cmsis_build/test.Release+VHT_M4.cprj
@@ -1,35 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2022-08-03T08:32:03" tool="csolution 0.9.6"/>
+  <created timestamp="2022-10-21T07:15:38" tool="csolution 1.1.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
   </info>
 
   <packages>
-    <package name="CMSIS-DSP" vendor="ARM" version="1.11.0:1.11.0"/>
-    <package name="CMSIS" vendor="ARM" version="5.9.1:5.9.1"/>
+    <package name="CMSIS" vendor="ARM" version="5.9.0:5.9.0"/>
   </packages>
 
   <compilers>
-    <compiler name="GCC" version="10.2.1"/>
+    <compiler name="AC6" version="6.18.0"/>
   </compilers>
 
   <target Dfpu="SP_FPU" Dname="ARMCM4_FP" Dsecure="Non-secure" Dvendor="ARM:82">
-    <output intdir="test.Release+VHT_M4_IntDir/" name="test.Release+VHT_M4" outdir="test.Release+VHT_M4_OutDir/" type="exe"/>
-    <asflags add="-masm=auto" compiler="GCC"/>
-    <cflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c11 -Ofast -ffast-math  -flax-vector-conversions" compiler="GCC"/>
-    <cxxflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections  -std=c++11 -Ofast -ffast-math  -flax-vector-conversions -Wno-unused-parameter" compiler="GCC"/>
-    <ldflags add="--specs=nano.specs --specs=rdimon.specs --entry=Reset_Handler -Wl,--gc-sections" compiler="GCC" file="RTE/Device/ARMCM4_FP/gcc_arm.ld"/>
+    <output intdir="tmp/test/VHT_M4/Release" name="test.Release+VHT_M4" outdir="out/test/VHT_M4/Release" rtedir="RTE" type="exe"/>
+    <asflags add="-masm=auto" compiler="AC6"/>
+    <cflags add="-std=c11 -Ofast -ffast-math" compiler="AC6"/>
+    <cxxflags add="-std=c++11 -Ofast -ffast-math" compiler="AC6"/>
+    <ldflags add="--entry=Reset_Handler --info=summarysizes --info=sizes --info=totals --info=unused --info=veneers" compiler="AC6" file="RTE/Device/ARMCM4_FP/ARMCM4_ac6.sct"/>
     <defines>EMBEDDED;NORMALFVP;CORTEXM</defines>
-    <includes>../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
+    <includes>../../Include;../../PrivateInclude;../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
   </target>
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Source" Cvendor="ARM" Cversion="1.11.0"/>
     <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.0.3">
-      <file attr="config" category="linkerScript" name="Device/ARM/ARMCM4/Source/GCC/gcc_arm.ld" version="2.1.0"/>
+      <file attr="config" category="linkerScript" name="Device/ARM/ARMCM4/Source/ARM/ARMCM4_ac6.sct" version="1.0.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM4/Source/startup_ARMCM4.c" version="2.0.3"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM4/Source/system_ARMCM4.c" version="1.0.1"/>
     </component>
@@ -155,6 +153,36 @@
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ15.cpp"/>
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ31.cpp"/>
     </group>
+    <group name="CMSIS-DSP">
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctions.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctions.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctions.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/QuaternionMathFunctions/QuaternionMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTables.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTablesF16.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctions.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctions.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctions.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctions.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctions.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ControllerFunctions/ControllerFunctions.c"/>
+    </group>
   </files>
 </cprj>
 
diff --git a/Testing/cmsis_build/test.Release+VHT_M7.cprj b/Testing/cmsis_build/test.Release+VHT_M7.cprj
index 3a15ea06..75a4b9e4 100644
--- a/Testing/cmsis_build/test.Release+VHT_M7.cprj
+++ b/Testing/cmsis_build/test.Release+VHT_M7.cprj
@@ -1,35 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2022-08-03T08:32:03" tool="csolution 0.9.6"/>
+  <created timestamp="2022-10-21T07:15:38" tool="csolution 1.1.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
   </info>
 
   <packages>
-    <package name="CMSIS-DSP" vendor="ARM" version="1.11.0:1.11.0"/>
-    <package name="CMSIS" vendor="ARM" version="5.9.1:5.9.1"/>
+    <package name="CMSIS" vendor="ARM" version="5.9.0:5.9.0"/>
   </packages>
 
   <compilers>
-    <compiler name="GCC" version="10.2.1"/>
+    <compiler name="AC6" version="6.18.0"/>
   </compilers>
 
   <target Dfpu="DP_FPU" Dname="ARMCM7_DP" Dsecure="Non-secure" Dvendor="ARM:82">
-    <output intdir="test.Release+VHT_M7_IntDir/" name="test.Release+VHT_M7" outdir="test.Release+VHT_M7_OutDir/" type="exe"/>
-    <asflags add="-masm=auto" compiler="GCC"/>
-    <cflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections -std=c11 -Ofast -ffast-math  -flax-vector-conversions" compiler="GCC"/>
-    <cxxflags add="-ffunction-sections -mfp16-format=ieee -fdata-sections  -std=c++11 -Ofast -ffast-math  -flax-vector-conversions -Wno-unused-parameter" compiler="GCC"/>
-    <ldflags add="--specs=nano.specs --specs=rdimon.specs --entry=Reset_Handler -Wl,--gc-sections" compiler="GCC" file="RTE/Device/ARMCM7_DP/gcc_arm.ld"/>
+    <output intdir="tmp/test/VHT_M7/Release" name="test.Release+VHT_M7" outdir="out/test/VHT_M7/Release" rtedir="RTE" type="exe"/>
+    <asflags add="-masm=auto" compiler="AC6"/>
+    <cflags add="-std=c11 -Ofast -ffast-math" compiler="AC6"/>
+    <cxxflags add="-std=c++11 -Ofast -ffast-math" compiler="AC6"/>
+    <ldflags add="--entry=Reset_Handler --info=summarysizes --info=sizes --info=totals --info=unused --info=veneers" compiler="AC6" file="RTE/Device/ARMCM7_DP/ARMCM7_ac6.sct"/>
     <defines>EMBEDDED;NORMALFVP;CORTEXM</defines>
-    <includes>../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
+    <includes>../../Include;../../PrivateInclude;../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
   </target>
 
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
-    <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Source" Cvendor="ARM" Cversion="1.11.0"/>
     <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.0.3">
-      <file attr="config" category="linkerScript" name="Device/ARM/ARMCM7/Source/GCC/gcc_arm.ld" version="2.1.0"/>
+      <file attr="config" category="linkerScript" name="Device/ARM/ARMCM7/Source/ARM/ARMCM7_ac6.sct" version="1.0.0"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM7/Source/startup_ARMCM7.c" version="2.0.3"/>
       <file attr="config" category="sourceC" name="Device/ARM/ARMCM7/Source/system_ARMCM7.c" version="1.0.1"/>
     </component>
@@ -155,6 +153,36 @@
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ15.cpp"/>
       <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ31.cpp"/>
     </group>
+    <group name="CMSIS-DSP">
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctions.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctions.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctions.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/QuaternionMathFunctions/QuaternionMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTables.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTablesF16.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctions.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctions.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctions.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctions.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctions.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ControllerFunctions/ControllerFunctions.c"/>
+    </group>
   </files>
 </cprj>
 
diff --git a/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj b/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj
new file mode 100644
index 00000000..81e54948
--- /dev/null
+++ b/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
+  <created timestamp="2022-10-21T07:15:38" tool="csolution 1.1.0"/>
+
+  <info isLayer="false">
+    <description>Automatically generated project</description>
+  </info>
+
+  <packages>
+    <package name="CMSIS" vendor="ARM" version="5.9.0:5.9.0"/>
+  </packages>
+
+  <compilers>
+    <compiler name="AC6" version="6.18.0"/>
+  </compilers>
+
+  <target Dfpu="DP_FPU" Dname="ARMCM7_DP" Dsecure="Non-secure" Dvendor="ARM:82">
+    <output intdir="tmp/test/VHT_M7_UNROLLED/Release" name="test.Release+VHT_M7_UNROLLED" outdir="out/test/VHT_M7_UNROLLED/Release" rtedir="RTE" type="exe"/>
+    <asflags add="-masm=auto" compiler="AC6"/>
+    <cflags add="-std=c11 -Ofast -ffast-math" compiler="AC6"/>
+    <cxxflags add="-std=c++11 -Ofast -ffast-math" compiler="AC6"/>
+    <ldflags add="--entry=Reset_Handler --info=summarysizes --info=sizes --info=totals --info=unused --info=veneers" compiler="AC6" file="RTE/Device/ARMCM7_DP/ARMCM7_ac6.sct"/>
+    <defines>EMBEDDED;NORMALFVP;CORTEXM;ARM_MATH_LOOPUNROLL</defines>
+    <includes>../../Include;../../PrivateInclude;../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
+  </target>
+
+  <components>
+    <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
+    <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.0.3">
+      <file attr="config" category="linkerScript" name="Device/ARM/ARMCM7/Source/ARM/ARMCM7_ac6.sct" version="1.0.0"/>
+      <file attr="config" category="sourceC" name="Device/ARM/ARMCM7/Source/startup_ARMCM7.c" version="2.0.3"/>
+      <file attr="config" category="sourceC" name="Device/ARM/ARMCM7/Source/system_ARMCM7.c" version="1.0.1"/>
+    </component>
+  </components>
+
+  <files>
+    <group name="App">
+      <file category="sourceCpp" name="../main.cpp"/>
+      <file category="sourceC" name="../patterndata.c"/>
+      <file category="sourceCpp" name="../testmain.cpp"/>
+    </group>
+    <group name="TestFramework">
+      <file category="sourceCpp" name="../FrameworkSource/ArrayMemory.cpp"/>
+      <file category="sourceCpp" name="../FrameworkSource/Calibrate.cpp"/>
+      <file category="sourceCpp" name="../FrameworkSource/Error.cpp"/>
+      <file category="sourceCpp" name="../FrameworkSource/FPGA.cpp"/>
+      <file category="sourceCpp" name="../FrameworkSource/Generators.cpp"/>
+      <file category="sourceCpp" name="../FrameworkSource/IORunner.cpp"/>
+      <file category="sourceCpp" name="../FrameworkSource/Pattern.cpp"/>
+      <file category="sourceCpp" name="../FrameworkSource/PatternMgr.cpp"/>
+      <file category="sourceCpp" name="../FrameworkSource/Test.cpp"/>
+      <file category="sourceCpp" name="../FrameworkSource/Timing.cpp"/>
+    </group>
+    <group name="GeneratedConfig">
+      <file category="sourceCpp" name="../GeneratedSource/TestDesc.cpp"/>
+    </group>
+    <group name="Tests">
+      <file category="sourceCpp" name="../Source/Tests/BasicTestsF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BasicTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BasicTestsF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BasicTestsQ7.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BasicTestsQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BasicTestsQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BayesF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BayesF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BinaryTestsF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BinaryTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BinaryTestsF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BinaryTestsQ7.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BinaryTestsQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BinaryTestsQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BIQUADF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BIQUADF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BIQUADF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BIQUADQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BIQUADQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/ComplexTestsF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/ComplexTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/ComplexTestsF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/ComplexTestsQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/ComplexTestsQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/DECIMF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/DECIMQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/DECIMQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/DistanceTestsF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/DistanceTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/DistanceTestsF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/DistanceTestsU32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/ExampleCategoryF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/ExampleCategoryQ7.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/ExampleCategoryQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/ExampleCategoryQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FastMathF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FastMathF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FastMathF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FastMathQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FastMathQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FastMathQ63.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FIRF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FIRF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FIRF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FIRQ7.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FIRQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FIRQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/InterpolationTestsF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/InterpolationTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/InterpolationTestsQ7.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/InterpolationTestsQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/InterpolationTestsQ31.cpp"/>
+      <file category="sourceC" name="../Source/Tests/mfccdata.c"/>
+      <file category="sourceC" name="../Source/Tests/mfccdata_f16.c"/>
+      <file category="sourceCpp" name="../Source/Tests/MFCCF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/MFCCF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/MFCCQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/MFCCQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/MISCF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/MISCF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/MISCF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/MISCQ7.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/MISCQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/MISCQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/QuaternionTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/StatsTestsF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/StatsTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/StatsTestsF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/StatsTestsQ7.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/StatsTestsQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/StatsTestsQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SupportBarTestsF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SupportBarTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SupportTestsF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SupportTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SupportTestsF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SupportTestsQ7.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SupportTestsQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SupportTestsQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SVMF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SVMF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformCF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformCF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformCF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformCQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformCQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformRF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformRF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformRF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformRQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformRQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/UnaryTestsF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/UnaryTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/UnaryTestsF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ7.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ31.cpp"/>
+    </group>
+    <group name="CMSIS-DSP">
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctions.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctions.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctions.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/QuaternionMathFunctions/QuaternionMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTables.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTablesF16.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctions.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctions.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctions.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctions.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctions.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ControllerFunctions/ControllerFunctions.c"/>
+    </group>
+  </files>
+</cprj>
+
diff --git a/Testing/cmsis_build/test.cproject.yml b/Testing/cmsis_build/test.cproject.yml
index a79ffc83..97185247 100644
--- a/Testing/cmsis_build/test.cproject.yml
+++ b/Testing/cmsis_build/test.cproject.yml
@@ -120,16 +120,19 @@ project:
         - file: ../Source/Tests/UnaryTestsQ15.cpp
         - file: ../Source/Tests/UnaryTestsQ31.cpp
 
-  components:
-    - component: ARM::CMSIS:CORE
-    - component: ARM::CMSIS:DSP&Source@1.11.0
+  # A CMSIS-DSP Layer is used to be able to build
+  # and test with the current source version
+  # without requring to install a CMSIS Pack
+  layers:
+    - layer: boot.clayer.yml 
+    - layer: dsp.clayer.yml 
       not-for-type: 
         - +FVP_A5Neon
         - +FVP_A7Neon
         - +FVP_A9Neon
     # CMSIS-DSP cannot be built with Neon intrinsics for A9
     # because of lack of Fused MAC on A9
-    - component: ARM::CMSIS:DSP&Source@1.11.0
+    - layer: dsp.clayer.yml 
       defines:
         - ARM_MATH_NEON
         - DISABLEFLOAT16
@@ -138,52 +141,13 @@ project:
         - +FVP_A7Neon
     # On A9, CMSIS-DSP is built with auto-vectorization
     # but no use of Neon intrinsics
-    - component: ARM::CMSIS:DSP&Source@1.11.0
+    - layer: dsp.clayer.yml 
       defines:
         - ARM_MATH_AUTOVECTORIZE
         - DISABLEFLOAT16
       for-type: 
         - +FVP_A9Neon
-    - component: Device:Startup&C Startup
-      not-for-type: 
-        - +VHT-Corstone-300 
-        - +VHT-Corstone-310
-        - +FVP_A5Neon
-        - +FVP_A7Neon
-        - +FVP_A9Neon
-    - component: Device:Startup
-      for-type: 
-        - +FVP_A5Neon
-        - +FVP_A7Neon
-        - +FVP_A9Neon
-    - component: Device:IRQ Controller
-      for-type: 
-        - +FVP_A5Neon
-        - +FVP_A7Neon
-        - +FVP_A9Neon
-    - component: Device:OS Tick
-      for-type: 
-        - +FVP_A5Neon
-        - +FVP_A7Neon
-        - +FVP_A9Neon
-    - component: ARM::Device:Definition
-      for-type: 
-        - +VHT-Corstone-300 
-        - +VHT-Corstone-310
-    - component: ARM::Device:Startup&Baremetal
-      for-type: 
-        - +VHT-Corstone-300 
-        - +VHT-Corstone-310
-    - component: ARM::Native Driver:Timeout
-      for-type: 
-        - +VHT-Corstone-300 
-        - +VHT-Corstone-310
-    - component: ARM::Native Driver:SysCounter
-      for-type: 
-        - +VHT-Corstone-300 
-        - +VHT-Corstone-310
-    - component: ARM::Native Driver:SysTimer
-      for-type: 
-        - +VHT-Corstone-300 
-        - +VHT-Corstone-310
 
+  components:
+    - component: ARM::CMSIS:CORE
+    
diff --git a/Testing/cmsis_build/test.csolution_ac6.yml b/Testing/cmsis_build/testac6.csolution.yml
similarity index 93%
rename from Testing/cmsis_build/test.csolution_ac6.yml
rename to Testing/cmsis_build/testac6.csolution.yml
index 651dc719..337bdec0 100644
--- a/Testing/cmsis_build/test.csolution_ac6.yml
+++ b/Testing/cmsis_build/testac6.csolution.yml
@@ -27,7 +27,6 @@ solution:
       - NORMALFVP
 
   packs:
-    - pack: ARM::CMSIS-DSP@1.11.0
     - pack: ARM::CMSIS@5.9.0
     - pack: ARM::V2M_MPS3_SSE_300_BSP@1.3.0
     - pack: ARM::V2M_MPS3_SSE_310_BSP@1.0.0
@@ -59,6 +58,12 @@ solution:
       defines:
         - CORTEXM
 
+    - type: VHT_M7_UNROLLED
+      device: ARMCM7_DP
+      defines:
+        - CORTEXM
+        - ARM_MATH_LOOPUNROLL
+
     - type: VHT_M4
       device: ARMCM4_FP
       defines:
diff --git a/Testing/cmsis_build/test.csolution_gcc.yml b/Testing/cmsis_build/testgcc.csolution.yml
similarity index 96%
rename from Testing/cmsis_build/test.csolution_gcc.yml
rename to Testing/cmsis_build/testgcc.csolution.yml
index 936653bc..8a4f69a1 100644
--- a/Testing/cmsis_build/test.csolution_gcc.yml
+++ b/Testing/cmsis_build/testgcc.csolution.yml
@@ -22,8 +22,7 @@ solution:
       - NORMALFVP
 
   packs:
-    - pack: ARM::CMSIS-DSP@1.11.0
-    - pack: ARM::CMSIS@5.9.1
+    - pack: ARM::CMSIS@5.9.0
     - pack: ARM::V2M_MPS3_SSE_300_BSP@1.3.0
     - pack: ARM::V2M_MPS3_SSE_310_BSP@1.0.0
     - pack: Keil::ARM_Compiler@1.7.2
diff --git a/Testing/processResult.py b/Testing/processResult.py
index 40bfe9f5..8e8ef0bd 100644
--- a/Testing/processResult.py
+++ b/Testing/processResult.py
@@ -168,7 +168,10 @@ class HTMLFormatter:
                 print("<td>%s</td>\n" % (params))
              else:
                 print("<td></td>\n")
-             print("<td>%d</td>" % cycles)
+             if (cycles > 0):
+                print("<td>%d</td>" % cycles)
+             else:
+                print("<td>NA</td>")
              print("</tr>")
 
              if passed != 1: