diff --git a/astprinter.d b/astprinter.d
index ebb9da3..d0e1570 100644
--- a/astprinter.d
+++ b/astprinter.d
@@ -3,8 +3,8 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
-import std.d.lexer;
-import std.d.ast;
+import stdx.d.lexer;
+import stdx.d.ast;
 import std.stdio;
 import std.string;
 
diff --git a/build.sh b/build.sh
index 98a5369..1a856e9 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,5 @@
-#dmd *.d std/d/*.d -release -inline -noboundscheck -O -w -wi -m64 -property -ofdscanner-dmd
-dmd *.d std/d/*.d -g -m64 -w -wi -ofdscanner 
-#ldc2 -O3 *.d std/d/*.d -of=dscanner-ldc -release -m64
-#ldc2 *.d std/d/*.d -of=dscanner -unittest -m64 -g
-#/opt/gdc/bin/gdc -O3 -odscanner-gdc -fno-bounds-check -frelease -m64 *.d std/d/*.d
+#dmd *.d stdx/d/*.d -release -inline -noboundscheck -O -w -wi -m64 -property -ofdscanner-dmd
+dmd *.d stdx/d/*.d -g -m64 -w -wi -ofdscanner 
+#ldc2 -O3 *.d stdx/d/*.d -of=dscanner-ldc -release -m64
+#ldc2 *.d stdx/d/*.d -of=dscanner -unittest -m64 -g
+#/opt/gdc/bin/gdc -O3 -odscanner-gdc -fno-bounds-check -frelease -m64 *.d stdx/d/*.d
diff --git a/ctags.d b/ctags.d
index 773b475..d29515d 100644
--- a/ctags.d
+++ b/ctags.d
@@ -5,9 +5,9 @@
 
 module ctags;
 
-import std.d.parser;
-import std.d.lexer;
-import std.d.ast;
+import stdx.d.parser;
+import stdx.d.lexer;
+import stdx.d.ast;
 import std.algorithm;
 import std.range;
 import std.stdio;
diff --git a/highlighter.d b/highlighter.d
index 9a11096..b1030dd 100644
--- a/highlighter.d
+++ b/highlighter.d
@@ -8,7 +8,7 @@ module highlighter;
 
 import std.stdio;
 import std.array;
-import std.d.lexer;
+import stdx.d.lexer;
 
 void writeSpan(string cssClass, string value)
 {
diff --git a/imports.d b/imports.d
index 90bcab5..6fef4aa 100644
--- a/imports.d
+++ b/imports.d
@@ -5,7 +5,7 @@
 
 module imports;
 
-import std.d.ast;
+import stdx.d.ast;
 import std.stdio;
 
 class ImportPrinter : ASTVisitor
diff --git a/main.d b/main.d
index a3d90b4..485d763 100644
--- a/main.d
+++ b/main.d
@@ -15,8 +15,8 @@ import std.path;
 import std.regex;
 import std.stdio;
 import std.range;
-import std.d.lexer;
-import std.d.parser;
+import stdx.d.lexer;
+import stdx.d.parser;
 
 import highlighter;
 import stats;
diff --git a/stats.d b/stats.d
index 7bc4ecb..85e2f4d 100644
--- a/stats.d
+++ b/stats.d
@@ -6,7 +6,7 @@
 module stats;
 
 import std.stdio;
-import std.d.lexer;
+import stdx.d.lexer;
 
 pure nothrow bool isLineOfCode(TokenType t)
 {
diff --git a/std/d/ast.d b/stdx/d/ast.d
similarity index 99%
rename from std/d/ast.d
rename to stdx/d/ast.d
index f535eae..57fa255 100644
--- a/std/d/ast.d
+++ b/stdx/d/ast.d
@@ -14,9 +14,9 @@
  * Source: $(PHOBOSSRC std/d/_ast.d)
  */
 
-module std.d.ast;
+module stdx.d.ast;
 
-import std.d.lexer;
+import stdx.d.lexer;
 import std.traits;
 
 // TODO: Many of these classes can be simplified by using std.variant.Algebraic
diff --git a/std/d/entities.d b/stdx/d/entities.d
similarity index 99%
rename from std/d/entities.d
rename to stdx/d/entities.d
index 269ffcb..dd2cd9e 100644
--- a/std/d/entities.d
+++ b/stdx/d/entities.d
@@ -9,7 +9,7 @@
  * Source: $(PHOBOSSRC std/d/_lexer.d)
  */
 
-module std.d.entities;
+module stdx.d.entities;
 
 /**
  * Generated from $(LINK http://www.w3.org/TR/html5/entities.json)
diff --git a/std/d/gendoc.sh b/stdx/d/gendoc.sh
old mode 100755
new mode 100644
similarity index 100%
rename from std/d/gendoc.sh
rename to stdx/d/gendoc.sh
diff --git a/std/d/lexer.d b/stdx/d/lexer.d
similarity index 99%
rename from std/d/lexer.d
rename to stdx/d/lexer.d
index b8c2237..5a1f47e 100644
--- a/std/d/lexer.d
+++ b/stdx/d/lexer.d
@@ -105,13 +105,13 @@
  * Source: $(PHOBOSSRC std/d/_lexer.d)
  */
 
-module std.d.lexer;
+module stdx.d.lexer;
 
 import std.algorithm;
 import std.ascii;
 import std.conv;
 import std.datetime;
-import std.d.entities;
+import stdx.d.entities;
 import std.exception;
 import std.range;
 import std.regex;
diff --git a/std/d/parser.d b/stdx/d/parser.d
similarity index 99%
rename from std/d/parser.d
rename to stdx/d/parser.d
index f2e52ad..bbde25c 100644
--- a/std/d/parser.d
+++ b/stdx/d/parser.d
@@ -52,10 +52,10 @@
  * Source: $(PHOBOSSRC std/d/_parser.d)
  */
 
-module std.d.parser;
+module stdx.d.parser;
 
-import std.d.lexer;
-import std.d.ast;
+import stdx.d.lexer;
+import stdx.d.ast;
 import std.conv;
 import std.algorithm;
 import std.array;