diff --git a/Tools/Source/TianoTools/Common/CommonLib.c b/Tools/CodeTools/TianoTools/Common/CommonLib.c
similarity index 100%
rename from Tools/Source/TianoTools/Common/CommonLib.c
rename to Tools/CodeTools/TianoTools/Common/CommonLib.c
diff --git a/Tools/Source/TianoTools/Common/CommonLib.h b/Tools/CodeTools/TianoTools/Common/CommonLib.h
similarity index 100%
rename from Tools/Source/TianoTools/Common/CommonLib.h
rename to Tools/CodeTools/TianoTools/Common/CommonLib.h
diff --git a/Tools/Source/TianoTools/Common/Crc32.c b/Tools/CodeTools/TianoTools/Common/Crc32.c
similarity index 100%
rename from Tools/Source/TianoTools/Common/Crc32.c
rename to Tools/CodeTools/TianoTools/Common/Crc32.c
diff --git a/Tools/Source/TianoTools/Common/Crc32.h b/Tools/CodeTools/TianoTools/Common/Crc32.h
similarity index 100%
rename from Tools/Source/TianoTools/Common/Crc32.h
rename to Tools/CodeTools/TianoTools/Common/Crc32.h
diff --git a/Tools/Source/TianoTools/Common/EfiCompress.c b/Tools/CodeTools/TianoTools/Common/EfiCompress.c
similarity index 100%
rename from Tools/Source/TianoTools/Common/EfiCompress.c
rename to Tools/CodeTools/TianoTools/Common/EfiCompress.c
diff --git a/Tools/Source/TianoTools/Common/EfiCompress.h b/Tools/CodeTools/TianoTools/Common/EfiCompress.h
similarity index 100%
rename from Tools/Source/TianoTools/Common/EfiCompress.h
rename to Tools/CodeTools/TianoTools/Common/EfiCompress.h
diff --git a/Tools/Source/TianoTools/Common/EfiCustomizedCompress.h b/Tools/CodeTools/TianoTools/Common/EfiCustomizedCompress.h
similarity index 100%
rename from Tools/Source/TianoTools/Common/EfiCustomizedCompress.h
rename to Tools/CodeTools/TianoTools/Common/EfiCustomizedCompress.h
diff --git a/Tools/Source/TianoTools/Common/EfiDecompress.c b/Tools/CodeTools/TianoTools/Common/EfiDecompress.c
similarity index 100%
rename from Tools/Source/TianoTools/Common/EfiDecompress.c
rename to Tools/CodeTools/TianoTools/Common/EfiDecompress.c
diff --git a/Tools/Source/TianoTools/Common/EfiDecompress.h b/Tools/CodeTools/TianoTools/Common/EfiDecompress.h
similarity index 100%
rename from Tools/Source/TianoTools/Common/EfiDecompress.h
rename to Tools/CodeTools/TianoTools/Common/EfiDecompress.h
diff --git a/Tools/Source/TianoTools/Common/EfiUtilityMsgs.c b/Tools/CodeTools/TianoTools/Common/EfiUtilityMsgs.c
similarity index 100%
rename from Tools/Source/TianoTools/Common/EfiUtilityMsgs.c
rename to Tools/CodeTools/TianoTools/Common/EfiUtilityMsgs.c
diff --git a/Tools/Source/TianoTools/Common/EfiUtilityMsgs.h b/Tools/CodeTools/TianoTools/Common/EfiUtilityMsgs.h
similarity index 100%
rename from Tools/Source/TianoTools/Common/EfiUtilityMsgs.h
rename to Tools/CodeTools/TianoTools/Common/EfiUtilityMsgs.h
diff --git a/Tools/Source/TianoTools/Common/FvLib.c b/Tools/CodeTools/TianoTools/Common/FvLib.c
similarity index 100%
rename from Tools/Source/TianoTools/Common/FvLib.c
rename to Tools/CodeTools/TianoTools/Common/FvLib.c
diff --git a/Tools/Source/TianoTools/Common/FvLib.h b/Tools/CodeTools/TianoTools/Common/FvLib.h
similarity index 100%
rename from Tools/Source/TianoTools/Common/FvLib.h
rename to Tools/CodeTools/TianoTools/Common/FvLib.h
diff --git a/Tools/Source/TianoTools/Common/MyAlloc.c b/Tools/CodeTools/TianoTools/Common/MyAlloc.c
similarity index 100%
rename from Tools/Source/TianoTools/Common/MyAlloc.c
rename to Tools/CodeTools/TianoTools/Common/MyAlloc.c
diff --git a/Tools/Source/TianoTools/Common/MyAlloc.h b/Tools/CodeTools/TianoTools/Common/MyAlloc.h
similarity index 100%
rename from Tools/Source/TianoTools/Common/MyAlloc.h
rename to Tools/CodeTools/TianoTools/Common/MyAlloc.h
diff --git a/Tools/Source/TianoTools/Common/ParseInf.c b/Tools/CodeTools/TianoTools/Common/ParseInf.c
similarity index 100%
rename from Tools/Source/TianoTools/Common/ParseInf.c
rename to Tools/CodeTools/TianoTools/Common/ParseInf.c
diff --git a/Tools/Source/TianoTools/Common/ParseInf.h b/Tools/CodeTools/TianoTools/Common/ParseInf.h
similarity index 100%
rename from Tools/Source/TianoTools/Common/ParseInf.h
rename to Tools/CodeTools/TianoTools/Common/ParseInf.h
diff --git a/Tools/Source/TianoTools/Common/SimpleFileParsing.c b/Tools/CodeTools/TianoTools/Common/SimpleFileParsing.c
similarity index 100%
rename from Tools/Source/TianoTools/Common/SimpleFileParsing.c
rename to Tools/CodeTools/TianoTools/Common/SimpleFileParsing.c
diff --git a/Tools/Source/TianoTools/Common/SimpleFileParsing.h b/Tools/CodeTools/TianoTools/Common/SimpleFileParsing.h
similarity index 100%
rename from Tools/Source/TianoTools/Common/SimpleFileParsing.h
rename to Tools/CodeTools/TianoTools/Common/SimpleFileParsing.h
diff --git a/Tools/Source/TianoTools/Common/WinNtInclude.h b/Tools/CodeTools/TianoTools/Common/WinNtInclude.h
similarity index 100%
rename from Tools/Source/TianoTools/Common/WinNtInclude.h
rename to Tools/CodeTools/TianoTools/Common/WinNtInclude.h
diff --git a/Tools/Source/TianoTools/Common/build.xml b/Tools/CodeTools/TianoTools/Common/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/Common/build.xml
rename to Tools/CodeTools/TianoTools/Common/build.xml
diff --git a/Tools/Source/TianoTools/CompressDll/CompressDll.c b/Tools/CodeTools/TianoTools/CompressDll/CompressDll.c
similarity index 100%
rename from Tools/Source/TianoTools/CompressDll/CompressDll.c
rename to Tools/CodeTools/TianoTools/CompressDll/CompressDll.c
diff --git a/Tools/Source/TianoTools/CompressDll/CompressDll.h b/Tools/CodeTools/TianoTools/CompressDll/CompressDll.h
similarity index 100%
rename from Tools/Source/TianoTools/CompressDll/CompressDll.h
rename to Tools/CodeTools/TianoTools/CompressDll/CompressDll.h
diff --git a/Tools/Source/TianoTools/CompressDll/build.xml b/Tools/CodeTools/TianoTools/CompressDll/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/CompressDll/build.xml
rename to Tools/CodeTools/TianoTools/CompressDll/build.xml
diff --git a/Tools/Source/TianoTools/CreateMtFile/CreateMtFile.c b/Tools/CodeTools/TianoTools/CreateMtFile/CreateMtFile.c
similarity index 100%
rename from Tools/Source/TianoTools/CreateMtFile/CreateMtFile.c
rename to Tools/CodeTools/TianoTools/CreateMtFile/CreateMtFile.c
diff --git a/Tools/Source/TianoTools/CreateMtFile/build.xml b/Tools/CodeTools/TianoTools/CreateMtFile/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/CreateMtFile/build.xml
rename to Tools/CodeTools/TianoTools/CreateMtFile/build.xml
diff --git a/Tools/Source/TianoTools/CustomizedCompress/CustomizedCompress.c b/Tools/CodeTools/TianoTools/CustomizedCompress/CustomizedCompress.c
similarity index 100%
rename from Tools/Source/TianoTools/CustomizedCompress/CustomizedCompress.c
rename to Tools/CodeTools/TianoTools/CustomizedCompress/CustomizedCompress.c
diff --git a/Tools/Source/TianoTools/CustomizedCompress/build.xml b/Tools/CodeTools/TianoTools/CustomizedCompress/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/CustomizedCompress/build.xml
rename to Tools/CodeTools/TianoTools/CustomizedCompress/build.xml
diff --git a/Tools/Source/TianoTools/EfiCompress/EfiCompressMain.c b/Tools/CodeTools/TianoTools/EfiCompress/EfiCompressMain.c
similarity index 100%
rename from Tools/Source/TianoTools/EfiCompress/EfiCompressMain.c
rename to Tools/CodeTools/TianoTools/EfiCompress/EfiCompressMain.c
diff --git a/Tools/Source/TianoTools/EfiCompress/build.xml b/Tools/CodeTools/TianoTools/EfiCompress/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/EfiCompress/build.xml
rename to Tools/CodeTools/TianoTools/EfiCompress/build.xml
diff --git a/Tools/Source/TianoTools/EfiRom/EfiRom.c b/Tools/CodeTools/TianoTools/EfiRom/EfiRom.c
similarity index 100%
rename from Tools/Source/TianoTools/EfiRom/EfiRom.c
rename to Tools/CodeTools/TianoTools/EfiRom/EfiRom.c
diff --git a/Tools/Source/TianoTools/EfiRom/build.xml b/Tools/CodeTools/TianoTools/EfiRom/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/EfiRom/build.xml
rename to Tools/CodeTools/TianoTools/EfiRom/build.xml
diff --git a/Tools/Source/TianoTools/FlashMap/FlashDefFile.c b/Tools/CodeTools/TianoTools/FlashMap/FlashDefFile.c
similarity index 100%
rename from Tools/Source/TianoTools/FlashMap/FlashDefFile.c
rename to Tools/CodeTools/TianoTools/FlashMap/FlashDefFile.c
diff --git a/Tools/Source/TianoTools/FlashMap/FlashDefFile.h b/Tools/CodeTools/TianoTools/FlashMap/FlashDefFile.h
similarity index 100%
rename from Tools/Source/TianoTools/FlashMap/FlashDefFile.h
rename to Tools/CodeTools/TianoTools/FlashMap/FlashDefFile.h
diff --git a/Tools/Source/TianoTools/FlashMap/FlashMap.c b/Tools/CodeTools/TianoTools/FlashMap/FlashMap.c
similarity index 100%
rename from Tools/Source/TianoTools/FlashMap/FlashMap.c
rename to Tools/CodeTools/TianoTools/FlashMap/FlashMap.c
diff --git a/Tools/Source/TianoTools/FlashMap/Microcode.c b/Tools/CodeTools/TianoTools/FlashMap/Microcode.c
similarity index 100%
rename from Tools/Source/TianoTools/FlashMap/Microcode.c
rename to Tools/CodeTools/TianoTools/FlashMap/Microcode.c
diff --git a/Tools/Source/TianoTools/FlashMap/Microcode.h b/Tools/CodeTools/TianoTools/FlashMap/Microcode.h
similarity index 100%
rename from Tools/Source/TianoTools/FlashMap/Microcode.h
rename to Tools/CodeTools/TianoTools/FlashMap/Microcode.h
diff --git a/Tools/Source/TianoTools/FlashMap/Symbols.c b/Tools/CodeTools/TianoTools/FlashMap/Symbols.c
similarity index 100%
rename from Tools/Source/TianoTools/FlashMap/Symbols.c
rename to Tools/CodeTools/TianoTools/FlashMap/Symbols.c
diff --git a/Tools/Source/TianoTools/FlashMap/Symbols.h b/Tools/CodeTools/TianoTools/FlashMap/Symbols.h
similarity index 100%
rename from Tools/Source/TianoTools/FlashMap/Symbols.h
rename to Tools/CodeTools/TianoTools/FlashMap/Symbols.h
diff --git a/Tools/Source/TianoTools/FlashMap/build.xml b/Tools/CodeTools/TianoTools/FlashMap/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/FlashMap/build.xml
rename to Tools/CodeTools/TianoTools/FlashMap/build.xml
diff --git a/Tools/Source/TianoTools/FwImage/build.xml b/Tools/CodeTools/TianoTools/FwImage/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/FwImage/build.xml
rename to Tools/CodeTools/TianoTools/FwImage/build.xml
diff --git a/Tools/Source/TianoTools/FwImage/fwimage.c b/Tools/CodeTools/TianoTools/FwImage/fwimage.c
similarity index 100%
rename from Tools/Source/TianoTools/FwImage/fwimage.c
rename to Tools/CodeTools/TianoTools/FwImage/fwimage.c
diff --git a/Tools/Source/TianoTools/GenAcpiTable/GenAcpiTable.c b/Tools/CodeTools/TianoTools/GenAcpiTable/GenAcpiTable.c
similarity index 100%
rename from Tools/Source/TianoTools/GenAcpiTable/GenAcpiTable.c
rename to Tools/CodeTools/TianoTools/GenAcpiTable/GenAcpiTable.c
diff --git a/Tools/Source/TianoTools/GenAcpiTable/build.xml b/Tools/CodeTools/TianoTools/GenAcpiTable/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/GenAcpiTable/build.xml
rename to Tools/CodeTools/TianoTools/GenAcpiTable/build.xml
diff --git a/Tools/Source/TianoTools/GenCRC32Section/GenCRC32Section.c b/Tools/CodeTools/TianoTools/GenCRC32Section/GenCRC32Section.c
similarity index 100%
rename from Tools/Source/TianoTools/GenCRC32Section/GenCRC32Section.c
rename to Tools/CodeTools/TianoTools/GenCRC32Section/GenCRC32Section.c
diff --git a/Tools/Source/TianoTools/GenCRC32Section/GenCRC32Section.h b/Tools/CodeTools/TianoTools/GenCRC32Section/GenCRC32Section.h
similarity index 100%
rename from Tools/Source/TianoTools/GenCRC32Section/GenCRC32Section.h
rename to Tools/CodeTools/TianoTools/GenCRC32Section/GenCRC32Section.h
diff --git a/Tools/Source/TianoTools/GenCRC32Section/build.xml b/Tools/CodeTools/TianoTools/GenCRC32Section/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/GenCRC32Section/build.xml
rename to Tools/CodeTools/TianoTools/GenCRC32Section/build.xml
diff --git a/Tools/Source/TianoTools/GenCapsuleHdr/CreateGuid.c b/Tools/CodeTools/TianoTools/GenCapsuleHdr/CreateGuid.c
similarity index 100%
rename from Tools/Source/TianoTools/GenCapsuleHdr/CreateGuid.c
rename to Tools/CodeTools/TianoTools/GenCapsuleHdr/CreateGuid.c
diff --git a/Tools/Source/TianoTools/GenCapsuleHdr/GenCapsuleHdr.c b/Tools/CodeTools/TianoTools/GenCapsuleHdr/GenCapsuleHdr.c
similarity index 100%
rename from Tools/Source/TianoTools/GenCapsuleHdr/GenCapsuleHdr.c
rename to Tools/CodeTools/TianoTools/GenCapsuleHdr/GenCapsuleHdr.c
diff --git a/Tools/Source/TianoTools/GenCapsuleHdr/build.xml b/Tools/CodeTools/TianoTools/GenCapsuleHdr/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/GenCapsuleHdr/build.xml
rename to Tools/CodeTools/TianoTools/GenCapsuleHdr/build.xml
diff --git a/Tools/Source/TianoTools/GenDepex/DepexParser.c b/Tools/CodeTools/TianoTools/GenDepex/DepexParser.c
similarity index 100%
rename from Tools/Source/TianoTools/GenDepex/DepexParser.c
rename to Tools/CodeTools/TianoTools/GenDepex/DepexParser.c
diff --git a/Tools/Source/TianoTools/GenDepex/DepexParser.h b/Tools/CodeTools/TianoTools/GenDepex/DepexParser.h
similarity index 100%
rename from Tools/Source/TianoTools/GenDepex/DepexParser.h
rename to Tools/CodeTools/TianoTools/GenDepex/DepexParser.h
diff --git a/Tools/Source/TianoTools/GenDepex/GenDepex.c b/Tools/CodeTools/TianoTools/GenDepex/GenDepex.c
similarity index 100%
rename from Tools/Source/TianoTools/GenDepex/GenDepex.c
rename to Tools/CodeTools/TianoTools/GenDepex/GenDepex.c
diff --git a/Tools/Source/TianoTools/GenDepex/GenDepex.h b/Tools/CodeTools/TianoTools/GenDepex/GenDepex.h
similarity index 100%
rename from Tools/Source/TianoTools/GenDepex/GenDepex.h
rename to Tools/CodeTools/TianoTools/GenDepex/GenDepex.h
diff --git a/Tools/Source/TianoTools/GenDepex/build.xml b/Tools/CodeTools/TianoTools/GenDepex/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/GenDepex/build.xml
rename to Tools/CodeTools/TianoTools/GenDepex/build.xml
diff --git a/Tools/Source/TianoTools/GenFfsFile/GenFfsFile.c b/Tools/CodeTools/TianoTools/GenFfsFile/GenFfsFile.c
similarity index 100%
rename from Tools/Source/TianoTools/GenFfsFile/GenFfsFile.c
rename to Tools/CodeTools/TianoTools/GenFfsFile/GenFfsFile.c
diff --git a/Tools/Source/TianoTools/GenFfsFile/GenFfsFile.h b/Tools/CodeTools/TianoTools/GenFfsFile/GenFfsFile.h
similarity index 100%
rename from Tools/Source/TianoTools/GenFfsFile/GenFfsFile.h
rename to Tools/CodeTools/TianoTools/GenFfsFile/GenFfsFile.h
diff --git a/Tools/Source/TianoTools/GenFfsFile/SimpleFileParsing.c b/Tools/CodeTools/TianoTools/GenFfsFile/SimpleFileParsing.c
similarity index 100%
rename from Tools/Source/TianoTools/GenFfsFile/SimpleFileParsing.c
rename to Tools/CodeTools/TianoTools/GenFfsFile/SimpleFileParsing.c
diff --git a/Tools/Source/TianoTools/GenFfsFile/build.xml b/Tools/CodeTools/TianoTools/GenFfsFile/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/GenFfsFile/build.xml
rename to Tools/CodeTools/TianoTools/GenFfsFile/build.xml
diff --git a/Tools/Source/TianoTools/GenFvImage/Ebc/PeCoffLoaderEx.c b/Tools/CodeTools/TianoTools/GenFvImage/Ebc/PeCoffLoaderEx.c
similarity index 100%
rename from Tools/Source/TianoTools/GenFvImage/Ebc/PeCoffLoaderEx.c
rename to Tools/CodeTools/TianoTools/GenFvImage/Ebc/PeCoffLoaderEx.c
diff --git a/Tools/Source/TianoTools/GenFvImage/GenFvImageExe.c b/Tools/CodeTools/TianoTools/GenFvImage/GenFvImageExe.c
similarity index 100%
rename from Tools/Source/TianoTools/GenFvImage/GenFvImageExe.c
rename to Tools/CodeTools/TianoTools/GenFvImage/GenFvImageExe.c
diff --git a/Tools/Source/TianoTools/GenFvImage/GenFvImageExe.h b/Tools/CodeTools/TianoTools/GenFvImage/GenFvImageExe.h
similarity index 100%
rename from Tools/Source/TianoTools/GenFvImage/GenFvImageExe.h
rename to Tools/CodeTools/TianoTools/GenFvImage/GenFvImageExe.h
diff --git a/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.c b/Tools/CodeTools/TianoTools/GenFvImage/GenFvImageLib.c
similarity index 100%
rename from Tools/Source/TianoTools/GenFvImage/GenFvImageLib.c
rename to Tools/CodeTools/TianoTools/GenFvImage/GenFvImageLib.c
diff --git a/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.h b/Tools/CodeTools/TianoTools/GenFvImage/GenFvImageLib.h
similarity index 100%
rename from Tools/Source/TianoTools/GenFvImage/GenFvImageLib.h
rename to Tools/CodeTools/TianoTools/GenFvImage/GenFvImageLib.h
diff --git a/Tools/Source/TianoTools/GenFvImage/GenFvImageLibInternal.h b/Tools/CodeTools/TianoTools/GenFvImage/GenFvImageLibInternal.h
similarity index 100%
rename from Tools/Source/TianoTools/GenFvImage/GenFvImageLibInternal.h
rename to Tools/CodeTools/TianoTools/GenFvImage/GenFvImageLibInternal.h
diff --git a/Tools/Source/TianoTools/GenFvImage/build.xml b/Tools/CodeTools/TianoTools/GenFvImage/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/GenFvImage/build.xml
rename to Tools/CodeTools/TianoTools/GenFvImage/build.xml
diff --git a/Tools/Source/TianoTools/GenSection/GenSection.c b/Tools/CodeTools/TianoTools/GenSection/GenSection.c
similarity index 100%
rename from Tools/Source/TianoTools/GenSection/GenSection.c
rename to Tools/CodeTools/TianoTools/GenSection/GenSection.c
diff --git a/Tools/Source/TianoTools/GenSection/GenSection.h b/Tools/CodeTools/TianoTools/GenSection/GenSection.h
similarity index 100%
rename from Tools/Source/TianoTools/GenSection/GenSection.h
rename to Tools/CodeTools/TianoTools/GenSection/GenSection.h
diff --git a/Tools/Source/TianoTools/GenSection/build.xml b/Tools/CodeTools/TianoTools/GenSection/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/GenSection/build.xml
rename to Tools/CodeTools/TianoTools/GenSection/build.xml
diff --git a/Tools/Source/TianoTools/GenTEImage/GenTEImage.c b/Tools/CodeTools/TianoTools/GenTEImage/GenTEImage.c
similarity index 100%
rename from Tools/Source/TianoTools/GenTEImage/GenTEImage.c
rename to Tools/CodeTools/TianoTools/GenTEImage/GenTEImage.c
diff --git a/Tools/Source/TianoTools/GenTEImage/build.xml b/Tools/CodeTools/TianoTools/GenTEImage/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/GenTEImage/build.xml
rename to Tools/CodeTools/TianoTools/GenTEImage/build.xml
diff --git a/Tools/Source/TianoTools/GuidChk/CommonUtils.h b/Tools/CodeTools/TianoTools/GuidChk/CommonUtils.h
similarity index 100%
rename from Tools/Source/TianoTools/GuidChk/CommonUtils.h
rename to Tools/CodeTools/TianoTools/GuidChk/CommonUtils.h
diff --git a/Tools/Source/TianoTools/GuidChk/FileSearch.c b/Tools/CodeTools/TianoTools/GuidChk/FileSearch.c
similarity index 100%
rename from Tools/Source/TianoTools/GuidChk/FileSearch.c
rename to Tools/CodeTools/TianoTools/GuidChk/FileSearch.c
diff --git a/Tools/Source/TianoTools/GuidChk/FileSearch.h b/Tools/CodeTools/TianoTools/GuidChk/FileSearch.h
similarity index 100%
rename from Tools/Source/TianoTools/GuidChk/FileSearch.h
rename to Tools/CodeTools/TianoTools/GuidChk/FileSearch.h
diff --git a/Tools/Source/TianoTools/GuidChk/GuidChk.c b/Tools/CodeTools/TianoTools/GuidChk/GuidChk.c
similarity index 100%
rename from Tools/Source/TianoTools/GuidChk/GuidChk.c
rename to Tools/CodeTools/TianoTools/GuidChk/GuidChk.c
diff --git a/Tools/Source/TianoTools/GuidChk/GuidList.c b/Tools/CodeTools/TianoTools/GuidChk/GuidList.c
similarity index 100%
rename from Tools/Source/TianoTools/GuidChk/GuidList.c
rename to Tools/CodeTools/TianoTools/GuidChk/GuidList.c
diff --git a/Tools/Source/TianoTools/GuidChk/UtilsMsgs.c b/Tools/CodeTools/TianoTools/GuidChk/UtilsMsgs.c
similarity index 100%
rename from Tools/Source/TianoTools/GuidChk/UtilsMsgs.c
rename to Tools/CodeTools/TianoTools/GuidChk/UtilsMsgs.c
diff --git a/Tools/Source/TianoTools/GuidChk/UtilsMsgs.h b/Tools/CodeTools/TianoTools/GuidChk/UtilsMsgs.h
similarity index 100%
rename from Tools/Source/TianoTools/GuidChk/UtilsMsgs.h
rename to Tools/CodeTools/TianoTools/GuidChk/UtilsMsgs.h
diff --git a/Tools/Source/TianoTools/GuidChk/build.xml b/Tools/CodeTools/TianoTools/GuidChk/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/GuidChk/build.xml
rename to Tools/CodeTools/TianoTools/GuidChk/build.xml
diff --git a/Tools/Source/TianoTools/Include/Common/BaseTypes.h b/Tools/CodeTools/TianoTools/Include/Common/BaseTypes.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Common/BaseTypes.h
rename to Tools/CodeTools/TianoTools/Include/Common/BaseTypes.h
diff --git a/Tools/Source/TianoTools/Include/Common/Capsule.h b/Tools/CodeTools/TianoTools/Include/Common/Capsule.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Common/Capsule.h
rename to Tools/CodeTools/TianoTools/Include/Common/Capsule.h
diff --git a/Tools/Source/TianoTools/Include/Common/Dependency.h b/Tools/CodeTools/TianoTools/Include/Common/Dependency.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Common/Dependency.h
rename to Tools/CodeTools/TianoTools/Include/Common/Dependency.h
diff --git a/Tools/Source/TianoTools/Include/Common/EfiImage.h b/Tools/CodeTools/TianoTools/Include/Common/EfiImage.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Common/EfiImage.h
rename to Tools/CodeTools/TianoTools/Include/Common/EfiImage.h
diff --git a/Tools/Source/TianoTools/Include/Common/FirmwareFileSystem.h b/Tools/CodeTools/TianoTools/Include/Common/FirmwareFileSystem.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Common/FirmwareFileSystem.h
rename to Tools/CodeTools/TianoTools/Include/Common/FirmwareFileSystem.h
diff --git a/Tools/Source/TianoTools/Include/Common/FirmwareVolumeHeader.h b/Tools/CodeTools/TianoTools/Include/Common/FirmwareVolumeHeader.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Common/FirmwareVolumeHeader.h
rename to Tools/CodeTools/TianoTools/Include/Common/FirmwareVolumeHeader.h
diff --git a/Tools/Source/TianoTools/Include/Common/FirmwareVolumeImageFormat.h b/Tools/CodeTools/TianoTools/Include/Common/FirmwareVolumeImageFormat.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Common/FirmwareVolumeImageFormat.h
rename to Tools/CodeTools/TianoTools/Include/Common/FirmwareVolumeImageFormat.h
diff --git a/Tools/Source/TianoTools/Include/Common/InternalFormRepresentation.h b/Tools/CodeTools/TianoTools/Include/Common/InternalFormRepresentation.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Common/InternalFormRepresentation.h
rename to Tools/CodeTools/TianoTools/Include/Common/InternalFormRepresentation.h
diff --git a/Tools/Source/TianoTools/Include/Common/MultiPhase.h b/Tools/CodeTools/TianoTools/Include/Common/MultiPhase.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Common/MultiPhase.h
rename to Tools/CodeTools/TianoTools/Include/Common/MultiPhase.h
diff --git a/Tools/Source/TianoTools/Include/Common/UefiBaseTypes.h b/Tools/CodeTools/TianoTools/Include/Common/UefiBaseTypes.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Common/UefiBaseTypes.h
rename to Tools/CodeTools/TianoTools/Include/Common/UefiBaseTypes.h
diff --git a/Tools/Source/TianoTools/Include/Common/Variable.h b/Tools/CodeTools/TianoTools/Include/Common/Variable.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Common/Variable.h
rename to Tools/CodeTools/TianoTools/Include/Common/Variable.h
diff --git a/Tools/Source/TianoTools/Include/Common/WorkingBlockHeader.h b/Tools/CodeTools/TianoTools/Include/Common/WorkingBlockHeader.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Common/WorkingBlockHeader.h
rename to Tools/CodeTools/TianoTools/Include/Common/WorkingBlockHeader.h
diff --git a/Tools/Source/TianoTools/Include/Guid/AcpiTableStorage.h b/Tools/CodeTools/TianoTools/Include/Guid/AcpiTableStorage.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Guid/AcpiTableStorage.h
rename to Tools/CodeTools/TianoTools/Include/Guid/AcpiTableStorage.h
diff --git a/Tools/Source/TianoTools/Include/Guid/Apriori.h b/Tools/CodeTools/TianoTools/Include/Guid/Apriori.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Guid/Apriori.h
rename to Tools/CodeTools/TianoTools/Include/Guid/Apriori.h
diff --git a/Tools/Source/TianoTools/Include/Guid/Capsule.h b/Tools/CodeTools/TianoTools/Include/Guid/Capsule.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Guid/Capsule.h
rename to Tools/CodeTools/TianoTools/Include/Guid/Capsule.h
diff --git a/Tools/Source/TianoTools/Include/Guid/FirmwareFileSystem.h b/Tools/CodeTools/TianoTools/Include/Guid/FirmwareFileSystem.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Guid/FirmwareFileSystem.h
rename to Tools/CodeTools/TianoTools/Include/Guid/FirmwareFileSystem.h
diff --git a/Tools/Source/TianoTools/Include/Ia32/ProcessorBind.h b/Tools/CodeTools/TianoTools/Include/Ia32/ProcessorBind.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Ia32/ProcessorBind.h
rename to Tools/CodeTools/TianoTools/Include/Ia32/ProcessorBind.h
diff --git a/Tools/Source/TianoTools/Include/IndustryStandard/pci22.h b/Tools/CodeTools/TianoTools/Include/IndustryStandard/pci22.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/IndustryStandard/pci22.h
rename to Tools/CodeTools/TianoTools/Include/IndustryStandard/pci22.h
diff --git a/Tools/Source/TianoTools/Include/Library/PeCoffLib.h b/Tools/CodeTools/TianoTools/Include/Library/PeCoffLib.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Library/PeCoffLib.h
rename to Tools/CodeTools/TianoTools/Include/Library/PeCoffLib.h
diff --git a/Tools/Source/TianoTools/Include/Library/PrintLib.h b/Tools/CodeTools/TianoTools/Include/Library/PrintLib.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Library/PrintLib.h
rename to Tools/CodeTools/TianoTools/Include/Library/PrintLib.h
diff --git a/Tools/Source/TianoTools/Include/Protocol/DevicePath.h b/Tools/CodeTools/TianoTools/Include/Protocol/DevicePath.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Protocol/DevicePath.h
rename to Tools/CodeTools/TianoTools/Include/Protocol/DevicePath.h
diff --git a/Tools/Source/TianoTools/Include/Protocol/GuidedSectionExtraction.h b/Tools/CodeTools/TianoTools/Include/Protocol/GuidedSectionExtraction.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Protocol/GuidedSectionExtraction.h
rename to Tools/CodeTools/TianoTools/Include/Protocol/GuidedSectionExtraction.h
diff --git a/Tools/Source/TianoTools/Include/Protocol/Hii.h b/Tools/CodeTools/TianoTools/Include/Protocol/Hii.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Protocol/Hii.h
rename to Tools/CodeTools/TianoTools/Include/Protocol/Hii.h
diff --git a/Tools/Source/TianoTools/Include/Protocol/UgaDraw.h b/Tools/CodeTools/TianoTools/Include/Protocol/UgaDraw.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/Protocol/UgaDraw.h
rename to Tools/CodeTools/TianoTools/Include/Protocol/UgaDraw.h
diff --git a/Tools/Source/TianoTools/Include/X64/ProcessorBind.h b/Tools/CodeTools/TianoTools/Include/X64/ProcessorBind.h
similarity index 100%
rename from Tools/Source/TianoTools/Include/X64/ProcessorBind.h
rename to Tools/CodeTools/TianoTools/Include/X64/ProcessorBind.h
diff --git a/Tools/Source/TianoTools/MakeDeps/MakeDeps.c b/Tools/CodeTools/TianoTools/MakeDeps/MakeDeps.c
similarity index 100%
rename from Tools/Source/TianoTools/MakeDeps/MakeDeps.c
rename to Tools/CodeTools/TianoTools/MakeDeps/MakeDeps.c
diff --git a/Tools/Source/TianoTools/MakeDeps/build.xml b/Tools/CodeTools/TianoTools/MakeDeps/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/MakeDeps/build.xml
rename to Tools/CodeTools/TianoTools/MakeDeps/build.xml
diff --git a/Tools/Source/TianoTools/ModifyInf/ModifyInf.c b/Tools/CodeTools/TianoTools/ModifyInf/ModifyInf.c
similarity index 100%
rename from Tools/Source/TianoTools/ModifyInf/ModifyInf.c
rename to Tools/CodeTools/TianoTools/ModifyInf/ModifyInf.c
diff --git a/Tools/Source/TianoTools/ModifyInf/build.xml b/Tools/CodeTools/TianoTools/ModifyInf/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/ModifyInf/build.xml
rename to Tools/CodeTools/TianoTools/ModifyInf/build.xml
diff --git a/Tools/Source/TianoTools/Pccts/CHANGES_FROM_131.txt b/Tools/CodeTools/TianoTools/Pccts/CHANGES_FROM_131.txt
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/CHANGES_FROM_131.txt
rename to Tools/CodeTools/TianoTools/Pccts/CHANGES_FROM_131.txt
diff --git a/Tools/Source/TianoTools/Pccts/CHANGES_FROM_133.txt b/Tools/CodeTools/TianoTools/Pccts/CHANGES_FROM_133.txt
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/CHANGES_FROM_133.txt
rename to Tools/CodeTools/TianoTools/Pccts/CHANGES_FROM_133.txt
diff --git a/Tools/Source/TianoTools/Pccts/CHANGES_FROM_133_BEFORE_MR13.txt b/Tools/CodeTools/TianoTools/Pccts/CHANGES_FROM_133_BEFORE_MR13.txt
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/CHANGES_FROM_133_BEFORE_MR13.txt
rename to Tools/CodeTools/TianoTools/Pccts/CHANGES_FROM_133_BEFORE_MR13.txt
diff --git a/Tools/Source/TianoTools/Pccts/CHANGES_SUMMARY.txt b/Tools/CodeTools/TianoTools/Pccts/CHANGES_SUMMARY.txt
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/CHANGES_SUMMARY.txt
rename to Tools/CodeTools/TianoTools/Pccts/CHANGES_SUMMARY.txt
diff --git a/Tools/Source/TianoTools/Pccts/KNOWN_PROBLEMS.txt b/Tools/CodeTools/TianoTools/Pccts/KNOWN_PROBLEMS.txt
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/KNOWN_PROBLEMS.txt
rename to Tools/CodeTools/TianoTools/Pccts/KNOWN_PROBLEMS.txt
diff --git a/Tools/Source/TianoTools/Pccts/MPW_Read_Me b/Tools/CodeTools/TianoTools/Pccts/MPW_Read_Me
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/MPW_Read_Me
rename to Tools/CodeTools/TianoTools/Pccts/MPW_Read_Me
diff --git a/Tools/Source/TianoTools/Pccts/NOTES.bcc b/Tools/CodeTools/TianoTools/Pccts/NOTES.bcc
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/NOTES.bcc
rename to Tools/CodeTools/TianoTools/Pccts/NOTES.bcc
diff --git a/Tools/Source/TianoTools/Pccts/NOTES.msvc b/Tools/CodeTools/TianoTools/Pccts/NOTES.msvc
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/NOTES.msvc
rename to Tools/CodeTools/TianoTools/Pccts/NOTES.msvc
diff --git a/Tools/Source/TianoTools/Pccts/README b/Tools/CodeTools/TianoTools/Pccts/README
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/README
rename to Tools/CodeTools/TianoTools/Pccts/README
diff --git a/Tools/Source/TianoTools/Pccts/RIGHTS b/Tools/CodeTools/TianoTools/Pccts/RIGHTS
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/RIGHTS
rename to Tools/CodeTools/TianoTools/Pccts/RIGHTS
diff --git a/Tools/Source/TianoTools/Pccts/antlr/AntlrMS.mak b/Tools/CodeTools/TianoTools/Pccts/antlr/AntlrMS.mak
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/AntlrMS.mak
rename to Tools/CodeTools/TianoTools/Pccts/antlr/AntlrMS.mak
diff --git a/Tools/Source/TianoTools/Pccts/antlr/AntlrPPC.mak b/Tools/CodeTools/TianoTools/Pccts/antlr/AntlrPPC.mak
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/AntlrPPC.mak
rename to Tools/CodeTools/TianoTools/Pccts/antlr/AntlrPPC.mak
diff --git a/Tools/Source/TianoTools/Pccts/antlr/README b/Tools/CodeTools/TianoTools/Pccts/antlr/README
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/README
rename to Tools/CodeTools/TianoTools/Pccts/antlr/README
diff --git a/Tools/Source/TianoTools/Pccts/antlr/antlr.1 b/Tools/CodeTools/TianoTools/Pccts/antlr/antlr.1
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/antlr.1
rename to Tools/CodeTools/TianoTools/Pccts/antlr/antlr.1
diff --git a/Tools/Source/TianoTools/Pccts/antlr/antlr.c b/Tools/CodeTools/TianoTools/Pccts/antlr/antlr.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/antlr.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/antlr.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/antlr.g b/Tools/CodeTools/TianoTools/Pccts/antlr/antlr.g
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/antlr.g
rename to Tools/CodeTools/TianoTools/Pccts/antlr/antlr.g
diff --git a/Tools/Source/TianoTools/Pccts/antlr/antlr.r b/Tools/CodeTools/TianoTools/Pccts/antlr/antlr.r
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/antlr.r
rename to Tools/CodeTools/TianoTools/Pccts/antlr/antlr.r
diff --git a/Tools/Source/TianoTools/Pccts/antlr/antlr1.txt b/Tools/CodeTools/TianoTools/Pccts/antlr/antlr1.txt
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/antlr1.txt
rename to Tools/CodeTools/TianoTools/Pccts/antlr/antlr1.txt
diff --git a/Tools/Source/TianoTools/Pccts/antlr/bits.c b/Tools/CodeTools/TianoTools/Pccts/antlr/bits.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/bits.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/bits.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/build.c b/Tools/CodeTools/TianoTools/Pccts/antlr/build.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/build.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/build.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/build.xml b/Tools/CodeTools/TianoTools/Pccts/antlr/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/build.xml
rename to Tools/CodeTools/TianoTools/Pccts/antlr/build.xml
diff --git a/Tools/Source/TianoTools/Pccts/antlr/dumpcycles.c b/Tools/CodeTools/TianoTools/Pccts/antlr/dumpcycles.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/dumpcycles.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/dumpcycles.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/dumpnode.c b/Tools/CodeTools/TianoTools/Pccts/antlr/dumpnode.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/dumpnode.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/dumpnode.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/egman.c b/Tools/CodeTools/TianoTools/Pccts/antlr/egman.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/egman.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/egman.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/err.c b/Tools/CodeTools/TianoTools/Pccts/antlr/err.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/err.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/err.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/fcache.c b/Tools/CodeTools/TianoTools/Pccts/antlr/fcache.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/fcache.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/fcache.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/fset.c b/Tools/CodeTools/TianoTools/Pccts/antlr/fset.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/fset.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/fset.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/fset2.c b/Tools/CodeTools/TianoTools/Pccts/antlr/fset2.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/fset2.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/fset2.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/gen.c b/Tools/CodeTools/TianoTools/Pccts/antlr/gen.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/gen.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/gen.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/generic.h b/Tools/CodeTools/TianoTools/Pccts/antlr/generic.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/generic.h
rename to Tools/CodeTools/TianoTools/Pccts/antlr/generic.h
diff --git a/Tools/Source/TianoTools/Pccts/antlr/globals.c b/Tools/CodeTools/TianoTools/Pccts/antlr/globals.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/globals.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/globals.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/hash.c b/Tools/CodeTools/TianoTools/Pccts/antlr/hash.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/hash.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/hash.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/hash.h b/Tools/CodeTools/TianoTools/Pccts/antlr/hash.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/hash.h
rename to Tools/CodeTools/TianoTools/Pccts/antlr/hash.h
diff --git a/Tools/Source/TianoTools/Pccts/antlr/lex.c b/Tools/CodeTools/TianoTools/Pccts/antlr/lex.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/lex.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/lex.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/main.c b/Tools/CodeTools/TianoTools/Pccts/antlr/main.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/main.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/main.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/makefile b/Tools/CodeTools/TianoTools/Pccts/antlr/makefile
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/makefile
rename to Tools/CodeTools/TianoTools/Pccts/antlr/makefile
diff --git a/Tools/Source/TianoTools/Pccts/antlr/makefile.cygwin b/Tools/CodeTools/TianoTools/Pccts/antlr/makefile.cygwin
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/makefile.cygwin
rename to Tools/CodeTools/TianoTools/Pccts/antlr/makefile.cygwin
diff --git a/Tools/Source/TianoTools/Pccts/antlr/makefile1 b/Tools/CodeTools/TianoTools/Pccts/antlr/makefile1
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/makefile1
rename to Tools/CodeTools/TianoTools/Pccts/antlr/makefile1
diff --git a/Tools/Source/TianoTools/Pccts/antlr/misc.c b/Tools/CodeTools/TianoTools/Pccts/antlr/misc.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/misc.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/misc.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/mode.h b/Tools/CodeTools/TianoTools/Pccts/antlr/mode.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/mode.h
rename to Tools/CodeTools/TianoTools/Pccts/antlr/mode.h
diff --git a/Tools/Source/TianoTools/Pccts/antlr/mrhoist.c b/Tools/CodeTools/TianoTools/Pccts/antlr/mrhoist.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/mrhoist.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/mrhoist.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/parser.dlg b/Tools/CodeTools/TianoTools/Pccts/antlr/parser.dlg
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/parser.dlg
rename to Tools/CodeTools/TianoTools/Pccts/antlr/parser.dlg
diff --git a/Tools/Source/TianoTools/Pccts/antlr/pred.c b/Tools/CodeTools/TianoTools/Pccts/antlr/pred.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/pred.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/pred.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/proto.h b/Tools/CodeTools/TianoTools/Pccts/antlr/proto.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/proto.h
rename to Tools/CodeTools/TianoTools/Pccts/antlr/proto.h
diff --git a/Tools/Source/TianoTools/Pccts/antlr/scan.c b/Tools/CodeTools/TianoTools/Pccts/antlr/scan.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/scan.c
rename to Tools/CodeTools/TianoTools/Pccts/antlr/scan.c
diff --git a/Tools/Source/TianoTools/Pccts/antlr/stdpccts.h b/Tools/CodeTools/TianoTools/Pccts/antlr/stdpccts.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/stdpccts.h
rename to Tools/CodeTools/TianoTools/Pccts/antlr/stdpccts.h
diff --git a/Tools/Source/TianoTools/Pccts/antlr/syn.h b/Tools/CodeTools/TianoTools/Pccts/antlr/syn.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/syn.h
rename to Tools/CodeTools/TianoTools/Pccts/antlr/syn.h
diff --git a/Tools/Source/TianoTools/Pccts/antlr/tokens.h b/Tools/CodeTools/TianoTools/Pccts/antlr/tokens.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/antlr/tokens.h
rename to Tools/CodeTools/TianoTools/Pccts/antlr/tokens.h
diff --git a/Tools/Source/TianoTools/Pccts/build.xml b/Tools/CodeTools/TianoTools/Pccts/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/build.xml
rename to Tools/CodeTools/TianoTools/Pccts/build.xml
diff --git a/Tools/Source/TianoTools/Pccts/dlg/DlgMS.mak b/Tools/CodeTools/TianoTools/Pccts/dlg/DlgMS.mak
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/DlgMS.mak
rename to Tools/CodeTools/TianoTools/Pccts/dlg/DlgMS.mak
diff --git a/Tools/Source/TianoTools/Pccts/dlg/DlgPPC.mak b/Tools/CodeTools/TianoTools/Pccts/dlg/DlgPPC.mak
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/DlgPPC.mak
rename to Tools/CodeTools/TianoTools/Pccts/dlg/DlgPPC.mak
diff --git a/Tools/Source/TianoTools/Pccts/dlg/automata.c b/Tools/CodeTools/TianoTools/Pccts/dlg/automata.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/automata.c
rename to Tools/CodeTools/TianoTools/Pccts/dlg/automata.c
diff --git a/Tools/Source/TianoTools/Pccts/dlg/build.xml b/Tools/CodeTools/TianoTools/Pccts/dlg/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/build.xml
rename to Tools/CodeTools/TianoTools/Pccts/dlg/build.xml
diff --git a/Tools/Source/TianoTools/Pccts/dlg/dlg.1 b/Tools/CodeTools/TianoTools/Pccts/dlg/dlg.1
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/dlg.1
rename to Tools/CodeTools/TianoTools/Pccts/dlg/dlg.1
diff --git a/Tools/Source/TianoTools/Pccts/dlg/dlg.h b/Tools/CodeTools/TianoTools/Pccts/dlg/dlg.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/dlg.h
rename to Tools/CodeTools/TianoTools/Pccts/dlg/dlg.h
diff --git a/Tools/Source/TianoTools/Pccts/dlg/dlg.r b/Tools/CodeTools/TianoTools/Pccts/dlg/dlg.r
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/dlg.r
rename to Tools/CodeTools/TianoTools/Pccts/dlg/dlg.r
diff --git a/Tools/Source/TianoTools/Pccts/dlg/dlg1.txt b/Tools/CodeTools/TianoTools/Pccts/dlg/dlg1.txt
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/dlg1.txt
rename to Tools/CodeTools/TianoTools/Pccts/dlg/dlg1.txt
diff --git a/Tools/Source/TianoTools/Pccts/dlg/dlg_a.c b/Tools/CodeTools/TianoTools/Pccts/dlg/dlg_a.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/dlg_a.c
rename to Tools/CodeTools/TianoTools/Pccts/dlg/dlg_a.c
diff --git a/Tools/Source/TianoTools/Pccts/dlg/dlg_p.c b/Tools/CodeTools/TianoTools/Pccts/dlg/dlg_p.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/dlg_p.c
rename to Tools/CodeTools/TianoTools/Pccts/dlg/dlg_p.c
diff --git a/Tools/Source/TianoTools/Pccts/dlg/dlg_p.g b/Tools/CodeTools/TianoTools/Pccts/dlg/dlg_p.g
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/dlg_p.g
rename to Tools/CodeTools/TianoTools/Pccts/dlg/dlg_p.g
diff --git a/Tools/Source/TianoTools/Pccts/dlg/err.c b/Tools/CodeTools/TianoTools/Pccts/dlg/err.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/err.c
rename to Tools/CodeTools/TianoTools/Pccts/dlg/err.c
diff --git a/Tools/Source/TianoTools/Pccts/dlg/main.c b/Tools/CodeTools/TianoTools/Pccts/dlg/main.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/main.c
rename to Tools/CodeTools/TianoTools/Pccts/dlg/main.c
diff --git a/Tools/Source/TianoTools/Pccts/dlg/makefile b/Tools/CodeTools/TianoTools/Pccts/dlg/makefile
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/makefile
rename to Tools/CodeTools/TianoTools/Pccts/dlg/makefile
diff --git a/Tools/Source/TianoTools/Pccts/dlg/makefile.cygwin b/Tools/CodeTools/TianoTools/Pccts/dlg/makefile.cygwin
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/makefile.cygwin
rename to Tools/CodeTools/TianoTools/Pccts/dlg/makefile.cygwin
diff --git a/Tools/Source/TianoTools/Pccts/dlg/makefile1 b/Tools/CodeTools/TianoTools/Pccts/dlg/makefile1
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/makefile1
rename to Tools/CodeTools/TianoTools/Pccts/dlg/makefile1
diff --git a/Tools/Source/TianoTools/Pccts/dlg/mode.h b/Tools/CodeTools/TianoTools/Pccts/dlg/mode.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/mode.h
rename to Tools/CodeTools/TianoTools/Pccts/dlg/mode.h
diff --git a/Tools/Source/TianoTools/Pccts/dlg/output.c b/Tools/CodeTools/TianoTools/Pccts/dlg/output.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/output.c
rename to Tools/CodeTools/TianoTools/Pccts/dlg/output.c
diff --git a/Tools/Source/TianoTools/Pccts/dlg/parser.dlg b/Tools/CodeTools/TianoTools/Pccts/dlg/parser.dlg
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/parser.dlg
rename to Tools/CodeTools/TianoTools/Pccts/dlg/parser.dlg
diff --git a/Tools/Source/TianoTools/Pccts/dlg/relabel.c b/Tools/CodeTools/TianoTools/Pccts/dlg/relabel.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/relabel.c
rename to Tools/CodeTools/TianoTools/Pccts/dlg/relabel.c
diff --git a/Tools/Source/TianoTools/Pccts/dlg/stdpccts.h b/Tools/CodeTools/TianoTools/Pccts/dlg/stdpccts.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/stdpccts.h
rename to Tools/CodeTools/TianoTools/Pccts/dlg/stdpccts.h
diff --git a/Tools/Source/TianoTools/Pccts/dlg/support.c b/Tools/CodeTools/TianoTools/Pccts/dlg/support.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/support.c
rename to Tools/CodeTools/TianoTools/Pccts/dlg/support.c
diff --git a/Tools/Source/TianoTools/Pccts/dlg/tokens.h b/Tools/CodeTools/TianoTools/Pccts/dlg/tokens.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/dlg/tokens.h
rename to Tools/CodeTools/TianoTools/Pccts/dlg/tokens.h
diff --git a/Tools/Source/TianoTools/Pccts/h/AParser.cpp b/Tools/CodeTools/TianoTools/Pccts/h/AParser.cpp
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/AParser.cpp
rename to Tools/CodeTools/TianoTools/Pccts/h/AParser.cpp
diff --git a/Tools/Source/TianoTools/Pccts/h/AParser.h b/Tools/CodeTools/TianoTools/Pccts/h/AParser.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/AParser.h
rename to Tools/CodeTools/TianoTools/Pccts/h/AParser.h
diff --git a/Tools/Source/TianoTools/Pccts/h/ASTBase.cpp b/Tools/CodeTools/TianoTools/Pccts/h/ASTBase.cpp
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/ASTBase.cpp
rename to Tools/CodeTools/TianoTools/Pccts/h/ASTBase.cpp
diff --git a/Tools/Source/TianoTools/Pccts/h/ASTBase.h b/Tools/CodeTools/TianoTools/Pccts/h/ASTBase.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/ASTBase.h
rename to Tools/CodeTools/TianoTools/Pccts/h/ASTBase.h
diff --git a/Tools/Source/TianoTools/Pccts/h/ATokPtr.h b/Tools/CodeTools/TianoTools/Pccts/h/ATokPtr.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/ATokPtr.h
rename to Tools/CodeTools/TianoTools/Pccts/h/ATokPtr.h
diff --git a/Tools/Source/TianoTools/Pccts/h/ATokPtrImpl.h b/Tools/CodeTools/TianoTools/Pccts/h/ATokPtrImpl.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/ATokPtrImpl.h
rename to Tools/CodeTools/TianoTools/Pccts/h/ATokPtrImpl.h
diff --git a/Tools/Source/TianoTools/Pccts/h/AToken.h b/Tools/CodeTools/TianoTools/Pccts/h/AToken.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/AToken.h
rename to Tools/CodeTools/TianoTools/Pccts/h/AToken.h
diff --git a/Tools/Source/TianoTools/Pccts/h/ATokenBuffer.cpp b/Tools/CodeTools/TianoTools/Pccts/h/ATokenBuffer.cpp
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/ATokenBuffer.cpp
rename to Tools/CodeTools/TianoTools/Pccts/h/ATokenBuffer.cpp
diff --git a/Tools/Source/TianoTools/Pccts/h/ATokenBuffer.h b/Tools/CodeTools/TianoTools/Pccts/h/ATokenBuffer.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/ATokenBuffer.h
rename to Tools/CodeTools/TianoTools/Pccts/h/ATokenBuffer.h
diff --git a/Tools/Source/TianoTools/Pccts/h/ATokenStream.h b/Tools/CodeTools/TianoTools/Pccts/h/ATokenStream.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/ATokenStream.h
rename to Tools/CodeTools/TianoTools/Pccts/h/ATokenStream.h
diff --git a/Tools/Source/TianoTools/Pccts/h/BufFileInput.cpp b/Tools/CodeTools/TianoTools/Pccts/h/BufFileInput.cpp
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/BufFileInput.cpp
rename to Tools/CodeTools/TianoTools/Pccts/h/BufFileInput.cpp
diff --git a/Tools/Source/TianoTools/Pccts/h/BufFileInput.h b/Tools/CodeTools/TianoTools/Pccts/h/BufFileInput.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/BufFileInput.h
rename to Tools/CodeTools/TianoTools/Pccts/h/BufFileInput.h
diff --git a/Tools/Source/TianoTools/Pccts/h/DLG_stream_input.h b/Tools/CodeTools/TianoTools/Pccts/h/DLG_stream_input.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/DLG_stream_input.h
rename to Tools/CodeTools/TianoTools/Pccts/h/DLG_stream_input.h
diff --git a/Tools/Source/TianoTools/Pccts/h/DLexer.h b/Tools/CodeTools/TianoTools/Pccts/h/DLexer.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/DLexer.h
rename to Tools/CodeTools/TianoTools/Pccts/h/DLexer.h
diff --git a/Tools/Source/TianoTools/Pccts/h/DLexerBase.cpp b/Tools/CodeTools/TianoTools/Pccts/h/DLexerBase.cpp
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/DLexerBase.cpp
rename to Tools/CodeTools/TianoTools/Pccts/h/DLexerBase.cpp
diff --git a/Tools/Source/TianoTools/Pccts/h/DLexerBase.h b/Tools/CodeTools/TianoTools/Pccts/h/DLexerBase.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/DLexerBase.h
rename to Tools/CodeTools/TianoTools/Pccts/h/DLexerBase.h
diff --git a/Tools/Source/TianoTools/Pccts/h/PBlackBox.h b/Tools/CodeTools/TianoTools/Pccts/h/PBlackBox.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/PBlackBox.h
rename to Tools/CodeTools/TianoTools/Pccts/h/PBlackBox.h
diff --git a/Tools/Source/TianoTools/Pccts/h/PCCTSAST.cpp b/Tools/CodeTools/TianoTools/Pccts/h/PCCTSAST.cpp
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/PCCTSAST.cpp
rename to Tools/CodeTools/TianoTools/Pccts/h/PCCTSAST.cpp
diff --git a/Tools/Source/TianoTools/Pccts/h/PCCTSAST.h b/Tools/CodeTools/TianoTools/Pccts/h/PCCTSAST.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/PCCTSAST.h
rename to Tools/CodeTools/TianoTools/Pccts/h/PCCTSAST.h
diff --git a/Tools/Source/TianoTools/Pccts/h/SList.h b/Tools/CodeTools/TianoTools/Pccts/h/SList.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/SList.h
rename to Tools/CodeTools/TianoTools/Pccts/h/SList.h
diff --git a/Tools/Source/TianoTools/Pccts/h/antlr.h b/Tools/CodeTools/TianoTools/Pccts/h/antlr.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/antlr.h
rename to Tools/CodeTools/TianoTools/Pccts/h/antlr.h
diff --git a/Tools/Source/TianoTools/Pccts/h/ast.c b/Tools/CodeTools/TianoTools/Pccts/h/ast.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/ast.c
rename to Tools/CodeTools/TianoTools/Pccts/h/ast.c
diff --git a/Tools/Source/TianoTools/Pccts/h/ast.h b/Tools/CodeTools/TianoTools/Pccts/h/ast.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/ast.h
rename to Tools/CodeTools/TianoTools/Pccts/h/ast.h
diff --git a/Tools/Source/TianoTools/Pccts/h/charbuf.h b/Tools/CodeTools/TianoTools/Pccts/h/charbuf.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/charbuf.h
rename to Tools/CodeTools/TianoTools/Pccts/h/charbuf.h
diff --git a/Tools/Source/TianoTools/Pccts/h/charptr.c b/Tools/CodeTools/TianoTools/Pccts/h/charptr.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/charptr.c
rename to Tools/CodeTools/TianoTools/Pccts/h/charptr.c
diff --git a/Tools/Source/TianoTools/Pccts/h/charptr.h b/Tools/CodeTools/TianoTools/Pccts/h/charptr.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/charptr.h
rename to Tools/CodeTools/TianoTools/Pccts/h/charptr.h
diff --git a/Tools/Source/TianoTools/Pccts/h/config.h b/Tools/CodeTools/TianoTools/Pccts/h/config.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/config.h
rename to Tools/CodeTools/TianoTools/Pccts/h/config.h
diff --git a/Tools/Source/TianoTools/Pccts/h/dlgauto.h b/Tools/CodeTools/TianoTools/Pccts/h/dlgauto.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/dlgauto.h
rename to Tools/CodeTools/TianoTools/Pccts/h/dlgauto.h
diff --git a/Tools/Source/TianoTools/Pccts/h/dlgdef.h b/Tools/CodeTools/TianoTools/Pccts/h/dlgdef.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/dlgdef.h
rename to Tools/CodeTools/TianoTools/Pccts/h/dlgdef.h
diff --git a/Tools/Source/TianoTools/Pccts/h/err.h b/Tools/CodeTools/TianoTools/Pccts/h/err.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/err.h
rename to Tools/CodeTools/TianoTools/Pccts/h/err.h
diff --git a/Tools/Source/TianoTools/Pccts/h/int.h b/Tools/CodeTools/TianoTools/Pccts/h/int.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/int.h
rename to Tools/CodeTools/TianoTools/Pccts/h/int.h
diff --git a/Tools/Source/TianoTools/Pccts/h/pccts_assert.h b/Tools/CodeTools/TianoTools/Pccts/h/pccts_assert.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/pccts_assert.h
rename to Tools/CodeTools/TianoTools/Pccts/h/pccts_assert.h
diff --git a/Tools/Source/TianoTools/Pccts/h/pccts_iostream.h b/Tools/CodeTools/TianoTools/Pccts/h/pccts_iostream.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/pccts_iostream.h
rename to Tools/CodeTools/TianoTools/Pccts/h/pccts_iostream.h
diff --git a/Tools/Source/TianoTools/Pccts/h/pccts_istream.h b/Tools/CodeTools/TianoTools/Pccts/h/pccts_istream.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/pccts_istream.h
rename to Tools/CodeTools/TianoTools/Pccts/h/pccts_istream.h
diff --git a/Tools/Source/TianoTools/Pccts/h/pccts_setjmp.h b/Tools/CodeTools/TianoTools/Pccts/h/pccts_setjmp.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/pccts_setjmp.h
rename to Tools/CodeTools/TianoTools/Pccts/h/pccts_setjmp.h
diff --git a/Tools/Source/TianoTools/Pccts/h/pccts_stdarg.h b/Tools/CodeTools/TianoTools/Pccts/h/pccts_stdarg.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/pccts_stdarg.h
rename to Tools/CodeTools/TianoTools/Pccts/h/pccts_stdarg.h
diff --git a/Tools/Source/TianoTools/Pccts/h/pccts_stdio.h b/Tools/CodeTools/TianoTools/Pccts/h/pccts_stdio.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/pccts_stdio.h
rename to Tools/CodeTools/TianoTools/Pccts/h/pccts_stdio.h
diff --git a/Tools/Source/TianoTools/Pccts/h/pccts_stdlib.h b/Tools/CodeTools/TianoTools/Pccts/h/pccts_stdlib.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/pccts_stdlib.h
rename to Tools/CodeTools/TianoTools/Pccts/h/pccts_stdlib.h
diff --git a/Tools/Source/TianoTools/Pccts/h/pccts_string.h b/Tools/CodeTools/TianoTools/Pccts/h/pccts_string.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/pccts_string.h
rename to Tools/CodeTools/TianoTools/Pccts/h/pccts_string.h
diff --git a/Tools/Source/TianoTools/Pccts/h/pcctscfg.h b/Tools/CodeTools/TianoTools/Pccts/h/pcctscfg.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/pcctscfg.h
rename to Tools/CodeTools/TianoTools/Pccts/h/pcctscfg.h
diff --git a/Tools/Source/TianoTools/Pccts/h/pcnames.bat b/Tools/CodeTools/TianoTools/Pccts/h/pcnames.bat
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/pcnames.bat
rename to Tools/CodeTools/TianoTools/Pccts/h/pcnames.bat
diff --git a/Tools/Source/TianoTools/Pccts/h/slist.cpp b/Tools/CodeTools/TianoTools/Pccts/h/slist.cpp
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/h/slist.cpp
rename to Tools/CodeTools/TianoTools/Pccts/h/slist.cpp
diff --git a/Tools/Source/TianoTools/Pccts/history.ps b/Tools/CodeTools/TianoTools/Pccts/history.ps
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/history.ps
rename to Tools/CodeTools/TianoTools/Pccts/history.ps
diff --git a/Tools/Source/TianoTools/Pccts/history.txt b/Tools/CodeTools/TianoTools/Pccts/history.txt
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/history.txt
rename to Tools/CodeTools/TianoTools/Pccts/history.txt
diff --git a/Tools/Source/TianoTools/Pccts/makefile b/Tools/CodeTools/TianoTools/Pccts/makefile
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/makefile
rename to Tools/CodeTools/TianoTools/Pccts/makefile
diff --git a/Tools/Source/TianoTools/Pccts/support/genmk/genmk.c b/Tools/CodeTools/TianoTools/Pccts/support/genmk/genmk.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/support/genmk/genmk.c
rename to Tools/CodeTools/TianoTools/Pccts/support/genmk/genmk.c
diff --git a/Tools/Source/TianoTools/Pccts/support/genmk/genmk_old.c b/Tools/CodeTools/TianoTools/Pccts/support/genmk/genmk_old.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/support/genmk/genmk_old.c
rename to Tools/CodeTools/TianoTools/Pccts/support/genmk/genmk_old.c
diff --git a/Tools/Source/TianoTools/Pccts/support/genmk/makefile b/Tools/CodeTools/TianoTools/Pccts/support/genmk/makefile
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/support/genmk/makefile
rename to Tools/CodeTools/TianoTools/Pccts/support/genmk/makefile
diff --git a/Tools/Source/TianoTools/Pccts/support/rexpr/makefile b/Tools/CodeTools/TianoTools/Pccts/support/rexpr/makefile
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/support/rexpr/makefile
rename to Tools/CodeTools/TianoTools/Pccts/support/rexpr/makefile
diff --git a/Tools/Source/TianoTools/Pccts/support/rexpr/rexpr.c b/Tools/CodeTools/TianoTools/Pccts/support/rexpr/rexpr.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/support/rexpr/rexpr.c
rename to Tools/CodeTools/TianoTools/Pccts/support/rexpr/rexpr.c
diff --git a/Tools/Source/TianoTools/Pccts/support/rexpr/rexpr.h b/Tools/CodeTools/TianoTools/Pccts/support/rexpr/rexpr.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/support/rexpr/rexpr.h
rename to Tools/CodeTools/TianoTools/Pccts/support/rexpr/rexpr.h
diff --git a/Tools/Source/TianoTools/Pccts/support/rexpr/test.c b/Tools/CodeTools/TianoTools/Pccts/support/rexpr/test.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/support/rexpr/test.c
rename to Tools/CodeTools/TianoTools/Pccts/support/rexpr/test.c
diff --git a/Tools/Source/TianoTools/Pccts/support/set/set.c b/Tools/CodeTools/TianoTools/Pccts/support/set/set.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/support/set/set.c
rename to Tools/CodeTools/TianoTools/Pccts/support/set/set.c
diff --git a/Tools/Source/TianoTools/Pccts/support/set/set.h b/Tools/CodeTools/TianoTools/Pccts/support/set/set.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/support/set/set.h
rename to Tools/CodeTools/TianoTools/Pccts/support/set/set.h
diff --git a/Tools/Source/TianoTools/Pccts/support/sym/sym.c b/Tools/CodeTools/TianoTools/Pccts/support/sym/sym.c
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/support/sym/sym.c
rename to Tools/CodeTools/TianoTools/Pccts/support/sym/sym.c
diff --git a/Tools/Source/TianoTools/Pccts/support/sym/template.h b/Tools/CodeTools/TianoTools/Pccts/support/sym/template.h
similarity index 100%
rename from Tools/Source/TianoTools/Pccts/support/sym/template.h
rename to Tools/CodeTools/TianoTools/Pccts/support/sym/template.h
diff --git a/Tools/Source/TianoTools/PeCoffLoader/BasePeCoff.c b/Tools/CodeTools/TianoTools/PeCoffLoader/BasePeCoff.c
similarity index 100%
rename from Tools/Source/TianoTools/PeCoffLoader/BasePeCoff.c
rename to Tools/CodeTools/TianoTools/PeCoffLoader/BasePeCoff.c
diff --git a/Tools/Source/TianoTools/PeCoffLoader/Common/EfiImage.h b/Tools/CodeTools/TianoTools/PeCoffLoader/Common/EfiImage.h
similarity index 100%
rename from Tools/Source/TianoTools/PeCoffLoader/Common/EfiImage.h
rename to Tools/CodeTools/TianoTools/PeCoffLoader/Common/EfiImage.h
diff --git a/Tools/Source/TianoTools/PeCoffLoader/Ia32/PeCoffLoaderEx.c b/Tools/CodeTools/TianoTools/PeCoffLoader/Ia32/PeCoffLoaderEx.c
similarity index 100%
rename from Tools/Source/TianoTools/PeCoffLoader/Ia32/PeCoffLoaderEx.c
rename to Tools/CodeTools/TianoTools/PeCoffLoader/Ia32/PeCoffLoaderEx.c
diff --git a/Tools/Source/TianoTools/PeCoffLoader/Ipf/PeCoffLoaderEx.c b/Tools/CodeTools/TianoTools/PeCoffLoader/Ipf/PeCoffLoaderEx.c
similarity index 100%
rename from Tools/Source/TianoTools/PeCoffLoader/Ipf/PeCoffLoaderEx.c
rename to Tools/CodeTools/TianoTools/PeCoffLoader/Ipf/PeCoffLoaderEx.c
diff --git a/Tools/Source/TianoTools/PeCoffLoader/X64/PeCoffLoaderEx.c b/Tools/CodeTools/TianoTools/PeCoffLoader/X64/PeCoffLoaderEx.c
similarity index 100%
rename from Tools/Source/TianoTools/PeCoffLoader/X64/PeCoffLoaderEx.c
rename to Tools/CodeTools/TianoTools/PeCoffLoader/X64/PeCoffLoaderEx.c
diff --git a/Tools/Source/TianoTools/PeCoffLoader/build.xml b/Tools/CodeTools/TianoTools/PeCoffLoader/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/PeCoffLoader/build.xml
rename to Tools/CodeTools/TianoTools/PeCoffLoader/build.xml
diff --git a/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c b/Tools/CodeTools/TianoTools/PeiRebase/PeiRebaseExe.c
similarity index 100%
rename from Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c
rename to Tools/CodeTools/TianoTools/PeiRebase/PeiRebaseExe.c
diff --git a/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.h b/Tools/CodeTools/TianoTools/PeiRebase/PeiRebaseExe.h
similarity index 100%
rename from Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.h
rename to Tools/CodeTools/TianoTools/PeiRebase/PeiRebaseExe.h
diff --git a/Tools/Source/TianoTools/PeiRebase/build.xml b/Tools/CodeTools/TianoTools/PeiRebase/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/PeiRebase/build.xml
rename to Tools/CodeTools/TianoTools/PeiRebase/build.xml
diff --git a/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.c b/Tools/CodeTools/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.c
similarity index 100%
rename from Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.c
rename to Tools/CodeTools/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.c
diff --git a/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h b/Tools/CodeTools/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h
similarity index 100%
rename from Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h
rename to Tools/CodeTools/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h
diff --git a/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml b/Tools/CodeTools/TianoTools/SecApResetVectorFixup/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
rename to Tools/CodeTools/TianoTools/SecApResetVectorFixup/build.xml
diff --git a/Tools/Source/TianoTools/SecFixup/SecFixup.c b/Tools/CodeTools/TianoTools/SecFixup/SecFixup.c
similarity index 100%
rename from Tools/Source/TianoTools/SecFixup/SecFixup.c
rename to Tools/CodeTools/TianoTools/SecFixup/SecFixup.c
diff --git a/Tools/Source/TianoTools/SecFixup/SecFixup.h b/Tools/CodeTools/TianoTools/SecFixup/SecFixup.h
similarity index 100%
rename from Tools/Source/TianoTools/SecFixup/SecFixup.h
rename to Tools/CodeTools/TianoTools/SecFixup/SecFixup.h
diff --git a/Tools/Source/TianoTools/SecFixup/build.xml b/Tools/CodeTools/TianoTools/SecFixup/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/SecFixup/build.xml
rename to Tools/CodeTools/TianoTools/SecFixup/build.xml
diff --git a/Tools/Source/TianoTools/SetStamp/SetStamp.c b/Tools/CodeTools/TianoTools/SetStamp/SetStamp.c
similarity index 100%
rename from Tools/Source/TianoTools/SetStamp/SetStamp.c
rename to Tools/CodeTools/TianoTools/SetStamp/SetStamp.c
diff --git a/Tools/Source/TianoTools/SetStamp/build.xml b/Tools/CodeTools/TianoTools/SetStamp/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/SetStamp/build.xml
rename to Tools/CodeTools/TianoTools/SetStamp/build.xml
diff --git a/Tools/Source/TianoTools/SplitFile/SplitFile.c b/Tools/CodeTools/TianoTools/SplitFile/SplitFile.c
similarity index 100%
rename from Tools/Source/TianoTools/SplitFile/SplitFile.c
rename to Tools/CodeTools/TianoTools/SplitFile/SplitFile.c
diff --git a/Tools/Source/TianoTools/SplitFile/build.xml b/Tools/CodeTools/TianoTools/SplitFile/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/SplitFile/build.xml
rename to Tools/CodeTools/TianoTools/SplitFile/build.xml
diff --git a/Tools/Source/TianoTools/StrGather/StrGather.c b/Tools/CodeTools/TianoTools/StrGather/StrGather.c
similarity index 100%
rename from Tools/Source/TianoTools/StrGather/StrGather.c
rename to Tools/CodeTools/TianoTools/StrGather/StrGather.c
diff --git a/Tools/Source/TianoTools/StrGather/StrGather.h b/Tools/CodeTools/TianoTools/StrGather/StrGather.h
similarity index 100%
rename from Tools/Source/TianoTools/StrGather/StrGather.h
rename to Tools/CodeTools/TianoTools/StrGather/StrGather.h
diff --git a/Tools/Source/TianoTools/StrGather/StringDB.c b/Tools/CodeTools/TianoTools/StrGather/StringDB.c
similarity index 100%
rename from Tools/Source/TianoTools/StrGather/StringDB.c
rename to Tools/CodeTools/TianoTools/StrGather/StringDB.c
diff --git a/Tools/Source/TianoTools/StrGather/StringDB.h b/Tools/CodeTools/TianoTools/StrGather/StringDB.h
similarity index 100%
rename from Tools/Source/TianoTools/StrGather/StringDB.h
rename to Tools/CodeTools/TianoTools/StrGather/StringDB.h
diff --git a/Tools/Source/TianoTools/StrGather/build.xml b/Tools/CodeTools/TianoTools/StrGather/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/StrGather/build.xml
rename to Tools/CodeTools/TianoTools/StrGather/build.xml
diff --git a/Tools/Source/TianoTools/String/PrintLib.c b/Tools/CodeTools/TianoTools/String/PrintLib.c
similarity index 100%
rename from Tools/Source/TianoTools/String/PrintLib.c
rename to Tools/CodeTools/TianoTools/String/PrintLib.c
diff --git a/Tools/Source/TianoTools/String/PrintLibInternal.c b/Tools/CodeTools/TianoTools/String/PrintLibInternal.c
similarity index 100%
rename from Tools/Source/TianoTools/String/PrintLibInternal.c
rename to Tools/CodeTools/TianoTools/String/PrintLibInternal.c
diff --git a/Tools/Source/TianoTools/String/PrintLibInternal.h b/Tools/CodeTools/TianoTools/String/PrintLibInternal.h
similarity index 100%
rename from Tools/Source/TianoTools/String/PrintLibInternal.h
rename to Tools/CodeTools/TianoTools/String/PrintLibInternal.h
diff --git a/Tools/Source/TianoTools/String/String.c b/Tools/CodeTools/TianoTools/String/String.c
similarity index 100%
rename from Tools/Source/TianoTools/String/String.c
rename to Tools/CodeTools/TianoTools/String/String.c
diff --git a/Tools/Source/TianoTools/String/build.xml b/Tools/CodeTools/TianoTools/String/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/String/build.xml
rename to Tools/CodeTools/TianoTools/String/build.xml
diff --git a/Tools/Source/TianoTools/Strip/Strip.c b/Tools/CodeTools/TianoTools/Strip/Strip.c
similarity index 100%
rename from Tools/Source/TianoTools/Strip/Strip.c
rename to Tools/CodeTools/TianoTools/Strip/Strip.c
diff --git a/Tools/Source/TianoTools/Strip/build.xml b/Tools/CodeTools/TianoTools/Strip/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/Strip/build.xml
rename to Tools/CodeTools/TianoTools/Strip/build.xml
diff --git a/Tools/Source/TianoTools/TianoTools.msa b/Tools/CodeTools/TianoTools/TianoTools.msa
similarity index 100%
rename from Tools/Source/TianoTools/TianoTools.msa
rename to Tools/CodeTools/TianoTools/TianoTools.msa
diff --git a/Tools/Source/TianoTools/VfrCompile/EfiVfr.h b/Tools/CodeTools/TianoTools/VfrCompile/EfiVfr.h
similarity index 100%
rename from Tools/Source/TianoTools/VfrCompile/EfiVfr.h
rename to Tools/CodeTools/TianoTools/VfrCompile/EfiVfr.h
diff --git a/Tools/Source/TianoTools/VfrCompile/VfrCompile.g b/Tools/CodeTools/TianoTools/VfrCompile/VfrCompile.g
similarity index 100%
rename from Tools/Source/TianoTools/VfrCompile/VfrCompile.g
rename to Tools/CodeTools/TianoTools/VfrCompile/VfrCompile.g
diff --git a/Tools/Source/TianoTools/VfrCompile/VfrServices.cpp b/Tools/CodeTools/TianoTools/VfrCompile/VfrServices.cpp
similarity index 100%
rename from Tools/Source/TianoTools/VfrCompile/VfrServices.cpp
rename to Tools/CodeTools/TianoTools/VfrCompile/VfrServices.cpp
diff --git a/Tools/Source/TianoTools/VfrCompile/VfrServices.h b/Tools/CodeTools/TianoTools/VfrCompile/VfrServices.h
similarity index 100%
rename from Tools/Source/TianoTools/VfrCompile/VfrServices.h
rename to Tools/CodeTools/TianoTools/VfrCompile/VfrServices.h
diff --git a/Tools/Source/TianoTools/VfrCompile/build.xml b/Tools/CodeTools/TianoTools/VfrCompile/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/VfrCompile/build.xml
rename to Tools/CodeTools/TianoTools/VfrCompile/build.xml
diff --git a/Tools/Source/TianoTools/ZeroDebugData/ZeroDebugData.c b/Tools/CodeTools/TianoTools/ZeroDebugData/ZeroDebugData.c
similarity index 100%
rename from Tools/Source/TianoTools/ZeroDebugData/ZeroDebugData.c
rename to Tools/CodeTools/TianoTools/ZeroDebugData/ZeroDebugData.c
diff --git a/Tools/Source/TianoTools/ZeroDebugData/build.xml b/Tools/CodeTools/TianoTools/ZeroDebugData/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/ZeroDebugData/build.xml
rename to Tools/CodeTools/TianoTools/ZeroDebugData/build.xml
diff --git a/Tools/Source/TianoTools/build.xml b/Tools/CodeTools/TianoTools/build.xml
similarity index 100%
rename from Tools/Source/TianoTools/build.xml
rename to Tools/CodeTools/TianoTools/build.xml
diff --git a/Tools/Source/Common/Common.msa b/Tools/Java/Source/Common/Common.msa
similarity index 100%
rename from Tools/Source/Common/Common.msa
rename to Tools/Java/Source/Common/Common.msa
diff --git a/Tools/Source/Common/build.xml b/Tools/Java/Source/Common/build.xml
similarity index 100%
rename from Tools/Source/Common/build.xml
rename to Tools/Java/Source/Common/build.xml
diff --git a/Tools/Source/Common/org/tianocore/common/cache/FileTimeStamp.java b/Tools/Java/Source/Common/org/tianocore/common/cache/FileTimeStamp.java
similarity index 100%
rename from Tools/Source/Common/org/tianocore/common/cache/FileTimeStamp.java
rename to Tools/Java/Source/Common/org/tianocore/common/cache/FileTimeStamp.java
diff --git a/Tools/Source/Common/org/tianocore/common/definitions/EdkDefinitions.java b/Tools/Java/Source/Common/org/tianocore/common/definitions/EdkDefinitions.java
similarity index 100%
rename from Tools/Source/Common/org/tianocore/common/definitions/EdkDefinitions.java
rename to Tools/Java/Source/Common/org/tianocore/common/definitions/EdkDefinitions.java
diff --git a/Tools/Source/Common/org/tianocore/common/definitions/ToolDefinitions.java b/Tools/Java/Source/Common/org/tianocore/common/definitions/ToolDefinitions.java
similarity index 100%
rename from Tools/Source/Common/org/tianocore/common/definitions/ToolDefinitions.java
rename to Tools/Java/Source/Common/org/tianocore/common/definitions/ToolDefinitions.java
diff --git a/Tools/Source/Common/org/tianocore/common/exception/EdkException.java b/Tools/Java/Source/Common/org/tianocore/common/exception/EdkException.java
similarity index 100%
rename from Tools/Source/Common/org/tianocore/common/exception/EdkException.java
rename to Tools/Java/Source/Common/org/tianocore/common/exception/EdkException.java
diff --git a/Tools/Source/Common/org/tianocore/common/logger/DefaultLogger.java b/Tools/Java/Source/Common/org/tianocore/common/logger/DefaultLogger.java
similarity index 100%
rename from Tools/Source/Common/org/tianocore/common/logger/DefaultLogger.java
rename to Tools/Java/Source/Common/org/tianocore/common/logger/DefaultLogger.java
diff --git a/Tools/Source/Common/org/tianocore/common/logger/EdkLog.java b/Tools/Java/Source/Common/org/tianocore/common/logger/EdkLog.java
similarity index 100%
rename from Tools/Source/Common/org/tianocore/common/logger/EdkLog.java
rename to Tools/Java/Source/Common/org/tianocore/common/logger/EdkLog.java
diff --git a/Tools/Source/Common/org/tianocore/common/logger/LogMethod.java b/Tools/Java/Source/Common/org/tianocore/common/logger/LogMethod.java
similarity index 100%
rename from Tools/Source/Common/org/tianocore/common/logger/LogMethod.java
rename to Tools/Java/Source/Common/org/tianocore/common/logger/LogMethod.java
diff --git a/Tools/Source/ContextTool/build.xml b/Tools/Java/Source/ContextTool/build.xml
similarity index 100%
rename from Tools/Source/ContextTool/build.xml
rename to Tools/Java/Source/ContextTool/build.xml
diff --git a/Tools/Source/ContextTool/org/tianocore/context/ContextMain.java b/Tools/Java/Source/ContextTool/org/tianocore/context/ContextMain.java
similarity index 100%
rename from Tools/Source/ContextTool/org/tianocore/context/ContextMain.java
rename to Tools/Java/Source/ContextTool/org/tianocore/context/ContextMain.java
diff --git a/Tools/Source/ContextTool/org/tianocore/context/HelpInfo.java b/Tools/Java/Source/ContextTool/org/tianocore/context/HelpInfo.java
similarity index 100%
rename from Tools/Source/ContextTool/org/tianocore/context/HelpInfo.java
rename to Tools/Java/Source/ContextTool/org/tianocore/context/HelpInfo.java
diff --git a/Tools/Source/ContextTool/org/tianocore/context/ParseParameter.java b/Tools/Java/Source/ContextTool/org/tianocore/context/ParseParameter.java
similarity index 100%
rename from Tools/Source/ContextTool/org/tianocore/context/ParseParameter.java
rename to Tools/Java/Source/ContextTool/org/tianocore/context/ParseParameter.java
diff --git a/Tools/Source/ContextTool/org/tianocore/context/TargetFile.java b/Tools/Java/Source/ContextTool/org/tianocore/context/TargetFile.java
similarity index 100%
rename from Tools/Source/ContextTool/org/tianocore/context/TargetFile.java
rename to Tools/Java/Source/ContextTool/org/tianocore/context/TargetFile.java
diff --git a/Tools/Source/Cpptasks/CppTasks.msa b/Tools/Java/Source/Cpptasks/CppTasks.msa
similarity index 100%
rename from Tools/Source/Cpptasks/CppTasks.msa
rename to Tools/Java/Source/Cpptasks/CppTasks.msa
diff --git a/Tools/Source/Cpptasks/build.xml b/Tools/Java/Source/Cpptasks/build.xml
similarity index 100%
rename from Tools/Source/Cpptasks/build.xml
rename to Tools/Java/Source/Cpptasks/build.xml
diff --git a/Tools/Source/Cpptasks/cpptasks.mf b/Tools/Java/Source/Cpptasks/cpptasks.mf
similarity index 100%
rename from Tools/Source/Cpptasks/cpptasks.mf
rename to Tools/Java/Source/Cpptasks/cpptasks.mf
diff --git a/Tools/Source/Cpptasks/cpptasks.tasks b/Tools/Java/Source/Cpptasks/cpptasks.tasks
similarity index 100%
rename from Tools/Source/Cpptasks/cpptasks.tasks
rename to Tools/Java/Source/Cpptasks/cpptasks.tasks
diff --git a/Tools/Source/Cpptasks/cpptasks.types b/Tools/Java/Source/Cpptasks/cpptasks.types
similarity index 100%
rename from Tools/Source/Cpptasks/cpptasks.types
rename to Tools/Java/Source/Cpptasks/cpptasks.types
diff --git a/Tools/Source/Cpptasks/javadoc.xml b/Tools/Java/Source/Cpptasks/javadoc.xml
similarity index 100%
rename from Tools/Source/Cpptasks/javadoc.xml
rename to Tools/Java/Source/Cpptasks/javadoc.xml
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AboutCCTask.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/AboutCCTask.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AboutCCTask.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/AboutCCTask.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ArchEnum.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ArchEnum.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ArchEnum.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ArchEnum.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AslcompilerDef.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/AslcompilerDef.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AslcompilerDef.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/AslcompilerDef.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AslcompilerEnum.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/AslcompilerEnum.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AslcompilerEnum.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/AslcompilerEnum.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AssemblerDef.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/AssemblerDef.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AssemblerDef.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/AssemblerDef.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AssemblerEnum.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/AssemblerEnum.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AssemblerEnum.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/AssemblerEnum.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CCTask.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/CCTask.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CCTask.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/CCTask.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CCTaskProgressMonitor.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/CCTaskProgressMonitor.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CCTaskProgressMonitor.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/CCTaskProgressMonitor.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CPUEnum.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/CPUEnum.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CPUEnum.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/CPUEnum.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CUtil.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/CUtil.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CUtil.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/CUtil.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerDef.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerDef.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerDef.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerDef.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerEnum.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerEnum.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerEnum.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerEnum.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerParam.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerParam.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerParam.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerParam.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DependencyInfo.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/DependencyInfo.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DependencyInfo.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/DependencyInfo.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DependencyTable.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/DependencyTable.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DependencyTable.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/DependencyTable.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerDef.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerDef.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerDef.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerDef.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerMap.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerMap.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerMap.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerMap.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerProtocolEnum.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerProtocolEnum.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerProtocolEnum.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerProtocolEnum.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/FileVisitor.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/FileVisitor.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/FileVisitor.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/FileVisitor.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerDef.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerDef.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerDef.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerDef.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerEnum.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerEnum.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerEnum.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerEnum.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerParam.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerParam.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerParam.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerParam.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/OSFamilyEnum.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/OSFamilyEnum.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/OSFamilyEnum.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/OSFamilyEnum.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ObjectFileCollector.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ObjectFileCollector.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ObjectFileCollector.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ObjectFileCollector.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/OptimizationEnum.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/OptimizationEnum.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/OptimizationEnum.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/OptimizationEnum.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/OutputTypeEnum.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/OutputTypeEnum.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/OutputTypeEnum.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/OutputTypeEnum.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/PrecompileDef.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/PrecompileDef.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/PrecompileDef.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/PrecompileDef.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/PrecompileExceptDef.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/PrecompileExceptDef.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/PrecompileExceptDef.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/PrecompileExceptDef.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorDef.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorDef.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorDef.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorDef.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorEnumValue.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorEnumValue.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorEnumValue.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorEnumValue.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorParam.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorParam.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorParam.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorParam.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/RuntimeType.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/RuntimeType.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/RuntimeType.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/RuntimeType.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/SourceHistory.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/SourceHistory.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/SourceHistory.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/SourceHistory.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/SubsystemEnum.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/SubsystemEnum.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/SubsystemEnum.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/SubsystemEnum.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetDef.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetDef.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetDef.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetDef.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetHistory.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetHistory.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetHistory.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetHistory.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetHistoryTable.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetHistoryTable.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetHistoryTable.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetHistoryTable.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetInfo.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetInfo.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetInfo.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetInfo.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetMatcher.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetMatcher.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetMatcher.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetMatcher.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/VersionInfo.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/VersionInfo.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/VersionInfo.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/VersionInfo.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandCfgParser.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandCfgParser.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandCfgParser.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandCfgParser.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/CfgFilenameState.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/CfgFilenameState.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/CfgFilenameState.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/CfgFilenameState.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/ConsumeToSpaceOrNewLine.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/ConsumeToSpaceOrNewLine.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/ConsumeToSpaceOrNewLine.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/ConsumeToSpaceOrNewLine.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/QuoteBranchState.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/QuoteBranchState.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/QuoteBranchState.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/QuoteBranchState.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLibrarian.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLibrarian.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLibrarian.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLibrarian.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractAslcompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractAslcompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractAslcompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractAslcompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractAssembler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractAssembler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractAssembler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractAssembler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Aslcompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Aslcompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Aslcompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Aslcompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AslcompilerConfiguration.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AslcompilerConfiguration.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AslcompilerConfiguration.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AslcompilerConfiguration.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Assembler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Assembler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Assembler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Assembler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AssemblerConfiguration.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AssemblerConfiguration.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AssemblerConfiguration.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AssemblerConfiguration.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAslcompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAslcompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAslcompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAslcompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAslcompilerConfiguration.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAslcompilerConfiguration.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAslcompilerConfiguration.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAslcompilerConfiguration.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAssembler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAssembler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAssembler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAssembler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAssemblerConfiguration.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAssemblerConfiguration.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAssemblerConfiguration.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAssemblerConfiguration.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineFortranCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineFortranCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineFortranCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineFortranCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Compiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Compiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Compiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Compiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CompilerConfiguration.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CompilerConfiguration.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CompilerConfiguration.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CompilerConfiguration.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/LinkType.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/LinkType.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/LinkType.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/LinkType.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Linker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Linker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Linker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Linker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Processor.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Processor.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Processor.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Processor.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/ProcessorConfiguration.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/ProcessorConfiguration.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/ProcessorConfiguration.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/ProcessorConfiguration.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/ProgressMonitor.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/ProgressMonitor.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/ProgressMonitor.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/ProgressMonitor.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioAslcompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioAslcompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioAslcompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioAslcompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioAssembler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioAssembler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioAssembler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioAssembler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioLibrarian.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioLibrarian.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioLibrarian.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioLibrarian.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioProcessor.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioProcessor.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioProcessor.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioProcessor.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/AbstractArLibrarian.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/AbstractArLibrarian.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/AbstractArLibrarian.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/AbstractArLibrarian.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccAssembler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccAssembler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccAssembler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccAssembler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccLibrarian.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccLibrarian.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccLibrarian.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccLibrarian.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GppLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/LdLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/LdLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/LdLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/LdLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccLibrarian.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccLibrarian.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccLibrarian.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccLibrarian.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GppLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GppLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GppLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GppLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/LdLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/LdLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/LdLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/LdLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLibrarian.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLibrarian.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLibrarian.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLibrarian.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GppLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GppLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GppLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GppLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/LdLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/LdLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/LdLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/LdLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/hp/aCCLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/hp/aCCLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/hp/aCCLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/hp/aCCLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ibm/VisualAgeLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ibm/VisualAgeLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ibm/VisualAgeLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ibm/VisualAgeLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux32CCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux32CCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux32CCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux32CCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux32Linker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux32Linker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux32Linker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux32Linker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux64CCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux64CCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux64CCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux64CCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux64Linker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux64Linker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux64Linker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux64Linker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelProcessor.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelProcessor.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelProcessor.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelProcessor.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Aslcompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Aslcompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Aslcompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Aslcompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32CCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32CCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32CCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32CCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Librarian.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Librarian.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Librarian.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Librarian.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Linker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Linker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Linker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Linker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin64CCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin64CCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin64CCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin64CCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390Linker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390Linker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390Linker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390Linker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390Processor.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390Processor.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390Processor.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390Processor.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccProcessor.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccProcessor.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccProcessor.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccProcessor.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/AbstractParser.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/AbstractParser.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/AbstractParser.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/AbstractParser.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/AbstractParserState.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/AbstractParserState.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/AbstractParserState.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/AbstractParserState.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/BranchState.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/BranchState.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/BranchState.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/BranchState.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/CParser.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/CParser.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/CParser.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/CParser.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/CaseInsensitiveLetterState.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/CaseInsensitiveLetterState.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/CaseInsensitiveLetterState.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/CaseInsensitiveLetterState.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/FilenameState.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/FilenameState.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/FilenameState.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/FilenameState.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/FortranParser.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/FortranParser.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/FortranParser.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/FortranParser.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/LetterState.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/LetterState.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/LetterState.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/LetterState.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/Parser.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/Parser.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/Parser.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/Parser.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/PostE.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/PostE.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/PostE.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/PostE.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/WhitespaceOrCaseInsensitiveLetterState.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/WhitespaceOrCaseInsensitiveLetterState.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/WhitespaceOrCaseInsensitiveLetterState.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/WhitespaceOrCaseInsensitiveLetterState.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/WhitespaceOrLetterState.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/WhitespaceOrLetterState.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/WhitespaceOrLetterState.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/WhitespaceOrLetterState.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89Linker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89Linker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89Linker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89Linker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89Processor.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89Processor.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89Processor.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89Processor.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxLinker.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxLinker.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxLinker.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxLinker.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/AslcompilerArgument.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/AslcompilerArgument.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/AslcompilerArgument.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/AslcompilerArgument.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/AssemblerArgument.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/AssemblerArgument.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/AssemblerArgument.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/AssemblerArgument.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/CommandLineArgument.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/CommandLineArgument.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/CommandLineArgument.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/CommandLineArgument.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/CompilerArgument.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/CompilerArgument.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/CompilerArgument.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/CompilerArgument.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/ConditionalFileSet.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/ConditionalFileSet.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/ConditionalFileSet.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/ConditionalFileSet.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/ConditionalPath.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/ConditionalPath.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/ConditionalPath.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/ConditionalPath.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/DefineArgument.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/DefineArgument.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/DefineArgument.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/DefineArgument.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/DefineSet.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/DefineSet.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/DefineSet.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/DefineSet.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/FlexLong.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/FlexLong.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/FlexLong.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/FlexLong.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/IncludePath.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/IncludePath.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/IncludePath.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/IncludePath.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LibrarySet.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LibrarySet.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LibrarySet.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LibrarySet.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LibraryTypeEnum.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LibraryTypeEnum.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LibraryTypeEnum.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LibraryTypeEnum.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LinkerArgument.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LinkerArgument.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LinkerArgument.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LinkerArgument.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/SystemIncludePath.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/SystemIncludePath.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/SystemIncludePath.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/SystemIncludePath.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/SystemLibrarySet.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/SystemLibrarySet.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/SystemLibrarySet.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/SystemLibrarySet.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/UndefineArgument.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/UndefineArgument.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/UndefineArgument.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/UndefineArgument.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/CommandLineUserDefine.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/CommandLineUserDefine.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/CommandLineUserDefine.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/CommandLineUserDefine.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineArgument.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineArgument.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineArgument.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineArgument.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineCompiler.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineCompiler.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineCompiler.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineCompiler.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineDef.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineDef.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineDef.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineDef.java
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineMapping.java b/Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineMapping.java
similarity index 100%
rename from Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineMapping.java
rename to Tools/Java/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineMapping.java
diff --git a/Tools/Source/FrameworkTasks/FrameworkTasks.msa b/Tools/Java/Source/FrameworkTasks/FrameworkTasks.msa
similarity index 100%
rename from Tools/Source/FrameworkTasks/FrameworkTasks.msa
rename to Tools/Java/Source/FrameworkTasks/FrameworkTasks.msa
diff --git a/Tools/Source/FrameworkTasks/build.xml b/Tools/Java/Source/FrameworkTasks/build.xml
similarity index 100%
rename from Tools/Source/FrameworkTasks/build.xml
rename to Tools/Java/Source/FrameworkTasks/build.xml
diff --git a/Tools/Source/FrameworkTasks/frameworktasks.tasks b/Tools/Java/Source/FrameworkTasks/frameworktasks.tasks
similarity index 100%
rename from Tools/Source/FrameworkTasks/frameworktasks.tasks
rename to Tools/Java/Source/FrameworkTasks/frameworktasks.tasks
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Compress.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/Compress.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Compress.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/Compress.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CompressHeader.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/CompressHeader.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CompressHeader.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/CompressHeader.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CompressSection.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/CompressSection.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CompressSection.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/CompressSection.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Database.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/Database.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Database.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/Database.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiDefine.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiDefine.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiDefine.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiDefine.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiRomTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiRomTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiRomTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiRomTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsHeader.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsHeader.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsHeader.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsHeader.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsTypes.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsTypes.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsTypes.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsTypes.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FileArg.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/FileArg.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FileArg.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/FileArg.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenAcpiTableTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenAcpiTableTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenAcpiTableTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenAcpiTableTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCapsuleHdrTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCapsuleHdrTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCapsuleHdrTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCapsuleHdrTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenDepexTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenDepexTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenDepexTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenDepexTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenTeImageTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenTeImageTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenTeImageTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenTeImageTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GuidChkTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GuidChkTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GuidChkTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GuidChkTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/IncludePath.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/IncludePath.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/IncludePath.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/IncludePath.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Input.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/Input.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Input.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/Input.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/InputFile.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/InputFile.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/InputFile.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/InputFile.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ModifyInfTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/ModifyInfTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ModifyInfTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/ModifyInfTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/NestElement.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/NestElement.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/NestElement.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/NestElement.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SecApResetVectorFixupTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/SecApResetVectorFixupTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SecApResetVectorFixupTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/SecApResetVectorFixupTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SecFixupTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/SecFixupTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SecFixupTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/SecFixupTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SectFile.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/SectFile.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SectFile.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/SectFile.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Section.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/Section.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Section.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/Section.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SetStampTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/SetStampTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SetStampTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/SetStampTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SkipExt.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/SkipExt.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SkipExt.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/SkipExt.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SplitfileTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/SplitfileTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SplitfileTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/SplitfileTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StripTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/StripTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StripTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/StripTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Tool.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/Tool.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Tool.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/Tool.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ToolArg.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/ToolArg.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ToolArg.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/ToolArg.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ZeroDebugDataTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/ZeroDebugDataTask.java
similarity index 100%
rename from Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ZeroDebugDataTask.java
rename to Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/ZeroDebugDataTask.java
diff --git a/Tools/Source/FrameworkWizard/FrameworkWizard.msa b/Tools/Java/Source/FrameworkWizard/FrameworkWizard.msa
similarity index 100%
rename from Tools/Source/FrameworkWizard/FrameworkWizard.msa
rename to Tools/Java/Source/FrameworkWizard/FrameworkWizard.msa
diff --git a/Tools/Source/FrameworkWizard/MANIFEST.MF b/Tools/Java/Source/FrameworkWizard/MANIFEST.MF
similarity index 100%
rename from Tools/Source/FrameworkWizard/MANIFEST.MF
rename to Tools/Java/Source/FrameworkWizard/MANIFEST.MF
diff --git a/Tools/Source/FrameworkWizard/build.xml b/Tools/Java/Source/FrameworkWizard/build.xml
similarity index 100%
rename from Tools/Source/FrameworkWizard/build.xml
rename to Tools/Java/Source/FrameworkWizard/build.xml
diff --git a/Tools/Source/FrameworkWizard/rsc/resources/images/No.JPG b/Tools/Java/Source/FrameworkWizard/rsc/resources/images/No.JPG
similarity index 100%
rename from Tools/Source/FrameworkWizard/rsc/resources/images/No.JPG
rename to Tools/Java/Source/FrameworkWizard/rsc/resources/images/No.JPG
diff --git a/Tools/Source/FrameworkWizard/rsc/resources/images/Yes.JPG b/Tools/Java/Source/FrameworkWizard/rsc/resources/images/Yes.JPG
similarity index 100%
rename from Tools/Source/FrameworkWizard/rsc/resources/images/Yes.JPG
rename to Tools/Java/Source/FrameworkWizard/rsc/resources/images/Yes.JPG
diff --git a/Tools/Source/FrameworkWizard/rsc/resources/images/logo.gif b/Tools/Java/Source/FrameworkWizard/rsc/resources/images/logo.gif
similarity index 100%
rename from Tools/Source/FrameworkWizard/rsc/resources/images/logo.gif
rename to Tools/Java/Source/FrameworkWizard/rsc/resources/images/logo.gif
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/About.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/About.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/About.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/About.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/NewFileChooser.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/NewFileChooser.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/NewFileChooser.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/NewFileChooser.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SplashScreen.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SplashScreen.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SplashScreen.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SplashScreen.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfig.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfig.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfig.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfig.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfigHelp.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfigHelp.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfigHelp.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfigHelp.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataType.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataType.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataType.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataType.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataValidation.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataValidation.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataValidation.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataValidation.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/FileOperation.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/FileOperation.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/FileOperation.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/FileOperation.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/GlobalData.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/GlobalData.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/GlobalData.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/GlobalData.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/IDefaultTableModel.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/IDefaultTableModel.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/IDefaultTableModel.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/IDefaultTableModel.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/IFileFilter.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/IFileFilter.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/IFileFilter.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/IFileFilter.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/Identification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/Identification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/Identification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/Identification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningFileType.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningFileType.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningFileType.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningFileType.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleList.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleList.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleList.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleList.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleType.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleType.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleType.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleType.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPackageList.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPackageList.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPackageList.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPackageList.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPackageType.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPackageType.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPackageType.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPackageType.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPlatformList.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPlatformList.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPlatformList.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPlatformList.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPlatformType.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPlatformType.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPlatformType.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPlatformType.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/ToolChainConfigId.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/ToolChainConfigId.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/ToolChainConfigId.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/ToolChainConfigId.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/ToolChainConfigVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/ToolChainConfigVector.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/ToolChainConfigVector.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/ToolChainConfigVector.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Log.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Log.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Log.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Log.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/OpenFile.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/OpenFile.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/OpenFile.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/OpenFile.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/SaveFile.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/SaveFile.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/SaveFile.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/SaveFile.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Sort.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Sort.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Sort.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Sort.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/XmlConfig.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/XmlConfig.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/XmlConfig.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/XmlConfig.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/Find.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/Find.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/Find.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/Find.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/FindResult.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/FindResult.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/FindResult.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/FindResult.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/GuidId.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/GuidId.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/GuidId.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/GuidId.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/LibraryClassId.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/LibraryClassId.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/LibraryClassId.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/LibraryClassId.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/PcdId.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/PcdId.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/PcdId.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/PcdId.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/PpiId.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/PpiId.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/PpiId.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/PpiId.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/ProtocolId.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/ProtocolId.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/ProtocolId.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/find/ProtocolId.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/ArchCheckBox.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/ArchCheckBox.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/ArchCheckBox.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/ArchCheckBox.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/ExitConfirm.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/ExitConfirm.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/ExitConfirm.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/ExitConfirm.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IComboBox.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IComboBox.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IComboBox.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IComboBox.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IDefaultMutableTreeNode.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IDefaultMutableTreeNode.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IDefaultMutableTreeNode.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IDefaultMutableTreeNode.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IDesktopManager.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IDesktopManager.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IDesktopManager.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IDesktopManager.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IDialog.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IDialog.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IDialog.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IDialog.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IFrame.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IFrame.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IFrame.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IFrame.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IInternalFrame.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IInternalFrame.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IInternalFrame.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IInternalFrame.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/ITree.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/ITree.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/ITree.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/ITree.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/StarLabel.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/StarLabel.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/StarLabel.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/StarLabel.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxList.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxList.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxList.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxList.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListCellRenderer.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListCellRenderer.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListCellRenderer.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListCellRenderer.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListItem.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListItem.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListItem.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListItem.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListModel.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListModel.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListModel.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListModel.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListener.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListener.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListener.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListener.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/AggregationOperation.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/AggregationOperation.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/AggregationOperation.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/AggregationOperation.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/DistributeRule.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/DistributeRule.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/DistributeRule.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/DistributeRule.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/Far.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/Far.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/Far.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/Far.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarFileItem.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarFileItem.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarFileItem.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarFileItem.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarHeader.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarHeader.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarHeader.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarHeader.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarInterface.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarInterface.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarInterface.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarInterface.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarMd5.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarMd5.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarMd5.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarMd5.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarPackage.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarPackage.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarPackage.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarPackage.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarPlatformItem.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarPlatformItem.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarPlatformItem.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarPlatformItem.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarStringDefinition.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarStringDefinition.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarStringDefinition.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarStringDefinition.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/Manifest.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/Manifest.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/Manifest.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/Manifest.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/ManifestInterface.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/ManifestInterface.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/ManifestInterface.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/ManifestInterface.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/PackageQuery.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/PackageQuery.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/PackageQuery.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/PackageQuery.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/PackageQueryInterface.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/PackageQueryInterface.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/PackageQueryInterface.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/PackageQueryInterface.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepOne.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepOne.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepOne.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepOne.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepTwo.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepTwo.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepTwo.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepTwo.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/BootModes/BootModesIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/BootModes/BootModesIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/BootModes/BootModesIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/BootModes/BootModesIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/BootModes/BootModesVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/BootModes/BootModesVector.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/BootModes/BootModesVector.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/BootModes/BootModesVector.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/DataHubs/DataHubsIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/DataHubs/DataHubsIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/DataHubs/DataHubsIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/DataHubs/DataHubsIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/DataHubs/DataHubsVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/DataHubs/DataHubsVector.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/DataHubs/DataHubsVector.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/DataHubs/DataHubsVector.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Events/EventsIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Events/EventsIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Events/EventsIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Events/EventsIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Events/EventsVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Events/EventsVector.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Events/EventsVector.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Events/EventsVector.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Externs/ExternsIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Externs/ExternsIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Externs/ExternsIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Externs/ExternsIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Externs/ExternsVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Externs/ExternsVector.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Externs/ExternsVector.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Externs/ExternsVector.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Guids/GuidsIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Guids/GuidsIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Guids/GuidsIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Guids/GuidsIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Guids/GuidsVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Guids/GuidsVector.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Guids/GuidsVector.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Guids/GuidsVector.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/HiiPackages/HiiPackagesIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/HiiPackages/HiiPackagesIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/HiiPackages/HiiPackagesIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/HiiPackages/HiiPackagesIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/HiiPackages/HiiPackagesVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/HiiPackages/HiiPackagesVector.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/HiiPackages/HiiPackagesVector.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/HiiPackages/HiiPackagesVector.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Hobs/HobsIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Hobs/HobsIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Hobs/HobsIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Hobs/HobsIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Hobs/HobsVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Hobs/HobsVector.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Hobs/HobsVector.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Hobs/HobsVector.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassVector.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassVector.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassVector.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/ModuleIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/ModuleIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/ModuleIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/ModuleIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PackageDependencies/PackageDependenciesIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PackageDependencies/PackageDependenciesIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PackageDependencies/PackageDependenciesIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PackageDependencies/PackageDependenciesIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PackageDependencies/PackageDependenciesVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PackageDependencies/PackageDependenciesVector.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PackageDependencies/PackageDependenciesVector.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PackageDependencies/PackageDependenciesVector.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdCodedIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdCodedIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdCodedIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdCodedIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdCodedVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdCodedVector.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdCodedVector.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdCodedVector.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdVector.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdVector.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdVector.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Ppis/PpisIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Ppis/PpisIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Ppis/PpisIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Ppis/PpisIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Ppis/PpisVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Ppis/PpisVector.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Ppis/PpisVector.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Ppis/PpisVector.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Protocols/ProtocolsIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Protocols/ProtocolsIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Protocols/ProtocolsIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Protocols/ProtocolsIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Protocols/ProtocolsVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Protocols/ProtocolsVector.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Protocols/ProtocolsVector.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Protocols/ProtocolsVector.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SourceFiles/SourceFilesIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SourceFiles/SourceFilesIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SourceFiles/SourceFilesIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SourceFiles/SourceFilesIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SourceFiles/SourceFilesVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SourceFiles/SourceFilesVector.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SourceFiles/SourceFilesVector.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SourceFiles/SourceFilesVector.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SystemTables/SystemTablesIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SystemTables/SystemTablesIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SystemTables/SystemTablesIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SystemTables/SystemTablesIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SystemTables/SystemTablesVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SystemTables/SystemTablesVector.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SystemTables/SystemTablesVector.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SystemTables/SystemTablesVector.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Variables/VariablesIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Variables/VariablesIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Variables/VariablesIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Variables/VariablesIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Variables/VariablesVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Variables/VariablesVector.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Variables/VariablesVector.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Variables/VariablesVector.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHiiPackages.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHiiPackages.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHiiPackages.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHiiPackages.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleLibraryClassDefinitions.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleLibraryClassDefinitions.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleLibraryClassDefinitions.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleLibraryClassDefinitions.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePackageDependencies.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePackageDependencies.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePackageDependencies.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePackageDependencies.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePpis.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePpis.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePpis.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePpis.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleProtocols.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleProtocols.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleProtocols.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleProtocols.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSystemTables.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSystemTables.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSystemTables.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSystemTables.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/PackageIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/PackageIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/PackageIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/PackageIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GuidEditor.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GuidEditor.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GuidEditor.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GuidEditor.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageDefinitions.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageDefinitions.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageDefinitions.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageDefinitions.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPpiDecls.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPpiDecls.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPpiDecls.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPpiDecls.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdProtocolDecls.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdProtocolDecls.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdProtocolDecls.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdProtocolDecls.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/PlatformIdentification.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/PlatformIdentification.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/PlatformIdentification.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/PlatformIdentification.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/DynamicTree.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/DynamicTree.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/DynamicTree.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/DynamicTree.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFvOptions.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFvOptions.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFvOptions.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFvOptions.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/GenListDialog.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/GenListDialog.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/GenListDialog.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/GenListDialog.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/GenLongTextDialog.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/GenLongTextDialog.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/GenLongTextDialog.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/GenLongTextDialog.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/ListEditor.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/ListEditor.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/ListEditor.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/ListEditor.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/LongTextEditor.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/LongTextEditor.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/LongTextEditor.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/LongTextEditor.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/TableSorter.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/TableSorter.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/TableSorter.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/TableSorter.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/WorkspaceProfile.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/WorkspaceProfile.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/WorkspaceProfile.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/WorkspaceProfile.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/toolchain/Preferences.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/toolchain/Preferences.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/toolchain/Preferences.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/toolchain/Preferences.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/toolchain/ToolChainId.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/toolchain/ToolChainId.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/toolchain/ToolChainId.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/toolchain/ToolChainId.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/Workspace.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/Workspace.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/Workspace.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/Workspace.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/ui/SwitchWorkspace.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/ui/SwitchWorkspace.java
similarity index 100%
rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/ui/SwitchWorkspace.java
rename to Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/ui/SwitchWorkspace.java
diff --git a/Tools/Source/GenBuild/GenBuild.msa b/Tools/Java/Source/GenBuild/GenBuild.msa
similarity index 100%
rename from Tools/Source/GenBuild/GenBuild.msa
rename to Tools/Java/Source/GenBuild/GenBuild.msa
diff --git a/Tools/Source/GenBuild/GenBuild.tasks b/Tools/Java/Source/GenBuild/GenBuild.tasks
similarity index 100%
rename from Tools/Source/GenBuild/GenBuild.tasks
rename to Tools/Java/Source/GenBuild/GenBuild.tasks
diff --git a/Tools/Source/GenBuild/build.xml b/Tools/Java/Source/GenBuild/build.xml
similarity index 100%
rename from Tools/Source/GenBuild/build.xml
rename to Tools/Java/Source/GenBuild/build.xml
diff --git a/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java b/Tools/Java/Source/GenBuild/org/tianocore/build/FfsProcess.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/FfsProcess.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/FileProcess.java b/Tools/Java/Source/GenBuild/org/tianocore/build/FileProcess.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/FileProcess.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/FileProcess.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/GenBuildThread.java b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildThread.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/GenBuildThread.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildThread.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java b/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java b/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java b/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/exception/AutoGenException.java b/Tools/Java/Source/GenBuild/org/tianocore/build/exception/AutoGenException.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/exception/AutoGenException.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/exception/AutoGenException.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/exception/GenBuildException.java b/Tools/Java/Source/GenBuild/org/tianocore/build/exception/GenBuildException.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/exception/GenBuildException.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/exception/GenBuildException.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/exception/PcdAutogenException.java b/Tools/Java/Source/GenBuild/org/tianocore/build/exception/PcdAutogenException.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/exception/PcdAutogenException.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/exception/PcdAutogenException.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/exception/PlatformPcdPreprocessBuildException.java b/Tools/Java/Source/GenBuild/org/tianocore/build/exception/PlatformPcdPreprocessBuildException.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/exception/PlatformPcdPreprocessBuildException.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/exception/PlatformPcdPreprocessBuildException.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/exception/XmlParseException.java b/Tools/Java/Source/GenBuild/org/tianocore/build/exception/XmlParseException.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/exception/XmlParseException.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/exception/XmlParseException.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserForThread.java b/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserForThread.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserForThread.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserForThread.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java b/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/DpFile.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/DpFile.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/global/DpFile.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/global/DpFile.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/DpFileList.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/DpFileList.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/global/DpFileList.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/global/DpFileList.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/OnDependency.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/OnDependency.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/global/OnDependency.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/global/OnDependency.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/OutputManager.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/global/OutputManager.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/PropertyManager.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/PropertyManager.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/global/PropertyManager.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/global/PropertyManager.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/Spd.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/Spd.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/global/Spd.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/global/Spd.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/VariableTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/VariableTask.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/global/VariableTask.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/global/VariableTask.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/id/FpdModuleIdentification.java b/Tools/Java/Source/GenBuild/org/tianocore/build/id/FpdModuleIdentification.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/id/FpdModuleIdentification.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/id/FpdModuleIdentification.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/id/Identification.java b/Tools/Java/Source/GenBuild/org/tianocore/build/id/Identification.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/id/Identification.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/id/Identification.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/id/ModuleIdentification.java b/Tools/Java/Source/GenBuild/org/tianocore/build/id/ModuleIdentification.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/id/ModuleIdentification.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/id/ModuleIdentification.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/id/PackageIdentification.java b/Tools/Java/Source/GenBuild/org/tianocore/build/id/PackageIdentification.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/id/PackageIdentification.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/id/PackageIdentification.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/id/PlatformIdentification.java b/Tools/Java/Source/GenBuild/org/tianocore/build/id/PlatformIdentification.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/id/PlatformIdentification.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/id/PlatformIdentification.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java b/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java b/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PlatformPcdPreprocessActionForBuilding.java b/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PlatformPcdPreprocessActionForBuilding.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/pcd/action/PlatformPcdPreprocessActionForBuilding.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PlatformPcdPreprocessActionForBuilding.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java b/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainAttribute.java b/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainAttribute.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainAttribute.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainAttribute.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainConfig.java b/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainConfig.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainConfig.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainConfig.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainElement.java b/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainElement.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainElement.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainElement.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainInfo.java b/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainInfo.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainInfo.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainInfo.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainKey.java b/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainKey.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainKey.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainKey.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainMap.java b/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainMap.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainMap.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainMap.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/tools/ModuleItem.java b/Tools/Java/Source/GenBuild/org/tianocore/build/tools/ModuleItem.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/tools/ModuleItem.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/tools/ModuleItem.java
diff --git a/Tools/Source/GenBuild/org/tianocore/build/tools/PackageItem.java b/Tools/Java/Source/GenBuild/org/tianocore/build/tools/PackageItem.java
similarity index 100%
rename from Tools/Source/GenBuild/org/tianocore/build/tools/PackageItem.java
rename to Tools/Java/Source/GenBuild/org/tianocore/build/tools/PackageItem.java
diff --git a/Tools/Source/Merge/Merge.msa b/Tools/Java/Source/Merge/Merge.msa
similarity index 100%
rename from Tools/Source/Merge/Merge.msa
rename to Tools/Java/Source/Merge/Merge.msa
diff --git a/Tools/Source/Merge/build.xml b/Tools/Java/Source/Merge/build.xml
similarity index 100%
rename from Tools/Source/Merge/build.xml
rename to Tools/Java/Source/Merge/build.xml
diff --git a/Tools/Source/Merge/readme.txt b/Tools/Java/Source/Merge/readme.txt
similarity index 100%
rename from Tools/Source/Merge/readme.txt
rename to Tools/Java/Source/Merge/readme.txt
diff --git a/Tools/Source/Merge/src/org/tianocore/Merge/CombineMsa.java b/Tools/Java/Source/Merge/src/org/tianocore/Merge/CombineMsa.java
similarity index 100%
rename from Tools/Source/Merge/src/org/tianocore/Merge/CombineMsa.java
rename to Tools/Java/Source/Merge/src/org/tianocore/Merge/CombineMsa.java
diff --git a/Tools/Source/Merge/src/org/tianocore/Merge/Merge.java b/Tools/Java/Source/Merge/src/org/tianocore/Merge/Merge.java
similarity index 100%
rename from Tools/Source/Merge/src/org/tianocore/Merge/Merge.java
rename to Tools/Java/Source/Merge/src/org/tianocore/Merge/Merge.java
diff --git a/Tools/Source/Merge/src/org/tianocore/Merge/MergeCmd.java b/Tools/Java/Source/Merge/src/org/tianocore/Merge/MergeCmd.java
similarity index 100%
rename from Tools/Source/Merge/src/org/tianocore/Merge/MergeCmd.java
rename to Tools/Java/Source/Merge/src/org/tianocore/Merge/MergeCmd.java
diff --git a/Tools/Source/MigrationTools/MANIFEST.MF b/Tools/Java/Source/MigrationTools/MANIFEST.MF
similarity index 100%
rename from Tools/Source/MigrationTools/MANIFEST.MF
rename to Tools/Java/Source/MigrationTools/MANIFEST.MF
diff --git a/Tools/Source/MigrationTools/MigrationTools.msa b/Tools/Java/Source/MigrationTools/MigrationTools.msa
similarity index 100%
rename from Tools/Source/MigrationTools/MigrationTools.msa
rename to Tools/Java/Source/MigrationTools/MigrationTools.msa
diff --git a/Tools/Source/MigrationTools/build.xml b/Tools/Java/Source/MigrationTools/build.xml
similarity index 100%
rename from Tools/Source/MigrationTools/build.xml
rename to Tools/Java/Source/MigrationTools/build.xml
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Common.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/Common.java
similarity index 100%
rename from Tools/Source/MigrationTools/org/tianocore/migration/Common.java
rename to Tools/Java/Source/MigrationTools/org/tianocore/migration/Common.java
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/Critic.java
similarity index 100%
rename from Tools/Source/MigrationTools/org/tianocore/migration/Critic.java
rename to Tools/Java/Source/MigrationTools/org/tianocore/migration/Critic.java
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Database.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/Database.java
similarity index 100%
rename from Tools/Source/MigrationTools/org/tianocore/migration/Database.java
rename to Tools/Java/Source/MigrationTools/org/tianocore/migration/Database.java
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/FirstPanel.java
similarity index 100%
rename from Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java
rename to Tools/Java/Source/MigrationTools/org/tianocore/migration/FirstPanel.java
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Func.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/Func.java
similarity index 100%
rename from Tools/Source/MigrationTools/org/tianocore/migration/Func.java
rename to Tools/Java/Source/MigrationTools/org/tianocore/migration/Func.java
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Guid.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/Guid.java
similarity index 100%
rename from Tools/Source/MigrationTools/org/tianocore/migration/Guid.java
rename to Tools/Java/Source/MigrationTools/org/tianocore/migration/Guid.java
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Macro.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/Macro.java
similarity index 100%
rename from Tools/Source/MigrationTools/org/tianocore/migration/Macro.java
rename to Tools/Java/Source/MigrationTools/org/tianocore/migration/Macro.java
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
similarity index 100%
rename from Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
rename to Tools/Java/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
similarity index 100%
rename from Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
rename to Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
similarity index 100%
rename from Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
rename to Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaOwner.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/MsaOwner.java
similarity index 100%
rename from Tools/Source/MigrationTools/org/tianocore/migration/MsaOwner.java
rename to Tools/Java/Source/MigrationTools/org/tianocore/migration/MsaOwner.java
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaTreeEditor.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/MsaTreeEditor.java
similarity index 100%
rename from Tools/Source/MigrationTools/org/tianocore/migration/MsaTreeEditor.java
rename to Tools/Java/Source/MigrationTools/org/tianocore/migration/MsaTreeEditor.java
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
similarity index 100%
rename from Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
rename to Tools/Java/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/PathIterator.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/PathIterator.java
similarity index 100%
rename from Tools/Source/MigrationTools/org/tianocore/migration/PathIterator.java
rename to Tools/Java/Source/MigrationTools/org/tianocore/migration/PathIterator.java
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
similarity index 100%
rename from Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
rename to Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/UI.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/UI.java
similarity index 100%
rename from Tools/Source/MigrationTools/org/tianocore/migration/UI.java
rename to Tools/Java/Source/MigrationTools/org/tianocore/migration/UI.java
diff --git a/Tools/Source/PcdTools/PcdTools.msa b/Tools/Java/Source/PcdTools/PcdTools.msa
similarity index 100%
rename from Tools/Source/PcdTools/PcdTools.msa
rename to Tools/Java/Source/PcdTools/PcdTools.msa
diff --git a/Tools/Source/PcdTools/build.xml b/Tools/Java/Source/PcdTools/build.xml
similarity index 100%
rename from Tools/Source/PcdTools/build.xml
rename to Tools/Java/Source/PcdTools/build.xml
diff --git a/Tools/Source/PcdTools/org/tianocore/pcd/action/BuildAction.java b/Tools/Java/Source/PcdTools/org/tianocore/pcd/action/BuildAction.java
similarity index 100%
rename from Tools/Source/PcdTools/org/tianocore/pcd/action/BuildAction.java
rename to Tools/Java/Source/PcdTools/org/tianocore/pcd/action/BuildAction.java
diff --git a/Tools/Source/PcdTools/org/tianocore/pcd/action/PlatformPcdPreprocessAction.java b/Tools/Java/Source/PcdTools/org/tianocore/pcd/action/PlatformPcdPreprocessAction.java
similarity index 100%
rename from Tools/Source/PcdTools/org/tianocore/pcd/action/PlatformPcdPreprocessAction.java
rename to Tools/Java/Source/PcdTools/org/tianocore/pcd/action/PlatformPcdPreprocessAction.java
diff --git a/Tools/Source/PcdTools/org/tianocore/pcd/entity/CommonDefinition.java b/Tools/Java/Source/PcdTools/org/tianocore/pcd/entity/CommonDefinition.java
similarity index 100%
rename from Tools/Source/PcdTools/org/tianocore/pcd/entity/CommonDefinition.java
rename to Tools/Java/Source/PcdTools/org/tianocore/pcd/entity/CommonDefinition.java
diff --git a/Tools/Source/PcdTools/org/tianocore/pcd/entity/DynamicTokenValue.java b/Tools/Java/Source/PcdTools/org/tianocore/pcd/entity/DynamicTokenValue.java
similarity index 100%
rename from Tools/Source/PcdTools/org/tianocore/pcd/entity/DynamicTokenValue.java
rename to Tools/Java/Source/PcdTools/org/tianocore/pcd/entity/DynamicTokenValue.java
diff --git a/Tools/Source/PcdTools/org/tianocore/pcd/entity/MemoryDatabaseManager.java b/Tools/Java/Source/PcdTools/org/tianocore/pcd/entity/MemoryDatabaseManager.java
similarity index 100%
rename from Tools/Source/PcdTools/org/tianocore/pcd/entity/MemoryDatabaseManager.java
rename to Tools/Java/Source/PcdTools/org/tianocore/pcd/entity/MemoryDatabaseManager.java
diff --git a/Tools/Source/PcdTools/org/tianocore/pcd/entity/ModulePcdInfoFromFpd.java b/Tools/Java/Source/PcdTools/org/tianocore/pcd/entity/ModulePcdInfoFromFpd.java
similarity index 100%
rename from Tools/Source/PcdTools/org/tianocore/pcd/entity/ModulePcdInfoFromFpd.java
rename to Tools/Java/Source/PcdTools/org/tianocore/pcd/entity/ModulePcdInfoFromFpd.java
diff --git a/Tools/Source/PcdTools/org/tianocore/pcd/entity/SkuInstance.java b/Tools/Java/Source/PcdTools/org/tianocore/pcd/entity/SkuInstance.java
similarity index 100%
rename from Tools/Source/PcdTools/org/tianocore/pcd/entity/SkuInstance.java
rename to Tools/Java/Source/PcdTools/org/tianocore/pcd/entity/SkuInstance.java
diff --git a/Tools/Source/PcdTools/org/tianocore/pcd/entity/Token.java b/Tools/Java/Source/PcdTools/org/tianocore/pcd/entity/Token.java
similarity index 100%
rename from Tools/Source/PcdTools/org/tianocore/pcd/entity/Token.java
rename to Tools/Java/Source/PcdTools/org/tianocore/pcd/entity/Token.java
diff --git a/Tools/Source/PcdTools/org/tianocore/pcd/entity/UsageIdentification.java b/Tools/Java/Source/PcdTools/org/tianocore/pcd/entity/UsageIdentification.java
similarity index 100%
rename from Tools/Source/PcdTools/org/tianocore/pcd/entity/UsageIdentification.java
rename to Tools/Java/Source/PcdTools/org/tianocore/pcd/entity/UsageIdentification.java
diff --git a/Tools/Source/PcdTools/org/tianocore/pcd/entity/UsageInstance.java b/Tools/Java/Source/PcdTools/org/tianocore/pcd/entity/UsageInstance.java
similarity index 100%
rename from Tools/Source/PcdTools/org/tianocore/pcd/entity/UsageInstance.java
rename to Tools/Java/Source/PcdTools/org/tianocore/pcd/entity/UsageInstance.java
diff --git a/Tools/Source/PcdTools/org/tianocore/pcd/exception/BuildActionException.java b/Tools/Java/Source/PcdTools/org/tianocore/pcd/exception/BuildActionException.java
similarity index 100%
rename from Tools/Source/PcdTools/org/tianocore/pcd/exception/BuildActionException.java
rename to Tools/Java/Source/PcdTools/org/tianocore/pcd/exception/BuildActionException.java
diff --git a/Tools/Source/PcdTools/org/tianocore/pcd/exception/EntityException.java b/Tools/Java/Source/PcdTools/org/tianocore/pcd/exception/EntityException.java
similarity index 100%
rename from Tools/Source/PcdTools/org/tianocore/pcd/exception/EntityException.java
rename to Tools/Java/Source/PcdTools/org/tianocore/pcd/exception/EntityException.java
diff --git a/Tools/Source/PcdTools/org/tianocore/pcd/exception/PlatformPcdPreprocessException.java b/Tools/Java/Source/PcdTools/org/tianocore/pcd/exception/PlatformPcdPreprocessException.java
similarity index 100%
rename from Tools/Source/PcdTools/org/tianocore/pcd/exception/PlatformPcdPreprocessException.java
rename to Tools/Java/Source/PcdTools/org/tianocore/pcd/exception/PlatformPcdPreprocessException.java
diff --git a/Tools/Source/PcdTools/org/tianocore/pcd/exception/UIException.java b/Tools/Java/Source/PcdTools/org/tianocore/pcd/exception/UIException.java
similarity index 100%
rename from Tools/Source/PcdTools/org/tianocore/pcd/exception/UIException.java
rename to Tools/Java/Source/PcdTools/org/tianocore/pcd/exception/UIException.java
diff --git a/Tools/Source/SurfaceArea/SurfaceArea.msa b/Tools/Java/Source/SurfaceArea/SurfaceArea.msa
similarity index 100%
rename from Tools/Source/SurfaceArea/SurfaceArea.msa
rename to Tools/Java/Source/SurfaceArea/SurfaceArea.msa
diff --git a/Tools/Source/SurfaceArea/build.xml b/Tools/Java/Source/SurfaceArea/build.xml
similarity index 100%
rename from Tools/Source/SurfaceArea/build.xml
rename to Tools/Java/Source/SurfaceArea/build.xml
diff --git a/Tools/build.xml b/Tools/build.xml
index e7f10311c4..5b194667e4 100644
--- a/Tools/build.xml
+++ b/Tools/build.xml
@@ -32,15 +32,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <!-- Note: this is an ordered list. The projects have dependencies between them. -->
       <filelist dir="."
         files="
