diff --git a/boost/Makefile.am b/src/boost/Makefile.am
similarity index 100%
rename from boost/Makefile.am
rename to src/boost/Makefile.am
diff --git a/boost/format.hpp b/src/boost/format.hpp
similarity index 100%
rename from boost/format.hpp
rename to src/boost/format.hpp
diff --git a/boost/format/Makefile.am b/src/boost/format/Makefile.am
similarity index 100%
rename from boost/format/Makefile.am
rename to src/boost/format/Makefile.am
diff --git a/boost/format/exceptions.hpp b/src/boost/format/exceptions.hpp
similarity index 100%
rename from boost/format/exceptions.hpp
rename to src/boost/format/exceptions.hpp
diff --git a/boost/format/feed_args.hpp b/src/boost/format/feed_args.hpp
similarity index 100%
rename from boost/format/feed_args.hpp
rename to src/boost/format/feed_args.hpp
diff --git a/boost/format/format_class.hpp b/src/boost/format/format_class.hpp
similarity index 100%
rename from boost/format/format_class.hpp
rename to src/boost/format/format_class.hpp
diff --git a/boost/format/format_fwd.hpp b/src/boost/format/format_fwd.hpp
similarity index 100%
rename from boost/format/format_fwd.hpp
rename to src/boost/format/format_fwd.hpp
diff --git a/boost/format/format_implementation.cc b/src/boost/format/format_implementation.cc
similarity index 100%
rename from boost/format/format_implementation.cc
rename to src/boost/format/format_implementation.cc
diff --git a/boost/format/free_funcs.cc b/src/boost/format/free_funcs.cc
similarity index 100%
rename from boost/format/free_funcs.cc
rename to src/boost/format/free_funcs.cc
diff --git a/boost/format/group.hpp b/src/boost/format/group.hpp
similarity index 100%
rename from boost/format/group.hpp
rename to src/boost/format/group.hpp
diff --git a/boost/format/internals.hpp b/src/boost/format/internals.hpp
similarity index 100%
rename from boost/format/internals.hpp
rename to src/boost/format/internals.hpp
diff --git a/boost/format/internals_fwd.hpp b/src/boost/format/internals_fwd.hpp
similarity index 100%
rename from boost/format/internals_fwd.hpp
rename to src/boost/format/internals_fwd.hpp
diff --git a/boost/format/macros_default.hpp b/src/boost/format/macros_default.hpp
similarity index 100%
rename from boost/format/macros_default.hpp
rename to src/boost/format/macros_default.hpp
diff --git a/boost/format/parsing.cc b/src/boost/format/parsing.cc
similarity index 100%
rename from boost/format/parsing.cc
rename to src/boost/format/parsing.cc
diff --git a/src/fix.cc b/src/fix/fix.cc
similarity index 100%
rename from src/fix.cc
rename to src/fix/fix.cc
diff --git a/src/shared.cc b/src/libmain/shared.cc
similarity index 100%
rename from src/shared.cc
rename to src/libmain/shared.cc
diff --git a/src/shared.hh b/src/libmain/shared.hh
similarity index 100%
rename from src/shared.hh
rename to src/libmain/shared.hh
diff --git a/src/archive.cc b/src/libnix/archive.cc
similarity index 100%
rename from src/archive.cc
rename to src/libnix/archive.cc
diff --git a/src/archive.hh b/src/libnix/archive.hh
similarity index 100%
rename from src/archive.hh
rename to src/libnix/archive.hh
diff --git a/src/db.cc b/src/libnix/db.cc
similarity index 100%
rename from src/db.cc
rename to src/libnix/db.cc
diff --git a/src/db.hh b/src/libnix/db.hh
similarity index 100%
rename from src/db.hh
rename to src/libnix/db.hh
diff --git a/src/exec.cc b/src/libnix/exec.cc
similarity index 100%
rename from src/exec.cc
rename to src/libnix/exec.cc
diff --git a/src/exec.hh b/src/libnix/exec.hh
similarity index 100%
rename from src/exec.hh
rename to src/libnix/exec.hh
diff --git a/src/expr.cc b/src/libnix/expr.cc
similarity index 100%
rename from src/expr.cc
rename to src/libnix/expr.cc
diff --git a/src/expr.hh b/src/libnix/expr.hh
similarity index 100%
rename from src/expr.hh
rename to src/libnix/expr.hh
diff --git a/src/globals.cc b/src/libnix/globals.cc
similarity index 100%
rename from src/globals.cc
rename to src/libnix/globals.cc
diff --git a/src/globals.hh b/src/libnix/globals.hh
similarity index 100%
rename from src/globals.hh
rename to src/libnix/globals.hh
diff --git a/src/hash.cc b/src/libnix/hash.cc
similarity index 100%
rename from src/hash.cc
rename to src/libnix/hash.cc
diff --git a/src/hash.hh b/src/libnix/hash.hh
similarity index 100%
rename from src/hash.hh
rename to src/libnix/hash.hh
diff --git a/src/md5.c b/src/libnix/md5.c
similarity index 100%
rename from src/md5.c
rename to src/libnix/md5.c
diff --git a/src/md5.h b/src/libnix/md5.h
similarity index 100%
rename from src/md5.h
rename to src/libnix/md5.h
diff --git a/src/normalise.cc b/src/libnix/normalise.cc
similarity index 100%
rename from src/normalise.cc
rename to src/libnix/normalise.cc
diff --git a/src/normalise.hh b/src/libnix/normalise.hh
similarity index 100%
rename from src/normalise.hh
rename to src/libnix/normalise.hh
diff --git a/src/pathlocks.cc b/src/libnix/pathlocks.cc
similarity index 100%
rename from src/pathlocks.cc
rename to src/libnix/pathlocks.cc
diff --git a/src/pathlocks.hh b/src/libnix/pathlocks.hh
similarity index 100%
rename from src/pathlocks.hh
rename to src/libnix/pathlocks.hh
diff --git a/src/references.cc b/src/libnix/references.cc
similarity index 100%
rename from src/references.cc
rename to src/libnix/references.cc
diff --git a/src/references.hh b/src/libnix/references.hh
similarity index 100%
rename from src/references.hh
rename to src/libnix/references.hh
diff --git a/src/store.cc b/src/libnix/store.cc
similarity index 100%
rename from src/store.cc
rename to src/libnix/store.cc
diff --git a/src/store.hh b/src/libnix/store.hh
similarity index 100%
rename from src/store.hh
rename to src/libnix/store.hh
diff --git a/src/test-builder-1.sh b/src/libnix/test-builder-1.sh
similarity index 100%
rename from src/test-builder-1.sh
rename to src/libnix/test-builder-1.sh
diff --git a/src/test-builder-2.sh b/src/libnix/test-builder-2.sh
similarity index 100%
rename from src/test-builder-2.sh
rename to src/libnix/test-builder-2.sh
diff --git a/src/test.cc b/src/libnix/test.cc
similarity index 100%
rename from src/test.cc
rename to src/libnix/test.cc
diff --git a/src/util.cc b/src/libnix/util.cc
similarity index 100%
rename from src/util.cc
rename to src/libnix/util.cc
diff --git a/src/util.hh b/src/libnix/util.hh
similarity index 100%
rename from src/util.hh
rename to src/libnix/util.hh
diff --git a/src/nix-hash.cc b/src/nix-hash/nix-hash.cc
similarity index 100%
rename from src/nix-hash.cc
rename to src/nix-hash/nix-hash.cc
diff --git a/src/dotgraph.cc b/src/nix/dotgraph.cc
similarity index 100%
rename from src/dotgraph.cc
rename to src/nix/dotgraph.cc
diff --git a/src/dotgraph.hh b/src/nix/dotgraph.hh
similarity index 100%
rename from src/dotgraph.hh
rename to src/nix/dotgraph.hh
diff --git a/src/nix-help.txt b/src/nix/nix-help.txt
similarity index 100%
rename from src/nix-help.txt
rename to src/nix/nix-help.txt
diff --git a/src/nix.cc b/src/nix/nix.cc
similarity index 100%
rename from src/nix.cc
rename to src/nix/nix.cc
diff --git a/src/test-expr-1.nix b/src/test-expr-1.nix
deleted file mode 100644
index a94ee73828..0000000000
--- a/src/test-expr-1.nix
+++ /dev/null
@@ -1 +0,0 @@
-Str("Hello World")