diff --git a/ci.sh b/ci.sh
index 23093ca2de..14c4f3ee21 100755
--- a/ci.sh
+++ b/ci.sh
@@ -115,7 +115,7 @@ test_dub_package() {
         done
         popd
         # Test rdmd build
-        "${build_path}/dmd" -version=NoBackend -version=GC -version=NoMain -Jgenerated/dub -Jres -Isrc -i -run test/dub_package/frontend.d
+        "${build_path}/dmd" -version=NoBackend -version=GC -version=NoMain -Jgenerated/dub -Jsrc/dmd/res -Isrc -i -run test/dub_package/frontend.d
     fi
     deactivate
 }
diff --git a/dub.sdl b/dub.sdl
index e0c6850123..66cc81dd9a 100644
--- a/dub.sdl
+++ b/dub.sdl
@@ -71,7 +71,7 @@ subPackage {
   name "frontend"
   targetType "library"
   sourcePaths "src/dmd"
-  stringImportPaths "res"
+  stringImportPaths "src/dmd/res"
 
   versions \
     "NoBackend" \
diff --git a/src/build.d b/src/build.d
index 2b54180e20..4d64aa438e 100755
--- a/src/build.d
+++ b/src/build.d
@@ -916,7 +916,7 @@ void parseEnvironment()
     env.getDefault("GIT_HOME", "https://github.com/dlang");
     env.getDefault("SYSCONFDIR", "/etc");
     env.getDefault("TMP", tempDir);
-    env.getDefault("RES", dmdRepo.buildPath("res"));
+    env.getDefault("RES", dmdRepo.buildPath("src/dmd/res"));
 
     version (Windows)
         enum installPref = "";
diff --git a/res/default_ddoc_theme.ddoc b/src/dmd/res/default_ddoc_theme.ddoc
similarity index 100%
rename from res/default_ddoc_theme.ddoc
rename to src/dmd/res/default_ddoc_theme.ddoc
diff --git a/src/vcbuild/dmd.vcxproj b/src/vcbuild/dmd.vcxproj
index fb99e7ae15..d6ce2d0648 100644
--- a/src/vcbuild/dmd.vcxproj
+++ b/src/vcbuild/dmd.vcxproj
@@ -122,7 +122,7 @@
     </Link>
     <DCompile>
       <VersionIdentifiers>MARS</VersionIdentifiers>
-      <StringImportPaths>..\..\res;$(OutDir)</StringImportPaths>
+      <StringImportPaths>../dmd/res;$(OutDir)</StringImportPaths>
       <CRuntimeLibrary>MultiThreadedDebug</CRuntimeLibrary>
       <CompilationModel>Package</CompilationModel>
       <ImportPaths>..</ImportPaths>
@@ -146,7 +146,7 @@
     </Link>
     <DCompile>
       <VersionIdentifiers>MARS</VersionIdentifiers>
-      <StringImportPaths>..\..\res;$(OutDir)</StringImportPaths>
+      <StringImportPaths>../dmd/res;$(OutDir)</StringImportPaths>
       <CRuntimeLibrary>MultiThreadedDebug</CRuntimeLibrary>
       <CompilationModel>Package</CompilationModel>
       <ImportPaths>..</ImportPaths>
@@ -175,7 +175,7 @@
     </Link>
     <DCompile>
       <VersionIdentifiers>MARS</VersionIdentifiers>
-      <StringImportPaths>..\..\res;$(OutDir)</StringImportPaths>
+      <StringImportPaths>../dmd/res;$(OutDir)</StringImportPaths>
       <CompilationModel>Package</CompilationModel>
       <ImportPaths>..</ImportPaths>
       <Optimizer>true</Optimizer>
@@ -204,7 +204,7 @@
     </Link>
     <DCompile>
       <VersionIdentifiers>MARS</VersionIdentifiers>
-      <StringImportPaths>..\..\res;$(OutDir)</StringImportPaths>
+      <StringImportPaths>../dmd/res;$(OutDir)</StringImportPaths>
       <CompilationModel>Package</CompilationModel>
       <ImportPaths>..</ImportPaths>
       <Optimizer>true</Optimizer>
diff --git a/test/tools/unit_test_runner.d b/test/tools/unit_test_runner.d
index 6d3fdd1a1b..747a8c9c0f 100755
--- a/test/tools/unit_test_runner.d
+++ b/test/tools/unit_test_runner.d
@@ -250,7 +250,7 @@ void writeCmdfile(string path, string runnerPath, string outputPath,
         "-version=MARS",
         "-unittest",
         "-J" ~ buildOutputPath,
-        "-J" ~ projectRootDir.buildPath("res"),
+        "-J" ~ projectRootDir.buildPath("src/dmd/res"),
         "-I" ~ projectRootDir.buildPath("src"),
         "-I" ~ unitTestDir,
         "-i",