diff --git a/Tools/AllResourceFiles.msa b/Tools/AllResourceFiles.msa
new file mode 100755
index 0000000000..925ba0ca69
--- /dev/null
+++ b/Tools/AllResourceFiles.msa
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
+  <MsaHeader>
+    <ModuleName>Edk_II_Resources</ModuleName>
+    <ModuleType>TOOL</ModuleType>
+    <GuidValue>5d6c499e-53fd-430e-9285-2d7811b924e8</GuidValue>
+    <Version>2.0</Version>
+    <Abstract>This is the EDK II Tool Resources Module</Abstract>
+    <Description>
+      This Module provides the EFI/Tiano Tools and resources that are used to
+      create EFI/Tiano Modules and Platform Binary Files (PBF) These resources
+      and tools do not require compilation. (The three JAR files are provided,
+      Pre-compiled, and do not require additional compilation, the sources are
+      provided, but will not be built under normal procedures.
+    </Description>
+    <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>
+    <License>
+All rights reserved.
+
+This program and the accompanying materials are licensed and made available
+under the terms and conditions of the BSD License which accompanies this
+distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
+WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    </License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
+  </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>NULL</OutputFileBasename>
+  </ModuleDefinitions>
+  <NonProcessedFiles>
+    <Filename>build.xml</Filename>
+    <Filename>bin/build</Filename>
+    <Filename>bin/build.bat</Filename>
+    <Filename>bin/FrameworkWizard</Filename>
+    <Filename>bin/FrameworkWizard.bat</Filename>
+    <Filename>bin/SAVerify.bat</Filename>
+    <Filename>Conf/FrameworkDatabase.db</Filename>
+    <Filename>Conf/tools_def.template</Filename>
+    <Filename>Conf/target.template</Filename>
+    <Filename>Conf/BuildMacro.xml</Filename>
+    <Filename>XMLSchema/FarManifest.xsd</Filename>
+    <Filename>XMLSchema/FrameworkDataAttributes.xsd</Filename>
+    <Filename>XMLSchema/FrameworkDataElements.xsd</Filename>
+    <Filename>XMLSchema/FrameworkDataTypes.xsd</Filename>
+    <Filename>XMLSchema/FrameworkHeaders.xsd</Filename>
+    <Filename>XMLSchema/FrameworkPlatformDataElements.xsd</Filename>
+    <Filename>XMLSchema/FrameworkPlatformDataTypes.xsd</Filename>
+    <Filename>XMLSchema/NamingConvention.xsd</Filename>
+    <Filename>XMLSchema/SurfaceArea.xsd</Filename>
+    <Filename>XMLSchema/SurfaceArea.xsdconfig</Filename>
+    <Filename>Conf/Pcd/PcdDatabaseCommonDefinitions.sample</Filename>
+    <Filename>Conf/Pcd/PcdDatabaseDxeDefinitions.sample</Filename>
+    <Filename>Conf/Pcd/PcdDatabasePeiDefinitions.sample</Filename>
+    <Filename>gcc/README.txt</Filename>
+    <Filename>gcc/tianoCross-gcc-4.0</Filename>
+    <Filename>gcc/tianoCross-gcc-4.1</Filename>
+  </NonProcessedFiles>
+</ModuleSurfaceArea>
diff --git a/Tools/Tools.spd b/Tools/Tools.spd
index b58f304d7b..475950de7d 100644
--- a/Tools/Tools.spd
+++ b/Tools/Tools.spd
@@ -4,7 +4,7 @@
     <PackageName>Tools</PackageName>
     <GuidValue>53f84ca0-53fe-4412-b4e7-dcec602e1d49</GuidValue>
     <Version>2.0</Version>
-    <Abstract>TianoCore.org EFI Framework Tools</Abstract>
+    <Abstract>TianoCore.org EDK II Tools</Abstract>
     <Description>This package provides the tools needed to create EFI/Framework platform
       binary files (PBF) and EFI/Framework Modules that can be incorporated 
       into a PBF.  Source Code is provided for all C and Java applications. 
@@ -27,17 +27,6 @@
     <RePackage>false</RePackage>
   </PackageDefinitions>
   <MsaFiles>
-    <Filename>ToolResources.msa</Filename>
-    <Filename>JavaResources.msa</Filename>
-    <Filename>Source/Common/Common.msa</Filename>
-    <Filename>Source/PcdTools/PcdTools.msa</Filename>
-    <Filename>Source/Cpptasks/CppTasks.msa</Filename>
-    <Filename>Source/FrameworkTasks/FrameworkTasks.msa</Filename>
-    <Filename>Source/FrameworkWizard/FrameworkWizard.msa</Filename>
-    <Filename>Source/GenBuild/GenBuild.msa</Filename>
-    <Filename>Source/SurfaceArea/SurfaceArea.msa</Filename>
-    <Filename>Source/TianoTools/TianoTools.msa</Filename>
-    <Filename>Source/MigrationTools/MigrationTools.msa</Filename>
-    <Filename>Source/Merge/Merge.msa</Filename>
+    <Filename>AllResourceFiles.msa</Filename>
   </MsaFiles>
-</PackageSurfaceArea>
\ No newline at end of file
+</PackageSurfaceArea>