diff --git a/build.bat b/build.bat
index 03e3eb3..651724e 100644
--- a/build.bat
+++ b/build.bat
@@ -4,10 +4,10 @@ set containers_modules=
 for /r "containers/src" %%F in (*.d) do call set containers_modules=%%containers_modules%% "%%F"
 
 set common_modules=
-for /r "src/common" %%F in (*.d) do call set common_modules=%%common_modules%% "%%F"
+for /r "src/dcd/common" %%F in (*.d) do call set common_modules=%%common_modules%% "%%F"
 
 set server_modules=
-for /r "src/server" %%F in (*.d) do call set server_modules=%%server_modules%% "%%F"
+for /r "src/dcd/server" %%F in (*.d) do call set server_modules=%%server_modules%% "%%F"
 
 set dsymbol_modules=
 for /r "dsymbol/src" %%F in (*.d) do call set dsymbol_modules=%%dsymbol_modules%% "%%F"
@@ -22,10 +22,10 @@ set client_name=bin\dcd-client
 set server_name=bin\dcd-server
 
 %DC%^
- src\client\client.d^
- src\common\messages.d^
- src\common\dcd_version.d^
- src\common\socket.d^
+ src\dcd\client\client.d^
+ src\dcd\common\messages.d^
+ src\dcd\common\dcd_version.d^
+ src\dcd\common\socket.d^
  %msgspack_modules%^
  -Imsgpack-d\src^
  -release -inline -O -wi^
diff --git a/dub.json b/dub.json
index d1fa393..344fa99 100644
--- a/dub.json
+++ b/dub.json
@@ -17,26 +17,26 @@
       "name": "library",
       "targetType": "library",
       "excludedSourceFiles": [
-        "src/client/*",
-        "src/server/main.d"
+        "src/dcd/client/*",
+        "src/dcd/server/main.d"
       ]
     },
     {
       "name": "client",
       "targetType": "executable",
       "targetName": "dcd-client",
-      "mainSourceFile": "src/client/client.d",
+      "mainSourceFile": "src/dcd/client/client.d",
       "excludedSourceFiles": [
-        "src/server/*"
+        "src/dcd/server/*"
       ]
     },
     {
       "name": "server",
       "targetType": "executable",
       "targetName": "dcd-server",
-      "mainSourceFile": "src/server/server.d",
+      "mainSourceFile": "src/dcd/server/server.d",
       "excludedSourceFiles": [
-        "src/client/*"
+        "src/dcd/client/*"
       ]
     }
   ]
diff --git a/makefile b/makefile
index 566852e..00be4b2 100644
--- a/makefile
+++ b/makefile
@@ -27,8 +27,8 @@ clean:
 	rm -f *.o
 
 CLIENT_SRC := \
-	$(shell find src/common -name "*.d")\
-	$(shell find src/client -name "*.d")\
+	$(shell find src/dcd/common -name "*.d")\
+	$(shell find src/dcd/client -name "*.d")\
 	$(shell find msgpack-d/src/ -name "*.d")
 
 DMD_CLIENT_FLAGS := -Imsgpack-d/src\
@@ -54,8 +54,8 @@ LDC_CLIENT_FLAGS := -Imsgpack-d/src\
 	-of=bin/dcd-client
 
 SERVER_SRC := \
-	$(shell find src/common -name "*.d")\
-	$(shell find src/server -name "*.d")\
+	$(shell find src/dcd/common -name "*.d")\
+	$(shell find src/dcd/server -name "*.d")\
 	$(shell find ${DSYMBOL_DIR}/src -name "*.d")\
 	${DPARSE_DIR}/src/dparse/ast.d\
 	${DPARSE_DIR}/src/dparse/entities.d\
diff --git a/src/client/client.d b/src/dcd/client/client.d
similarity index 98%
rename from src/client/client.d
rename to src/dcd/client/client.d
index c04e3f9..83c7071 100644
--- a/src/client/client.d
+++ b/src/dcd/client/client.d
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-module client.client;
+module dcd.client.client;
 
 import std.socket;
 import std.stdio;
@@ -30,9 +30,9 @@ import std.conv;
 import std.string;
 import std.experimental.logger;
 
