diff --git a/reactos/base/setup/usetup/interface/usetup.c b/reactos/base/setup/usetup/interface/usetup.c
index 9fa6d32fdf3..e0f503e7503 100644
--- a/reactos/base/setup/usetup/interface/usetup.c
+++ b/reactos/base/setup/usetup/interface/usetup.c
@@ -1404,7 +1404,7 @@ IsDiskSizeValid(PPARTENTRY PartEntry)
     ULONGLONG m1, m2;
 
     /*  check for unpartitioned space  */
-    m1 = PartEntry->UnpartitionedLength; 
+    m1 = PartEntry->UnpartitionedLength;
     m1 = (m1 + (1 << 19)) >> 20;  /* in MBytes (rounded) */
 
     if( m1 > RequiredPartitionDiskSpace)
@@ -2843,6 +2843,7 @@ AddSectionToCopyQueue(HINF InfFile,
     PWCHAR FileKeyValue;
     PWCHAR DirKeyValue;
     PWCHAR TargetFileName;
+    WCHAR CompleteOrigFileName[512];
 
     if (SourceCabinet)
         return AddSectionToCopyQueueCab(InfFile, L"SourceFiles", SourceCabinet, DestinationPath, Ir);
@@ -2901,10 +2902,14 @@ AddSectionToCopyQueue(HINF InfFile,
             break;
         }
 
+        wcscpy(CompleteOrigFileName, SourceRootDir.Buffer);
+        wcscat(CompleteOrigFileName, L"\\");
+        wcscat(CompleteOrigFileName, DirKeyValue);
+
         if (!SetupQueueCopy(SetupFileQueue,
                             SourceCabinet,
                             SourceRootPath.Buffer,
-                            SourceRootDir.Buffer,
+                            CompleteOrigFileName,
                             FileKeyName,
                             DirKeyValue,
                             TargetFileName))
@@ -3601,10 +3606,10 @@ BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir)
 {
     UCHAR PartitionType;
     NTSTATUS Status;
-    
+
     PartitionType = PartitionList->ActiveBootPartition->
                     PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionType;
-    
+
     Status = InstallVBRToPartition(&SystemRootPath,
                                    &SourceRootPath,
                                    &DestinationArcPath,
@@ -3614,7 +3619,7 @@ BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir)
         MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER);
         return QUIT_PAGE;
     }
-    
+
     return SUCCESS_PAGE;
 }
 
@@ -3644,10 +3649,10 @@ BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir)
     swprintf(DestinationDevicePathBuffer,
              L"\\Device\\Harddisk%d\\Partition0",
              PartitionList->ActiveBootDisk->DiskNumber);
-    
+
     wcscpy(SourceMbrPathBuffer, SourceRootPath.Buffer);
     wcscat(SourceMbrPathBuffer, L"\\loader\\dosmbr.bin");
-        
+
     DPRINT("Install MBR bootcode: %S ==> %S\n",
             SourceMbrPathBuffer, DestinationDevicePathBuffer);
 
@@ -3931,7 +3936,7 @@ RunUSetup(VOID)
             case BOOT_LOADER_HARDDISK_MBR_PAGE:
                 Page = BootLoaderHarddiskMbrPage(&Ir);
                 break;
-                
+
             case BOOT_LOADER_HARDDISK_VBR_PAGE:
                 Page = BootLoaderHarddiskVbrPage(&Ir);
                 break;
diff --git a/reactos/boot/bootdata/txtsetup.sif b/reactos/boot/bootdata/txtsetup.sif
index fb0937edbb2..3b89c64499f 100644
--- a/reactos/boot/bootdata/txtsetup.sif
+++ b/reactos/boot/bootdata/txtsetup.sif
@@ -39,7 +39,12 @@ pci.sys=,,,,,,,,,,,,4
 scsiport.sys=,,,,,,x,,,,,,4
 fastfat.sys=,,,,,,x,,,,,,4
 ramdisk.sys=,,,,,,x,,,,,,4
-ext2.sys=,,,,,,x,,,,,,4
+ext2fs.sys=,,,,,,x,,,,,,4
+classpnp.sys=,,,,,,,,,,,,4
+pcix.sys=,,,,,,,,,,,,4
+pcmcia.sys=,,,,,,,,,,,,4
+swenum.sys=,,,,,,,,,,,,4
+ntdll.dll=,,,,,,,,,,,,2
 
 [HardwareIdsDatabase]
 ;*PNP0A00 = isapnp