-          Source/Common/build.xml
-          Source/PcdTools/build.xml
-          Source/GenBuild/build.xml
-          Source/FrameworkTasks/build.xml
-          Source/Cpptasks/build.xml
-          Source/FrameworkWizard/build.xml
-          Source/MigrationTools/build.xml
-          Source/ContextTool/build.xml
-          Source/Merge/build.xml
+          Java/Source/Common/build.xml
+          Java/Source/PcdTools/build.xml
+          Java/Source/GenBuild/build.xml
+          Java/Source/FrameworkTasks/build.xml
+          Java/Source/Cpptasks/build.xml
+          Java/Source/FrameworkWizard/build.xml
+          Java/Source/MigrationTools/build.xml
+          Java/Source/ContextTool/build.xml
+          Java/Source/Merge/build.xml
           "/>
     </subant>
     <echo message="The EDK II Java Tools build has completed!"/>
@@ -51,7 +51,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <!-- Note: this is an ordered list. The projects have dependencies between them. -->
       <filelist dir="."
         files="
-          Source/FrameworkWizard/build.xml
+          Java/Source/FrameworkWizard/build.xml
           "/>
     </subant>
   </target>
@@ -60,7 +60,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <subant target="" verbose="true" inheritall="false">
       <filelist dir="."
         files="