-import common.messages;
-import common.dcd_version;
-import common.socket;
+import dcd.common.messages;
+import dcd.common.dcd_version;
+import dcd.common.socket;
 
 int main(string[] args)
 {
diff --git a/src/common/constants.d b/src/dcd/common/constants.d
similarity index 99%
rename from src/common/constants.d
rename to src/dcd/common/constants.d
index d788e0d..78626fc 100644
--- a/src/common/constants.d
+++ b/src/dcd/common/constants.d
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-module common.constants;
+module dcd.common.constants;
 
 // The lists in this module should be kept sorted.
 
diff --git a/src/common/dcd_version.d b/src/dcd/common/dcd_version.d
similarity index 96%
rename from src/common/dcd_version.d
rename to src/dcd/common/dcd_version.d
index 2a81868..ea40840 100644
--- a/src/common/dcd_version.d
+++ b/src/dcd/common/dcd_version.d
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-module common.dcd_version;
+module dcd.common.dcd_version;
 
 /**
  * Human-readable version number
diff --git a/src/common/messages.d b/src/dcd/common/messages.d
similarity index 99%
rename from src/common/messages.d
rename to src/dcd/common/messages.d
index 3287758..be47dab 100644
--- a/src/common/messages.d
+++ b/src/dcd/common/messages.d
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-module common.messages;
+module dcd.common.messages;
 
 import std.socket;
 import msgpack;
diff --git a/src/common/socket.d b/src/dcd/common/socket.d
similarity index 98%
rename from src/common/socket.d
rename to src/dcd/common/socket.d
index 9fb2528..9be4246 100644
--- a/src/common/socket.d
+++ b/src/dcd/common/socket.d
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-module common.socket;
+module dcd.common.socket;
 
 import core.sys.posix.unistd; // getuid
 import std.format;
diff --git a/src/server/autocomplete/complete.d b/src/dcd/server/autocomplete/complete.d
similarity index 99%
rename from src/server/autocomplete/complete.d
rename to src/dcd/server/autocomplete/complete.d
index 8e7b079..444dc41 100644
--- a/src/server/autocomplete/complete.d
+++ b/src/dcd/server/autocomplete/complete.d
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-module server.autocomplete.complete;
+module dcd.server.autocomplete.complete;
 
 import std.algorithm;
 import std.array;
@@ -27,7 +27,7 @@ import std.path;
 import std.string;
 import std.typecons;
 
-import server.autocomplete.util;
+import dcd.server.autocomplete.util;
 
 import dparse.lexer;
 import dparse.rollback_allocator;
@@ -40,8 +40,8 @@ import dsymbol.scope_;
 import dsymbol.string_interning;
 import dsymbol.symbol;
 
-import common.constants;
-import common.messages;
+import dcd.common.constants;
+import dcd.common.messages;
 
 /**
  * Handles autocompletion
diff --git a/src/server/autocomplete/doc.d b/src/dcd/server/autocomplete/doc.d
similarity index 95%
rename from src/server/autocomplete/doc.d
rename to src/dcd/server/autocomplete/doc.d
index c450580..e2e97ce 100644
--- a/src/server/autocomplete/doc.d
+++ b/src/dcd/server/autocomplete/doc.d
@@ -16,21 +16,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-module server.autocomplete.doc;
+module dcd.server.autocomplete.doc;
 
 import std.algorithm;
 import std.array;
 import std.experimental.logger;
 import std.typecons;
 
-import server.autocomplete.util;
+import dcd.server.autocomplete.util;
 
 import dparse.lexer;
 import dparse.rollback_allocator;
 
 import dsymbol.modulecache;
 
-import common.messages;
+import dcd.common.messages;
 
 /**
  * Gets documentation for the symbol at the cursor
diff --git a/src/server/autocomplete/localuse.d b/src/dcd/server/autocomplete/localuse.d
similarity index 97%
rename from src/server/autocomplete/localuse.d
rename to src/dcd/server/autocomplete/localuse.d
index 65ae294..7990498 100644
--- a/src/server/autocomplete/localuse.d
+++ b/src/dcd/server/autocomplete/localuse.d
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-module server.autocomplete.localuse;
+module dcd.server.autocomplete.localuse;
 
 import std.experimental.logger;
 import std.range;
 import std.typecons;
 
-import server.autocomplete.util;
+import dcd.server.autocomplete.util;
 
 import dparse.lexer;
 import dparse.rollback_allocator;
@@ -31,7 +31,7 @@ import dsymbol.conversion;
 import dsymbol.modulecache;
 import dsymbol.symbol;
 
-import common.messages;
+import dcd.common.messages;
 
 /**
  * Finds the uses of the symbol at the cursor position within a single document.
diff --git a/src/server/autocomplete/package.d b/src/dcd/server/autocomplete/package.d
similarity index 80%
rename from src/server/autocomplete/package.d
rename to src/dcd/server/autocomplete/package.d
index 502305e..ee7811c 100644
--- a/src/server/autocomplete/package.d
+++ b/src/dcd/server/autocomplete/package.d
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-module server.autocomplete;
+module dcd.server.autocomplete;
 
 public:
 
-import server.autocomplete.complete;
-import server.autocomplete.doc;
-import server.autocomplete.localuse;
-import server.autocomplete.symbols;
+import dcd.server.autocomplete.complete;
+import dcd.server.autocomplete.doc;
+import dcd.server.autocomplete.localuse;
+import dcd.server.autocomplete.symbols;
diff --git a/src/server/autocomplete/symbols.d b/src/dcd/server/autocomplete/symbols.d
similarity index 97%
rename from src/server/autocomplete/symbols.d
rename to src/dcd/server/autocomplete/symbols.d
index cf28b74..ead6575 100644
--- a/src/server/autocomplete/symbols.d
+++ b/src/dcd/server/autocomplete/symbols.d
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-module server.autocomplete.symbols;
+module dcd.server.autocomplete.symbols;
 
 import std.experimental.logger;
 import std.typecons;
 
-import server.autocomplete.util;
+import dcd.server.autocomplete.util;
 
 import dparse.lexer;
 import dparse.rollback_allocator;
@@ -31,7 +31,7 @@ import dsymbol.modulecache;
 import dsymbol.string_interning;
 import dsymbol.symbol;
 
-import common.messages;
+import dcd.common.messages;
 
 import containers.hashset;
 
diff --git a/src/server/autocomplete/util.d b/src/dcd/server/autocomplete/util.d
similarity index 99%
rename from src/server/autocomplete/util.d
rename to src/dcd/server/autocomplete/util.d
index f9f1263..397b77d 100644
--- a/src/server/autocomplete/util.d
+++ b/src/dcd/server/autocomplete/util.d
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-module server.autocomplete.util;
+module dcd.server.autocomplete.util;
 
 import std.algorithm;
 import std.experimental.allocator;
@@ -25,7 +25,7 @@ import std.range;
 import std.string;
 import std.typecons;
 
-import common.messages;
+import dcd.common.messages;
 
 import dparse.lexer;
 import dparse.rollback_allocator;
diff --git a/src/server/main.d b/src/dcd/server/main.d
similarity index 98%
rename from src/server/main.d
rename to src/dcd/server/main.d
index f699f7e..8f243bb 100644
--- a/src/server/main.d
+++ b/src/dcd/server/main.d
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-module server.main;
+module dcd.server.main;
 
 import core.sys.posix.sys.stat;
 import std.algorithm;
@@ -36,12 +36,12 @@ import std.stdio;
 
 import msgpack;
 
-import common.dcd_version;
-import common.messages;
-import common.socket;
+import dcd.common.dcd_version;
+import dcd.common.messages;
+import dcd.common.socket;
 import dsymbol.modulecache;
-import server.autocomplete;
-import server.server;
+import dcd.server.autocomplete;
+import dcd.server.server;
 
 int main(string[] args)
 {
diff --git a/src/server/server.d b/src/dcd/server/server.d
similarity index 99%
rename from src/server/server.d
rename to src/dcd/server/server.d
index c18f5f1..10b3651 100644
--- a/src/server/server.d
+++ b/src/dcd/server/server.d
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-module server.server;
+module dcd.server.server;
 
 import std.algorithm;
 import std.array;