diff --git a/reactos/boot/freeldr/freeldr/windows/setupldr2.c b/reactos/boot/freeldr/freeldr/windows/setupldr2.c
index f57a0be7ed6..58ee4d89d31 100644
--- a/reactos/boot/freeldr/freeldr/windows/setupldr2.c
+++ b/reactos/boot/freeldr/freeldr/windows/setupldr2.c
@@ -109,11 +109,11 @@ SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR
 VOID
 SetupLdrScanBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR SearchPath)
 {
-    INFCONTEXT InfContext;
+    INFCONTEXT InfContext, dirContext;
     BOOLEAN Status;
-    LPCSTR Media, DriverName;
+    LPCSTR Media, DriverName, dirIndex, ImagePath;
     WCHAR ServiceName[256];
-    WCHAR ImagePath[256];
+    WCHAR ImagePathW[256];
 
     /* Open inf section */
     if (!InfFindFirstLine(InfHandle, "SourceDisksFiles", NULL, &InfContext))
@@ -123,23 +123,28 @@ SetupLdrScanBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPC
     do
     {
         if (InfGetDataField(&InfContext, 7, &Media) &&
-            InfGetDataField(&InfContext, 0, &DriverName))
+            InfGetDataField(&InfContext, 0, &DriverName) && 
+            InfGetDataField(&InfContext, 13, &dirIndex))
         {
-            if (strcmp(Media, "x") == 0)
+            if ((strcmp(Media, "x") == 0) &&
+                InfFindFirstLine(InfHandle, "Directories", dirIndex, &dirContext) &&
+                InfGetDataField(&dirContext, 1, &ImagePath))
             {
                 /* Convert name to widechar */
                 swprintf(ServiceName, L"%S", DriverName);
 
+                /* Prepare image path */
+                swprintf(ImagePathW, L"%S", ImagePath);
+                wcscat(ImagePathW, L"\\");
+                wcscat(ImagePathW, ServiceName);
+                
                 /* Remove .sys extension */
                 ServiceName[wcslen(ServiceName) - 4] = 0;
 
-                /* Prepare image path */
-                swprintf(ImagePath, L"%S", DriverName);
-
                 /* Add it to the list */
                 Status = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead,
                     L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\",
-                    ImagePath,
+                    ImagePathW,
                     ServiceName);
 
                 if (!Status)
@@ -274,41 +279,50 @@ VOID LoadReactOSSetup2(VOID)
     UseRealHeap = TRUE;
     LoaderBlock->ConfigurationRoot = MachHwDetect();
 
+	strcpy(FileName, "\\ArcName\\");
+
     /* Load kernel */
-    strcpy(FileName, BootPath);
-    strcat(FileName, "NTOSKRNL.EXE");
-    Status = WinLdrLoadImage(FileName, LoaderSystemCode, &NtosBase);
+    strcpy(FileName+strlen("\\ArcName\\"), BootPath);
+    strcat(FileName, "SYSTEM32\\NTOSKRNL.EXE");
+    Status = WinLdrLoadImage(FileName+strlen("\\ArcName\\"), LoaderSystemCode, &NtosBase);
     DPRINTM(DPRINT_WINDOWS, "Ntos loaded with status %d at %p\n", Status, NtosBase);
+    Status = WinLdrAllocateDataTableEntry(LoaderBlock, "ntoskrnl.exe",
+        FileName, NtosBase, &KernelDTE);
+    DPRINTM(DPRINT_WINDOWS, "Ntos Data Table Entry allocated with status %d at %p\n", Status, KernelDTE);
 
     /* Load HAL */
-    strcpy(FileName, BootPath);
-    strcat(FileName, "HAL.DLL");
-    Status = WinLdrLoadImage(FileName, LoaderHalCode, &HalBase);
+    strcpy(FileName+strlen("\\ArcName\\"), BootPath);
+    strcat(FileName, "SYSTEM32\\HAL.DLL");
+    Status = WinLdrLoadImage(FileName+strlen("\\ArcName\\"), LoaderHalCode, &HalBase);
     DPRINTM(DPRINT_WINDOWS, "HAL loaded with status %d at %p\n", Status, HalBase);
+    Status = WinLdrAllocateDataTableEntry(LoaderBlock, "hal.dll",
+        FileName, HalBase, &HalDTE);
+    DPRINTM(DPRINT_WINDOWS, "HAL Data Table Entry allocated with status %d at %p\n", Status, HalDTE);
 
     /* Load kernel-debugger support dll */
-    strcpy(FileName, BootPath);
-    strcat(FileName, "KDCOM.DLL");
-    Status = WinLdrLoadImage(FileName, LoaderBootDriver, &KdComBase);
+    strcpy(FileName+strlen("\\ArcName\\"), BootPath);
+    strcat(FileName, "SYSTEM32\\KDCOM.DLL");
+    Status = WinLdrLoadImage(FileName+strlen("\\ArcName\\"), LoaderBootDriver, &KdComBase);
     DPRINTM(DPRINT_WINDOWS, "KdCom loaded with status %d at %p\n", Status, KdComBase);
-
-    /* Allocate data table entries for above-loaded modules */
-    WinLdrAllocateDataTableEntry(LoaderBlock, "ntoskrnl.exe",
-        "NTOSKRNL.EXE", NtosBase, &KernelDTE);
-    WinLdrAllocateDataTableEntry(LoaderBlock, "hal.dll",
-        "HAL.DLL", HalBase, &HalDTE);
-    WinLdrAllocateDataTableEntry(LoaderBlock, "kdcom.dll",
-        "KDCOM.DLL", KdComBase, &KdComDTE);
+    Status = WinLdrAllocateDataTableEntry(LoaderBlock, "kdcom.dll",
+        FileName, KdComBase, &KdComDTE);
+    DPRINTM(DPRINT_WINDOWS, "KdCom Data Table Entry allocated with status %d at %p\n", Status, HalDTE);
 
     /* Load all referenced DLLs for kernel, HAL and kdcom.dll */
     strcpy(SearchPath, BootPath);
     WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE);
     WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE);