-          Source/Merge/build.xml
+          Java/Source/Merge/build.xml
           "/>
     </subant>
   </target>
@@ -69,7 +69,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <subant target="" verbose="true" inheritall="false">
       <filelist dir="."
         files="
-          Source/SurfaceArea/build.xml
+          Java/Source/SurfaceArea/build.xml
           "/>
     </subant>
   </target>
@@ -117,17 +117,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <subant target="clean" inheritall="false">
       <filelist dir="."
         files="
-          Source/FrameworkWizard/build.xml 
-          Source/Cpptasks/build.xml 
-          Source/FrameworkTasks/build.xml 
-          Source/GenBuild/build.xml 
-          Source/PcdTools/build.xml 
-          Source/Common/build.xml 
-          Source/SurfaceArea/build.xml 
+          Java/Source/FrameworkWizard/build.xml 
+          Java/Source/Cpptasks/build.xml 
+          Java/Source/FrameworkTasks/build.xml 
+          Java/Source/GenBuild/build.xml 
+          Java/Source/PcdTools/build.xml 
+          Java/Source/Common/build.xml 
+          Java/Source/SurfaceArea/build.xml 
           Source/TianoTools/build.xml
-          Source/MigrationTools/build.xml
-          Source/ContextTool/build.xml
-          Source/Merge/build.xml
+          Java/Source/MigrationTools/build.xml
+          Java/Source/ContextTool/build.xml
+          Java/Source/Merge/build.xml
         "/>
     </subant>
   </target>
@@ -151,17 +151,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <subant target="cleanall" inheritall="true">
       <filelist dir="."
         files="
-          Source/FrameworkWizard/build.xml 
-          Source/Cpptasks/build.xml 
-          Source/FrameworkTasks/build.xml 
-          Source/GenBuild/build.xml 
-          Source/PcdTools/build.xml 
-          Source/Common/build.xml 
-          Source/SurfaceArea/build.xml 
+          Java/Source/FrameworkWizard/build.xml 
+          Java/Source/Cpptasks/build.xml 
+          Java/Source/FrameworkTasks/build.xml 
+          Java/Source/GenBuild/build.xml 
+          Java/Source/PcdTools/build.xml 
+          Java/Source/Common/build.xml 
+          Java/Source/SurfaceArea/build.xml 
           Source/TianoTools/build.xml
-          Source/MigrationTools/build.xml
-          Source/ContextTool/build.xml
-          Source/Merge/build.xml
+          Java/Source/MigrationTools/build.xml
+          Java/Source/ContextTool/build.xml
+          Java/Source/Merge/build.xml
         "/>
     </subant>
   </target>