diff --git a/.gitignore b/.gitignore
index 8ecc863..b2b6a39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,14 +2,10 @@
 /configure
 /common.mk
 /config.mk
-/include/config.h
+/src/include/config.h
+/deps
+/build
+/md4c
 /qmdoc
 /qmdoc.css
 /no-toc.css
-*.o
-*.lo
-*.d
-/md4c
-/limb
-/limb.built
-/skalibs
diff --git a/include/md4c.h b/include/md4c.h
deleted file mode 120000
index 9a4f178..0000000
--- a/include/md4c.h
+++ /dev/null
@@ -1 +0,0 @@
-../md4c/src/md4c.h
\ No newline at end of file
diff --git a/meta/bins/qmdoc b/meta/bins/qmdoc
deleted file mode 100644
index 92e2e79..0000000
--- a/meta/bins/qmdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-src/main.o
-limb
-skalibs
-src/md4c.o
diff --git a/meta/deps/skalibs/get_version b/meta/deps/skalibs/get_version
deleted file mode 100755
index 55041f5..0000000
--- a/meta/deps/skalibs/get_version
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-grep SKALIBS_VERSION "$@/skalibs/config.h" | cut -d\" -f2
diff --git a/meta/deps/skalibs/git b/meta/deps/skalibs/git
deleted file mode 100644
index 5965139..0000000
--- a/meta/deps/skalibs/git
+++ /dev/null
@@ -1 +0,0 @@
-git://lila.oss/skalibs.git
diff --git a/meta/deps/skalibs/incdir b/meta/deps/skalibs/incdir
deleted file mode 100644
index e4484e2..0000000
--- a/meta/deps/skalibs/incdir
+++ /dev/null
@@ -1 +0,0 @@
-src/include
diff --git a/meta/deps/skalibs/libdir b/meta/deps/skalibs/libdir
deleted file mode 100644
index 5baacc7..0000000
--- a/meta/deps/skalibs/libdir
+++ /dev/null
@@ -1 +0,0 @@
-skalibs
diff --git a/meta/deps/skalibs/library b/meta/deps/skalibs/library
deleted file mode 100644
index 39971a0..0000000
--- a/meta/deps/skalibs/library
+++ /dev/null
@@ -1 +0,0 @@
-skarnet
diff --git a/meta/deps/skalibs/version b/meta/deps/skalibs/version
deleted file mode 100644
index 0ab9020..0000000
--- a/meta/deps/skalibs/version
+++ /dev/null
@@ -1 +0,0 @@
-2.8.0.0
diff --git a/project.mk b/project.mk
index 953f5cb..92cf033 100644
--- a/project.mk
+++ b/project.mk
@@ -1,16 +1,17 @@
-qmdoc.css: css/struct.css css/common.css css/light.css css/dark.css
-no-toc.css: css/no-toc.css
+build/qmdoc.css: src/extra/css/struct.css src/extra/css/common.css \
+	src/extra/css/light.css src/extra/css/dark.css
+build/no-toc.css: src/extra/css/no-toc.css
 
 BINS = qmdoc
-CSS = qmdoc.css
-CSS_NOTOC = no-toc.css
+CSS = build/qmdoc.css
+CSS_NOTOC = build/no-toc.css
 DATA = $(CSS) $(CSS_NOTOC)
 
 all: $(CSS) $(CSS_NOTOC)
 CLEAN += $(CSS) $(CSS_NOTOC)
 
 
-%.css:
+%.css: | build
 	$(_CSS) cat $^ > $@
 
-_CSS = $(if $(V),,$(call say,"  CSS ")$@;)
+_CSS = $(if $(V),,$(call say," CSS  ")$@;)
diff --git a/doc/qmdoc.1.md b/src/doc/qmdoc.1.md
similarity index 100%
rename from doc/qmdoc.1.md
rename to src/doc/qmdoc.1.md
diff --git a/css/common.css b/src/extra/css/common.css
similarity index 100%
rename from css/common.css
rename to src/extra/css/common.css
diff --git a/css/dark.css b/src/extra/css/dark.css
similarity index 100%
rename from css/dark.css
rename to src/extra/css/dark.css
diff --git a/css/light.css b/src/extra/css/light.css
similarity index 100%
rename from css/light.css
rename to src/extra/css/light.css
diff --git a/css/no-toc.css b/src/extra/css/no-toc.css
similarity index 100%
rename from css/no-toc.css
rename to src/extra/css/no-toc.css
diff --git a/css/struct.css b/src/extra/css/struct.css
similarity index 100%
rename from css/struct.css
rename to src/extra/css/struct.css
diff --git a/src/include/md4c.h b/src/include/md4c.h
new file mode 120000
index 0000000..b8f596e
--- /dev/null
+++ b/src/include/md4c.h
@@ -0,0 +1 @@
+../../md4c/src/md4c.h
\ No newline at end of file
diff --git a/include/qmdoc.h b/src/include/qmdoc.h
similarity index 100%
rename from include/qmdoc.h
rename to src/include/qmdoc.h
diff --git a/src/md4c.c b/src/md4c.c
deleted file mode 120000
index 4a2f861..0000000
--- a/src/md4c.c
+++ /dev/null
@@ -1 +0,0 @@
-../md4c/src/md4c.c
\ No newline at end of file
diff --git a/meta/deps/skalibs/include b/src/qmdoc/+limb
similarity index 100%
rename from meta/deps/skalibs/include
rename to src/qmdoc/+limb
diff --git a/src/qmdoc/md4c.c b/src/qmdoc/md4c.c
new file mode 120000
index 0000000..46c0108
--- /dev/null
+++ b/src/qmdoc/md4c.c
@@ -0,0 +1 @@
+../../md4c/src/md4c.c
\ No newline at end of file
diff --git a/src/main.c b/src/qmdoc/qmdoc.c
similarity index 100%
rename from src/main.c
rename to src/qmdoc/qmdoc.c