diff --git a/circleci.sh b/circleci.sh
index e4ae72863dc5..2326e72c695c 100755
--- a/circleci.sh
+++ b/circleci.sh
@@ -89,7 +89,7 @@ coverage() {
 
     # rebuild dmd with coverage enabled
     # use the just build dmd as host compiler this time
-    mv src/dmd src/host_dmd
+    mv generated/dmd src/host_dmd
     make -j$N -C src -f posix.mak MODEL=$MODEL HOST_DMD=./host_dmd clean
     make -j$N -C src -f posix.mak MODEL=$MODEL HOST_DMD=./host_dmd dmd.conf
     make -j$N -C src -f posix.mak MODEL=$MODEL HOST_DMD=./host_dmd ENABLE_COVERAGE=1
diff --git a/src/access.d b/src/dmd/access.d
similarity index 98%
rename from src/access.d
rename to src/dmd/access.d
index cbdf9e603641..e2b31a4d2a53 100644
--- a/src/access.d
+++ b/src/dmd/access.d
@@ -8,21 +8,21 @@
  * Source:      $(DMDSRC _access.d)
  */
 
-module ddmd.access;
+module dmd.access;
 
-import ddmd.aggregate;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.mtype;
-import ddmd.tokens;
+import dmd.aggregate;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.mtype;
+import dmd.tokens;
 
 private enum LOG = false;
 
@@ -589,7 +589,7 @@ private Dsymbol mostVisibleOverload(Dsymbol s)
                     break;
                 }
             }
-            // handled by ddmd.func.overloadApply for unknown reason
+            // handled by dmd.func.overloadApply for unknown reason
             assert(next !is ad); // should not alias itself
             assert(next !is fstart); // should not alias the overload list itself
         }
diff --git a/src/aggregate.d b/src/dmd/aggregate.d
similarity index 98%
rename from src/aggregate.d
rename to src/dmd/aggregate.d
index fe7de60f3628..cac6a64df734 100644
--- a/src/aggregate.d
+++ b/src/dmd/aggregate.d
@@ -8,27 +8,27 @@
  * Source:      $(DMDSRC _aggregate.d)
  */
 
-module ddmd.aggregate;
+module dmd.aggregate;
 
 import core.stdc.stdio;
 import core.checkedint;
 
