diff --git a/Makefile b/Makefile
index c3343d6..43d301b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,4 @@
-.PHONY: doc
-.PHONY: test
-.PHONY: lib
+.PHONY: doc test
 
 all:
 	${MAKE} -C src
diff --git a/d/Doxyfile b/d/Doxyfile
new file mode 120000
index 0000000..c247307
--- /dev/null
+++ b/d/Doxyfile
@@ -0,0 +1 @@
+../Doxyfile
\ No newline at end of file
diff --git a/d/Makefile b/d/Makefile
new file mode 100644
index 0000000..987a385
--- /dev/null
+++ b/d/Makefile
@@ -0,0 +1,4 @@
+.PHONY: doc
+
+doc:
+	doxygen
diff --git a/d/doc/psyc.svg b/d/doc/psyc.svg
new file mode 120000
index 0000000..73c1ee9
--- /dev/null
+++ b/d/doc/psyc.svg
@@ -0,0 +1 @@
+../../doc/psyc.svg
\ No newline at end of file
diff --git a/include/d/psyc/common.d b/d/include/psyc/common.d
similarity index 100%
rename from include/d/psyc/common.d
rename to d/include/psyc/common.d
diff --git a/include/d/psyc/parser.d b/d/include/psyc/parser.d
similarity index 99%
rename from include/d/psyc/parser.d
rename to d/include/psyc/parser.d
index 9f0e382..e24bdf9 100644
--- a/include/d/psyc/parser.d
+++ b/d/include/psyc/parser.d
@@ -2,7 +2,6 @@ module psyc.parser;
 
 import psyc.common;
 
-
 extern (C):
 
 enum ParseFlag