+    if (KdComDTE)
+        WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE);
+    /* In system32 too */
+    strcpy(SearchPath + strlen(BootPath), "system32\\");
+    WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE);
+    WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE);
     if (KdComDTE)
         WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE);
 
-    /* Load NLS data */
-    SetupLdrLoadNlsData(LoaderBlock, InfHandle, BootPath);
+    /* Load NLS data, they are in system32 */
+    SetupLdrLoadNlsData(LoaderBlock, InfHandle, SearchPath);
 
     /* Get a list of boot drivers */
     SetupLdrScanBootDrivers(LoaderBlock, InfHandle, BootPath);
diff --git a/reactos/dll/win32/syssetup/wizard.c b/reactos/dll/win32/syssetup/wizard.c
index a68054596cd..9547493ec51 100644
--- a/reactos/dll/win32/syssetup/wizard.c
+++ b/reactos/dll/win32/syssetup/wizard.c
@@ -1921,7 +1921,7 @@ SetInstallationCompleted(VOID)
   HKEY hKey = 0;
   DWORD InProgress = 0;
   DWORD InstallDate;
-  
+
   if (RegOpenKeyExW( HKEY_LOCAL_MACHINE,
                      L"SYSTEM\\Setup",
                      0,
@@ -1931,7 +1931,7 @@ SetInstallationCompleted(VOID)
     RegSetValueExW( hKey, L"SystemSetupInProgress", 0, REG_DWORD, (LPBYTE)&InProgress, sizeof(InProgress) );
     RegCloseKey( hKey );
   }
-  
+
   if (RegOpenKeyExW( HKEY_LOCAL_MACHINE,
                      L"Software\\Microsoft\\Windows NT\\CurrentVersion",
                      0,
@@ -2233,7 +2233,7 @@ GetRosInstallCD(WCHAR * szPath, DWORD dwPathLength)
     {
         WCHAR szBuffer[MAX_PATH];
         wcscpy(szBuffer, szDrive);
-        wcscat(szBuffer, L"reactos\\ntoskrnl.exe");
+        wcscat(szBuffer, L"reactos\\system32\\ntoskrnl.exe");
         LogItem(SYSSETUP_SEVERITY_INFORMATION, szBuffer);
         if (FileExists(szBuffer, NULL))
         {
@@ -2383,7 +2383,7 @@ InstallWizard(VOID)
   hWnd = (HWND)PropertySheet(&psh);
   ShowWindow(hWnd, SW_SHOW);
 
-  while (GetMessage(&msg, NULL, 0, 0)) 
+  while (GetMessage(&msg, NULL, 0, 0))
   {
     if(!IsDialogMessage(hWnd, &msg))
     {
diff --git a/reactos/drivers/base/bootvid/bootvid.rbuild b/reactos/drivers/base/bootvid/bootvid.rbuild
index 0c996310194..03f62c7440d 100644
--- a/reactos/drivers/base/bootvid/bootvid.rbuild
+++ b/reactos/drivers/base/bootvid/bootvid.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="bootvid" type="kernelmodedll" entrypoint="0" installbase="system32" installname="bootvid.dll">
 	<importlibrary definition="bootvid.spec"></importlibrary>
-	<bootstrap installbase="$(CDOUTPUT)" nameoncd="bootvid.dll" />
+	<bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="bootvid.dll" />
 	<include base="bootvid">.</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/base/kdcom/kdcom.rbuild b/reactos/drivers/base/kdcom/kdcom.rbuild
index 301c44ce75c..888aad65dbe 100644
--- a/reactos/drivers/base/kdcom/kdcom.rbuild
+++ b/reactos/drivers/base/kdcom/kdcom.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kdcom" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kdcom.dll">
 	<importlibrary definition="kdcom.spec"></importlibrary>
-	<bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" />
+	<bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="kdcom.dll" />
 	<include base="kdcom">.</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/base/kddll/kddll.rbuild b/reactos/drivers/base/kddll/kddll.rbuild
index 6e01f2fa2b3..4a368a007a1 100644
--- a/reactos/drivers/base/kddll/kddll.rbuild
+++ b/reactos/drivers/base/kddll/kddll.rbuild
@@ -16,7 +16,7 @@
 
 <module name="kdcom" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kdcom.dll">
 	<importlibrary definition="kddll.spec"></importlibrary>
-	<bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" />
+	<bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="kdcom.dll" />
 	<include base="kdcom">.</include>
 	<library>kdlib</library>
 	<library>kdserial</library>
diff --git a/reactos/drivers/base/nmidebug/nmidebug.rbuild b/reactos/drivers/base/nmidebug/nmidebug.rbuild
index b3633d45cda..02d605ce5a5 100644
--- a/reactos/drivers/base/nmidebug/nmidebug.rbuild
+++ b/reactos/drivers/base/nmidebug/nmidebug.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="nmidebug" type="kernelmodedriver" installbase="system32/drivers" installname="nmidebug.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<include base="null">.</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/bus/acpi/acpi.rbuild b/reactos/drivers/bus/acpi/acpi.rbuild
index f11b6942b44..a33498acd50 100644
--- a/reactos/drivers/bus/acpi/acpi.rbuild
+++ b/reactos/drivers/bus/acpi/acpi.rbuild
@@ -18,7 +18,7 @@
 </if>
 
 <module name="acpi" type="kernelmodedriver" installbase="system32/drivers" installname="acpi.sys" allowwarnings="true">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<include base="acpi">include</include>
 	<include base="acpica">include</include>
 	<library>ntoskrnl</library>
diff --git a/reactos/drivers/bus/isapnp/isapnp.rbuild b/reactos/drivers/bus/isapnp/isapnp.rbuild
index bc8a96acaf7..9f31fbde9f1 100644
--- a/reactos/drivers/bus/isapnp/isapnp.rbuild
+++ b/reactos/drivers/bus/isapnp/isapnp.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="isapnp" type="kernelmodedriver" installbase="system32/drivers" installname="isapnp.sys">
-	<bootstrap installbase="$(CDOUTPUT)"/>
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers"/>
 	<include base="isapnp">.</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/bus/pci/pci.rbuild b/reactos/drivers/bus/pci/pci.rbuild
index 982d0d3872f..7f6ce0dd01c 100644
--- a/reactos/drivers/bus/pci/pci.rbuild
+++ b/reactos/drivers/bus/pci/pci.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="pci" type="kernelmodedriver" installbase="system32/drivers" installname="pci.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<include base="pci">.</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/bus/pcix/pcix.rbuild b/reactos/drivers/bus/pcix/pcix.rbuild
index 0ceaf14d9b1..b00225e4ee2 100644
--- a/reactos/drivers/bus/pcix/pcix.rbuild
+++ b/reactos/drivers/bus/pcix/pcix.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="pcix" type="kernelmodedriver" installbase="system32/drivers" installname="pcix.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<include base="pcix">.</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/bus/pcmcia/pcmcia.rbuild b/reactos/drivers/bus/pcmcia/pcmcia.rbuild
index 2d33ce5dcd6..b2fe4e30c40 100644
--- a/reactos/drivers/bus/pcmcia/pcmcia.rbuild
+++ b/reactos/drivers/bus/pcmcia/pcmcia.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="pcmcia" type="kernelmodedriver" installbase="system32/drivers" installname="pcmcia.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<include base="pcmcia">.</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/filesystems/cdfs/cdfs.rbuild b/reactos/drivers/filesystems/cdfs/cdfs.rbuild
index ef0edec3bba..2562d39ed4b 100644
--- a/reactos/drivers/filesystems/cdfs/cdfs.rbuild
+++ b/reactos/drivers/filesystems/cdfs/cdfs.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="cdfs" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<include base="cdfs">.</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/filesystems/ext2/ext2.rbuild b/reactos/drivers/filesystems/ext2/ext2.rbuild
index fc092a308c7..1cc1a54b382 100644
--- a/reactos/drivers/filesystems/ext2/ext2.rbuild
+++ b/reactos/drivers/filesystems/ext2/ext2.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="ext2fs" type="kernelmodedriver" installbase="system32/drivers" installname="ext2.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+<module name="ext2fs" type="kernelmodedriver" installbase="system32/drivers" installname="ext2fs.sys">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<include base="ext2fs">inc</include>
 	<compilerflag compilerset="msc">/wd4003</compilerflag>
 	<library>ntoskrnl</library>
diff --git a/reactos/drivers/filesystems/fastfat/vfatfs.rbuild b/reactos/drivers/filesystems/fastfat/vfatfs.rbuild
index a8e81d2c2c3..179d825a792 100644
--- a/reactos/drivers/filesystems/fastfat/vfatfs.rbuild
+++ b/reactos/drivers/filesystems/fastfat/vfatfs.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="fastfat" type="kernelmodedriver" installbase="system32/drivers" installname="fastfat.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<include base="fastfat">.</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild b/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild
index bd8f6c8fb67..ae73147dd47 100644
--- a/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild
+++ b/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="fastfatn" type="kernelmodedriver" installbase="system32/drivers" installname="fastfatn.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<include base="fastfatn">.</include>
 	<include base="ReactOS">include/reactos/libs/fullfat</include>
 	<library>fullfat</library>
diff --git a/reactos/drivers/filesystems/ntfs/ntfs.rbuild b/reactos/drivers/filesystems/ntfs/ntfs.rbuild
index 76e974fb795..45b8266fd32 100644
--- a/reactos/drivers/filesystems/ntfs/ntfs.rbuild
+++ b/reactos/drivers/filesystems/ntfs/ntfs.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="ntfs" type="kernelmodedriver" installbase="system32/drivers" installname="ntfs.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<include base="ntfs">.</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/input/i8042prt/i8042prt.rbuild b/reactos/drivers/input/i8042prt/i8042prt.rbuild
index 041517802f6..5542ab5d0e2 100644
--- a/reactos/drivers/input/i8042prt/i8042prt.rbuild
+++ b/reactos/drivers/input/i8042prt/i8042prt.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="i8042prt" type="kernelmodedriver" installbase="system32/drivers" installname="i8042prt.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>createclose.c</file>
diff --git a/reactos/drivers/input/kbdclass/kbdclass.rbuild b/reactos/drivers/input/kbdclass/kbdclass.rbuild
index 480896a80ed..639e4738044 100644
--- a/reactos/drivers/input/kbdclass/kbdclass.rbuild
+++ b/reactos/drivers/input/kbdclass/kbdclass.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdclass" type="kernelmodedriver" installbase="system32/drivers" installname="kbdclass.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<library>pseh</library>
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/ksfilter/swenum/swenum.rbuild b/reactos/drivers/ksfilter/swenum/swenum.rbuild
index 462a0f6824d..3f9ee3c9400 100644
--- a/reactos/drivers/ksfilter/swenum/swenum.rbuild
+++ b/reactos/drivers/ksfilter/swenum/swenum.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="swenum" type="kernelmodedriver" installbase="system32/drivers" installname="swenum.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<library>ntoskrnl</library>
 	<library>ks</library>
 	<file>swenum.c</file>
diff --git a/reactos/drivers/setup/blue/blue.rbuild b/reactos/drivers/setup/blue/blue.rbuild
index 56c4a4bb8a8..075a2997f7c 100644
--- a/reactos/drivers/setup/blue/blue.rbuild
+++ b/reactos/drivers/setup/blue/blue.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="blue" type="kernelmodedriver" installbase="system32/drivers" installname="blue.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<include base="ReactOS">include/reactos/drivers</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/storage/class/cdrom/cdrom.rbuild b/reactos/drivers/storage/class/cdrom/cdrom.rbuild
index eaca832c0a6..3735a15ce93 100644
--- a/reactos/drivers/storage/class/cdrom/cdrom.rbuild
+++ b/reactos/drivers/storage/class/cdrom/cdrom.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="cdrom" type="kernelmodedriver" installbase="system32/drivers" installname="cdrom.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<library>class2</library>
diff --git a/reactos/drivers/storage/class/cdrom_new/cdrom_new.rbuild b/reactos/drivers/storage/class/cdrom_new/cdrom_new.rbuild
index 3969aedb585..4e8d9fbed4e 100644
--- a/reactos/drivers/storage/class/cdrom_new/cdrom_new.rbuild
+++ b/reactos/drivers/storage/class/cdrom_new/cdrom_new.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="cdrom_new" type="kernelmodedriver" installbase="system32/drivers" installname="cdrom_new.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<library>classpnp</library>
diff --git a/reactos/drivers/storage/class/class2/class2.rbuild b/reactos/drivers/storage/class/class2/class2.rbuild
index 17636571e0d..423122e1db2 100644
--- a/reactos/drivers/storage/class/class2/class2.rbuild
+++ b/reactos/drivers/storage/class/class2/class2.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="class2" type="kernelmodedriver" installbase="system32/drivers" installname="class2.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<importlibrary definition="class2.spec" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/storage/class/disk/disk.rbuild b/reactos/drivers/storage/class/disk/disk.rbuild
index e59a64ecc20..543441659dd 100644
--- a/reactos/drivers/storage/class/disk/disk.rbuild
+++ b/reactos/drivers/storage/class/disk/disk.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="disk.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<library>class2</library>
diff --git a/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild b/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild
index f861502db18..6adba99282d 100644
--- a/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild
+++ b/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="ramdisk" type="kernelmodedriver" installbase="system32/drivers" installname="ramdisk.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>ramdisk.c</file>
diff --git a/reactos/drivers/storage/classpnp/classpnp.rbuild b/reactos/drivers/storage/classpnp/classpnp.rbuild
index 094801a0ddb..92f982e5034 100644
--- a/reactos/drivers/storage/classpnp/classpnp.rbuild
+++ b/reactos/drivers/storage/classpnp/classpnp.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="classpnp" type="kernelmodedriver" installbase="system32/drivers" installname="classpnp.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<importlibrary definition="class.spec" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/storage/floppy/floppy.rbuild b/reactos/drivers/storage/floppy/floppy.rbuild
index 1634b7bb35d..41bd2d39b1c 100644
--- a/reactos/drivers/storage/floppy/floppy.rbuild
+++ b/reactos/drivers/storage/floppy/floppy.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="floppy" type="kernelmodedriver" installbase="system32/drivers" installname="floppy.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<include base="floppy">.</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/storage/ide/atapi/atapi.rbuild b/reactos/drivers/storage/ide/atapi/atapi.rbuild
index 032a5b71602..6c6a680abca 100644
--- a/reactos/drivers/storage/ide/atapi/atapi.rbuild
+++ b/reactos/drivers/storage/ide/atapi/atapi.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="atapi" type="kernelmodedriver" installbase="system32/drivers" installname="atapi.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<include base="atapi">.</include>
 	<library>scsiport</library>
 	<library>libcntpr</library>
diff --git a/reactos/drivers/storage/ide/uniata/uniata.rbuild b/reactos/drivers/storage/ide/uniata/uniata.rbuild
index b065ca7828f..af1ad6b324b 100644
--- a/reactos/drivers/storage/ide/uniata/uniata.rbuild
+++ b/reactos/drivers/storage/ide/uniata/uniata.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="uniata" type="kernelmodedriver" installbase="system32/drivers" installname="uniata.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<include base="uniata">.</include>
 	<include base="uniata">inc</include>
 	<group compilerset="gcc">
diff --git a/reactos/drivers/storage/port/buslogic/buslogic.rbuild b/reactos/drivers/storage/port/buslogic/buslogic.rbuild
index 3347f10b98d..92f5fc69fa3 100644
--- a/reactos/drivers/storage/port/buslogic/buslogic.rbuild
+++ b/reactos/drivers/storage/port/buslogic/buslogic.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="buslogic" type="kernelmodedriver" installbase="system32/drivers" installname="buslogic.sys" crt="libcntpr">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<include base="buslogic">.</include>
 	<library>scsiport</library>
 	<file>BusLogic958.c</file>
diff --git a/reactos/drivers/storage/scsiport/scsiport.rbuild b/reactos/drivers/storage/scsiport/scsiport.rbuild
index 556d742680f..d56de33941a 100644
--- a/reactos/drivers/storage/scsiport/scsiport.rbuild
+++ b/reactos/drivers/storage/scsiport/scsiport.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<define name="_SCSIPORT_" />
 	<importlibrary definition="scsiport.pspec" />
 	<include base="scsiport">.</include>
diff --git a/reactos/hal/halarm/hal.rbuild b/reactos/hal/halarm/hal.rbuild
index 2a6086a5894..71eb9f9b622 100644
--- a/reactos/hal/halarm/hal.rbuild
+++ b/reactos/hal/halarm/hal.rbuild
@@ -3,7 +3,7 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<module name="hal" type="kernelmodedll" entrypoint="HalInitSystem@8" installbase="system32" installname="hal.dll">
 		<importlibrary base="hal" definition="../hal.pspec" />
-		<bootstrap installbase="$(CDOUTPUT)" />
+		<bootstrap installbase="$(CDOUTPUT)/system32" />
 		<include>include</include>
 		<include base="ntoskrnl">include</include>
 		<define name="_NTHAL_" />
diff --git a/reactos/hal/halarm/omap3/halup.rbuild b/reactos/hal/halarm/omap3/halup.rbuild
index 7486fa96116..c5bcbae27b5 100644
--- a/reactos/hal/halarm/omap3/halup.rbuild
+++ b/reactos/hal/halarm/omap3/halup.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="hal" type="kernelmodedll" entrypoint="HalInitSystem" installbase="system32" installname="hal.dll">
 	<importlibrary base="hal" definition="../hal.pspec" />
-	<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
+	<bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="hal.dll" />
 	<include base="hal">include</include>
 	<include base="ntoskrnl">include</include>
 	<define name="_NTHAL_" />
diff --git a/reactos/hal/halarm/versa/halup.rbuild b/reactos/hal/halarm/versa/halup.rbuild
index ac59afe19ec..88db996966f 100644
--- a/reactos/hal/halarm/versa/halup.rbuild
+++ b/reactos/hal/halarm/versa/halup.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="hal" type="kernelmodedll" entrypoint="HalInitSystem" installbase="system32" installname="hal.dll">
 	<importlibrary base="hal" definition="../hal.pspec" />
-	<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
+	<bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="hal.dll" />
 	<include base="hal">include</include>
 	<include base="ntoskrnl">include</include>
 	<define name="_NTHAL_" />
diff --git a/reactos/hal/halppc/up/halup.rbuild b/reactos/hal/halppc/up/halup.rbuild
index cd946027cc5..d3a3ba0b5c5 100644
--- a/reactos/hal/halppc/up/halup.rbuild
+++ b/reactos/hal/halppc/up/halup.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="hal" type="kernelmodedll" entrypoint="HalInitSystem">
 	<importlibrary definition="../../hal/hal.pspec" />
-	<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
+	<bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="hal.dll" />
 	<include base="halppc_generic">../include</include>
 	<include base="ntoskrnl">include</include>
 	<define name="_NTHAL_" />
diff --git a/reactos/hal/halx86/hal.rbuild b/reactos/hal/halx86/hal.rbuild
index 17ffea9c4a0..80cc50f0fe1 100644
--- a/reactos/hal/halx86/hal.rbuild
+++ b/reactos/hal/halx86/hal.rbuild
@@ -3,7 +3,7 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<module name="hal" type="kernelmodedll" entrypoint="HalInitSystem@8" installbase="system32" installname="hal.dll">
 		<importlibrary base="hal" definition="../hal.pspec" />
-		<bootstrap installbase="$(CDOUTPUT)" />
+		<bootstrap installbase="$(CDOUTPUT)/system32" />
 		<include>include</include>
 		<include base="ntoskrnl">include</include>
 		<define name="_NTHALDLL_" />
diff --git a/reactos/hal/halx86/halacpi.rbuild b/reactos/hal/halx86/halacpi.rbuild
index 2037d9f759d..21b9f8f8384 100644
--- a/reactos/hal/halx86/halacpi.rbuild
+++ b/reactos/hal/halx86/halacpi.rbuild
@@ -3,7 +3,7 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<module name="halacpi" type="kernelmodedll" entrypoint="HalInitSystem@8" installbase="system32" installname="halacpi.dll">
 		<importlibrary base="hal" definition="../hal.pspec" />
-		<bootstrap installbase="$(CDOUTPUT)" />
+		<bootstrap installbase="$(CDOUTPUT)/system32" />
 		<include>include</include>
 		<include base="ntoskrnl">include</include>
 		<define name="_NTHALDLL_" />
diff --git a/reactos/hal/halx86/halamd64.rbuild b/reactos/hal/halx86/halamd64.rbuild
index 02f633c9fd0..3f443181cc4 100644
--- a/reactos/hal/halx86/halamd64.rbuild
+++ b/reactos/hal/halx86/halamd64.rbuild
@@ -3,7 +3,7 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 <module name="hal" type="kernelmodedll" entrypoint="HalInitSystem" installbase="system32" installname="hal.dll">
 	<importlibrary base="hal" definition="../hal.pspec" />
-	<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
+	<bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="hal.dll" />
 	<include base="hal">include</include>
 	<include base="ntoskrnl">include</include>
 	<!-- include base="x86emu">.</include -->
diff --git a/reactos/hal/halx86/halmps.rbuild b/reactos/hal/halx86/halmps.rbuild
index d76c49f39da..8d949b709b5 100644
--- a/reactos/hal/halx86/halmps.rbuild
+++ b/reactos/hal/halx86/halmps.rbuild
@@ -3,7 +3,7 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<module name="halmps" type="kernelmodedll" entrypoint="HalInitSystem@8">
 		<importlibrary base="hal" definition="../hal.pspec" />
-		<bootstrap installbase="$(CDOUTPUT)" />
+		<bootstrap installbase="$(CDOUTPUT)/system32" />
 		<include>include</include>
 		<include base="ntoskrnl">include</include>
 		<define name="CONFIG_SMP" />
diff --git a/reactos/media/nls/nls.rbuild b/reactos/media/nls/nls.rbuild
index ece51819cfa..023416f1bf6 100644
--- a/reactos/media/nls/nls.rbuild
+++ b/reactos/media/nls/nls.rbuild
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
-	<cdfile installbase="$(CDOUTPUT)">c_437.nls</cdfile>
-	<cdfile installbase="$(CDOUTPUT)">c_1252.nls</cdfile>
-	<cdfile installbase="$(CDOUTPUT)">l_intl.nls</cdfile>
+	<cdfile installbase="$(CDOUTPUT)/system32">c_437.nls</cdfile>
+	<cdfile installbase="$(CDOUTPUT)/system32">c_1252.nls</cdfile>
+	<cdfile installbase="$(CDOUTPUT)/system32">l_intl.nls</cdfile>
 
 	<installfile installbase="system32">c_037.nls</installfile>
 	<installfile installbase="system32">c_424.nls</installfile>
diff --git a/reactos/ntoskrnl/ntoskrnl-generic.rbuild b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
index 12882439405..9eb9bcd86b0 100644
--- a/reactos/ntoskrnl/ntoskrnl-generic.rbuild
+++ b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)/system32" />
 	<importlibrary definition="ntoskrnl.pspec" />
 	<define name="__NTOSKRNL__" />
 	<define name="_NTOSKRNL_" />