-import ddmd.arraytypes;
-import ddmd.gluelayer;
-import ddmd.declaration;
-import ddmd.dscope;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.mtype;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.arraytypes;
+import dmd.gluelayer;
+import dmd.declaration;
+import dmd.dscope;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.id;
+import dmd.identifier;
+import dmd.mtype;
+import dmd.tokens;
+import dmd.visitor;
 
 enum Sizeok : int
 {
diff --git a/src/aliasthis.d b/src/dmd/aliasthis.d
similarity index 93%
rename from src/aliasthis.d
rename to src/dmd/aliasthis.d
index 5c4d604eba7f..774841d7d13c 100644
--- a/src/aliasthis.d
+++ b/src/dmd/aliasthis.d
@@ -8,21 +8,21 @@
  * Source:      $(DMDSRC _aliasthis.d)
  */
 
-module ddmd.aliasthis;
+module dmd.aliasthis;
 
 import core.stdc.stdio;
-import ddmd.aggregate;
-import ddmd.declaration;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.globals;
-import ddmd.identifier;
-import ddmd.mtype;
-import ddmd.opover;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.declaration;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.errors;
+import dmd.expression;
+import dmd.globals;
+import dmd.identifier;
+import dmd.mtype;
+import dmd.opover;
+import dmd.tokens;
+import dmd.visitor;
 
 /***********************************************************
  * alias ident this;
diff --git a/src/apply.d b/src/dmd/apply.d
similarity index 97%
rename from src/apply.d
rename to src/dmd/apply.d
index 372369c39688..6e645714cbdc 100644
--- a/src/apply.d
+++ b/src/dmd/apply.d
@@ -8,12 +8,12 @@
  * Source:      $(DMDSRC _apply.d)
  */
 
-module ddmd.apply;
+module dmd.apply;
 
-import ddmd.arraytypes;
-import ddmd.dtemplate;
-import ddmd.expression;
-import ddmd.visitor;
+import dmd.arraytypes;
+import dmd.dtemplate;
+import dmd.expression;
+import dmd.visitor;
 
 /**************************************
  * An Expression tree walker that will visit each Expression e in the tree,
diff --git a/src/argtypes.d b/src/dmd/argtypes.d
similarity index 99%
rename from src/argtypes.d
rename to src/dmd/argtypes.d
index 0bc94dbb9bcf..e44f4d917e4e 100644
--- a/src/argtypes.d
+++ b/src/dmd/argtypes.d
@@ -8,13 +8,13 @@
  * Source:      $(DMDSRC _argtypes.d)
  */
 
-module ddmd.argtypes;
+module dmd.argtypes;
 
 import core.stdc.stdio;
-import ddmd.declaration;
-import ddmd.globals;
-import ddmd.mtype;
-import ddmd.visitor;
+import dmd.declaration;
+import dmd.globals;
+import dmd.mtype;
+import dmd.visitor;
 
 /****************************************************
  * This breaks a type down into 'simpler' types that can be passed to a function
diff --git a/src/arrayop.d b/src/dmd/arrayop.d
similarity index 98%
rename from src/arrayop.d
rename to src/dmd/arrayop.d
index 62ab7b59f16c..67f6f423809b 100644
--- a/src/arrayop.d
+++ b/src/dmd/arrayop.d
@@ -8,23 +8,23 @@
  * Source:      $(DMDSRC _arrayop.d)
  */
 
-module ddmd.arrayop;
+module dmd.arrayop;
 
 import core.stdc.stdio;
-import ddmd.arraytypes;
-import ddmd.declaration;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.mtype;
-import ddmd.root.outbuffer;
-import ddmd.statement;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.arraytypes;
+import dmd.declaration;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.id;
+import dmd.identifier;
+import dmd.mtype;
+import dmd.root.outbuffer;
+import dmd.statement;
+import dmd.tokens;
+import dmd.visitor;
 
 /**************************************
  * Hash table of array op functions already generated or known about.
diff --git a/src/arraytypes.d b/src/dmd/arraytypes.d
similarity index 82%
rename from src/arraytypes.d
rename to src/dmd/arraytypes.d
index df288ea97ccc..31ed626134b7 100644
--- a/src/arraytypes.d
+++ b/src/dmd/arraytypes.d
@@ -8,21 +8,21 @@
  * Source:      $(DMDSRC _arraytypes.d)
  */
 
-module ddmd.arraytypes;
+module dmd.arraytypes;
 
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.dmodule;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.identifier;
-import ddmd.init;
-import ddmd.mtype;
-import ddmd.root.array;
-import ddmd.root.rootobject;
-import ddmd.statement;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.dmodule;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.expression;
+import dmd.func;
+import dmd.identifier;
+import dmd.init;
+import dmd.mtype;
+import dmd.root.array;
+import dmd.root.rootobject;
+import dmd.statement;
 
 alias Strings = Array!(const(char)*);
 alias Identifiers = Array!(Identifier);
diff --git a/src/asttypename.d b/src/dmd/asttypename.d
similarity index 74%
rename from src/asttypename.d
rename to src/dmd/asttypename.d
index 298067b84c2c..5fb5022f5f45 100644
--- a/src/asttypename.d
+++ b/src/dmd/asttypename.d
@@ -6,38 +6,38 @@
  * Source:      $(DMDSRC _asttypename.d)
  */
 
-module ddmd.asttypename;
+module dmd.asttypename;
 
-import ddmd.attrib;
-import ddmd.aliasthis;
-import ddmd.aggregate;
-import ddmd.complex;
-import ddmd.cond;
-import ddmd.ctfeexpr;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.denum;
-import ddmd.dimport;
-import ddmd.declaration;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.dversion;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.denum;
-import ddmd.dimport;
-import ddmd.dmodule;
-import ddmd.mtype;
-import ddmd.typinf;
-import ddmd.identifier;
-import ddmd.init;
-import ddmd.doc;
-import ddmd.root.rootobject;
-import ddmd.statement;
-import ddmd.staticassert;
-import ddmd.nspace;
-import ddmd.visitor;
+import dmd.attrib;
+import dmd.aliasthis;
+import dmd.aggregate;
+import dmd.complex;
+import dmd.cond;
+import dmd.ctfeexpr;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.denum;
+import dmd.dimport;
+import dmd.declaration;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.dversion;
+import dmd.expression;
+import dmd.func;
+import dmd.denum;
+import dmd.dimport;
+import dmd.dmodule;
+import dmd.mtype;
+import dmd.typinf;
+import dmd.identifier;
+import dmd.init;
+import dmd.doc;
+import dmd.root.rootobject;
+import dmd.statement;
+import dmd.staticassert;
+import dmd.nspace;
+import dmd.visitor;
 
 /// Returns: the typename of the dynamic ast-node-type
 /// (this is a development tool, do not use in actual code)
@@ -107,7 +107,7 @@ public :
 ///
 unittest
 {
-    import ddmd.globals : Loc;
+    import dmd.globals : Loc;
     Expression e = new TypeidExp(Loc.init, null);
     assert(e.astTypeName == "TypeidExp");
 }
diff --git a/src/attrib.d b/src/dmd/attrib.d
similarity index 98%
rename from src/attrib.d
rename to src/dmd/attrib.d
index f965d814b434..bc031ecd7629 100644
--- a/src/attrib.d
+++ b/src/dmd/attrib.d
@@ -8,34 +8,34 @@
  * Source:      $(DMDSRC _attrib.d)
  */
 
-module ddmd.attrib;
+module dmd.attrib;
 
 import core.stdc.stdio;
 import core.stdc.string;
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.cond;
-import ddmd.declaration;
-import ddmd.dinterpret;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.hdrgen;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.mtype;
-import ddmd.parse;
-import ddmd.root.outbuffer;
-import ddmd.root.rmem;
-import ddmd.tokens;
-import ddmd.utf;
-import ddmd.utils;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.cond;
+import dmd.declaration;
+import dmd.dinterpret;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.hdrgen;
+import dmd.id;
+import dmd.identifier;
+import dmd.mtype;
+import dmd.parse;
+import dmd.root.outbuffer;
+import dmd.root.rmem;
+import dmd.tokens;
+import dmd.utf;
+import dmd.utils;
+import dmd.visitor;
 
 /***********************************************************
  */
diff --git a/src/backend/bcomplex.d b/src/dmd/backend/bcomplex.d
similarity index 97%
rename from src/backend/bcomplex.d
rename to src/dmd/backend/bcomplex.d
index c90beaec3a9c..3e2cb55bc451 100644
--- a/src/backend/bcomplex.d
+++ b/src/dmd/backend/bcomplex.d
@@ -7,7 +7,7 @@
  * Source:      $(DMDSRC backend/_bcomplex.d)
  */
 
-module ddmd.backend.bcomplex;
+module dmd.backend.bcomplex;
 
 extern (C++):
 @nogc:
diff --git a/src/backend/cc.d b/src/dmd/backend/cc.d
similarity index 99%
rename from src/backend/cc.d
rename to src/dmd/backend/cc.d
index dd3f1e161c5f..9d0f95fc2d95 100644
--- a/src/backend/cc.d
+++ b/src/dmd/backend/cc.d
@@ -9,14 +9,14 @@
  * Source:      $(DMDSRC backend/_cc.d)
  */
 
-module ddmd.backend.cc;
+module dmd.backend.cc;
 
 import tk.dlist;
-import ddmd.backend.cdef;        // host and target compiler definition
-import ddmd.backend.code_x86;
-import ddmd.backend.type;
-import ddmd.backend.el;
-import ddmd.backend.dt;
+import dmd.backend.cdef;        // host and target compiler definition
+import dmd.backend.code_x86;
+import dmd.backend.type;
+import dmd.backend.el;
+import dmd.backend.dt;
 
 extern (C++):
 @nogc:
diff --git a/src/backend/cdef.d b/src/dmd/backend/cdef.d
similarity index 99%
rename from src/backend/cdef.d
rename to src/dmd/backend/cdef.d
index 3c78188a2e5f..add37e706554 100644
--- a/src/backend/cdef.d
+++ b/src/dmd/backend/cdef.d
@@ -9,10 +9,10 @@
  * Source:      $(DMDSRC backend/_cdef.d)
  */
 
-module ddmd.backend.cdef;
+module dmd.backend.cdef;
 
-import ddmd.backend.cc: Classsym, Symbol;
-import ddmd.backend.el;
+import dmd.backend.cc: Classsym, Symbol;
+import dmd.backend.el;
 
 import tk.dlist;
 
@@ -756,7 +756,7 @@ struct con_t
  * Bootstrap complex types.
  */
 
-import ddmd.backend.bcomplex;
+import dmd.backend.bcomplex;
 
 /*********************************
  * Union of all data types. Storage allocated must be the right
diff --git a/src/backend/cgcv.d b/src/dmd/backend/cgcv.d
similarity index 96%
rename from src/backend/cgcv.d
rename to src/dmd/backend/cgcv.d
index a349e53a8605..d6147d33f153 100644
--- a/src/backend/cgcv.d
+++ b/src/dmd/backend/cgcv.d
@@ -11,10 +11,10 @@
 
 /* Header for cgcv.c    */
 
-module ddmd.backend.cgcv;
+module dmd.backend.cgcv;
 
-import ddmd.backend.cc : Classsym, Symbol;
-import ddmd.backend.type;
+import dmd.backend.cc : Classsym, Symbol;
+import dmd.backend.type;
 import tk.dlist;
 
 extern (C++):
diff --git a/src/backend/code.d b/src/dmd/backend/code.d
similarity index 98%
rename from src/backend/code.d
rename to src/dmd/backend/code.d
index 0b4f25e0cd98..c801df41e538 100644
--- a/src/backend/code.d
+++ b/src/dmd/backend/code.d
@@ -9,13 +9,13 @@
  * Source:      $(DMDSRC backend/_code.d)
  */
 
-module ddmd.backend.code;
+module dmd.backend.code;
 
-import ddmd.backend.cc;
-import ddmd.backend.cdef;
-import ddmd.backend.code_x86;
-import ddmd.backend.outbuf;
-import ddmd.backend.type;
+import dmd.backend.cc;
+import dmd.backend.cdef;
+import dmd.backend.code_x86;
+import dmd.backend.outbuf;
+import dmd.backend.type;
 
 extern (C++):
 
diff --git a/src/backend/code_x86.d b/src/dmd/backend/code_x86.d
similarity index 99%
rename from src/backend/code_x86.d
rename to src/dmd/backend/code_x86.d
index 5ae61e323074..0eaf3492b0c0 100644
--- a/src/backend/code_x86.d
+++ b/src/dmd/backend/code_x86.d
@@ -9,10 +9,10 @@
  * Source:      $(DMDSRC backend/_code_x86.d)
  */
 
-module ddmd.backend.code_x86;
+module dmd.backend.code_x86;
 
-import ddmd.backend.cdef;
-import ddmd.backend.code;
+import dmd.backend.cdef;
+import dmd.backend.code;
 
 /* Register definitions */
 
diff --git a/src/backend/cv4.d b/src/dmd/backend/cv4.d
similarity index 99%
rename from src/backend/cv4.d
rename to src/dmd/backend/cv4.d
index 1f746973318e..6abf1dfb1a34 100644
--- a/src/backend/cv4.d
+++ b/src/dmd/backend/cv4.d
@@ -8,7 +8,7 @@
  * Source:      $(DMDSRC backend/_cv4.d)
  */
 
-module ddmd.backend.cv4;
+module dmd.backend.cv4;
 
 enum OEM = 0x42;        // Digital Mars OEM number (picked at random)
 
diff --git a/src/backend/dt.d b/src/dmd/backend/dt.d
similarity index 93%
rename from src/backend/dt.d
rename to src/dmd/backend/dt.d
index 989f2b2cf31f..6900819c46dc 100644
--- a/src/backend/dt.d
+++ b/src/dmd/backend/dt.d
@@ -8,11 +8,11 @@
  * Source:      $(DMDSRC backend/dt.di)
  */
 
-module ddmd.backend.dt;
+module dmd.backend.dt;
 
-import ddmd.backend.cc;
-import ddmd.backend.ty;
-import ddmd.backend.type;
+import dmd.backend.cc;
+import dmd.backend.ty;
+import dmd.backend.type;
 
 //struct Symbol;
 //alias uint tym_t;
diff --git a/src/backend/dwarf.d b/src/dmd/backend/dwarf.d
similarity index 86%
rename from src/backend/dwarf.d
rename to src/dmd/backend/dwarf.d
index 03af00e01b10..a9d3ce593e02 100644
--- a/src/backend/dwarf.d
+++ b/src/dmd/backend/dwarf.d
@@ -3,12 +3,12 @@
  * Source: $(DMDSRC backend/_dwarf.d)
  */
 
-module ddmd.backend.dwarf;
+module dmd.backend.dwarf;
 
-import ddmd.backend.cc;
-import ddmd.backend.cdef;
-import ddmd.backend.outbuf;
-import ddmd.backend.type;
+import dmd.backend.cc;
+import dmd.backend.cdef;
+import dmd.backend.outbuf;
+import dmd.backend.type;
 
 enum DWARF_VERSION = 3;
 
diff --git a/src/backend/dwarf2.d b/src/dmd/backend/dwarf2.d
similarity index 99%
rename from src/backend/dwarf2.d
rename to src/dmd/backend/dwarf2.d
index 755eadab1719..8589ecf7e87f 100644
--- a/src/backend/dwarf2.d
+++ b/src/dmd/backend/dwarf2.d
@@ -5,7 +5,7 @@
  * Source: $(DMDSRC backend/_dwarf2.d)
  */
 
-module ddmd.backend.dwarf2;
+module dmd.backend.dwarf2;
 
 
 enum
diff --git a/src/backend/el.d b/src/dmd/backend/el.d
similarity index 98%
rename from src/backend/el.d
rename to src/dmd/backend/el.d
index 4032924ee997..1c2220aa6437 100644
--- a/src/backend/el.d
+++ b/src/dmd/backend/el.d
@@ -9,13 +9,13 @@
  * Source:      $(DMDSRC backend/_el.d)
  */
 
-module ddmd.backend.el;
+module dmd.backend.el;
 
-import ddmd.backend.cdef;
-import ddmd.backend.cc;
-import ddmd.backend.type;
+import dmd.backend.cdef;
+import dmd.backend.cc;
+import dmd.backend.type;
 
-import ddmd.backend.cc : Symbol;
+import dmd.backend.cc : Symbol;
 
 extern (C++):
 @nogc:
diff --git a/src/backend/exh.d b/src/dmd/backend/exh.d
similarity index 91%
rename from src/backend/exh.d
rename to src/dmd/backend/exh.d
index f6017c1a782e..5e0f6e369203 100644
--- a/src/backend/exh.d
+++ b/src/dmd/backend/exh.d
@@ -9,12 +9,12 @@
  * Source:      $(DMDSRC backend/_exh.d)
  */
 
-module ddmd.backend.exh;
+module dmd.backend.exh;
 
-import ddmd.backend.cc;
-import ddmd.backend.cdef;
-import ddmd.backend.el;
-import ddmd.backend.type;
+import dmd.backend.cc;
+import dmd.backend.cdef;
+import dmd.backend.el;
+import dmd.backend.type;
 
 extern (C++):
 @nogc:
diff --git a/src/backend/global.d b/src/dmd/backend/global.d
similarity index 98%
rename from src/backend/global.d
rename to src/dmd/backend/global.d
index d101f320e2f9..ed02251e12b9 100644
--- a/src/backend/global.d
+++ b/src/dmd/backend/global.d
@@ -9,7 +9,7 @@
  * Source:      $(DMDSRC backend/_global.d)
  */
 
-module ddmd.backend.global;
+module dmd.backend.global;
 
 extern (C++):
 @nogc:
@@ -17,14 +17,14 @@ nothrow:
 
 import core.stdc.stdio;
 
-import ddmd.backend.cdef;
-import ddmd.backend.cc;
-import ddmd.backend.cc : Symbol, block, Classsym, Blockx, code;
-import ddmd.backend.code;
-import ddmd.backend.el;
-import ddmd.backend.el : elem;
-import ddmd.backend.type;
-//import ddmd.backend.obj;
+import dmd.backend.cdef;
+import dmd.backend.cc;
+import dmd.backend.cc : Symbol, block, Classsym, Blockx, code;
+import dmd.backend.code;
+import dmd.backend.el;
+import dmd.backend.el : elem;
+import dmd.backend.type;
+//import dmd.backend.obj;
 
 import tk.dlist;
 
diff --git a/src/backend/iasm.d b/src/dmd/backend/iasm.d
similarity index 99%
rename from src/backend/iasm.d
rename to src/dmd/backend/iasm.d
index 2867c67e2228..4ad686cebb9b 100644
--- a/src/backend/iasm.d
+++ b/src/dmd/backend/iasm.d
@@ -10,9 +10,9 @@
  * Source:      $(DMDSRC backend/_iasm.d)
  */
 
-module ddmd.backend.iasm;
+module dmd.backend.iasm;
 
-import ddmd.backend.cc : block;
+import dmd.backend.cc : block;
 
 extern (C++):
 @nogc:
diff --git a/src/backend/mach.d b/src/dmd/backend/mach.d
similarity index 99%
rename from src/backend/mach.d
rename to src/dmd/backend/mach.d
index 7bbecd5b4856..6700688f73d9 100644
--- a/src/backend/mach.d
+++ b/src/dmd/backend/mach.d
@@ -3,7 +3,7 @@
  * Translated to D from mach.h
  */
 
-module ddmd.backend.mach;
+module dmd.backend.mach;
 
 alias cpu_type_t = int;
 alias cpu_subtype_t = int;
diff --git a/src/backend/md5.d b/src/dmd/backend/md5.d
similarity index 99%
rename from src/backend/md5.d
rename to src/dmd/backend/md5.d
index b3eaabb322bd..90e92af7065c 100644
--- a/src/backend/md5.d
+++ b/src/dmd/backend/md5.d
@@ -2,7 +2,7 @@
  * Source: $(DMDSRC backend/_md5.d)
  */
 
-module ddmd.backend.md5;
+module dmd.backend.md5;
 
 /*
  **********************************************************************
diff --git a/src/backend/mscoff.d b/src/dmd/backend/mscoff.d
similarity index 99%
rename from src/backend/mscoff.d
rename to src/dmd/backend/mscoff.d
index 4e81314ed5a5..6b2b6d6f07f6 100644
--- a/src/backend/mscoff.d
+++ b/src/dmd/backend/mscoff.d
@@ -3,7 +3,7 @@
  * Source: $(DMDSRC backend/_mscoff.d)
  */
 
-module ddmd.backend.mscoff;
+module dmd.backend.mscoff;
 
 align (1):
 
diff --git a/src/backend/obj.d b/src/dmd/backend/obj.d
similarity index 98%
rename from src/backend/obj.d
rename to src/dmd/backend/obj.d
index e86c7c212702..c9ba2b5bc2eb 100644
--- a/src/backend/obj.d
+++ b/src/dmd/backend/obj.d
@@ -9,16 +9,16 @@
  * Source:      $(DMDSRC backend/_obj.d)
  */
 
-module ddmd.backend.obj;
+module dmd.backend.obj;
 
 /* Interface to object file format
  */
 
-import ddmd.backend.cdef;
-import ddmd.backend.cc;
-import ddmd.backend.code;
-import ddmd.backend.el;
-import ddmd.backend.outbuf;
+import dmd.backend.cdef;
+import dmd.backend.cc;
+import dmd.backend.code;
+import dmd.backend.el;
+import dmd.backend.outbuf;
 
 extern (C++):
 
diff --git a/src/backend/oper.d b/src/dmd/backend/oper.d
similarity index 99%
rename from src/backend/oper.d
rename to src/dmd/backend/oper.d
index f023ec2fcfae..317c862941f7 100644
--- a/src/backend/oper.d
+++ b/src/dmd/backend/oper.d
@@ -9,7 +9,7 @@
  * Source:      $(DMDSRC backend/_oper.d)
  */
 
-module ddmd.backend.oper;
+module dmd.backend.oper;
 
 extern (C++):
 @nogc:
diff --git a/src/backend/outbuf.d b/src/dmd/backend/outbuf.d
similarity index 99%
rename from src/backend/outbuf.d
rename to src/dmd/backend/outbuf.d
index 631b33760570..c6423b862963 100644
--- a/src/backend/outbuf.d
+++ b/src/dmd/backend/outbuf.d
@@ -9,7 +9,7 @@
  * Source:      $(DMDSRC backend/_outbuf.d)
  */
 
-module ddmd.backend.outbuf;
+module dmd.backend.outbuf;
 
 import core.stdc.string;
 
diff --git a/src/backend/rtlsym.d b/src/dmd/backend/rtlsym.d
similarity index 98%
rename from src/backend/rtlsym.d
rename to src/dmd/backend/rtlsym.d
index 59ba82ce7591..8255e56c6b91 100644
--- a/src/backend/rtlsym.d
+++ b/src/dmd/backend/rtlsym.d
@@ -9,9 +9,9 @@
  * Source:      $(DMDSRC backend/_rtlsym.d)
  */
 
-module ddmd.backend.rtlsym;
+module dmd.backend.rtlsym;
 
-import ddmd.backend.cc : Symbol;
+import dmd.backend.cc : Symbol;
 
 enum
 {
diff --git a/src/backend/ty.d b/src/dmd/backend/ty.d
similarity index 99%
rename from src/backend/ty.d
rename to src/dmd/backend/ty.d
index 51125db155d6..c97ca5195b87 100644
--- a/src/backend/ty.d
+++ b/src/dmd/backend/ty.d
@@ -9,7 +9,7 @@
  * Source:      $(DMDSRC backend/_ty.d)
  */
 
-module ddmd.backend.ty;
+module dmd.backend.ty;
 
 extern (C++):
 @nogc:
diff --git a/src/backend/type.d b/src/dmd/backend/type.d
similarity index 95%
rename from src/backend/type.d
rename to src/dmd/backend/type.d
index 697168ffd62a..74a72eade956 100644
--- a/src/backend/type.d
+++ b/src/dmd/backend/type.d
@@ -8,13 +8,13 @@
  * Source:      $(DMDSRC backend/_type.d)
  */
 
-module ddmd.backend.type;
+module dmd.backend.type;
 
-import ddmd.backend.cdef;
-import ddmd.backend.cc : block, Blockx, Classsym, Symbol;
-import ddmd.backend.code;
-import ddmd.backend.el : elem;
-import ddmd.backend.ty;
+import dmd.backend.cdef;
+import dmd.backend.cc : block, Blockx, Classsym, Symbol;
+import dmd.backend.code;
+import dmd.backend.el : elem;
+import dmd.backend.ty;
 
 import tk.dlist;
 
diff --git a/src/backend/xmm.d b/src/dmd/backend/xmm.d
similarity index 99%
rename from src/backend/xmm.d
rename to src/dmd/backend/xmm.d
index 97cc4036abde..fd0b8218c5f4 100644
--- a/src/backend/xmm.d
+++ b/src/dmd/backend/xmm.d
@@ -7,7 +7,7 @@
  * Source:      $(DMDSRC backend/_xmm.d)
  */
 
-module ddmd.backend.xmm;
+module dmd.backend.xmm;
 
 // XMM opcodes
 
diff --git a/src/blockexit.d b/src/dmd/blockexit.d
similarity index 98%
rename from src/blockexit.d
rename to src/dmd/blockexit.d
index 1e2eaaddaeb3..ed02fe289c97 100644
--- a/src/blockexit.d
+++ b/src/dmd/blockexit.d
@@ -8,23 +8,23 @@
  * Source:      $(DMDSRC _blockexit.d)
  */
 
-module ddmd.blockexit;
+module dmd.blockexit;
 
 import core.stdc.stdio;
 
-import ddmd.arraytypes;
-import ddmd.canthrow;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.mtype;
-import ddmd.statement;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.arraytypes;
+import dmd.canthrow;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.id;
+import dmd.identifier;
+import dmd.mtype;
+import dmd.statement;
+import dmd.tokens;
+import dmd.visitor;
 
 /**
  * BE stands for BlockExit.
diff --git a/src/builtin.d b/src/dmd/builtin.d
similarity index 97%
rename from src/builtin.d
rename to src/dmd/builtin.d
index 9cd4bce97702..9f97958c0417 100644
--- a/src/builtin.d
+++ b/src/dmd/builtin.d
@@ -8,20 +8,20 @@
  * Source:      $(DMDSRC _builtin.d)
  */
 
-module ddmd.builtin;
+module dmd.builtin;
 
 import core.stdc.math;
 import core.stdc.string;
-import ddmd.arraytypes;
-import ddmd.dmangle;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.mtype;
-import ddmd.root.ctfloat;
-import ddmd.root.stringtable;
-import ddmd.tokens;
+import dmd.arraytypes;
+import dmd.dmangle;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.mtype;
+import dmd.root.ctfloat;
+import dmd.root.stringtable;
+import dmd.tokens;
 
 private:
 
diff --git a/src/canthrow.d b/src/dmd/canthrow.d
similarity index 96%
rename from src/canthrow.d
rename to src/dmd/canthrow.d
index aeffc54a6cd7..a90da4afde46 100644
--- a/src/canthrow.d
+++ b/src/dmd/canthrow.d
@@ -8,24 +8,24 @@
  * Source:      $(DMDSRC _canthrow.d)
  */
 
-module ddmd.canthrow;
+module dmd.canthrow;
 
-import ddmd.aggregate;
-import ddmd.apply;
-import ddmd.arraytypes;
-import ddmd.attrib;
-import ddmd.declaration;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.init;
-import ddmd.mtype;
-import ddmd.root.rootobject;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.apply;
+import dmd.arraytypes;
+import dmd.attrib;
+import dmd.declaration;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.init;
+import dmd.mtype;
+import dmd.root.rootobject;
+import dmd.tokens;
+import dmd.visitor;
 
 /********************************************
  * Returns true if the expression may throw exceptions.
diff --git a/src/checkwhitespace.d b/src/dmd/checkwhitespace.d
similarity index 100%
rename from src/checkwhitespace.d
rename to src/dmd/checkwhitespace.d
diff --git a/src/clone.d b/src/dmd/clone.d
similarity index 99%
rename from src/clone.d
rename to src/dmd/clone.d
index 0421d5a602e0..6e742ddbef57 100644
--- a/src/clone.d
+++ b/src/dmd/clone.d
@@ -8,26 +8,26 @@
  * Source:      $(DMDSRC _clone.d)
  */
 
-module ddmd.clone;
+module dmd.clone;
 
 import core.stdc.stdio;
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.declaration;
-import ddmd.dscope;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.init;
-import ddmd.mtype;
-import ddmd.opover;
-import ddmd.statement;
-import ddmd.tokens;
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.declaration;
+import dmd.dscope;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.id;
+import dmd.identifier;
+import dmd.init;
+import dmd.mtype;
+import dmd.opover;
+import dmd.statement;
+import dmd.tokens;
 
 /*******************************************
  * Merge function attributes pure, nothrow, @safe, @nogc, and @disable
diff --git a/src/complex.d b/src/dmd/complex.d
similarity index 97%
rename from src/complex.d
rename to src/dmd/complex.d
index 7e26f4193094..ea0246f49f2c 100644
--- a/src/complex.d
+++ b/src/dmd/complex.d
@@ -8,9 +8,9 @@
  * Source:      $(DMDSRC _complex.d)
  */
 
-module ddmd.complex;
+module dmd.complex;
 
-import ddmd.root.ctfloat;
+import dmd.root.ctfloat;
 
 struct complex_t
 {
diff --git a/src/cond.d b/src/dmd/cond.d
similarity index 97%
rename from src/cond.d
rename to src/dmd/cond.d
index f800570d514e..be14d8a2b809 100644
--- a/src/cond.d
+++ b/src/dmd/cond.d
@@ -8,24 +8,24 @@
  * Source:      $(DMDSRC _cond.d)
  */
 
-module ddmd.cond;
+module dmd.cond;
 
 import core.stdc.string;
-import ddmd.arraytypes;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.globals;
-import ddmd.identifier;
-import ddmd.mtype;
-import ddmd.root.outbuffer;
-import ddmd.root.rootobject;
-import ddmd.tokens;
-import ddmd.utils;
-import ddmd.visitor;
-import ddmd.id;
+import dmd.arraytypes;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.errors;
+import dmd.expression;
+import dmd.globals;
+import dmd.identifier;
+import dmd.mtype;
+import dmd.root.outbuffer;
+import dmd.root.rootobject;
+import dmd.tokens;
+import dmd.utils;
+import dmd.visitor;
+import dmd.id;
 
 
 /***********************************************************
diff --git a/src/constfold.d b/src/dmd/constfold.d
similarity index 99%
rename from src/constfold.d
rename to src/dmd/constfold.d
index ea7753c05bc3..c1376c7540db 100644
--- a/src/constfold.d
+++ b/src/dmd/constfold.d
@@ -8,26 +8,26 @@
  * Source:      $(DMDSRC _constfold.d)
  */
 
-module ddmd.constfold;
+module dmd.constfold;
 
 import core.stdc.string;
 import core.stdc.stdio;
-import ddmd.arraytypes;
-import ddmd.complex;
-import ddmd.ctfeexpr;
-import ddmd.declaration;
-import ddmd.dstruct;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.globals;
-import ddmd.mtype;
-import ddmd.root.ctfloat;
-import ddmd.root.port;
-import ddmd.root.rmem;
-import ddmd.sideeffect;
-import ddmd.target;
-import ddmd.tokens;
-import ddmd.utf;
+import dmd.arraytypes;
+import dmd.complex;
+import dmd.ctfeexpr;
+import dmd.declaration;
+import dmd.dstruct;
+import dmd.errors;
+import dmd.expression;
+import dmd.globals;
+import dmd.mtype;
+import dmd.root.ctfloat;
+import dmd.root.port;
+import dmd.root.rmem;
+import dmd.sideeffect;
+import dmd.target;
+import dmd.tokens;
+import dmd.utf;
 
 private enum LOG = false;
 
diff --git a/src/cppmangle.d b/src/dmd/cppmangle.d
similarity index 99%
rename from src/cppmangle.d
rename to src/dmd/cppmangle.d
index 210a424da1df..eb666b0b24fb 100644
--- a/src/cppmangle.d
+++ b/src/dmd/cppmangle.d
@@ -7,26 +7,26 @@
  * Source:    $(DMDSRC _cppmangle.d)
  */
 
-module ddmd.cppmangle;
+module dmd.cppmangle;
 
 import core.stdc.string;
 import core.stdc.stdio;
 
-import ddmd.arraytypes;
-import ddmd.declaration;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.mtype;
-import ddmd.root.outbuffer;
-import ddmd.root.rootobject;
-import ddmd.target;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.arraytypes;
+import dmd.declaration;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.id;
+import dmd.mtype;
+import dmd.root.outbuffer;
+import dmd.root.rootobject;
+import dmd.target;
+import dmd.tokens;
+import dmd.visitor;
 
 /* Do mangling for C++ linkage.
  * No attempt is made to support mangling of templates, operator
diff --git a/src/ctfeexpr.d b/src/dmd/ctfeexpr.d
similarity index 99%
rename from src/ctfeexpr.d
rename to src/dmd/ctfeexpr.d
index 17e643cf14af..20990c25b15e 100644
--- a/src/ctfeexpr.d
+++ b/src/dmd/ctfeexpr.d
@@ -8,29 +8,29 @@
  * Source:      $(DMDSRC _ctfeexpr.d)
  */
 
-module ddmd.ctfeexpr;
+module dmd.ctfeexpr;
 
 import core.stdc.stdio;
 import core.stdc.string;
-import ddmd.arraytypes;
-import ddmd.complex;
-import ddmd.constfold;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.dinterpret;
-import ddmd.dstruct;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.mtype;
-import ddmd.root.ctfloat;
-import ddmd.root.port;
-import ddmd.root.rmem;
-import ddmd.target;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.arraytypes;
+import dmd.complex;
+import dmd.constfold;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.dinterpret;
+import dmd.dstruct;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.mtype;
+import dmd.root.ctfloat;
+import dmd.root.port;
+import dmd.root.rmem;
+import dmd.target;
+import dmd.tokens;
+import dmd.visitor;
 
 /***********************************************************
  * Global status of the CTFE engine. Mostly used for performance diagnostics
diff --git a/src/dcast.d b/src/dmd/dcast.d
similarity index 99%
rename from src/dcast.d
rename to src/dmd/dcast.d
index c0790da49a86..11f975759721 100644
--- a/src/dcast.d
+++ b/src/dmd/dcast.d
@@ -8,34 +8,34 @@
  * Source:      $(DMDSRC _dcast.d)
  */
 
-module ddmd.dcast;
+module dmd.dcast;
 
 import core.stdc.stdio;
 import core.stdc.string;
-import ddmd.aggregate;
-import ddmd.aliasthis;
-import ddmd.arrayop;
-import ddmd.arraytypes;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.dscope;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.impcnvtab;
-import ddmd.init;
-import ddmd.intrange;
-import ddmd.mtype;
-import ddmd.opover;
-import ddmd.root.ctfloat;
-import ddmd.root.outbuffer;
-import ddmd.root.rmem;
-import ddmd.tokens;
-import ddmd.utf;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.aliasthis;
+import dmd.arrayop;
+import dmd.arraytypes;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.dscope;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.impcnvtab;
+import dmd.init;
+import dmd.intrange;
+import dmd.mtype;
+import dmd.opover;
+import dmd.root.ctfloat;
+import dmd.root.outbuffer;
+import dmd.root.rmem;
+import dmd.tokens;
+import dmd.utf;
+import dmd.visitor;
 
 enum LOG = false;
 
diff --git a/src/dclass.d b/src/dmd/dclass.d
similarity index 99%
rename from src/dclass.d
rename to src/dmd/dclass.d
index 490be4493ee3..7adc11c85ee2 100644
--- a/src/dclass.d
+++ b/src/dmd/dclass.d
@@ -8,32 +8,32 @@
  * Source:      $(DMDSRC _dclass.d)
  */
 
-module ddmd.dclass;
+module dmd.dclass;
 
 import core.stdc.stdio;
 import core.stdc.string;
 
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.gluelayer;
-import ddmd.clone;
-import ddmd.declaration;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.hdrgen;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.mtype;
-import ddmd.objc;
-import ddmd.root.rmem;
-import ddmd.statement;
-import ddmd.target;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.gluelayer;
+import dmd.clone;
+import dmd.declaration;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.func;
+import dmd.globals;
+import dmd.hdrgen;
+import dmd.id;
+import dmd.identifier;
+import dmd.mtype;
+import dmd.objc;
+import dmd.root.rmem;
+import dmd.statement;
+import dmd.target;
+import dmd.visitor;
 
 enum Abstract : int
 {
@@ -1108,7 +1108,7 @@ extern (C++) class ClassDeclaration : AggregateDeclaration
                         error("base %s is forward referenced", b.sym.ident.toChars());
                     else
                     {
-                        import ddmd.access : symbolIsVisible;
+                        import dmd.access : symbolIsVisible;
 
                         s = b.sym.search(loc, ident, flags);
                         if (!s)
diff --git a/src/declaration.d b/src/dmd/declaration.d
similarity index 99%
rename from src/declaration.d
rename to src/dmd/declaration.d
index a8e3818b770d..2577c37ca187 100644
--- a/src/declaration.d
+++ b/src/dmd/declaration.d
@@ -8,34 +8,34 @@
  * Source:      $(DMDSRC _declaration.d)
  */
 
-module ddmd.declaration;
+module dmd.declaration;
 
 import core.stdc.stdio;
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.dcast;
-import ddmd.dclass;
-import ddmd.delegatize;
-import ddmd.dscope;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.hdrgen;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.init;
-import ddmd.intrange;
-import ddmd.mtype;
-import ddmd.root.outbuffer;
-import ddmd.root.rootobject;
-import ddmd.sideeffect;
-import ddmd.target;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.dcast;
+import dmd.dclass;
+import dmd.delegatize;
+import dmd.dscope;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.hdrgen;
+import dmd.id;
+import dmd.identifier;
+import dmd.init;
+import dmd.intrange;
+import dmd.mtype;
+import dmd.root.outbuffer;
+import dmd.root.rootobject;
+import dmd.sideeffect;
+import dmd.target;
+import dmd.tokens;
+import dmd.visitor;
 
 /************************************
  * Check to see the aggregate type is nested and its context pointer is
diff --git a/src/delegatize.d b/src/dmd/delegatize.d
similarity index 95%
rename from src/delegatize.d
rename to src/dmd/delegatize.d
index 760de171fb13..c67a4563f30d 100644
--- a/src/delegatize.d
+++ b/src/dmd/delegatize.d
@@ -8,20 +8,20 @@
  * Source:      $(DMDSRC _delegatize.d)
  */
 
-module ddmd.delegatize;
+module dmd.delegatize;
 
 import core.stdc.stdio;
-import ddmd.apply;
-import ddmd.declaration;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.mtype;
-import ddmd.statement;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.apply;
+import dmd.declaration;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.mtype;
+import dmd.statement;
+import dmd.tokens;
+import dmd.visitor;
 
 extern (C++) Expression toDelegate(Expression e, Type t, Scope* sc)
 {
diff --git a/src/denum.d b/src/dmd/denum.d
similarity index 98%
rename from src/denum.d
rename to src/dmd/denum.d
index 80b855f2fc1c..cd486ab3a1ae 100644
--- a/src/denum.d
+++ b/src/dmd/denum.d
@@ -8,24 +8,24 @@
  * Source:      $(DMDSRC _denum.d)
  */
 
-module ddmd.denum;
+module dmd.denum;
 
 import core.stdc.stdio;
-import ddmd.root.rootobject;
-import ddmd.gluelayer;
-import ddmd.declaration;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.init;
-import ddmd.mtype;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.root.rootobject;
+import dmd.gluelayer;
+import dmd.declaration;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.errors;
+import dmd.expression;
+import dmd.globals;
+import dmd.id;
+import dmd.identifier;
+import dmd.init;
+import dmd.mtype;
+import dmd.tokens;
+import dmd.visitor;
 
 /***********************************************************
  */
diff --git a/src/dimport.d b/src/dmd/dimport.d
similarity index 97%
rename from src/dimport.d
rename to src/dmd/dimport.d
index e1880425823b..37a6df855239 100644
--- a/src/dimport.d
+++ b/src/dmd/dimport.d
@@ -8,26 +8,26 @@
  * Source:      $(DMDSRC _dimport.d)
  */
 
-module ddmd.dimport;
+module dmd.dimport;
 
 import core.stdc.string;
 import core.stdc.stdio;
 
-import ddmd.arraytypes;
-import ddmd.declaration;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.globals;
-import ddmd.hdrgen;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.mtype;
-import ddmd.root.outbuffer;
-import ddmd.utils;
-import ddmd.visitor;
+import dmd.arraytypes;
+import dmd.declaration;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.errors;
+import dmd.expression;
+import dmd.globals;
+import dmd.hdrgen;
+import dmd.id;
+import dmd.identifier;
+import dmd.mtype;
+import dmd.root.outbuffer;
+import dmd.utils;
+import dmd.visitor;
 
 /***********************************************************
  */
diff --git a/src/dinifile.d b/src/dmd/dinifile.d
similarity index 98%
rename from src/dinifile.d
rename to src/dmd/dinifile.d
index 8e1c85cba32c..699c85a34abe 100644
--- a/src/dinifile.d
+++ b/src/dmd/dinifile.d
@@ -10,19 +10,19 @@
  * For any other uses, please contact Digital Mars.
  */
 
-module ddmd.dinifile;
+module dmd.dinifile;
 
 import core.stdc.ctype;
 import core.stdc.string;
 import core.sys.posix.stdlib;
 import core.sys.windows.windows;
 
-import ddmd.errors;
-import ddmd.globals;
-import ddmd.root.filename;
-import ddmd.root.outbuffer;
-import ddmd.root.port;
-import ddmd.root.stringtable;
+import dmd.errors;
+import dmd.globals;
+import dmd.root.filename;
+import dmd.root.outbuffer;
+import dmd.root.port;
+import dmd.root.stringtable;
 
 version (Windows) extern (C) int putenv(const char*);
 private enum LOG = false;
diff --git a/src/dinterpret.d b/src/dmd/dinterpret.d
similarity index 99%
rename from src/dinterpret.d
rename to src/dmd/dinterpret.d
index 2d1c65e8ee2a..e7e2c4033149 100644
--- a/src/dinterpret.d
+++ b/src/dmd/dinterpret.d
@@ -6,35 +6,35 @@
 // Distributed under the Boost Software License, Version 1.0.
 // http://www.boost.org/LICENSE_1_0.txt
 
-module ddmd.dinterpret;
+module dmd.dinterpret;
 
 import core.stdc.stdio;
 import core.stdc.string;
-import ddmd.apply;
-import ddmd.arraytypes;
-import ddmd.attrib;
-import ddmd.builtin;
-import ddmd.constfold;
-import ddmd.ctfeexpr;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.init;
-import ddmd.mtype;
-import ddmd.root.array;
-import ddmd.root.rootobject;
-import ddmd.statement;
-import ddmd.tokens;
-import ddmd.utf;
-import ddmd.visitor;
+import dmd.apply;
+import dmd.arraytypes;
+import dmd.attrib;
+import dmd.builtin;
+import dmd.constfold;
+import dmd.ctfeexpr;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.id;
+import dmd.identifier;
+import dmd.init;
+import dmd.mtype;
+import dmd.root.array;
+import dmd.root.rootobject;
+import dmd.statement;
+import dmd.tokens;
+import dmd.utf;
+import dmd.visitor;
 
 enum CtfeGoal : int
 {
diff --git a/src/dmacro.d b/src/dmd/dmacro.d
similarity index 99%
rename from src/dmacro.d
rename to src/dmd/dmacro.d
index 5c2212ef0a2b..d0eb218295ee 100644
--- a/src/dmacro.d
+++ b/src/dmd/dmacro.d
@@ -8,15 +8,15 @@
  * Source:      $(DMDSRC _dmacro.d)
  */
 
-module ddmd.dmacro;
+module dmd.dmacro;
 
 import core.stdc.ctype;
 import core.stdc.string;
-import ddmd.doc;
-import ddmd.errors;
-import ddmd.globals;
-import ddmd.root.outbuffer;
-import ddmd.root.rmem;
+import dmd.doc;
+import dmd.errors;
+import dmd.globals;
+import dmd.root.outbuffer;
+import dmd.root.rmem;
 
 struct Macro
 {
diff --git a/src/dmangle.d b/src/dmd/dmangle.d
similarity index 98%
rename from src/dmangle.d
rename to src/dmd/dmangle.d
index 97b2084fbe91..024ff99deef1 100644
--- a/src/dmangle.d
+++ b/src/dmd/dmangle.d
@@ -7,29 +7,29 @@
  * Source:    $(DMDSRC _dmangle.d)
  */
 
-module ddmd.dmangle;
+module dmd.dmangle;
 
 import core.stdc.ctype;
 import core.stdc.stdio;
 import core.stdc.string;
 
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.cppmangle;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.dmodule;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.mtype;
-import ddmd.root.ctfloat;
-import ddmd.root.outbuffer;
-import ddmd.utf;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.cppmangle;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.dmodule;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.id;
+import dmd.mtype;
+import dmd.root.ctfloat;
+import dmd.root.outbuffer;
+import dmd.utf;
+import dmd.visitor;
 
 private immutable char[TMAX] mangleChar =
 [
diff --git a/src/dmodule.d b/src/dmd/dmodule.d
similarity index 99%
rename from src/dmodule.d
rename to src/dmd/dmodule.d
index 37e2784e0b2c..a83590211920 100644
--- a/src/dmodule.d
+++ b/src/dmd/dmodule.d
@@ -8,31 +8,31 @@
  * Source:      $(DMDSRC _dmodule.d)
  */
 
-module ddmd.dmodule;
+module dmd.dmodule;
 
 import core.stdc.stdio;
 import core.stdc.stdlib;
 import core.stdc.string;
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.gluelayer;
-import ddmd.dimport;
-import ddmd.dmacro;
-import ddmd.doc;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.parse;
-import ddmd.root.file;
-import ddmd.root.filename;
-import ddmd.root.outbuffer;
-import ddmd.root.port;
-import ddmd.target;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.gluelayer;
+import dmd.dimport;
+import dmd.dmacro;
+import dmd.doc;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.errors;
+import dmd.expression;
+import dmd.globals;
+import dmd.id;
+import dmd.identifier;
+import dmd.parse;
+import dmd.root.file;
+import dmd.root.filename;
+import dmd.root.outbuffer;
+import dmd.root.port;
+import dmd.target;
+import dmd.visitor;
 
 version(Windows) {
     extern (C) char* getcwd(char* buffer, size_t maxlen);
diff --git a/src/dmsc.d b/src/dmd/dmsc.d
similarity index 95%
rename from src/dmsc.d
rename to src/dmd/dmsc.d
index 4ad2ee94b870..03d246c93a7e 100644
--- a/src/dmsc.d
+++ b/src/dmd/dmsc.d
@@ -8,7 +8,7 @@
  * Source:      $(DMDSRC _dmsc.d)
  */
 
-module ddmd.dmsc;
+module dmd.dmsc;
 
 import core.stdc.stdio;
 import core.stdc.string;
@@ -16,15 +16,15 @@ import core.stdc.stddef;
 
 extern (C++):
 
-import ddmd.globals;
+import dmd.globals;
 
-import ddmd.root.filename;
+import dmd.root.filename;
 
-import ddmd.backend.cc;
-import ddmd.backend.cdef;
-import ddmd.backend.global;
-import ddmd.backend.ty;
-import ddmd.backend.type;
+import dmd.backend.cc;
+import dmd.backend.cdef;
+import dmd.backend.global;
+import dmd.backend.ty;
+import dmd.backend.type;
 
 /+
 #include        "mars.h"
diff --git a/src/doc.d b/src/dmd/doc.d
similarity index 99%
rename from src/doc.d
rename to src/dmd/doc.d
index c14365c0d90f..9ee7c8268b4b 100644
--- a/src/doc.d
+++ b/src/dmd/doc.d
@@ -8,43 +8,43 @@
  * Source:      $(DMDSRC _doc.d)
  */
 
-module ddmd.doc;
+module dmd.doc;
 
 import core.stdc.ctype;
 import core.stdc.stdlib;
 import core.stdc.stdio;
 import core.stdc.string;
 import core.stdc.time;
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.attrib;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.denum;
-import ddmd.dmacro;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.hdrgen;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.lexer;
-import ddmd.mtype;
-import ddmd.root.array;
-import ddmd.root.file;
-import ddmd.root.filename;
-import ddmd.root.outbuffer;
-import ddmd.root.port;
-import ddmd.root.rmem;
-import ddmd.tokens;
-import ddmd.utf;
-import ddmd.utils;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.attrib;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.denum;
+import dmd.dmacro;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.func;
+import dmd.globals;
+import dmd.hdrgen;
+import dmd.id;
+import dmd.identifier;
+import dmd.lexer;
+import dmd.mtype;
+import dmd.root.array;
+import dmd.root.file;
+import dmd.root.filename;
+import dmd.root.outbuffer;
+import dmd.root.port;
+import dmd.root.rmem;
+import dmd.tokens;
+import dmd.utf;
+import dmd.utils;
+import dmd.visitor;
 
 struct Escape
 {
diff --git a/src/dscope.d b/src/dmd/dscope.d
similarity index 98%
rename from src/dscope.d
rename to src/dmd/dscope.d
index ca596ae8c614..f697afcb0f6f 100644
--- a/src/dscope.d
+++ b/src/dmd/dscope.d
@@ -8,27 +8,27 @@
  * Source:      $(DMDSRC _dscope.d)
  */
 
-module ddmd.dscope;
+module dmd.dscope;
 
 import core.stdc.stdio;
 import core.stdc.string;
-import ddmd.aggregate;
-import ddmd.attrib;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.dmodule;
-import ddmd.doc;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.root.outbuffer;
-import ddmd.root.rmem;
-import ddmd.root.speller;
-import ddmd.statement;
+import dmd.aggregate;
+import dmd.attrib;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.dmodule;
+import dmd.doc;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.func;
+import dmd.globals;
+import dmd.id;
+import dmd.identifier;
+import dmd.root.outbuffer;
+import dmd.root.rmem;
+import dmd.root.speller;
+import dmd.statement;
 
 //version=LOGSEARCH;
 
diff --git a/src/dstruct.d b/src/dmd/dstruct.d
similarity index 98%
rename from src/dstruct.d
rename to src/dmd/dstruct.d
index fb265d557066..c86f0935c574 100644
--- a/src/dstruct.d
+++ b/src/dmd/dstruct.d
@@ -6,29 +6,29 @@
 // Distributed under the Boost Software License, Version 1.0.
 // http://www.boost.org/LICENSE_1_0.txt
 
-module ddmd.dstruct;
+module dmd.dstruct;
 
 import core.stdc.stdio;
-import ddmd.aggregate;
-import ddmd.argtypes;
-import ddmd.arraytypes;
-import ddmd.clone;
-import ddmd.declaration;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.mtype;
-import ddmd.opover;
-import ddmd.tokens;
-import ddmd.typinf;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.argtypes;
+import dmd.arraytypes;
+import dmd.clone;
+import dmd.declaration;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.id;
+import dmd.identifier;
+import dmd.mtype;
+import dmd.opover;
+import dmd.tokens;
+import dmd.typinf;
+import dmd.visitor;
 
 /***************************************
  * Search toString member function for TypeInfo_Struct.
diff --git a/src/dsymbol.d b/src/dmd/dsymbol.d
similarity index 98%
rename from src/dsymbol.d
rename to src/dmd/dsymbol.d
index 660984fc4933..5b357aff141f 100644
--- a/src/dsymbol.d
+++ b/src/dmd/dsymbol.d
@@ -8,44 +8,44 @@
  * Source:      $(DMDSRC _dsymbol.d)
  */
 
-module ddmd.dsymbol;
+module dmd.dsymbol;
 
 import core.stdc.stdarg;
 import core.stdc.stdio;
 import core.stdc.string;
 import core.stdc.stdlib;
 
-import ddmd.aggregate;
-import ddmd.aliasthis;
-import ddmd.arraytypes;
-import ddmd.attrib;
-import ddmd.gluelayer;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.denum;
-import ddmd.dimport;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dstruct;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.init;
-import ddmd.lexer;
-import ddmd.mtype;
-import ddmd.nspace;
-import ddmd.opover;
-import ddmd.root.aav;
-import ddmd.root.rmem;
-import ddmd.root.rootobject;
-import ddmd.root.speller;
-import ddmd.statement;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.aliasthis;
+import dmd.arraytypes;
+import dmd.attrib;
+import dmd.gluelayer;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.denum;
+import dmd.dimport;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dstruct;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.id;
+import dmd.identifier;
+import dmd.init;
+import dmd.lexer;
+import dmd.mtype;
+import dmd.nspace;
+import dmd.opover;
+import dmd.root.aav;
+import dmd.root.rmem;
+import dmd.root.rootobject;
+import dmd.root.speller;
+import dmd.statement;
+import dmd.tokens;
+import dmd.visitor;
 
 struct Ungag
 {
@@ -1265,7 +1265,7 @@ private:
     Dsymbols* importedScopes;
     PROTKIND* prots;            // array of PROTKIND, one for each import
 
-    import ddmd.root.array : BitArray;
+    import dmd.root.array : BitArray;
     BitArray accessiblePackages, privateAccessiblePackages;// whitelists of accessible (imported) packages
 
 public:
@@ -1342,7 +1342,7 @@ public:
                 /* Don't find private members if ss is a module
                  */
                 Dsymbol s2 = ss.search(loc, ident, sflags | (ss.isModule() ? IgnorePrivateImports : IgnoreNone));
-                import ddmd.access : symbolIsVisible;
+                import dmd.access : symbolIsVisible;
                 if (!s2 || !(flags & IgnoreSymbolVisibility) && !symbolIsVisible(this, s2))
                     continue;
                 if (!s)
diff --git a/src/dtemplate.d b/src/dmd/dtemplate.d
similarity index 99%
rename from src/dtemplate.d
rename to src/dmd/dtemplate.d
index 570048052f5a..0d18226a7b8b 100644
--- a/src/dtemplate.d
+++ b/src/dmd/dtemplate.d
@@ -10,36 +10,36 @@
  * Source:      $(DMDSRC _dtemplate.d)
  */
 
-module ddmd.dtemplate;
+module dmd.dtemplate;
 
 import core.stdc.stdio;
 import core.stdc.string;
-import ddmd.aggregate;
-import ddmd.aliasthis;
-import ddmd.arraytypes;
-import ddmd.attrib;
-import ddmd.dcast;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.dmangle;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.hdrgen;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.init;
-import ddmd.mtype;
-import ddmd.opover;
-import ddmd.root.aav;
-import ddmd.root.outbuffer;
-import ddmd.root.rootobject;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.aliasthis;
+import dmd.arraytypes;
+import dmd.attrib;
+import dmd.dcast;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.dmangle;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.hdrgen;
+import dmd.id;
+import dmd.identifier;
+import dmd.init;
+import dmd.mtype;
+import dmd.opover;
+import dmd.root.aav;
+import dmd.root.outbuffer;
+import dmd.root.rootobject;
+import dmd.tokens;
+import dmd.visitor;
 
 //debug = FindExistingInstance; // print debug stats of findExistingInstance
 private enum LOG = false;
@@ -339,7 +339,7 @@ private int arrayObjectMatch(Objects* oa1, Objects* oa2)
  */
 private hash_t arrayObjectHash(Objects* oa1)
 {
-    import ddmd.root.hash : mixHash;
+    import dmd.root.hash : mixHash;
 
     hash_t hash = 0;
     foreach (o1; *oa1)
@@ -371,8 +371,8 @@ private hash_t arrayObjectHash(Objects* oa1)
  */
 private hash_t expressionHash(Expression e)
 {
-    import ddmd.root.ctfloat : CTFloat;
-    import ddmd.root.hash : calcHash, mixHash;
+    import dmd.root.ctfloat : CTFloat;
+    import dmd.root.hash : calcHash, mixHash;
 
     switch (e.op)
     {
diff --git a/src/dversion.d b/src/dmd/dversion.d
similarity index 95%
rename from src/dversion.d
rename to src/dmd/dversion.d
index b5638cd0ea67..c001c90e490b 100644
--- a/src/dversion.d
+++ b/src/dmd/dversion.d
@@ -8,17 +8,17 @@
  * Source:      $(DMDSRC _dversion.d)
  */
 
-module ddmd.dversion;
-
-import ddmd.arraytypes;
-import ddmd.cond;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.globals;
-import ddmd.identifier;
-import ddmd.root.outbuffer;
-import ddmd.visitor;
+module dmd.dversion;
+
+import dmd.arraytypes;
+import dmd.cond;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.globals;
+import dmd.identifier;
+import dmd.root.outbuffer;
+import dmd.visitor;
 
 /***********************************************************
  * DebugSymbol's happen for statements like:
diff --git a/src/e2ir.d b/src/dmd/e2ir.d
similarity index 99%
rename from src/e2ir.d
rename to src/dmd/e2ir.d
index b566be7d4bc2..aa31a4b68e9f 100644
--- a/src/e2ir.d
+++ b/src/dmd/e2ir.d
@@ -8,74 +8,74 @@
  * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/_tocsym.d, _e2ir.d)
  */
 
-module ddmd.e2ir;
+module dmd.e2ir;
 
 import core.stdc.stdio;
 import core.stdc.stddef;
 import core.stdc.string;
 import core.stdc.time;
 
-import ddmd.root.array;
-import ddmd.root.ctfloat;
-import ddmd.root.rmem;
-import ddmd.root.rootobject;
-import ddmd.root.stringtable;
-
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.attrib;
-import ddmd.ctfeexpr;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.denum;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.glue;
-import ddmd.id;
-import ddmd.init;
-import ddmd.irstate;
-import ddmd.mars;
-import ddmd.mtype;
-import ddmd.s2ir;
-import ddmd.sideeffect;
-import ddmd.statement;
-import ddmd.target;
-import ddmd.tocsym;
-import ddmd.toctype;
-import ddmd.toir;
-import ddmd.tokens;
-import ddmd.toobj;
-import ddmd.typinf;
-import ddmd.visitor;
-
-import ddmd.backend.cc;
-import ddmd.backend.cdef;
-import ddmd.backend.cgcv;
-import ddmd.backend.code;
-import ddmd.backend.code_x86;
-import ddmd.backend.cv4;
-import ddmd.backend.dt;
-import ddmd.backend.el;
-import ddmd.backend.global;
-import ddmd.backend.obj;
-import ddmd.backend.oper;
-import ddmd.backend.rtlsym;
-import ddmd.backend.ty;
-import ddmd.backend.type;
+import dmd.root.array;
+import dmd.root.ctfloat;
+import dmd.root.rmem;
+import dmd.root.rootobject;
+import dmd.root.stringtable;
+
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.attrib;
+import dmd.ctfeexpr;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.denum;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.glue;
+import dmd.id;
+import dmd.init;
+import dmd.irstate;
+import dmd.mars;
+import dmd.mtype;
+import dmd.s2ir;
+import dmd.sideeffect;
+import dmd.statement;
+import dmd.target;
+import dmd.tocsym;
+import dmd.toctype;
+import dmd.toir;
+import dmd.tokens;
+import dmd.toobj;
+import dmd.typinf;
+import dmd.visitor;
+
+import dmd.backend.cc;
+import dmd.backend.cdef;
+import dmd.backend.cgcv;
+import dmd.backend.code;
+import dmd.backend.code_x86;
+import dmd.backend.cv4;
+import dmd.backend.dt;
+import dmd.backend.el;
+import dmd.backend.global;
+import dmd.backend.obj;
+import dmd.backend.oper;
+import dmd.backend.rtlsym;
+import dmd.backend.ty;
+import dmd.backend.type;
 
 extern (C++):
 
 alias Elems = Array!(elem *);
 
-alias toSymbol = ddmd.tocsym.toSymbol;
-alias toSymbol = ddmd.glue.toSymbol;
+alias toSymbol = dmd.tocsym.toSymbol;
+alias toSymbol = dmd.glue.toSymbol;
 
 void objc_callfunc_setupMethodSelector(Type tret, FuncDeclaration fd, Type t, elem *ehidden, elem **esel);
 void objc_callfunc_setupMethodCall(elem **ec, elem *ehidden, elem *ethis, TypeFunction tf);
@@ -5690,8 +5690,8 @@ Symbol *toStringSymbol(const(char)* str, size_t len, size_t sz)
             /* The stringTab pools common strings within an object file.
              * Win32 and Win64 use COMDATs to pool common strings across object files.
              */
-            import ddmd.root.outbuffer : OutBuffer;
-            import ddmd.dmangle;
+            import dmd.root.outbuffer : OutBuffer;
+            import dmd.dmangle;
 
             scope StringExp se = new StringExp(Loc(), cast(void*)str, len, 'c');
             se.sz = cast(ubyte)sz;
@@ -5707,7 +5707,7 @@ Symbol *toStringSymbol(const(char)* str, size_t len, size_t sz)
 
             if (buf.offset >= 32 + 2)
             {   // Replace long string with hash of that string
-                import ddmd.backend.md5;
+                import dmd.backend.md5;
                 MD5_CTX mdContext;
                 MD5Init(&mdContext);
                 MD5Update(&mdContext, cast(ubyte*)buf.peekString(), cast(uint)buf.offset);
diff --git a/src/eh.d b/src/dmd/eh.d
similarity index 97%
rename from src/eh.d
rename to src/dmd/eh.d
index 685711972ba0..338aab698dfe 100644
--- a/src/eh.d
+++ b/src/dmd/eh.d
@@ -9,24 +9,24 @@
  * Source:      $(DMDSRC _eh.d)
  */
 
-module ddmd.eh;
+module dmd.eh;
 
 import core.stdc.stdio;
 import core.stdc.stdlib;
 import core.stdc.string;
 
-import ddmd.globals;
-
-import ddmd.backend.cc;
-import ddmd.backend.cdef;
-import ddmd.backend.code;
-import ddmd.backend.code_x86;
-import ddmd.backend.dt;
-import ddmd.backend.el;
-import ddmd.backend.global;
-import ddmd.backend.obj;
-import ddmd.backend.ty;
-import ddmd.backend.type;
+import dmd.globals;
+
+import dmd.backend.cc;
+import dmd.backend.cdef;
+import dmd.backend.code;
+import dmd.backend.code_x86;
+import dmd.backend.dt;
+import dmd.backend.el;
+import dmd.backend.global;
+import dmd.backend.obj;
+import dmd.backend.ty;
+import dmd.backend.type;
 
 extern (C++):
 
diff --git a/src/entity.d b/src/dmd/entity.d
similarity index 99%
rename from src/entity.d
rename to src/dmd/entity.d
index 4ae7f7b5248c..445840747b0e 100644
--- a/src/entity.d
+++ b/src/dmd/entity.d
@@ -8,7 +8,7 @@
  * Source:      $(DMDSRC _entity.d)
  */
 
-module ddmd.entity;
+module dmd.entity;
 
 import core.stdc.ctype;
 
diff --git a/src/errors.d b/src/dmd/errors.d
similarity index 98%
rename from src/errors.d
rename to src/dmd/errors.d
index fc986541421e..b1177fdd1c41 100644
--- a/src/errors.d
+++ b/src/dmd/errors.d
@@ -8,7 +8,7 @@
  * Source:      $(DMDSRC _errors.d)
  */
 
-module ddmd.errors;
+module dmd.errors;
 
 import core.stdc.stdarg;
 import core.stdc.stdio;
@@ -16,9 +16,9 @@ import core.stdc.stdlib;
 import core.stdc.string;
 import core.sys.posix.unistd;
 import core.sys.windows.windows;
-import ddmd.globals;
-import ddmd.root.outbuffer;
-import ddmd.root.rmem;
+import dmd.globals;
+import dmd.root.outbuffer;
+import dmd.root.rmem;
 
 version (Windows) extern (C) int isatty(int);
 
diff --git a/src/escape.d b/src/dmd/escape.d
similarity index 99%
rename from src/escape.d
rename to src/dmd/escape.d
index 3d04ee00189a..32fc7e000e94 100644
--- a/src/escape.d
+++ b/src/dmd/escape.d
@@ -8,25 +8,25 @@
  * Source:      $(DMDSRC _escape.d)
  */
 
-module ddmd.escape;
+module dmd.escape;
 
 import core.stdc.stdio : printf;
 
-import ddmd.aggregate;
-import ddmd.declaration;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.identifier;
-import ddmd.init;
-import ddmd.mtype;
-import ddmd.root.rootobject;
-import ddmd.tokens;
-import ddmd.visitor;
-import ddmd.arraytypes;
+import dmd.aggregate;
+import dmd.declaration;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.identifier;
+import dmd.init;
+import dmd.mtype;
+import dmd.root.rootobject;
+import dmd.tokens;
+import dmd.visitor;
+import dmd.arraytypes;
 
 /****************************************
  * Function parameter par is being initialized to arg,
diff --git a/src/expression.d b/src/dmd/expression.d
similarity index 99%
rename from src/expression.d
rename to src/dmd/expression.d
index 0acac47071b0..2a65873242d3 100644
--- a/src/expression.d
+++ b/src/dmd/expression.d
@@ -8,68 +8,68 @@
  * Source:      $(DMDSRC _expression.d)
  */
 
-module ddmd.expression;
+module dmd.expression;
 
 import core.stdc.stdarg;
 import core.stdc.stdio;
 import core.stdc.string;
 
-import ddmd.access;
-import ddmd.aggregate;
-import ddmd.aliasthis;
-import ddmd.apply;
-import ddmd.argtypes;
-import ddmd.arrayop;
-import ddmd.arraytypes;
-import ddmd.attrib;
-import ddmd.gluelayer;
-import ddmd.canthrow;
-import ddmd.complex;
-import ddmd.constfold;
-import ddmd.ctfeexpr;
-import ddmd.dcast;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.delegatize;
-import ddmd.denum;
-import ddmd.dimport;
-import ddmd.dinterpret;
-import ddmd.dmangle;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.escape;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.hdrgen;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.imphint;
-import ddmd.inline;
-import ddmd.intrange;
-import ddmd.mtype;
-import ddmd.nspace;
-import ddmd.opover;
-import ddmd.optimize;
-import ddmd.parse;
-import ddmd.root.ctfloat;
-import ddmd.root.file;
-import ddmd.root.filename;
-import ddmd.root.outbuffer;
-import ddmd.root.rmem;
-import ddmd.root.rootobject;
-import ddmd.safe;
-import ddmd.sideeffect;
-import ddmd.target;
-import ddmd.tokens;
-import ddmd.traits;
-import ddmd.typinf;
-import ddmd.utf;
-import ddmd.utils;
-import ddmd.visitor;
+import dmd.access;
+import dmd.aggregate;
+import dmd.aliasthis;
+import dmd.apply;
+import dmd.argtypes;
+import dmd.arrayop;
+import dmd.arraytypes;
+import dmd.attrib;
+import dmd.gluelayer;
+import dmd.canthrow;
+import dmd.complex;
+import dmd.constfold;
+import dmd.ctfeexpr;
+import dmd.dcast;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.delegatize;
+import dmd.denum;
+import dmd.dimport;
+import dmd.dinterpret;
+import dmd.dmangle;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.escape;
+import dmd.func;
+import dmd.globals;
+import dmd.hdrgen;
+import dmd.id;
+import dmd.identifier;
+import dmd.imphint;
+import dmd.inline;
+import dmd.intrange;
+import dmd.mtype;
+import dmd.nspace;
+import dmd.opover;
+import dmd.optimize;
+import dmd.parse;
+import dmd.root.ctfloat;
+import dmd.root.file;
+import dmd.root.filename;
+import dmd.root.outbuffer;
+import dmd.root.rmem;
+import dmd.root.rootobject;
+import dmd.safe;
+import dmd.sideeffect;
+import dmd.target;
+import dmd.tokens;
+import dmd.traits;
+import dmd.typinf;
+import dmd.utf;
+import dmd.utils;
+import dmd.visitor;
 
 enum LOGSEMANTIC = false;
 void emplaceExp(T : Expression, Args...)(void* p, Args args)
diff --git a/src/func.d b/src/dmd/func.d
similarity index 99%
rename from src/func.d
rename to src/dmd/func.d
index 5722af58539b..92e509ddc2ce 100644
--- a/src/func.d
+++ b/src/dmd/func.d
@@ -8,45 +8,45 @@
  * Source:      $(DMDSRC _func.d)
  */
 
-module ddmd.func;
+module dmd.func;
 
 import core.stdc.stdio;
 import core.stdc.string;
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.blockexit;
-import ddmd.gluelayer;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.delegatize;
-import ddmd.dinterpret;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.escape;
-import ddmd.expression;
-import ddmd.globals;
-import ddmd.hdrgen;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.init;
-import ddmd.mars;
-import ddmd.mtype;
-import ddmd.nogc;
-import ddmd.objc;
-import ddmd.opover;
-import ddmd.root.filename;
-import ddmd.root.outbuffer;
-import ddmd.root.rootobject;
-import ddmd.statement_rewrite_walker;
-import ddmd.statementsem;
-import ddmd.statement;
-import ddmd.target;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.blockexit;
+import dmd.gluelayer;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.delegatize;
+import dmd.dinterpret;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.escape;
+import dmd.expression;
+import dmd.globals;
+import dmd.hdrgen;
+import dmd.id;
+import dmd.identifier;
+import dmd.init;
+import dmd.mars;
+import dmd.mtype;
+import dmd.nogc;
+import dmd.objc;
+import dmd.opover;
+import dmd.root.filename;
+import dmd.root.outbuffer;
+import dmd.root.rootobject;
+import dmd.statement_rewrite_walker;
+import dmd.statementsem;
+import dmd.statement;
+import dmd.target;
+import dmd.tokens;
+import dmd.visitor;
 
 /// Inline Status
 enum ILS : int
@@ -4467,7 +4467,7 @@ extern (C++) final class FuncLiteralDeclaration : FuncDeclaration
      */
     void modifyReturns(Scope* sc, Type tret)
     {
-        import ddmd.statement_rewrite_walker;
+        import dmd.statement_rewrite_walker;
 
         extern (C++) final class RetWalker : StatementRewriteWalker
         {
diff --git a/src/globals.d b/src/dmd/globals.d
similarity index 99%
rename from src/globals.d
rename to src/dmd/globals.d
index 811069eb3d24..f7553c1a0bdf 100644
--- a/src/globals.d
+++ b/src/dmd/globals.d
@@ -8,13 +8,13 @@
  * Source:      $(DMDSRC _globals.d)
  */
 
-module ddmd.globals;
+module dmd.globals;
 
 import core.stdc.stdint;
 import core.stdc.stdio;
-import ddmd.root.array;
-import ddmd.root.filename;
-import ddmd.root.outbuffer;
+import dmd.root.array;
+import dmd.root.filename;
+import dmd.root.outbuffer;
 
 template xversion(string s)
 {
diff --git a/src/glue.d b/src/dmd/glue.d
similarity index 97%
rename from src/glue.d
rename to src/dmd/glue.d
index a27780ec5c0c..6f101f88a661 100644
--- a/src/glue.d
+++ b/src/dmd/glue.d
@@ -8,66 +8,66 @@
  * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/_glue.d, _glue.d)
  */
 
-module ddmd.glue;
+module dmd.glue;
 
 import core.stdc.stdio;
 import core.stdc.string;
 import core.stdc.stdlib;
 
-import ddmd.root.array;
-import ddmd.root.file;
-import ddmd.root.filename;
-import ddmd.root.outbuffer;
-import ddmd.root.rmem;
-
-import ddmd.backend.cdef;
-import ddmd.backend.cc;
-import ddmd.backend.code;
-import ddmd.backend.dt;
-import ddmd.backend.el;
-import ddmd.backend.global;
-import ddmd.backend.obj;
-import ddmd.backend.oper;
-import ddmd.backend.outbuf;
-import ddmd.backend.rtlsym;
-import ddmd.backend.ty;
-import ddmd.backend.type;
-
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.blockexit;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.dmangle;
-import ddmd.dmodule;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.e2ir;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.identifier;
-import ddmd.id;
-import ddmd.irstate;
-import ddmd.lib;
-import ddmd.mars;
-import ddmd.mtype;
-import ddmd.objc;
-import ddmd.s2ir;
-import ddmd.statement;
-import ddmd.target;
-import ddmd.tocsym;
-import ddmd.toctype;
-import ddmd.toir;
-import ddmd.toobj;
-import ddmd.utils;
+import dmd.root.array;
+import dmd.root.file;
+import dmd.root.filename;
+import dmd.root.outbuffer;
+import dmd.root.rmem;
+
+import dmd.backend.cdef;
+import dmd.backend.cc;
+import dmd.backend.code;
+import dmd.backend.dt;
+import dmd.backend.el;
+import dmd.backend.global;
+import dmd.backend.obj;
+import dmd.backend.oper;
+import dmd.backend.outbuf;
+import dmd.backend.rtlsym;
+import dmd.backend.ty;
+import dmd.backend.type;
+
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.blockexit;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.dmangle;
+import dmd.dmodule;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.e2ir;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.identifier;
+import dmd.id;
+import dmd.irstate;
+import dmd.lib;
+import dmd.mars;
+import dmd.mtype;
+import dmd.objc;
+import dmd.s2ir;
+import dmd.statement;
+import dmd.target;
+import dmd.tocsym;
+import dmd.toctype;
+import dmd.toir;
+import dmd.toobj;
+import dmd.utils;
 
 extern (C++):
 
 alias symbols = Array!(Symbol*);
-alias toSymbol = ddmd.tocsym.toSymbol;
+alias toSymbol = dmd.tocsym.toSymbol;
 
 void objc_Module_genmoduleinfo_classes();
 
diff --git a/src/gluelayer.d b/src/dmd/gluelayer.d
similarity index 82%
rename from src/gluelayer.d
rename to src/dmd/gluelayer.d
index e8fc1c4de32e..f244bb0ec4be 100644
--- a/src/gluelayer.d
+++ b/src/dmd/gluelayer.d
@@ -8,15 +8,15 @@
  * Source:      $(DMDSRC _gluelayer.d)
  */
 
-module ddmd.gluelayer;
+module dmd.gluelayer;
 
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.lib;
-import ddmd.mtype;
-import ddmd.statement;
-import ddmd.root.file;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.lib;
+import dmd.mtype;
+import dmd.statement;
+import dmd.root.file;
 
 version (NoBackend)
 {
@@ -55,10 +55,10 @@ version (NoBackend)
 }
 else
 {
-    public import ddmd.backend.cc : block, Blockx, Symbol;
-    public import ddmd.backend.type : type;
-    public import ddmd.backend.el : elem;
-    public import ddmd.backend.code : code;
+    public import dmd.backend.cc : block, Blockx, Symbol;
+    public import dmd.backend.type : type;
+    public import dmd.backend.el : elem;
+    public import dmd.backend.code : code;
 
     extern (C++)
     {
diff --git a/src/hdrgen.d b/src/dmd/hdrgen.d
similarity index 99%
rename from src/hdrgen.d
rename to src/dmd/hdrgen.d
index d5b9ee254fff..3d970ae67bbb 100644
--- a/src/hdrgen.d
+++ b/src/dmd/hdrgen.d
@@ -8,46 +8,46 @@
  * Source:      $(DMDSRC _hdrgen.d)
  */
 
-module ddmd.hdrgen;
+module dmd.hdrgen;
 
 import core.stdc.ctype;
 import core.stdc.stdio;
 import core.stdc.string;
-import ddmd.aggregate;
-import ddmd.aliasthis;
-import ddmd.arraytypes;
-import ddmd.attrib;
-import ddmd.complex;
-import ddmd.cond;
-import ddmd.ctfeexpr;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.denum;
-import ddmd.dimport;
-import ddmd.dmodule;
-import ddmd.doc;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.dversion;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.init;
-import ddmd.mtype;
-import ddmd.nspace;
-import ddmd.parse;
-import ddmd.root.ctfloat;
-import ddmd.root.outbuffer;
-import ddmd.root.rootobject;
-import ddmd.statement;
-import ddmd.staticassert;
-import ddmd.target;
-import ddmd.tokens;
-import ddmd.utils;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.aliasthis;
+import dmd.arraytypes;
+import dmd.attrib;
+import dmd.complex;
+import dmd.cond;
+import dmd.ctfeexpr;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.denum;
+import dmd.dimport;
+import dmd.dmodule;
+import dmd.doc;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.dversion;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.id;
+import dmd.identifier;
+import dmd.init;
+import dmd.mtype;
+import dmd.nspace;
+import dmd.parse;
+import dmd.root.ctfloat;
+import dmd.root.outbuffer;
+import dmd.root.rootobject;
+import dmd.statement;
+import dmd.staticassert;
+import dmd.target;
+import dmd.tokens;
+import dmd.utils;
+import dmd.visitor;
 
 struct HdrGenState
 {
diff --git a/src/iasm.d b/src/dmd/iasm.d
similarity index 99%
rename from src/iasm.d
rename to src/dmd/iasm.d
index 90361c012907..72bf2e6b0258 100644
--- a/src/iasm.d
+++ b/src/dmd/iasm.d
@@ -13,46 +13,46 @@
  * Source:      $(DMDSRC _iasm.d)
  */
 
-module ddmd.iasm;
+module dmd.iasm;
 
 import core.stdc.stdio;
 import core.stdc.stdarg;
 import core.stdc.stdlib;
 import core.stdc.string;
 
-import ddmd.declaration;
-import ddmd.denum;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.init;
-import ddmd.mars;
-import ddmd.mtype;
-import ddmd.statement;
-import ddmd.target;
-import ddmd.tokens;
-
-import ddmd.root.ctfloat;
-import ddmd.root.rmem;
-import ddmd.root.rootobject;
-
-import ddmd.backend.cc;
-import ddmd.backend.cdef;
-import ddmd.backend.code;
-import ddmd.backend.code_x86;
-import ddmd.backend.global;
-import ddmd.backend.el;
-import ddmd.backend.type;
-import ddmd.backend.oper;
-import ddmd.backend.code;
-import ddmd.backend.iasm;
-import ddmd.backend.xmm;
+import dmd.declaration;
+import dmd.denum;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.id;
+import dmd.identifier;
+import dmd.init;
+import dmd.mars;
+import dmd.mtype;
+import dmd.statement;
+import dmd.target;
+import dmd.tokens;
+
+import dmd.root.ctfloat;
+import dmd.root.rmem;
+import dmd.root.rootobject;
+
+import dmd.backend.cc;
+import dmd.backend.cdef;
+import dmd.backend.code;
+import dmd.backend.code_x86;
+import dmd.backend.global;
+import dmd.backend.el;
+import dmd.backend.type;
+import dmd.backend.oper;
+import dmd.backend.code;
+import dmd.backend.iasm;
+import dmd.backend.xmm;
 
 //debug = EXTRA_DEBUG;
 //debug = debuga;
diff --git a/src/identifier.d b/src/dmd/identifier.d
similarity index 96%
rename from src/identifier.d
rename to src/dmd/identifier.d
index d0c0bc8ec555..d8c0600098d4 100644
--- a/src/identifier.d
+++ b/src/dmd/identifier.d
@@ -8,18 +8,18 @@
  * Source:      $(DMDSRC _identifier.d)
  */
 
-module ddmd.identifier;
+module dmd.identifier;
 
 import core.stdc.ctype;
 import core.stdc.stdio;
 import core.stdc.string;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.root.outbuffer;
-import ddmd.root.rootobject;
-import ddmd.root.stringtable;
-import ddmd.tokens;
-import ddmd.utf;
+import dmd.globals;
+import dmd.id;
+import dmd.root.outbuffer;
+import dmd.root.rootobject;
+import dmd.root.stringtable;
+import dmd.tokens;
+import dmd.utf;
 
 /***********************************************************
  */
diff --git a/src/idgen.d b/src/dmd/idgen.d
similarity index 98%
rename from src/idgen.d
rename to src/dmd/idgen.d
index 24a12688eff9..4d8a64abcd5a 100644
--- a/src/idgen.d
+++ b/src/dmd/idgen.d
@@ -403,7 +403,7 @@ int main()
     }
 
     {
-        auto fp = fopen("id.d","wb");
+        auto fp = fopen("dmd/id.d","wb");
         if (!fp)
         {
             printf("can't open id.d\n");
@@ -412,9 +412,9 @@ int main()
 
         fprintf(fp, "// File generated by idgen.d\n");
         fprintf(fp, "\n");
-        fprintf(fp, "module ddmd.id;\n");
+        fprintf(fp, "module dmd.id;\n");
         fprintf(fp, "\n");
-        fprintf(fp, "import ddmd.identifier, ddmd.tokens;\n");
+        fprintf(fp, "import dmd.identifier, dmd.tokens;\n");
         fprintf(fp, "\n");
         fprintf(fp, "struct Id\n");
         fprintf(fp, "{\n");
diff --git a/src/impcnvtab.d b/src/dmd/impcnvtab.d
similarity index 99%
rename from src/impcnvtab.d
rename to src/dmd/impcnvtab.d
index 9fff9583e3d5..0cc98bf64ac6 100644
--- a/src/impcnvtab.d
+++ b/src/dmd/impcnvtab.d
@@ -8,9 +8,9 @@
  * Source:      $(DMDSRC _impcnvtab.d)
  */
 
-module ddmd.impcnvtab;
+module dmd.impcnvtab;
 
-import ddmd.mtype;
+import dmd.mtype;
 
 immutable ENUMTY[TMAX][TMAX] impcnvResult = impCnvTab.impcnvResultTab;
 immutable ENUMTY[TMAX][TMAX] impcnvType1 = impCnvTab.impcnvType1Tab;
diff --git a/src/imphint.d b/src/dmd/imphint.d
similarity index 98%
rename from src/imphint.d
rename to src/dmd/imphint.d
index 8d917b2b240c..ddf603f39abb 100644
--- a/src/imphint.d
+++ b/src/dmd/imphint.d
@@ -8,7 +8,7 @@
  * Source:      $(DMDSRC _imphint.d)
  */
 
-module ddmd.imphint;
+module dmd.imphint;
 
 import core.stdc.string;
 
diff --git a/src/init.d b/src/dmd/init.d
similarity index 98%
rename from src/init.d
rename to src/dmd/init.d
index 48e06bc453ee..ea3c5d231b0d 100644
--- a/src/init.d
+++ b/src/dmd/init.d
@@ -8,32 +8,32 @@
  * Source:      $(DMDSRC _init.d)
  */
 
-module ddmd.init;
+module dmd.init;
 
 import core.stdc.stdio;
 import core.checkedint;
 
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.dcast;
-import ddmd.declaration;
-import ddmd.dscope;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.hdrgen;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.mtype;
-import ddmd.root.outbuffer;
-import ddmd.root.rootobject;
-import ddmd.statement;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.dcast;
+import dmd.declaration;
+import dmd.dscope;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.hdrgen;
+import dmd.id;
+import dmd.identifier;
+import dmd.mtype;
+import dmd.root.outbuffer;
+import dmd.root.rootobject;
+import dmd.statement;
+import dmd.tokens;
+import dmd.visitor;
 
 enum NeedInterpret : int
 {
diff --git a/src/inline.d b/src/dmd/inline.d
similarity index 99%
rename from src/inline.d
rename to src/dmd/inline.d
index d1732005754b..f3b270c6c9f7 100644
--- a/src/inline.d
+++ b/src/dmd/inline.d
@@ -8,32 +8,32 @@
  * Source:    $(DMDSRC _inline.d)
  */
 
-module ddmd.inline;
+module dmd.inline;
 
 import core.stdc.stdio;
 import core.stdc.string;
 
-import ddmd.aggregate;
-import ddmd.apply;
-import ddmd.arraytypes;
-import ddmd.attrib;
-import ddmd.declaration;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.init;
-import ddmd.mtype;
-import ddmd.opover;
-import ddmd.statement;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.apply;
+import dmd.arraytypes;
+import dmd.attrib;
+import dmd.declaration;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.id;
+import dmd.identifier;
+import dmd.init;
+import dmd.mtype;
+import dmd.opover;
+import dmd.statement;
+import dmd.tokens;
+import dmd.visitor;
 
 private:
 
diff --git a/src/intrange.d b/src/dmd/intrange.d
similarity index 99%
rename from src/intrange.d
rename to src/dmd/intrange.d
index 7c144e22de04..30f9267a48e5 100644
--- a/src/intrange.d
+++ b/src/dmd/intrange.d
@@ -8,13 +8,13 @@
  * Source:      $(DMDSRC _intrange.d)
  */
 
-module ddmd.intrange;
+module dmd.intrange;
 
 import core.stdc.stdio;
 
-import ddmd.mtype;
-import ddmd.expression;
-import ddmd.globals;
+import dmd.mtype;
+import dmd.expression;
+import dmd.globals;
 
 enum UINT64_MAX = 0xFFFFFFFFFFFFFFFFUL;
 
diff --git a/src/irstate.d b/src/dmd/irstate.d
similarity index 96%
rename from src/irstate.d
rename to src/dmd/irstate.d
index 83450345d83a..00de3d936c2a 100644
--- a/src/irstate.d
+++ b/src/dmd/irstate.d
@@ -8,20 +8,20 @@
  * Source:      $(DMDSRC _irstate.d)
  */
 
-module ddmd.irstate;
+module dmd.irstate;
 
-import ddmd.arraytypes;
-import ddmd.backend.type;
-import ddmd.dmodule;
-import ddmd.dsymbol;
-import ddmd.func;
-import ddmd.identifier;
-import ddmd.statement;
-import ddmd.globals;
-import ddmd.mtype;
+import dmd.arraytypes;
+import dmd.backend.type;
+import dmd.dmodule;
+import dmd.dsymbol;
+import dmd.func;
+import dmd.identifier;
+import dmd.statement;
+import dmd.globals;
+import dmd.mtype;
 
-import ddmd.backend.cc;
-import ddmd.backend.el;
+import dmd.backend.cc;
+import dmd.backend.el;
 
 /****************************************
  * Our label symbol, with vector to keep track of forward references.
diff --git a/src/json.d b/src/dmd/json.d
similarity index 97%
rename from src/json.d
rename to src/dmd/json.d
index cd00f5ab3465..572d7d3f1a7c 100644
--- a/src/json.d
+++ b/src/dmd/json.d
@@ -8,29 +8,29 @@
  * Source:      $(DMDSRC _json.d)
  */
 
-module ddmd.json;
+module dmd.json;
 
 import core.stdc.stdio;
 import core.stdc.string;
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.attrib;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.denum;
-import ddmd.dimport;
-import ddmd.dmodule;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.hdrgen;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.mtype;
-import ddmd.root.outbuffer;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.attrib;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.denum;
+import dmd.dimport;
+import dmd.dmodule;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.hdrgen;
+import dmd.id;
+import dmd.identifier;
+import dmd.mtype;
+import dmd.root.outbuffer;
+import dmd.visitor;
 
 extern (C++) final class ToJsonVisitor : Visitor
 {
diff --git a/src/lexer.d b/src/dmd/lexer.d
similarity index 99%
rename from src/lexer.d
rename to src/dmd/lexer.d
index 389cffee3407..d695f97392a3 100644
--- a/src/lexer.d
+++ b/src/dmd/lexer.d
@@ -8,7 +8,7 @@
  * Source:      $(DMDSRC _lexer.d)
  */
 
-module ddmd.lexer;
+module dmd.lexer;
 
 import core.stdc.ctype;
 import core.stdc.errno;
@@ -17,17 +17,17 @@ import core.stdc.stdio;
 import core.stdc.string;
 import core.stdc.time;
 
-import ddmd.entity;
-import ddmd.errors;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.root.ctfloat;
-import ddmd.root.outbuffer;
-import ddmd.root.port;
-import ddmd.root.rmem;
-import ddmd.tokens;
-import ddmd.utf;
+import dmd.entity;
+import dmd.errors;
+import dmd.globals;
+import dmd.id;
+import dmd.identifier;
+import dmd.root.ctfloat;
+import dmd.root.outbuffer;
+import dmd.root.port;
+import dmd.root.rmem;
+import dmd.tokens;
+import dmd.utf;
 
 enum LS = 0x2028;       // UTF line separator
 enum PS = 0x2029;       // UTF paragraph separator
diff --git a/src/lib.d b/src/dmd/lib.d
similarity index 93%
rename from src/lib.d
rename to src/dmd/lib.d
index 5ff801a812d4..eab0408bff6b 100644
--- a/src/lib.d
+++ b/src/dmd/lib.d
@@ -8,31 +8,31 @@
  * Source:      $(DMDSRC _lib.d)
  */
 
-module ddmd.lib;
+module dmd.lib;
 
 import core.stdc.stdio;
 import core.stdc.stdarg;
 
-import ddmd.globals;
-import ddmd.errors;
-import ddmd.utils;
+import dmd.globals;
+import dmd.errors;
+import dmd.utils;
 
-import ddmd.root.outbuffer;
-import ddmd.root.file;
-import ddmd.root.filename;
+import dmd.root.outbuffer;
+import dmd.root.file;
+import dmd.root.filename;
 
 static if (TARGET_WINDOS)
 {
-    import ddmd.libomf;
-    import ddmd.libmscoff;
+    import dmd.libomf;
+    import dmd.libmscoff;
 }
 else static if (TARGET_LINUX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS)
 {
-    import ddmd.libelf;
+    import dmd.libelf;
 }
 else static if (TARGET_OSX)
 {
-    import ddmd.libmach;
+    import dmd.libmach;
 }
 else
 {
diff --git a/src/libelf.d b/src/dmd/libelf.d
similarity index 98%
rename from src/libelf.d
rename to src/dmd/libelf.d
index 575eea40ae3c..079e3f04971d 100644
--- a/src/libelf.d
+++ b/src/dmd/libelf.d
@@ -8,7 +8,7 @@
  * Source:      $(DMDSRC _libelf.d)
  */
 
-module ddmd.libelf;
+module dmd.libelf;
 
 import core.stdc.time;
 import core.stdc.string;
@@ -17,19 +17,19 @@ import core.stdc.stdio;
 import core.sys.posix.sys.stat;
 import core.sys.posix.unistd;
 
-import ddmd.globals;
-import ddmd.lib;
-import ddmd.utils;
+import dmd.globals;
+import dmd.lib;
+import dmd.utils;
 
-import ddmd.root.array;
-import ddmd.root.file;
-import ddmd.root.filename;
-import ddmd.root.outbuffer;
-import ddmd.root.port;
-import ddmd.root.rmem;
-import ddmd.root.stringtable;
+import dmd.root.array;
+import dmd.root.file;
+import dmd.root.filename;
+import dmd.root.outbuffer;
+import dmd.root.port;
+import dmd.root.rmem;
+import dmd.root.stringtable;
 
-import ddmd.scanelf;
+import dmd.scanelf;
 
 enum LOG = false;
 
diff --git a/src/libmach.d b/src/dmd/libmach.d
similarity index 98%
rename from src/libmach.d
rename to src/dmd/libmach.d
index d8bfc2f4d557..44efe47d63b8 100644
--- a/src/libmach.d
+++ b/src/dmd/libmach.d
@@ -8,7 +8,7 @@
  * Source:      $(DMDSRC _libmach.d)
  */
 
-module ddmd.libmach;
+module dmd.libmach;
 
 import core.stdc.time;
 import core.stdc.string;
@@ -19,19 +19,19 @@ import core.stdc.config;
 import core.sys.posix.sys.stat;
 import core.sys.posix.unistd;
 
-import ddmd.globals;
-import ddmd.lib;
-import ddmd.utils;
+import dmd.globals;
+import dmd.lib;
+import dmd.utils;
 
-import ddmd.root.array;
-import ddmd.root.file;
-import ddmd.root.filename;
-import ddmd.root.outbuffer;
-import ddmd.root.port;
-import ddmd.root.rmem;
-import ddmd.root.stringtable;
+import dmd.root.array;
+import dmd.root.file;
+import dmd.root.filename;
+import dmd.root.outbuffer;
+import dmd.root.port;
+import dmd.root.rmem;
+import dmd.root.stringtable;
 
-import ddmd.scanmach;
+import dmd.scanmach;
 
 enum LOG = false;
 
diff --git a/src/libmscoff.d b/src/dmd/libmscoff.d
similarity index 98%
rename from src/libmscoff.d
rename to src/dmd/libmscoff.d
index 8ef016612253..ee38cbcb4496 100644
--- a/src/libmscoff.d
+++ b/src/dmd/libmscoff.d
@@ -8,7 +8,7 @@
  * Source:      $(DMDSRC _libmscoff.d)
  */
 
-module ddmd.libmscoff;
+module dmd.libmscoff;
 
 import core.stdc.stdlib;
 import core.stdc.string;
@@ -19,19 +19,19 @@ import core.stdc.string;
 import core.sys.windows.windows;
 import core.sys.windows.stat;
 
-import ddmd.globals;
-import ddmd.lib;
-import ddmd.utils;
+import dmd.globals;
+import dmd.lib;
+import dmd.utils;
 
-import ddmd.root.array;
-import ddmd.root.file;
-import ddmd.root.filename;
-import ddmd.root.outbuffer;
-import ddmd.root.port;
-import ddmd.root.rmem;
-import ddmd.root.stringtable;
+import dmd.root.array;
+import dmd.root.file;
+import dmd.root.filename;
+import dmd.root.outbuffer;
+import dmd.root.port;
+import dmd.root.rmem;
+import dmd.root.stringtable;
 
-import ddmd.scanmscoff;
+import dmd.scanmscoff;
 
 enum LOG = false;
 
diff --git a/src/libomf.d b/src/dmd/libomf.d
similarity index 98%
rename from src/libomf.d
rename to src/dmd/libomf.d
index f6adf7597a6d..da82b6a38657 100644
--- a/src/libomf.d
+++ b/src/dmd/libomf.d
@@ -8,23 +8,23 @@
  * Source:      $(DMDSRC _libomf.d)
  */
 
-module ddmd.libomf;
+module dmd.libomf;
 
 import core.stdc.stdio;
 import core.stdc.string;
 import core.stdc.stdlib;
 
-import ddmd.globals;
-import ddmd.utils;
-import ddmd.lib;
+import dmd.globals;
+import dmd.utils;
+import dmd.lib;
 
-import ddmd.root.array;
-import ddmd.root.file;
-import ddmd.root.filename;
-import ddmd.root.outbuffer;
-import ddmd.root.stringtable;
+import dmd.root.array;
+import dmd.root.file;
+import dmd.root.filename;
+import dmd.root.outbuffer;
+import dmd.root.stringtable;
 
-import ddmd.scanomf;
+import dmd.scanomf;
 
 enum LOG = false;
 
diff --git a/src/link.d b/src/dmd/link.d
similarity index 99%
rename from src/link.d
rename to src/dmd/link.d
index 949161e82846..85f539f44e36 100644
--- a/src/link.d
+++ b/src/dmd/link.d
@@ -8,7 +8,7 @@
  * Source:      $(DMDSRC _link.d)
  */
 
-module ddmd.link;
+module dmd.link;
 
 import core.stdc.ctype;
 import core.stdc.stdio;
@@ -17,13 +17,13 @@ import core.sys.posix.stdio;
 import core.sys.posix.stdlib;
 import core.sys.posix.unistd;
 import core.sys.windows.windows;
-import ddmd.errors;
-import ddmd.globals;
-import ddmd.root.file;
-import ddmd.root.filename;
-import ddmd.root.outbuffer;
-import ddmd.root.rmem;
-import ddmd.utils;
+import dmd.errors;
+import dmd.globals;
+import dmd.root.file;
+import dmd.root.filename;
+import dmd.root.outbuffer;
+import dmd.root.rmem;
+import dmd.utils;
 
 version (Posix) extern (C) int pipe(int*);
 version (Windows) extern (C) int putenv(const char*);
diff --git a/src/mars.d b/src/dmd/mars.d
similarity index 98%
rename from src/mars.d
rename to src/dmd/mars.d
index 8a7b2292cdc1..0a3e4e69a91f 100644
--- a/src/mars.d
+++ b/src/dmd/mars.d
@@ -13,7 +13,7 @@
  * Source:      $(DMDSRC _mars.d)
  */
 
-module ddmd.mars;
+module dmd.mars;
 
 import core.stdc.ctype;
 import core.stdc.errno;
@@ -21,39 +21,39 @@ import core.stdc.limits;
 import core.stdc.stdio;
 import core.stdc.stdlib;
 import core.stdc.string;
-import ddmd.arraytypes;
-import ddmd.gluelayer;
-import ddmd.builtin;
-import ddmd.cond;
-import ddmd.dinifile;
-import ddmd.dinterpret;
-import ddmd.dmodule;
-import ddmd.doc;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.globals;
-import ddmd.hdrgen;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.inline;
-import ddmd.json;
-import ddmd.lib;
-import ddmd.link;
-import ddmd.mtype;
-import ddmd.objc;
-import ddmd.parse;
-import ddmd.root.file;
-import ddmd.root.filename;
-import ddmd.root.man;
-import ddmd.root.outbuffer;
-import ddmd.root.response;
-import ddmd.root.rmem;
-import ddmd.root.stringtable;
-import ddmd.target;
-import ddmd.tokens;
-import ddmd.utils;
+import dmd.arraytypes;
+import dmd.gluelayer;
+import dmd.builtin;
+import dmd.cond;
+import dmd.dinifile;
+import dmd.dinterpret;
+import dmd.dmodule;
+import dmd.doc;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.errors;
+import dmd.expression;
+import dmd.globals;
+import dmd.hdrgen;
+import dmd.id;
+import dmd.identifier;
+import dmd.inline;
+import dmd.json;
+import dmd.lib;
+import dmd.link;
+import dmd.mtype;
+import dmd.objc;
+import dmd.parse;
+import dmd.root.file;
+import dmd.root.filename;
+import dmd.root.man;
+import dmd.root.outbuffer;
+import dmd.root.response;
+import dmd.root.rmem;
+import dmd.root.stringtable;
+import dmd.target;
+import dmd.tokens;
+import dmd.utils;
 
 // strtol redeclared here because its signature changed from 2.073 to 2.074
 import core.stdc.config;
@@ -1907,7 +1907,7 @@ private void setDefaultLibrary()
 
 
 /**
- * Add default `version` identifier for ddmd, and set the
+ * Add default `version` identifier for dmd. and set the
  * target platform in `global`.
  *
  * Needs to be run after all arguments parsing (command line, DFLAGS environment
diff --git a/src/mtype.d b/src/dmd/mtype.d
similarity index 99%
rename from src/mtype.d
rename to src/dmd/mtype.d
index eea4c89b6039..1df5830be2ab 100644
--- a/src/mtype.d
+++ b/src/dmd/mtype.d
@@ -8,7 +8,7 @@
  * Source:      $(DMDSRC _mtype.d)
  */
 
-module ddmd.mtype;
+module dmd.mtype;
 
 import core.checkedint;
 import core.stdc.stdarg;
@@ -16,42 +16,42 @@ import core.stdc.stdio;
 import core.stdc.stdlib;
 import core.stdc.string;
 
-import ddmd.access;
-import ddmd.aggregate;
-import ddmd.aliasthis;
-import ddmd.arrayop;
-import ddmd.arraytypes;
-import ddmd.gluelayer;
-import ddmd.complex;
-import ddmd.dcast;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.denum;
-import ddmd.dimport;
-import ddmd.dmangle;
-import ddmd.dscope;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.hdrgen;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.imphint;
-import ddmd.init;
-import ddmd.opover;
-import ddmd.root.ctfloat;
-import ddmd.root.outbuffer;
-import ddmd.root.rmem;
-import ddmd.root.rootobject;
-import ddmd.root.stringtable;
-import ddmd.sideeffect;
-import ddmd.target;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.access;
+import dmd.aggregate;
+import dmd.aliasthis;
+import dmd.arrayop;
+import dmd.arraytypes;
+import dmd.gluelayer;
+import dmd.complex;
+import dmd.dcast;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.denum;
+import dmd.dimport;
+import dmd.dmangle;
+import dmd.dscope;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.hdrgen;
+import dmd.id;
+import dmd.identifier;
+import dmd.imphint;
+import dmd.init;
+import dmd.opover;
+import dmd.root.ctfloat;
+import dmd.root.outbuffer;
+import dmd.root.rmem;
+import dmd.root.rootobject;
+import dmd.root.stringtable;
+import dmd.sideeffect;
+import dmd.target;
+import dmd.tokens;
+import dmd.visitor;
 
 enum LOGDOTEXP = 0;         // log ::dotExp()
 enum LOGDEFAULTINIT = 0;    // log ::defaultInit()
diff --git a/src/nogc.d b/src/dmd/nogc.d
similarity index 95%
rename from src/nogc.d
rename to src/dmd/nogc.d
index 5264e9f197ce..8bfce7490e9e 100644
--- a/src/nogc.d
+++ b/src/dmd/nogc.d
@@ -8,19 +8,19 @@
  * Source:      $(DMDSRC _nogc.d)
  */
 
-module ddmd.nogc;
-
-import ddmd.aggregate;
-import ddmd.apply;
-import ddmd.declaration;
-import ddmd.dscope;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.init;
-import ddmd.mtype;
-import ddmd.tokens;
-import ddmd.visitor;
+module dmd.nogc;
+
+import dmd.aggregate;
+import dmd.apply;
+import dmd.declaration;
+import dmd.dscope;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.init;
+import dmd.mtype;
+import dmd.tokens;
+import dmd.visitor;
 
 /**************************************
  * Look for GC-allocations
diff --git a/src/nspace.d b/src/dmd/nspace.d
similarity index 97%
rename from src/nspace.d
rename to src/dmd/nspace.d
index f6dabb5fbb7a..34d2577f17fd 100644
--- a/src/nspace.d
+++ b/src/dmd/nspace.d
@@ -8,15 +8,15 @@
  * Source:      $(DMDSRC _nspace.d)
  */
 
-module ddmd.nspace;
+module dmd.nspace;
 
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.globals;
-import ddmd.identifier;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.globals;
+import dmd.identifier;
+import dmd.visitor;
 import core.stdc.stdio;
 
 private enum LOG = false;
diff --git a/src/objc.d b/src/dmd/objc.d
similarity index 94%
rename from src/objc.d
rename to src/dmd/objc.d
index b006bf1b72f1..5b70fc779705 100644
--- a/src/objc.d
+++ b/src/dmd/objc.d
@@ -8,24 +8,24 @@
  * Source:      $(DMDSRC _objc.d)
  */
 
-module ddmd.objc;
-
-import ddmd.arraytypes;
-import ddmd.cond;
-import ddmd.dclass;
-import ddmd.dmangle;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dstruct;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.gluelayer;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.mtype;
-import ddmd.root.outbuffer;
-import ddmd.root.stringtable;
+module dmd.objc;
+
+import dmd.arraytypes;
+import dmd.cond;
+import dmd.dclass;
+import dmd.dmangle;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dstruct;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.gluelayer;
+import dmd.id;
+import dmd.identifier;
+import dmd.mtype;
+import dmd.root.outbuffer;
+import dmd.root.stringtable;
 
 struct ObjcSelector
 {
@@ -164,7 +164,7 @@ extern (C++) void objc_InterfaceDeclaration_semantic_objcExtern(InterfaceDeclara
 // MARK: semantic
 extern (C++) void objc_FuncDeclaration_semantic_setSelector(FuncDeclaration fd, Scope* sc)
 {
-    import ddmd.tokens;
+    import dmd.tokens;
 
     if (!fd.userAttribDecl)
         return;
diff --git a/src/objc_glue.d b/src/dmd/objc_glue.d
similarity index 93%
rename from src/objc_glue.d
rename to src/dmd/objc_glue.d
index e83c686e29ac..b91ebc691fe4 100644
--- a/src/objc_glue.d
+++ b/src/dmd/objc_glue.d
@@ -9,34 +9,34 @@
  * https://github.com/dlang/dmd/blob/master/src/_objc_glue.d
  */
 
-module ddmd.objc_glue;
+module dmd.objc_glue;
 
 import core.stdc.stdio;
 import core.stdc.stdlib;
 import core.stdc.string;
 
-import ddmd.aggregate;
-import ddmd.declaration;
-import ddmd.dmodule;
-import ddmd.func;
-import ddmd.identifier;
-import ddmd.mars;
-import ddmd.mtype;
-import ddmd.objc;
-
-import ddmd.root.stringtable;
-
-import ddmd.backend.dt;
-import ddmd.backend.cc;
-import ddmd.backend.cdef;
-import ddmd.backend.el;
-import ddmd.backend.global;
-import ddmd.backend.oper;
-import ddmd.backend.outbuf;
-import ddmd.backend.ty;
-import ddmd.backend.type;
-import ddmd.backend.mach;
-import ddmd.backend.obj;
+import dmd.aggregate;
+import dmd.declaration;
+import dmd.dmodule;
+import dmd.func;
+import dmd.identifier;
+import dmd.mars;
+import dmd.mtype;
+import dmd.objc;
+
+import dmd.root.stringtable;
+
+import dmd.backend.dt;
+import dmd.backend.cc;
+import dmd.backend.cdef;
+import dmd.backend.el;
+import dmd.backend.global;
+import dmd.backend.oper;
+import dmd.backend.outbuf;
+import dmd.backend.ty;
+import dmd.backend.type;
+import dmd.backend.mach;
+import dmd.backend.obj;
 
 extern (C++):
 
diff --git a/src/objc_glue_stubs.d b/src/dmd/objc_glue_stubs.d
similarity index 93%
rename from src/objc_glue_stubs.d
rename to src/dmd/objc_glue_stubs.d
index 7b01b91a7df2..e6642d91f371 100644
--- a/src/objc_glue_stubs.d
+++ b/src/dmd/objc_glue_stubs.d
@@ -12,10 +12,10 @@
 
 import core.stdc.stdio : printf;
 
-import ddmd.func;
-import ddmd.mtype;
+import dmd.func;
+import dmd.mtype;
 
-import ddmd.backend.el;
+import dmd.backend.el;
 
 extern (C++):
 
diff --git a/src/objc_stubs.d b/src/dmd/objc_stubs.d
similarity index 94%
rename from src/objc_stubs.d
rename to src/dmd/objc_stubs.d
index 69c291a12fba..6ba75891f561 100644
--- a/src/objc_stubs.d
+++ b/src/dmd/objc_stubs.d
@@ -8,15 +8,15 @@
  * Source:      $(DMDSRC _objc_stubs.d)
  */
 
-module ddmd.objc;
+module dmd.objc;
 
 import core.stdc.stdio;
-import ddmd.dclass;
-import ddmd.dscope;
-import ddmd.dstruct;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.root.stringtable;
+import dmd.dclass;
+import dmd.dscope;
+import dmd.dstruct;
+import dmd.func;
+import dmd.globals;
+import dmd.root.stringtable;
 
 struct ObjcSelector
 {
diff --git a/src/opover.d b/src/dmd/opover.d
similarity index 99%
rename from src/opover.d
rename to src/dmd/opover.d
index 6983450a9f67..bfd80c287e72 100644
--- a/src/opover.d
+++ b/src/dmd/opover.d
@@ -8,28 +8,28 @@
  * Source:      $(DMDSRC _opover.d)
  */
 
-module ddmd.opover;
+module dmd.opover;
 
 import core.stdc.stdio;
-import ddmd.aggregate;
-import ddmd.aliasthis;
-import ddmd.arraytypes;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.dscope;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.mtype;
-import ddmd.statement;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.aliasthis;
+import dmd.arraytypes;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.dscope;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.id;
+import dmd.identifier;
+import dmd.mtype;
+import dmd.statement;
+import dmd.tokens;
+import dmd.visitor;
 
 /***********************************
  * Determine if operands of binary op can be reversed
@@ -1203,7 +1203,7 @@ extern (C++) Expression op_overload(Expression e, Scope* sc)
                 if (sd != (cast(TypeStruct)t2).sym)
                     return;
 
-                import ddmd.clone : needOpEquals;
+                import dmd.clone : needOpEquals;
                 if (!needOpEquals(sd))
                 {
                     // Use bitwise equality.
diff --git a/src/optimize.d b/src/dmd/optimize.d
similarity index 99%
rename from src/optimize.d
rename to src/dmd/optimize.d
index 72625a4ae5f8..1ee8aa11fae6 100644
--- a/src/optimize.d
+++ b/src/dmd/optimize.d
@@ -8,22 +8,22 @@
  * Source:      $(DMDSRC _optimize.d)
  */
 
-module ddmd.optimize;
+module dmd.optimize;
 
 import core.stdc.stdio;
 
-import ddmd.constfold;
-import ddmd.ctfeexpr;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.expression;
-import ddmd.globals;
-import ddmd.init;
-import ddmd.mtype;
-import ddmd.root.ctfloat;
-import ddmd.sideeffect;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.constfold;
+import dmd.ctfeexpr;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.expression;
+import dmd.globals;
+import dmd.init;
+import dmd.mtype;
+import dmd.root.ctfloat;
+import dmd.sideeffect;
+import dmd.tokens;
+import dmd.visitor;
 
 /*************************************
  * If variable has a const initializer,
@@ -589,7 +589,7 @@ extern (C++) Expression Expression_optimize(Expression e, int result, bool keepL
             }
             if (e.type.ty == Tclass && e.e1.type.ty == Tclass)
             {
-                import ddmd.aggregate : SIZEOKdone;
+                import dmd.aggregate : SIZEOKdone;
 
                 // See if we can remove an unnecessary cast
                 ClassDeclaration cdfrom = e.e1.type.isClassHandle();
diff --git a/src/parse.d b/src/dmd/parse.d
similarity index 99%
rename from src/parse.d
rename to src/dmd/parse.d
index 187bc4f95ff3..6570c273ef6c 100644
--- a/src/parse.d
+++ b/src/dmd/parse.d
@@ -8,42 +8,42 @@
  * Source:      $(DMDSRC _parse.d)
  */
 
-module ddmd.parse;
+module dmd.parse;
 
 import core.stdc.stdio;
 import core.stdc.string;
-import ddmd.aggregate;
-import ddmd.aliasthis;
-import ddmd.arraytypes;
-import ddmd.attrib;
-import ddmd.cond;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.denum;
-import ddmd.dimport;
-import ddmd.dmodule;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.dversion;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.hdrgen;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.init;
-import ddmd.lexer;
-import ddmd.mtype;
-import ddmd.nspace;
-import ddmd.root.filename;
-import ddmd.root.outbuffer;
-import ddmd.root.rmem;
-import ddmd.root.rootobject;
-import ddmd.statement;
-import ddmd.staticassert;
-import ddmd.tokens;
+import dmd.aggregate;
+import dmd.aliasthis;
+import dmd.arraytypes;
+import dmd.attrib;
+import dmd.cond;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.denum;
+import dmd.dimport;
+import dmd.dmodule;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.dversion;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.hdrgen;
+import dmd.id;
+import dmd.identifier;
+import dmd.init;
+import dmd.lexer;
+import dmd.mtype;
+import dmd.nspace;
+import dmd.root.filename;
+import dmd.root.outbuffer;
+import dmd.root.rmem;
+import dmd.root.rootobject;
+import dmd.statement;
+import dmd.staticassert;
+import dmd.tokens;
 
 // How multiple declarations are parsed.
 // If 1, treat as C.
diff --git a/src/root/aav.d b/src/dmd/root/aav.d
similarity index 98%
rename from src/root/aav.d
rename to src/dmd/root/aav.d
index 00d2ce2cff95..6279f96dd009 100644
--- a/src/root/aav.d
+++ b/src/dmd/root/aav.d
@@ -8,10 +8,10 @@
  * Source:    $(DMDSRC root/_aav.d)
  */
 
-module ddmd.root.aav;
+module dmd.root.aav;
 
 import core.stdc.string;
-import ddmd.root.rmem;
+import dmd.root.rmem;
 
 extern (C++) size_t hash(size_t a)
 {
diff --git a/src/root/array.d b/src/dmd/root/array.d
similarity index 99%
rename from src/root/array.d
rename to src/dmd/root/array.d
index d0d4425acd90..2803ffcc149c 100644
--- a/src/root/array.d
+++ b/src/dmd/root/array.d
@@ -6,11 +6,11 @@
 // Distributed under the Boost Software License, Version 1.0.
 // http://www.boost.org/LICENSE_1_0.txt
 
-module ddmd.root.array;
+module dmd.root.array;
 
 import core.stdc.string;
 
-import ddmd.root.rmem;
+import dmd.root.rmem;
 
 extern (C++) struct Array(T)
 {
diff --git a/src/root/ctfloat.d b/src/dmd/root/ctfloat.d
similarity index 98%
rename from src/root/ctfloat.d
rename to src/dmd/root/ctfloat.d
index a6a36b0dfeec..a36dbbe8476d 100644
--- a/src/root/ctfloat.d
+++ b/src/dmd/root/ctfloat.d
@@ -6,7 +6,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // http://www.boost.org/LICENSE_1_0.txt
 
-module ddmd.root.ctfloat;
+module dmd.root.ctfloat;
 
 static import core.math, core.stdc.math;
 import core.stdc.errno;
@@ -74,7 +74,7 @@ extern (C++) struct CTFloat
 
     static size_t hash(real_t a)
     {
-        import ddmd.root.hash : calcHash;
+        import dmd.root.hash : calcHash;
 
         if (isNaN(a))
             a = real_t.nan;
diff --git a/src/root/file.d b/src/dmd/root/file.d
similarity index 98%
rename from src/root/file.d
rename to src/dmd/root/file.d
index b24b0ee7fec5..c128d7ed6346 100644
--- a/src/root/file.d
+++ b/src/dmd/root/file.d
@@ -8,7 +8,7 @@
  * Source:    $(DMDSRC root/_file.d)
  */
 
-module ddmd.root.file;
+module dmd.root.file;
 
 import core.stdc.errno;
 import core.stdc.stdio;
@@ -16,8 +16,8 @@ import core.stdc.stdlib;
 import core.sys.posix.fcntl;
 import core.sys.posix.unistd;
 import core.sys.windows.windows;
-import ddmd.root.filename;
-import ddmd.root.rmem;
+import dmd.root.filename;
+import dmd.root.rmem;
 
 version (Windows) alias WIN32_FIND_DATAA = WIN32_FIND_DATA;
 
diff --git a/src/root/filename.d b/src/dmd/root/filename.d
similarity index 99%
rename from src/root/filename.d
rename to src/dmd/root/filename.d
index c4a72c5bd1d4..e33f62c43208 100644
--- a/src/root/filename.d
+++ b/src/dmd/root/filename.d
@@ -8,7 +8,7 @@
  * Source:    $(DMDSRC root/_filename.d)
  */
 
-module ddmd.root.filename;
+module dmd.root.filename;
 
 import core.stdc.ctype;
 import core.stdc.errno;
@@ -16,11 +16,11 @@ import core.stdc.string;
 import core.sys.posix.stdlib;
 import core.sys.posix.sys.stat;
 import core.sys.windows.windows;
-import ddmd.root.array;
-import ddmd.root.file;
-import ddmd.root.outbuffer;
-import ddmd.root.rmem;
-import ddmd.root.rootobject;
+import dmd.root.array;
+import dmd.root.file;
+import dmd.root.outbuffer;
+import dmd.root.rmem;
+import dmd.root.rootobject;
 
 nothrow
 {
diff --git a/src/root/hash.d b/src/dmd/root/hash.d
similarity index 98%
rename from src/root/hash.d
rename to src/dmd/root/hash.d
index 74e53c265819..76a36fe255ab 100644
--- a/src/root/hash.d
+++ b/src/dmd/root/hash.d
@@ -8,7 +8,7 @@
  * Source:    $(DMDSRC root/_hash.d)
  */
 
-module ddmd.root.hash;
+module dmd.root.hash;
 
 // MurmurHash2 was written by Austin Appleby, and is placed in the public
 // domain. The author hereby disclaims copyright to this source code.
diff --git a/src/root/man.d b/src/dmd/root/man.d
similarity index 99%
rename from src/root/man.d
rename to src/dmd/root/man.d
index 48f09b9b2d71..6cce377864b7 100644
--- a/src/root/man.d
+++ b/src/dmd/root/man.d
@@ -8,7 +8,7 @@
  * Source:    $(DMDSRC root/_man.d)
  */
 
-module ddmd.root.man;
+module dmd.root.man;
 
 import core.stdc.stdio;
 import core.stdc.stdlib;
diff --git a/src/root/outbuffer.d b/src/dmd/root/outbuffer.d
similarity index 99%
rename from src/root/outbuffer.d
rename to src/dmd/root/outbuffer.d
index cc0f6594a9d3..7f09d3030d35 100644
--- a/src/root/outbuffer.d
+++ b/src/dmd/root/outbuffer.d
@@ -8,13 +8,13 @@
  * Source:    $(DMDSRC root/_outbuffer.d)
  */
 
-module ddmd.root.outbuffer;
+module dmd.root.outbuffer;
 
 import core.stdc.stdarg;
 import core.stdc.stdio;
 import core.stdc.string;
-import ddmd.root.rmem;
-import ddmd.root.rootobject;
+import dmd.root.rmem;
+import dmd.root.rootobject;
 
 struct OutBuffer
 {
diff --git a/src/root/port.d b/src/dmd/root/port.d
similarity index 99%
rename from src/root/port.d
rename to src/dmd/root/port.d
index e83712e479ab..a01415e81b7d 100644
--- a/src/root/port.d
+++ b/src/dmd/root/port.d
@@ -8,7 +8,7 @@
  * Source:    $(DMDSRC root/_port.d)
  */
 
-module ddmd.root.port;
+module dmd.root.port;
 
 import core.stdc.ctype;
 import core.stdc.errno;
diff --git a/src/root/response.d b/src/dmd/root/response.d
similarity index 98%
rename from src/root/response.d
rename to src/dmd/root/response.d
index 3c024e11adb7..2ddaaff67925 100644
--- a/src/root/response.d
+++ b/src/dmd/root/response.d
@@ -12,13 +12,13 @@
  * Source:    $(DMDSRC root/_response.d)
  */
 
-module ddmd.root.response;
+module dmd.root.response;
 
 import core.stdc.stdio;
 import core.stdc.stdlib;
 import core.stdc.string;
-import ddmd.root.file;
-import ddmd.root.filename;
+import dmd.root.file;
+import dmd.root.filename;
 
 /*********************************
  * #include <stdlib.h>
diff --git a/src/root/rmem.d b/src/dmd/root/rmem.d
similarity index 99%
rename from src/root/rmem.d
rename to src/dmd/root/rmem.d
index f3cb81421be5..cbf6502ad17c 100644
--- a/src/root/rmem.d
+++ b/src/dmd/root/rmem.d
@@ -8,7 +8,7 @@
  * Source:    $(DMDSRC root/_rmem.d)
  */
 
-module ddmd.root.rmem;
+module dmd.root.rmem;
 
 import core.stdc.string;
 
diff --git a/src/root/rootobject.d b/src/dmd/root/rootobject.d
similarity index 96%
rename from src/root/rootobject.d
rename to src/dmd/root/rootobject.d
index f87234c6e61b..e3409fa804c1 100644
--- a/src/root/rootobject.d
+++ b/src/dmd/root/rootobject.d
@@ -8,11 +8,11 @@
  * Source:    $(DMDSRC root/_rootobject.d)
  */
 
-module ddmd.root.rootobject;
+module dmd.root.rootobject;
 
 import core.stdc.stdio;
 
-import ddmd.root.outbuffer;
+import dmd.root.outbuffer;
 
 /***********************************************************
  */
diff --git a/src/root/speller.d b/src/dmd/root/speller.d
similarity index 99%
rename from src/root/speller.d
rename to src/dmd/root/speller.d
index b0a805c2733e..7dc1b5e6f80d 100644
--- a/src/root/speller.d
+++ b/src/dmd/root/speller.d
@@ -8,7 +8,7 @@
  * Source:    $(DMDSRC root/_speller.d)
  */
 
-module ddmd.root.speller;
+module dmd.root.speller;
 
 import core.stdc.limits;
 import core.stdc.stdlib;
diff --git a/src/root/stringtable.d b/src/dmd/root/stringtable.d
similarity index 98%
rename from src/root/stringtable.d
rename to src/dmd/root/stringtable.d
index f8bd2cc15119..f0a4f3fe385e 100644
--- a/src/root/stringtable.d
+++ b/src/dmd/root/stringtable.d
@@ -8,10 +8,10 @@
  * Source:    $(DMDSRC root/_stringtable.d)
  */
 
-module ddmd.root.stringtable;
+module dmd.root.stringtable;
 
 import core.stdc.string;
-import ddmd.root.rmem, ddmd.root.hash;
+import dmd.root.rmem, dmd.root.hash;
 
 enum POOL_BITS = 12;
 enum POOL_SIZE = (1U << POOL_BITS);
diff --git a/src/s2ir.d b/src/dmd/s2ir.d
similarity index 97%
rename from src/s2ir.d
rename to src/dmd/s2ir.d
index 39bb3f7a35c7..a40a48a7d5b2 100644
--- a/src/s2ir.d
+++ b/src/dmd/s2ir.d
@@ -8,7 +8,7 @@
  * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/_tocsym.d, _s2ir.d)
  */
 
-module ddmd.s2ir;
+module dmd.s2ir;
 
 import core.stdc.stdio;
 import core.stdc.string;
@@ -16,55 +16,55 @@ import core.stdc.stddef;
 import core.stdc.stdlib;
 import core.stdc.time;
 
-import ddmd.root.array;
-import ddmd.root.rmem;
-import ddmd.root.rootobject;
-
-import ddmd.aggregate;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.denum;
-import ddmd.dmodule;
-import ddmd.dsymbol;
-import ddmd.dstruct;
-import ddmd.dtemplate;
-import ddmd.e2ir;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.glue;
-import ddmd.id;
-import ddmd.init;
-import ddmd.irstate;
-import ddmd.mtype;
-import ddmd.statement;
-import ddmd.target;
-import ddmd.toctype;
-import ddmd.tocsym;
-import ddmd.toir;
-import ddmd.tokens;
-import ddmd.visitor;
-
-import ddmd.backend.cc;
-import ddmd.backend.cdef;
-import ddmd.backend.cgcv;
-import ddmd.backend.code;
-import ddmd.backend.code_x86;
-import ddmd.backend.cv4;
-import ddmd.backend.dt;
-import ddmd.backend.el;
-import ddmd.backend.global;
-import ddmd.backend.obj;
-import ddmd.backend.oper;
-import ddmd.backend.rtlsym;
-import ddmd.backend.ty;
-import ddmd.backend.type;
+import dmd.root.array;
+import dmd.root.rmem;
+import dmd.root.rootobject;
+
+import dmd.aggregate;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.denum;
+import dmd.dmodule;
+import dmd.dsymbol;
+import dmd.dstruct;
+import dmd.dtemplate;
+import dmd.e2ir;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.glue;
+import dmd.id;
+import dmd.init;
+import dmd.irstate;
+import dmd.mtype;
+import dmd.statement;
+import dmd.target;
+import dmd.toctype;
+import dmd.tocsym;
+import dmd.toir;
+import dmd.tokens;
+import dmd.visitor;
+
+import dmd.backend.cc;
+import dmd.backend.cdef;
+import dmd.backend.cgcv;
+import dmd.backend.code;
+import dmd.backend.code_x86;
+import dmd.backend.cv4;
+import dmd.backend.dt;
+import dmd.backend.el;
+import dmd.backend.global;
+import dmd.backend.obj;
+import dmd.backend.oper;
+import dmd.backend.rtlsym;
+import dmd.backend.ty;
+import dmd.backend.type;
 
 extern (C++):
 
-alias toSymbol = ddmd.tocsym.toSymbol;
-alias toSymbol = ddmd.glue.toSymbol;
+alias toSymbol = dmd.tocsym.toSymbol;
+alias toSymbol = dmd.glue.toSymbol;
 
 
 void elem_setLoc(elem *e, Loc loc)
@@ -101,7 +101,7 @@ void setScopeIndex(Blockx *blx, block *b, int scope_index)
 
 block *block_calloc(Blockx *blx)
 {
-    block *b = ddmd.backend.global.block_calloc();
+    block *b = dmd.backend.global.block_calloc();
     b.Btry = blx.tryblock;
     return b;
 }
@@ -117,7 +117,7 @@ Label *getLabel(IRState *irs, Blockx *blx, Statement s)
     if (slot == null)
     {
         Label *label = new Label();
-        label.lblock = blx ? block_calloc(blx) : ddmd.backend.global.block_calloc();
+        label.lblock = blx ? block_calloc(blx) : dmd.backend.global.block_calloc();
         label.fwdrefs = null;
         irs.insertLabel(s, label);
         return label;
@@ -202,7 +202,7 @@ extern (C++) class S2irVisitor : Visitor
         IRState mystate = IRState(irs, s);
 
         // bexit is the block that gets control after this IfStatement is done
-        block *bexit = mystate.breakBlock ? mystate.breakBlock : ddmd.backend.global.block_calloc();
+        block *bexit = mystate.breakBlock ? mystate.breakBlock : dmd.backend.global.block_calloc();
 
         incUsage(irs, s.loc);
         e = toElemDtor(s.condition, &mystate);
@@ -1614,7 +1614,7 @@ void insertFinallyBlockCalls(block *startblock)
                 // Rewrite into a BCgoto => BCret
                 if (!bcret)
                 {
-                    bcret = ddmd.backend.global.block_calloc();
+                    bcret = dmd.backend.global.block_calloc();
                     bcret.BC = BCret;
                 }
                 b.BC = BCgoto;
@@ -1628,7 +1628,7 @@ void insertFinallyBlockCalls(block *startblock)
                 tym_t ty = tybasic(e.Ety);
                 if (!bcretexp)
                 {
-                    bcretexp = ddmd.backend.global.block_calloc();
+                    bcretexp = dmd.backend.global.block_calloc();
                     bcretexp.BC = BCretexp;
                     type *t;
                     if ((ty == TYstruct || ty == TYarray) && e.ET)
@@ -1715,7 +1715,7 @@ void insertFinallyBlockCalls(block *startblock)
                     }
 
                     // Create new block, bnew, which will replace retblock
-                    block *bnew = ddmd.backend.global.block_calloc();
+                    block *bnew = dmd.backend.global.block_calloc();
 
                     /* Rewrite BC_ret block as:
                      *  if (sflag == flagvalue) goto breakblock; else goto bnew;
diff --git a/src/safe.d b/src/dmd/safe.d
similarity index 96%
rename from src/safe.d
rename to src/dmd/safe.d
index 673f0f0a1a99..3a3a55709eb0 100644
--- a/src/safe.d
+++ b/src/dmd/safe.d
@@ -8,18 +8,18 @@
  * Source:      $(DMDSRC _safe.d)
  */
 
-module ddmd.safe;
+module dmd.safe;
 
 import core.stdc.stdio;
 
-import ddmd.aggregate;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.dscope;
-import ddmd.expression;
-import ddmd.mtype;
-import ddmd.target;
-import ddmd.tokens;
+import dmd.aggregate;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.dscope;
+import dmd.expression;
+import dmd.mtype;
+import dmd.target;
+import dmd.tokens;
 
 
 /*************************************************************
diff --git a/src/sapply.d b/src/dmd/sapply.d
similarity index 98%
rename from src/sapply.d
rename to src/dmd/sapply.d
index 6ab0e688855b..2366ed197e21 100644
--- a/src/sapply.d
+++ b/src/dmd/sapply.d
@@ -8,10 +8,10 @@
  * Source:      $(DMDSRC _sparse.d)
  */
 
-module ddmd.sapply;
+module dmd.sapply;
 
-import ddmd.statement;
-import ddmd.visitor;
+import dmd.statement;
+import dmd.visitor;
 
 /**************************************
  * A Statement tree walker that will visit each Statement s in the tree,
diff --git a/src/scanelf.d b/src/dmd/scanelf.d
similarity index 98%
rename from src/scanelf.d
rename to src/dmd/scanelf.d
index 4db2fe88eacf..e1bf6cf42d15 100644
--- a/src/scanelf.d
+++ b/src/dmd/scanelf.d
@@ -8,7 +8,7 @@
  * Source:      $(DMDSRC _scanelf.d)
  */
 
-module ddmd.scanelf;
+module dmd.scanelf;
 
 version (linux)
     import core.sys.linux.elf;
@@ -20,8 +20,8 @@ else version (Solaris)
 import core.stdc.string;
 import core.checkedint;
 
-import ddmd.globals;
-import ddmd.errors;
+import dmd.globals;
+import dmd.errors;
 
 enum LOG = false;
 
diff --git a/src/scanmach.d b/src/dmd/scanmach.d
similarity index 99%
rename from src/scanmach.d
rename to src/dmd/scanmach.d
index d6f5b0a6d7a3..8c1f6b5b0735 100644
--- a/src/scanmach.d
+++ b/src/dmd/scanmach.d
@@ -8,13 +8,13 @@
  * Source:      $(DMDSRC _scanmach.d)
  */
 
-module ddmd.scanmach;
+module dmd.scanmach;
 
 import core.stdc.string;
 import core.stdc.stdint;
 import core.sys.osx.mach.loader;
-import ddmd.globals;
-import ddmd.errors;
+import dmd.globals;
+import dmd.errors;
 
 enum LOG = false;
 
diff --git a/src/scanmscoff.d b/src/dmd/scanmscoff.d
similarity index 99%
rename from src/scanmscoff.d
rename to src/dmd/scanmscoff.d
index 023ca6daa816..9a449923130e 100644
--- a/src/scanmscoff.d
+++ b/src/dmd/scanmscoff.d
@@ -8,10 +8,10 @@
  * Source:      $(DMDSRC _scanmscoff.d)
  */
 
-module ddmd.scanmscoff;
+module dmd.scanmscoff;
 
 import core.stdc.string, core.stdc.stdlib, core.sys.windows.windows;
-import ddmd.globals, ddmd.errors;
+import dmd.globals, dmd.errors;
 
 enum LOG = false;
 
diff --git a/src/scanomf.d b/src/dmd/scanomf.d
similarity index 98%
rename from src/scanomf.d
rename to src/dmd/scanomf.d
index a53e26345330..cf719311e679 100644
--- a/src/scanomf.d
+++ b/src/dmd/scanomf.d
@@ -8,14 +8,14 @@
  * Source:      $(DMDSRC _scanomf.d)
  */
 
-module ddmd.scanomf;
+module dmd.scanomf;
 
 import core.stdc.string;
 import core.stdc.stdlib;
-import ddmd.globals;
-import ddmd.root.outbuffer;
-import ddmd.arraytypes;
-import ddmd.errors;
+import dmd.globals;
+import dmd.root.outbuffer;
+import dmd.arraytypes;
+import dmd.errors;
 
 enum LOG = false;
 
diff --git a/src/sideeffect.d b/src/dmd/sideeffect.d
similarity index 97%
rename from src/sideeffect.d
rename to src/dmd/sideeffect.d
index 21118d987bc7..0b4caf148702 100644
--- a/src/sideeffect.d
+++ b/src/dmd/sideeffect.d
@@ -8,19 +8,19 @@
  * Source:      $(DMDSRC _sideeffect.d)
  */
 
-module ddmd.sideeffect;
+module dmd.sideeffect;
 
-import ddmd.apply;
-import ddmd.declaration;
-import ddmd.dscope;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.identifier;
-import ddmd.init;
-import ddmd.mtype;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.apply;
+import dmd.declaration;
+import dmd.dscope;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.identifier;
+import dmd.init;
+import dmd.mtype;
+import dmd.tokens;
+import dmd.visitor;
 
 /**************************************************
  * Front-end expression rewriting should create temporary variables for
diff --git a/src/statement.d b/src/dmd/statement.d
similarity index 98%
rename from src/statement.d
rename to src/dmd/statement.d
index f0f2cb00b39f..f0b67b1c8b03 100644
--- a/src/statement.d
+++ b/src/dmd/statement.d
@@ -8,40 +8,40 @@
  * Source:      $(DMDSRC _statement.d)
  */
 
-module ddmd.statement;
+module dmd.statement;
 
 import core.stdc.stdarg;
 import core.stdc.stdio;
 
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.attrib;
-import ddmd.gluelayer;
-import ddmd.canthrow;
-import ddmd.cond;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.denum;
-import ddmd.dimport;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.hdrgen;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.mtype;
-import ddmd.parse;
-import ddmd.root.outbuffer;
-import ddmd.root.rootobject;
-import ddmd.sapply;
-import ddmd.sideeffect;
-import ddmd.staticassert;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.attrib;
+import dmd.gluelayer;
+import dmd.canthrow;
+import dmd.cond;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.denum;
+import dmd.dimport;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.hdrgen;
+import dmd.id;
+import dmd.identifier;
+import dmd.mtype;
+import dmd.parse;
+import dmd.root.outbuffer;
+import dmd.root.rootobject;
+import dmd.sapply;
+import dmd.sideeffect;
+import dmd.staticassert;
+import dmd.tokens;
+import dmd.visitor;
 
 extern (C++) Identifier fixupLabelName(Scope* sc, Identifier ident)
 {
diff --git a/src/statement_rewrite_walker.d b/src/dmd/statement_rewrite_walker.d
similarity index 98%
rename from src/statement_rewrite_walker.d
rename to src/dmd/statement_rewrite_walker.d
index 95bd04b3b47a..b0bd4614e787 100644
--- a/src/statement_rewrite_walker.d
+++ b/src/dmd/statement_rewrite_walker.d
@@ -8,12 +8,12 @@
  * Source:      $(DMDSRC _statement_rewrite_walker.d)
  */
 
-module ddmd.statement_rewrite_walker;
+module dmd.statement_rewrite_walker;
 
 import core.stdc.stdio;
 
-import ddmd.statement;
-import ddmd.visitor;
+import dmd.statement;
+import dmd.visitor;
 
 
 /** A visitor to walk entire statements and provides ability to replace any sub-statements.
diff --git a/src/statementsem.d b/src/dmd/statementsem.d
similarity index 99%
rename from src/statementsem.d
rename to src/dmd/statementsem.d
index 926ef0e623ee..87fb64fc3e59 100644
--- a/src/statementsem.d
+++ b/src/dmd/statementsem.d
@@ -8,45 +8,45 @@
  * Source:      $(DMDSRC _statementsem.d)
  */
 
-module ddmd.statementsem;
+module dmd.statementsem;
 
 import core.stdc.stdio;
 
-import ddmd.aggregate;
-import ddmd.aliasthis;
-import ddmd.arrayop;
-import ddmd.arraytypes;
-import ddmd.blockexit;
-import ddmd.clone;
-import ddmd.cond;
-import ddmd.dcast;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.denum;
-import ddmd.dimport;
-import ddmd.dinterpret;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.escape;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.gluelayer;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.init;
-import ddmd.intrange;
-import ddmd.mtype;
-import ddmd.nogc;
-import ddmd.opover;
-import ddmd.sideeffect;
-import ddmd.statement;
-import ddmd.target;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.aliasthis;
+import dmd.arrayop;
+import dmd.arraytypes;
+import dmd.blockexit;
+import dmd.clone;
+import dmd.cond;
+import dmd.dcast;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.denum;
+import dmd.dimport;
+import dmd.dinterpret;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.escape;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.gluelayer;
+import dmd.id;
+import dmd.identifier;
+import dmd.init;
+import dmd.intrange;
+import dmd.mtype;
+import dmd.nogc;
+import dmd.opover;
+import dmd.sideeffect;
+import dmd.statement;
+import dmd.target;
+import dmd.tokens;
+import dmd.visitor;
 
 private extern (C++) final class StatementSemanticVisitor : Visitor
 {
diff --git a/src/staticassert.d b/src/dmd/staticassert.d
similarity index 93%
rename from src/staticassert.d
rename to src/dmd/staticassert.d
index 7eb6f8a124a1..69a9b9d96834 100644
--- a/src/staticassert.d
+++ b/src/dmd/staticassert.d
@@ -8,17 +8,17 @@
  * Source:      $(DMDSRC _staticassert.d)
  */
 
-module ddmd.staticassert;
+module dmd.staticassert;
 
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.mtype;
-import ddmd.visitor;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.errors;
+import dmd.expression;
+import dmd.globals;
+import dmd.id;
+import dmd.identifier;
+import dmd.mtype;
+import dmd.visitor;
 
 /***********************************************************
  */
diff --git a/src/target.d b/src/dmd/target.d
similarity index 98%
rename from src/target.d
rename to src/dmd/target.d
index ea23ef66ce3c..9d2ee403208a 100644
--- a/src/target.d
+++ b/src/dmd/target.d
@@ -8,15 +8,15 @@
  * Source:      $(DMDSRC _target.d)
  */
 
-module ddmd.target;
+module dmd.target;
 
-import ddmd.dmodule;
-import ddmd.expression;
-import ddmd.globals;
-import ddmd.identifier;
-import ddmd.mtype;
-import ddmd.root.ctfloat;
-import ddmd.root.outbuffer;
+import dmd.dmodule;
+import dmd.expression;
+import dmd.globals;
+import dmd.identifier;
+import dmd.mtype;
+import dmd.root.ctfloat;
+import dmd.root.outbuffer;
 
 /***********************************************************
  */
diff --git a/src/tk/dlist.d b/src/dmd/tk/dlist.d
similarity index 100%
rename from src/tk/dlist.d
rename to src/dmd/tk/dlist.d
diff --git a/src/tocsym.d b/src/dmd/tocsym.d
similarity index 95%
rename from src/tocsym.d
rename to src/dmd/tocsym.d
index 9512802e62b8..9feb6b0fa4d5 100644
--- a/src/tocsym.d
+++ b/src/dmd/tocsym.d
@@ -8,52 +8,52 @@
  * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/_tocsym.d, _tocsym.d)
  */
 
-module ddmd.tocsym;
+module dmd.tocsym;
 
 import core.stdc.stdio;
 import core.stdc.string;
 
-import ddmd.root.array;
-import ddmd.root.rmem;
-
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.complex;
-import ddmd.cppmangle;
-import ddmd.ctfeexpr;
-import ddmd.declaration;
-import ddmd.dclass;
-import ddmd.denum;
-import ddmd.dmodule;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.glue;
-import ddmd.identifier;
-import ddmd.id;
-import ddmd.init;
-import ddmd.mtype;
-import ddmd.target;
-import ddmd.toctype;
-import ddmd.todt;
-import ddmd.tokens;
-import ddmd.typinf;
-import ddmd.visitor;
-import ddmd.irstate;
-import ddmd.dmangle;
-
-import ddmd.backend.cdef;
-import ddmd.backend.cc;
-import ddmd.backend.dt;
-import ddmd.backend.type;
-import ddmd.backend.global;
-import ddmd.backend.oper;
-import ddmd.backend.cgcv;
-import ddmd.backend.ty;
+import dmd.root.array;
+import dmd.root.rmem;
+
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.complex;
+import dmd.cppmangle;
+import dmd.ctfeexpr;
+import dmd.declaration;
+import dmd.dclass;
+import dmd.denum;
+import dmd.dmodule;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.glue;
+import dmd.identifier;
+import dmd.id;
+import dmd.init;
+import dmd.mtype;
+import dmd.target;
+import dmd.toctype;
+import dmd.todt;
+import dmd.tokens;
+import dmd.typinf;
+import dmd.visitor;
+import dmd.irstate;
+import dmd.dmangle;
+
+import dmd.backend.cdef;
+import dmd.backend.cc;
+import dmd.backend.dt;
+import dmd.backend.type;
+import dmd.backend.global;
+import dmd.backend.oper;
+import dmd.backend.cgcv;
+import dmd.backend.ty;
 
 extern (C++):
 
@@ -66,7 +66,7 @@ Symbol *toSymbolX(Dsymbol ds, const(char)* prefix, int sclass, type *t, const(ch
 {
     //printf("Dsymbol::toSymbolX('%s')\n", prefix);
     import core.stdc.stdlib : malloc, free;
-    import ddmd.root.outbuffer : OutBuffer;
+    import dmd.root.outbuffer : OutBuffer;
 
     OutBuffer buf;
     mangleToBuffer(ds, &buf);
@@ -139,7 +139,7 @@ Symbol *toSymbol(Dsymbol s)
             Symbol *s;
             if (vd.isDataseg())
             {
-                import ddmd.root.outbuffer : OutBuffer;
+                import dmd.root.outbuffer : OutBuffer;
                 OutBuffer buf;
                 mangleToBuffer(vd, &buf);
                 const length = buf.offset;
diff --git a/src/toctype.d b/src/dmd/toctype.d
similarity index 96%
rename from src/toctype.d
rename to src/dmd/toctype.d
index 39f149edcb57..495c062fe311 100644
--- a/src/toctype.d
+++ b/src/dmd/toctype.d
@@ -8,21 +8,21 @@
  * Source:      $(DMDSRC _toctype.d)
  */
 
-module ddmd.toctype;
+module dmd.toctype;
 
 import core.stdc.stdlib;
 
-import ddmd.backend.cc : Classsym, Symbol;
-import ddmd.backend.ty;
-import ddmd.backend.type;
-
-import ddmd.declaration;
-import ddmd.dstruct;
-import ddmd.globals;
-import ddmd.glue;
-import ddmd.id;
-import ddmd.mtype;
-import ddmd.visitor;
+import dmd.backend.cc : Classsym, Symbol;
+import dmd.backend.ty;
+import dmd.backend.type;
+
+import dmd.declaration;
+import dmd.dstruct;
+import dmd.globals;
+import dmd.glue;
+import dmd.id;
+import dmd.mtype;
+import dmd.visitor;
 
 extern (C++) final class ToCtypeVisitor : Visitor
 {
diff --git a/src/tocvdebug.d b/src/dmd/tocvdebug.d
similarity index 97%
rename from src/tocvdebug.d
rename to src/dmd/tocvdebug.d
index 10f217b7ae7b..236a58d3387f 100644
--- a/src/tocvdebug.d
+++ b/src/dmd/tocvdebug.d
@@ -8,7 +8,7 @@
  * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/_tocsym.d, _tocvdebug.d)
  */
 
-module ddmd.tocvdebug;
+module dmd.tocvdebug;
 
 version (Windows)
 {
@@ -19,35 +19,35 @@ import core.stdc.stddef;
 import core.stdc.stdlib;
 import core.stdc.time;
 
-import ddmd.root.array;
-import ddmd.root.rmem;
-
-import ddmd.aggregate;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.denum;
-import ddmd.dmodule;
-import ddmd.dsymbol;
-import ddmd.dstruct;
-import ddmd.dtemplate;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.id;
-import ddmd.mtype;
-import ddmd.target;
-import ddmd.visitor;
-
-import ddmd.backend.cc;
-import ddmd.backend.cdef;
-import ddmd.backend.cgcv;
-import ddmd.backend.code;
-import ddmd.backend.cv4;
-import ddmd.backend.dt;
-import ddmd.backend.global;
-import ddmd.backend.obj;
-import ddmd.backend.oper;
-import ddmd.backend.ty;
-import ddmd.backend.type;
+import dmd.root.array;
+import dmd.root.rmem;
+
+import dmd.aggregate;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.denum;
+import dmd.dmodule;
+import dmd.dsymbol;
+import dmd.dstruct;
+import dmd.dtemplate;
+import dmd.func;
+import dmd.globals;
+import dmd.id;
+import dmd.mtype;
+import dmd.target;
+import dmd.visitor;
+
+import dmd.backend.cc;
+import dmd.backend.cdef;
+import dmd.backend.cgcv;
+import dmd.backend.code;
+import dmd.backend.cv4;
+import dmd.backend.dt;
+import dmd.backend.global;
+import dmd.backend.obj;
+import dmd.backend.oper;
+import dmd.backend.ty;
+import dmd.backend.type;
 
 extern (C++):
 
@@ -1059,9 +1059,9 @@ int cvMember(Dsymbol s, ubyte *p)
 }
 else
 {
-    import ddmd.denum;
-    import ddmd.dstruct;
-    import ddmd.dclass;
+    import dmd.denum;
+    import dmd.dstruct;
+    import dmd.dclass;
 
     /****************************
      * Stub them out.
diff --git a/src/todt.d b/src/dmd/todt.d
similarity index 98%
rename from src/todt.d
rename to src/dmd/todt.d
index bf1ea9cc7302..58b5587d7c28 100644
--- a/src/todt.d
+++ b/src/dmd/todt.d
@@ -8,43 +8,43 @@
  * Source:      $(DMDSRC _todt.d)
  */
 
-module ddmd.todt;
+module dmd.todt;
 
 import core.stdc.stdio;
 import core.stdc.string;
 
-import ddmd.root.array;
-import ddmd.root.rmem;
-
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.backend.type;
-import ddmd.complex;
-import ddmd.ctfeexpr;
-import ddmd.declaration;
-import ddmd.dclass;
-import ddmd.denum;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.init;
-import ddmd.mtype;
-import ddmd.target;
-import ddmd.tokens;
-import ddmd.tocsym;
-import ddmd.toobj;
-import ddmd.typinf;
-import ddmd.visitor;
-
-import ddmd.backend.cc;
-import ddmd.backend.dt;
-
-alias toSymbol = ddmd.tocsym.toSymbol;
-alias toSymbol = ddmd.glue.toSymbol;
+import dmd.root.array;
+import dmd.root.rmem;
+
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.backend.type;
+import dmd.complex;
+import dmd.ctfeexpr;
+import dmd.declaration;
+import dmd.dclass;
+import dmd.denum;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.init;
+import dmd.mtype;
+import dmd.target;
+import dmd.tokens;
+import dmd.tocsym;
+import dmd.toobj;
+import dmd.typinf;
+import dmd.visitor;
+
+import dmd.backend.cc;
+import dmd.backend.dt;
+
+alias toSymbol = dmd.tocsym.toSymbol;
+alias toSymbol = dmd.glue.toSymbol;
 
 /* A dt_t is a simple structure representing data to be added
  * to the data segment of the output object file. As such,
diff --git a/src/toir.d b/src/dmd/toir.d
similarity index 97%
rename from src/toir.d
rename to src/dmd/toir.d
index 9df30823ec6f..9b1134deac6e 100644
--- a/src/toir.d
+++ b/src/dmd/toir.d
@@ -8,49 +8,49 @@
  * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/_tocsym.d, _toir.d)
  */
 
-module ddmd.toir;
+module dmd.toir;
 
 import core.stdc.stdio;
 import core.stdc.string;
 import core.stdc.stdlib;
 
-import ddmd.root.array;
-import ddmd.root.outbuffer;
-import ddmd.root.rmem;
-
-import ddmd.backend.cdef;
-import ddmd.backend.cc;
-import ddmd.backend.dt;
-import ddmd.backend.el;
-import ddmd.backend.global;
-import ddmd.backend.oper;
-import ddmd.backend.rtlsym;
-import ddmd.backend.ty;
-import ddmd.backend.type;
-
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.dmangle;
-import ddmd.dmodule;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.toctype;
-import ddmd.e2ir;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.glue;
-import ddmd.identifier;
-import ddmd.id;
-import ddmd.irstate;
-import ddmd.mtype;
-import ddmd.target;
-import ddmd.tocsym;
-
-alias toSymbol = ddmd.tocsym.toSymbol;
-alias toSymbol = ddmd.glue.toSymbol;
+import dmd.root.array;
+import dmd.root.outbuffer;
+import dmd.root.rmem;
+
+import dmd.backend.cdef;
+import dmd.backend.cc;
+import dmd.backend.dt;
+import dmd.backend.el;
+import dmd.backend.global;
+import dmd.backend.oper;
+import dmd.backend.rtlsym;
+import dmd.backend.ty;
+import dmd.backend.type;
+
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.dmangle;
+import dmd.dmodule;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.toctype;
+import dmd.e2ir;
+import dmd.func;
+import dmd.globals;
+import dmd.glue;
+import dmd.identifier;
+import dmd.id;
+import dmd.irstate;
+import dmd.mtype;
+import dmd.target;
+import dmd.tocsym;
+
+alias toSymbol = dmd.tocsym.toSymbol;
+alias toSymbol = dmd.glue.toSymbol;
 
 
 extern (C++):
diff --git a/src/tokens.d b/src/dmd/tokens.d
similarity index 99%
rename from src/tokens.d
rename to src/dmd/tokens.d
index 8b08417b9c72..7313d6811f61 100644
--- a/src/tokens.d
+++ b/src/dmd/tokens.d
@@ -8,17 +8,17 @@
  * Source:      $(DMDSRC _tokens.d)
  */
 
-module ddmd.tokens;
+module dmd.tokens;
 
 import core.stdc.ctype;
 import core.stdc.stdio;
 import core.stdc.string;
-import ddmd.globals;
-import ddmd.identifier;
-import ddmd.root.ctfloat;
-import ddmd.root.outbuffer;
-import ddmd.root.rmem;
-import ddmd.utf;
+import dmd.globals;
+import dmd.identifier;
+import dmd.root.ctfloat;
+import dmd.root.outbuffer;
+import dmd.root.rmem;
+import dmd.utf;
 
 enum TOK : int
 {
diff --git a/src/toobj.d b/src/dmd/toobj.d
similarity index 97%
rename from src/toobj.d
rename to src/dmd/toobj.d
index 2df6171a05ae..f27a09083d0e 100644
--- a/src/toobj.d
+++ b/src/dmd/toobj.d
@@ -8,69 +8,69 @@
  * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/_tocsym.d, _toobj.d)
  */
 
-module ddmd.toobj;
+module dmd.toobj;
 
 import core.stdc.stdio;
 import core.stdc.stddef;
 import core.stdc.string;
 import core.stdc.time;
 
-import ddmd.root.array;
-import ddmd.root.outbuffer;
-import ddmd.root.rmem;
-import ddmd.root.rootobject;
-
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.attrib;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.denum;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.glue;
-import ddmd.hdrgen;
-import ddmd.id;
-import ddmd.init;
-import ddmd.irstate;
-import ddmd.mtype;
-import ddmd.nspace;
-import ddmd.statement;
-import ddmd.staticassert;
-import ddmd.target;
-import ddmd.tocsym;
-import ddmd.tocvdebug;
-import ddmd.todt;
-import ddmd.tokens;
-import ddmd.traits;
-import ddmd.typinf;
-import ddmd.visitor;
-
-import ddmd.backend.cc;
-import ddmd.backend.cdef;
-import ddmd.backend.cgcv;
-import ddmd.backend.code;
-import ddmd.backend.code_x86;
-import ddmd.backend.cv4;
-import ddmd.backend.dt;
-import ddmd.backend.el;
-import ddmd.backend.global;
-import ddmd.backend.obj;
-import ddmd.backend.oper;
-import ddmd.backend.ty;
-import ddmd.backend.type;
+import dmd.root.array;
+import dmd.root.outbuffer;
+import dmd.root.rmem;
+import dmd.root.rootobject;
+
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.attrib;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.denum;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.glue;
+import dmd.hdrgen;
+import dmd.id;
+import dmd.init;
+import dmd.irstate;
+import dmd.mtype;
+import dmd.nspace;
+import dmd.statement;
+import dmd.staticassert;
+import dmd.target;
+import dmd.tocsym;
+import dmd.tocvdebug;
+import dmd.todt;
+import dmd.tokens;
+import dmd.traits;
+import dmd.typinf;
+import dmd.visitor;
+
+import dmd.backend.cc;
+import dmd.backend.cdef;
+import dmd.backend.cgcv;
+import dmd.backend.code;
+import dmd.backend.code_x86;
+import dmd.backend.cv4;
+import dmd.backend.dt;
+import dmd.backend.el;
+import dmd.backend.global;
+import dmd.backend.obj;
+import dmd.backend.oper;
+import dmd.backend.ty;
+import dmd.backend.type;
 
 extern (C++):
 
-alias toSymbol = ddmd.tocsym.toSymbol;
-alias toSymbol = ddmd.glue.toSymbol;
+alias toSymbol = dmd.tocsym.toSymbol;
+alias toSymbol = dmd.glue.toSymbol;
 
 
 /* ================================================================== */
diff --git a/src/traits.d b/src/dmd/traits.d
similarity index 98%
rename from src/traits.d
rename to src/dmd/traits.d
index 78d81c5ea936..ef705757c8e9 100644
--- a/src/traits.d
+++ b/src/dmd/traits.d
@@ -8,32 +8,32 @@
  * Source:      $(DMDSRC _traits.d)
  */
 
-module ddmd.traits;
+module dmd.traits;
 
 import core.stdc.stdio;
 import core.stdc.string;
-import ddmd.aggregate;
-import ddmd.arraytypes;
-import ddmd.canthrow;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.dscope;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.errors;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.globals;
-import ddmd.hdrgen;
-import ddmd.id;
-import ddmd.identifier;
-import ddmd.mtype;
-import ddmd.nogc;
-import ddmd.root.array;
-import ddmd.root.speller;
-import ddmd.root.stringtable;
-import ddmd.tokens;
-import ddmd.visitor;
+import dmd.aggregate;
+import dmd.arraytypes;
+import dmd.canthrow;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.dscope;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.errors;
+import dmd.expression;
+import dmd.func;
+import dmd.globals;
+import dmd.hdrgen;
+import dmd.id;
+import dmd.identifier;
+import dmd.mtype;
+import dmd.nogc;
+import dmd.root.array;
+import dmd.root.speller;
+import dmd.root.stringtable;
+import dmd.tokens;
+import dmd.visitor;
 
 enum LOGSEMANTIC = false;
 
diff --git a/src/typinf.d b/src/dmd/typinf.d
similarity index 96%
rename from src/typinf.d
rename to src/dmd/typinf.d
index 97c050dc1cf5..6a570530e706 100644
--- a/src/typinf.d
+++ b/src/dmd/typinf.d
@@ -8,18 +8,18 @@
  * Source:      $(DMDSRC _typeinf.d)
  */
 
-module ddmd.typinf;
-
-import ddmd.declaration;
-import ddmd.dmodule;
-import ddmd.dscope;
-import ddmd.dclass;
-import ddmd.dstruct;
-import ddmd.errors;
-import ddmd.globals;
-import ddmd.gluelayer;
-import ddmd.mtype;
-import ddmd.visitor;
+module dmd.typinf;
+
+import dmd.declaration;
+import dmd.dmodule;
+import dmd.dscope;
+import dmd.dclass;
+import dmd.dstruct;
+import dmd.errors;
+import dmd.globals;
+import dmd.gluelayer;
+import dmd.mtype;
+import dmd.visitor;
 
 /****************************************************
  * Get the exact TypeInfo.
diff --git a/src/utf.d b/src/dmd/utf.d
similarity index 99%
rename from src/utf.d
rename to src/dmd/utf.d
index e7a7748b3285..6181fe509225 100644
--- a/src/utf.d
+++ b/src/dmd/utf.d
@@ -8,7 +8,7 @@
  * Source:      $(DMDSRC _utf.d)
  */
 
-module ddmd.utf;
+module dmd.utf;
 
 nothrow pure @nogc:
 
diff --git a/src/utils.d b/src/dmd/utils.d
similarity index 91%
rename from src/utils.d
rename to src/dmd/utils.d
index 13d8f6fc8a15..d46506770811 100644
--- a/src/utils.d
+++ b/src/dmd/utils.d
@@ -11,14 +11,14 @@
  * Source:      $(DMDSRC _utils.d)
  */
 
-module ddmd.utils;
+module dmd.utils;
 
 import core.stdc.string;
-import ddmd.errors;
-import ddmd.globals;
-import ddmd.root.file;
-import ddmd.root.filename;
-import ddmd.root.outbuffer;
+import dmd.errors;
+import dmd.globals;
+import dmd.root.file;
+import dmd.root.filename;
+import dmd.root.outbuffer;
 
 
 /**
@@ -51,7 +51,7 @@ extern (C++) const(char)* toWinPath(const(char)* src)
  *
  * Params:
  *   loc = The line number information from where the call originates
- *   f = a `ddmd.root.file.File` handle to read
+ *   f = a `dmd.root.file.File` handle to read
  */
 extern (C++) void readFile(Loc loc, File* f)
 {
@@ -68,7 +68,7 @@ extern (C++) void readFile(Loc loc, File* f)
  *
  * Params:
  *   loc = The line number information from where the call originates
- *   f = a `ddmd.root.file.File` handle to write
+ *   f = a `dmd.root.file.File` handle to write
  */
 extern (C++) void writeFile(Loc loc, File* f)
 {
diff --git a/src/visitor.d b/src/dmd/visitor.d
similarity index 97%
rename from src/visitor.d
rename to src/dmd/visitor.d
index 11c206dba938..80819c14e617 100644
--- a/src/visitor.d
+++ b/src/dmd/visitor.d
@@ -8,29 +8,29 @@
  * Source:      $(DMDSRC _visitor.d)
  */
 
-module ddmd.visitor;
-
-import ddmd.aggregate;
-import ddmd.aliasthis;
-import ddmd.attrib;
-import ddmd.cond;
-import ddmd.ctfeexpr;
-import ddmd.dclass;
-import ddmd.declaration;
-import ddmd.denum;
-import ddmd.dimport;
-import ddmd.dmodule;
-import ddmd.dstruct;
-import ddmd.dsymbol;
-import ddmd.dtemplate;
-import ddmd.dversion;
-import ddmd.expression;
-import ddmd.func;
-import ddmd.init;
-import ddmd.mtype;
-import ddmd.nspace;
-import ddmd.statement;
-import ddmd.staticassert;
+module dmd.visitor;
+
+import dmd.aggregate;
+import dmd.aliasthis;
+import dmd.attrib;
+import dmd.cond;
+import dmd.ctfeexpr;
+import dmd.dclass;
+import dmd.declaration;
+import dmd.denum;
+import dmd.dimport;
+import dmd.dmodule;
+import dmd.dstruct;
+import dmd.dsymbol;
+import dmd.dtemplate;
+import dmd.dversion;
+import dmd.expression;
+import dmd.func;
+import dmd.init;
+import dmd.mtype;
+import dmd.nspace;
+import dmd.statement;
+import dmd.staticassert;
 
 extern (C++) class Visitor
 {
diff --git a/src/posix.mak b/src/posix.mak
index 9dc7225e9c53..cdf2f9df5143 100644
--- a/src/posix.mak
+++ b/src/posix.mak
@@ -22,10 +22,14 @@ INSTALL_DIR=../../install
 SYSCONFDIR=/etc
 PGO_DIR=$(abspath pgo)
 
+DMD=dmd
+
 C=backend
 TK=tk
 ROOT=root
 
+GENERATED=../generated
+
 ifeq (osx,$(OS))
     export MACOSX_DEPLOYMENT_TARGET=10.7
 endif
@@ -133,7 +137,7 @@ endif
 
 OS_UPCASE := $(shell echo $(OS) | tr '[a-z]' '[A-Z]')
 
-MMD=-MMD -MF $(basename $@).deps
+MMD=-MMD -MF $(GENERATED)/$(notdir $(basename $@)).deps
 
 # Default compiler flags for all source files
 CXXFLAGS := $(WARNINGS) \
@@ -201,7 +205,7 @@ endif
 endif
 
 
-FRONT_SRCS=$(addsuffix .d,access aggregate aliasthis apply argtypes arrayop	\
+FRONT_SRCS=$(addsuffix .d,$(addprefix $(DMD)/,access aggregate aliasthis apply argtypes arrayop	\
 	arraytypes attrib builtin canthrow clone complex cond constfold		\
 	cppmangle ctfeexpr dcast dclass declaration delegatize denum dimport	\
 	dinifile dinterpret dmacro dmangle dmodule doc dscope dstruct dsymbol	\
@@ -209,37 +213,36 @@ FRONT_SRCS=$(addsuffix .d,access aggregate aliasthis apply argtypes arrayop	\
 	globals hdrgen id identifier impcnvtab imphint init inline intrange	\
 	json lexer lib link mars mtype nogc nspace opover optimize parse sapply	\
 	sideeffect statement staticassert target tokens traits utf visitor	\
-	typinf utils  statement_rewrite_walker statementsem safe blockexit asttypename)
+	typinf utils  statement_rewrite_walker statementsem safe blockexit asttypename))
 
 ifeq ($(D_OBJC),1)
-	FRONT_SRCS += objc.d
+	FRONT_SRCS += $(DMD)/objc.d
 else
-	FRONT_SRCS += objc_stubs.d
+	FRONT_SRCS += $(DMD)/objc_stubs.d
 endif
 
-ROOT_SRCS = $(addsuffix .d,$(addprefix $(ROOT)/,aav array ctfloat file \
+ROOT_SRCS = $(addsuffix .d,$(addprefix $(DMD)/$(ROOT)/,aav array ctfloat file \
 	filename man outbuffer port response rmem rootobject speller \
 	stringtable hash))
 
 GLUE_OBJS =
 
 ifeq (osx,$(OS))
-    FRONT_SRCS += libmach.d scanmach.d
+    FRONT_SRCS += $(DMD)/libmach.d $(DMD)/scanmach.d
 else
-    FRONT_SRCS += libelf.d scanelf.d
+    FRONT_SRCS += $(DMD)/libelf.d $(DMD)/scanelf.d
 endif
 
-GLUE_SRCS=$(addsuffix .d, irstate toctype glue gluelayer todt tocsym toir dmsc \
-	tocvdebug s2ir toobj e2ir eh iasm)
+GLUE_SRCS=$(addsuffix .d,$(addprefix $(DMD)/,irstate toctype glue gluelayer todt tocsym toir dmsc \
+	tocvdebug s2ir toobj e2ir eh iasm))
 
 ifeq ($(D_OBJC),1)
-	GLUE_SRCS += objc_glue.d
+	GLUE_SRCS += $(DMD)/objc_glue.d
 else
-	GLUE_SRCS += objc_glue_stubs.d
+	GLUE_SRCS += $(DMD)/objc_glue_stubs.d
 endif
 
 DMD_SRCS=$(FRONT_SRCS) $(GLUE_SRCS) $(BACK_HDRS) $(TK_HDRS)
-
 BACK_OBJS = go.o gdag.o gother.o gflow.o gloop.o gsroa.o var.o el.o \
 	glocal.o os.o nteh.o evalu8.o cgcs.o \
 	rtlsym.o cgelem.o cgen.o cgreg.o out.o \
@@ -260,7 +263,7 @@ endif
 
 SRC = win32.mak posix.mak osmodel.mak aggregate.h aliasthis.h arraytypes.h	\
 	attrib.h complex_t.h cond.h ctfe.h ctfe.h declaration.h dsymbol.h	\
-	enum.h errors.h expression.h globals.h hdrgen.h identifier.h idgen.d	\
+	enum.h errors.h expression.h globals.h hdrgen.h identifier.h	\
 	import.h init.h intrange.h json.h lexer.h \
 	mars.h module.h mtype.h nspace.h objc.h                         \
 	scope.h statement.h staticassert.h target.h template.h tokens.h	\
@@ -276,11 +279,11 @@ GLUE_SRC = \
 	toelfdebug.d libelf.d scanelf.d libmach.d scanmach.d \
 	tk.c gluestub.d objc_glue.d
 
-BACK_HDRS=$C/bcomplex.d $C/cc.d $C/cdef.d $C/cgcv.d $C/code.d $C/cv4.d $C/dt.d $C/el.d $C/global.d \
+BACK_HDRS=$(addprefix $(DMD)/,$C/bcomplex.d $C/cc.d $C/cdef.d $C/cgcv.d $C/code.d $C/cv4.d $C/dt.d $C/el.d $C/global.d \
 	$C/obj.d $C/oper.d $C/outbuf.d $C/rtlsym.d $C/code_x86.d $C/iasm.d \
-	$C/ty.d $C/type.d $C/exh.d $C/mach.d $C/md5.d $C/mscoff.d $C/dwarf.d $C/dwarf2.d $C/xmm.d
+	$C/ty.d $C/type.d $C/exh.d $C/mach.d $C/md5.d $C/mscoff.d $C/dwarf.d $C/dwarf2.d $C/xmm.d)
 
-TK_HDRS= $(TK)/dlist.d
+TK_HDRS= $(DMD)/$(TK)/dlist.d
 
 BACK_SRC = \
 	$C/cdef.h $C/cc.h $C/oper.h $C/ty.h $C/optabgen.c \
@@ -314,32 +317,33 @@ STRING_IMPORT_FILES = verstr.h SYSCONFDIR.imp ../res/default_ddoc_theme.ddoc
 
 DEPS = $(patsubst %.o,%.deps,$(DMD_OBJS) $(GLUE_OBJS) $(BACK_OBJS))
 
-all: dmd
+all: $(GENERATED)/dmd
 
 auto-tester-build: dmd checkwhitespace dmd_frontend
 .PHONY: auto-tester-build
 
 glue.a: $(GLUE_OBJS)
-	$(AR) rcs glue.a $(GLUE_OBJS)
+	$(AR) rcs $@ $(GLUE_OBJS)
 
-backend.a: $(BACK_OBJS)
-	$(AR) rcs backend.a $(BACK_OBJS)
+$(GENERATED)/backend.a: $(BACK_OBJS)
+	$(AR) rcs $@ $(addprefix $(GENERATED)/,$(BACK_OBJS))
 
 dmd_frontend: $(FRONT_SRCS) gluelayer.d $(ROOT_SRCS) newdelete.o $(STRING_IMPORT_FILES) $(HOST_DMD_PATH)
 	CC=$(HOST_CXX) $(HOST_DMD_RUN) -of$@ $(MODEL_FLAG) -vtls -J. -J../res -L-lstdc++ $(DFLAGS) $(filter-out $(STRING_IMPORT_FILES) $(HOST_DMD_PATH),$^) -version=NoBackend
 
 ifdef ENABLE_LTO
-dmd: $(DMD_SRCS) $(ROOT_SRCS) newdelete.o $(GLUE_OBJS) $(BACK_OBJS) $(STRING_IMPORT_FILES) $(HOST_DMD_PATH)
+$(GENERATED)/dmd: $(DMD_SRCS) $(ROOT_SRCS) $(GENERATED)/newdelete.o $(GLUE_OBJS) $(BACK_OBJS) $(STRING_IMPORT_FILES) $(HOST_DMD_PATH)
 	CC=$(HOST_CXX) $(HOST_DMD_RUN) -of$@ $(MODEL_FLAG) -vtls -J. -J../res -L-lstdc++ $(DFLAGS) $(filter-out $(STRING_IMPORT_FILES) $(HOST_DMD_PATH),$^)
 else
-dmd: $(DMD_SRCS) $(ROOT_SRCS) newdelete.o backend.a $(STRING_IMPORT_FILES) $(HOST_DMD_PATH)
+$(GENERATED)/dmd: $(DMD_SRCS) $(ROOT_SRCS) $(GENERATED)/newdelete.o $(GENERATED)/backend.a $(STRING_IMPORT_FILES) $(HOST_DMD_PATH)
 	CC=$(HOST_CXX) $(HOST_DMD_RUN) -of$@ $(MODEL_FLAG) -vtls -J. -J../res -L-lstdc++ $(DFLAGS) $(filter-out $(STRING_IMPORT_FILES) $(HOST_DMD_PATH),$^)
 endif
 
 clean:
-	rm -f newdelete.o $(GLUE_OBJS) $(BACK_OBJS) dmd optab.o id.o	\
+	rm -f newdelete.o $(GLUE_OBJS) $(BACK_OBJS) optab.o id.o	\
 		idgen $(idgen_output) optabgen $(optabgen_output)	\
 		verstr.h SYSCONFDIR.imp core *.cov *.deps *.gcda *.gcno *.a *.lst
+	rm -f $(GENERATED)/*
 	@[ ! -d ${PGO_DIR} ] || echo You should issue manually: rm -rf ${PGO_DIR}
 
 ######## Download and install the last dmd buildable without dmd
@@ -381,10 +385,10 @@ $(optabgen_output) : optabgen
 
 ######## idgen generates some source
 
-idgen_output = id.h id.d
+idgen_output = id.h $(DMD)/id.d
 $(idgen_output) : idgen
 
-idgen: idgen.d $(HOST_DMD_PATH)
+idgen: $(DMD)/idgen.d $(HOST_DMD_PATH)
 	CC=$(HOST_CXX) $(HOST_DMD_RUN) $<
 	./idgen
 
@@ -440,17 +444,17 @@ var.o: optab.c tytab.c
 # matching below.
 vpath %.c $(C)
 
-$(BACK_OBJS): %.o: %.c posix.mak
+$(BACK_OBJS): %.o:  %.c posix.mak
 	@echo "  (CC)  BACK_OBJS  $<"
-	$(CXX) -c $(CXXFLAGS) $(BACK_FLAGS) $(MMD) $<
+	$(CXX) -c -o$(GENERATED)/$@ $(CXXFLAGS) $(BACK_FLAGS) $(MMD) $<
 
 $(GLUE_OBJS): %.o: %.c posix.mak
 	@echo "  (CC)  GLUE_OBJS  $<"
 	$(CXX) -c $(CXXFLAGS) $(GLUE_FLAGS) $(MMD) $<
 
-newdelete.o: %.o: $(ROOT)/%.c posix.mak
-	@echo "  (CC)  ROOT_OBJS  $<"
-	$(CXX) -c $(CXXFLAGS) $(ROOT_FLAGS) $(MMD) $<
+$(GENERATED)/newdelete.o: %.o: $(ROOT)/newdelete.c posix.mak
+	@echo "  (CC)  ROOT_OBJS  $< $@"
+	$(CXX) -c -o$@ $(CXXFLAGS) $(ROOT_FLAGS) $(MMD) $<
 
 
 -include $(DEPS)
diff --git a/test/Makefile b/test/Makefile
index f194dec16c59..9c035b22df3d 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -94,7 +94,7 @@ export REQUIRED_ARGS=
 
 ifeq ($(findstring win,$(OS)),win)
 export ARGS=-inline -release -g -O
-export DMD=../src/dmd.exe
+export DMD=../generated/dmd.exe
 export EXE=.exe
 export OBJ=.obj
 export DSEP=\\
@@ -106,7 +106,7 @@ export DFLAGS=-I$(DRUNTIME_PATH)\import -I$(PHOBOS_PATH)
 export LIB=$(PHOBOS_PATH)
 else
 export ARGS=-inline -release -g -O -fPIC
-export DMD=../src/dmd
+export DMD=../generated/dmd
 export EXE=
 export OBJ=.o
 export DSEP=/