Release preparation: Fixed pack generation respecting changed DSP folders.

Change-Id: I362b92100dd27a24942d130e7f24f0b38eec8d14
diff --git a/ARM.CMSIS.pdsc b/ARM.CMSIS.pdsc
index 0f20307..b5405a1 100644
--- a/ARM.CMSIS.pdsc
+++ b/ARM.CMSIS.pdsc
@@ -8,10 +8,11 @@
   <url>http://www.keil.com/pack/</url>
 
   <releases>
-    <release version="5.5.0-rc0" release="2019-03-15">
+    <release version="5.5.0-rc1" release="2019-03-15">
       The following folders have been removed:
-        - CMSIS/Include/
-        - CMSIS/DSP_Lib/ (superseded by CMSIS/DSP/Lib/)
+        - CMSIS/Include/ (superseded by CMSIS/DSP/Include/ and CMSIS/Core/Include/)
+        - CMSIS/Lib/ (superseded by CMSIS/DSP/Lib/)
+        - CMSIS/DSP_Lib/ (superseded by CMSIS/DSP/)
 
       CMSIS-Core(M): 5.2.0 (see revision history for details)
         - Reworked Stack/Heap configuration for ARM startup files.
diff --git a/CMSIS/Utilities/gen_pack.bat b/CMSIS/Utilities/gen_pack.bat
index d2bc482..ac48aef 100644
--- a/CMSIS/Utilities/gen_pack.bat
+++ b/CMSIS/Utilities/gen_pack.bat
@@ -48,7 +48,6 @@
 :: Copy CMSIS folder 
 :: -- Core files 
 XCOPY /Q /S /Y ..\..\CMSIS\Core\Include\*.* %RELEASE_PATH%\CMSIS\Core\Include\*.*
-XCOPY /Q /S /Y ..\..\CMSIS\Core\Include\*.* %RELEASE_PATH%\CMSIS\Include\*.*
 XCOPY /Q /S /Y ..\..\CMSIS\Core\Template\ARMv8-M\*.* %RELEASE_PATH%\CMSIS\Core\Template\ARMv8-M\*.*
 XCOPY /Q /S /Y ..\..\CMSIS\Core_A\Include\*.* %RELEASE_PATH%\CMSIS\Core_A\Include\*.*
 XCOPY /Q /S /Y ..\..\CMSIS\Core_A\Source\*.* %RELEASE_PATH%\CMSIS\Core_A\Source\*.*
@@ -60,7 +59,10 @@
 XCOPY /Q /S /Y ..\..\CMSIS\Driver\*.* %RELEASE_PATH%\CMSIS\Driver\*.*
 
 :: -- DSP files 
-XCOPY /Q /S /Y ..\..\CMSIS\DSP\*.* %RELEASE_PATH%\CMSIS\DSP\*.*
+XCOPY /Q /S /Y ..\..\CMSIS\DSP\Include\*.* %RELEASE_PATH%\CMSIS\DSP\Include\*.*
+XCOPY /Q /S /Y ..\..\CMSIS\DSP\Source\*.* %RELEASE_PATH%\CMSIS\DSP\Source\*.*
+XCOPY /Q /S /Y ..\..\CMSIS\DSP\Projects\*.* %RELEASE_PATH%\CMSIS\DSP\Projects\*.*
+XCOPY /Q /S /Y ..\..\CMSIS\DSP\Examples\*.* %RELEASE_PATH%\CMSIS\DSP\Examples\*.*
 
 :: -- NN files 
 XCOPY /Q /S /Y ..\..\CMSIS\NN\*.* %RELEASE_PATH%\CMSIS\NN\*.*
diff --git a/manifest b/manifest
index 8c8b038..6a0707a 100644
--- a/manifest
+++ b/manifest
@@ -17,7 +17,6 @@
  - LICENSE.txt
  - Device/**/*
  - CMSIS/Core/Include/**/*
- - CMSIS/Core/Include/**/*: CMSIS/Include/
  - CMSIS/Core/Template/**/*
  - CMSIS/Core_A/**/*
  - CMSIS/DAP/**/*
@@ -26,11 +25,7 @@
  - CMSIS/DSP/Source/**/*
  - CMSIS/DSP/Projects/**/*
  - CMSIS/DSP/Examples/**/*
- - CMSIS/DSP/Include/**/*: CMSIS/Include/
- - CMSIS/DSP/Source/**/*: CMSIS/DSP_Lib/Source/
- - CMSIS/DSP/Projects/**/*: CMSIS/DSP_Lib/Source/
- - CMSIS/DSP/Examples/**/*: CMSIS/DSP_Lib/Examples/
- - CMSIS/Lib/**/*
+ - CMSIS/DSP/Lib/**/*
  - CMSIS/NN/**/*
  - CMSIS/Pack/**/*
  - CMSIS/RTOS/**/*