diff --git a/Makefile b/Makefile
index bc2952b..b662908 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 TARGET ?= target/psse
-SRC_DIRS ?= ./src
+SRC_DIRS ?= ./src/c
 
 SRCS := $(shell find $(SRC_DIRS) -name *.cpp -or -name *.c -or -name *.s)
 HDRS := $(shell find $(SRC_DIRS) -name *.h)
diff --git a/src/arith/integer.c b/src/c/arith/integer.c
similarity index 100%
rename from src/arith/integer.c
rename to src/c/arith/integer.c
diff --git a/src/arith/integer.h b/src/c/arith/integer.h
similarity index 100%
rename from src/arith/integer.h
rename to src/c/arith/integer.h
diff --git a/src/arith/peano.c b/src/c/arith/peano.c
similarity index 100%
rename from src/arith/peano.c
rename to src/c/arith/peano.c
diff --git a/src/arith/peano.h b/src/c/arith/peano.h
similarity index 100%
rename from src/arith/peano.h
rename to src/c/arith/peano.h
diff --git a/src/arith/ratio.c b/src/c/arith/ratio.c
similarity index 100%
rename from src/arith/ratio.c
rename to src/c/arith/ratio.c
diff --git a/src/arith/ratio.h b/src/c/arith/ratio.h
similarity index 100%
rename from src/arith/ratio.h
rename to src/c/arith/ratio.h
diff --git a/src/arith/real.c b/src/c/arith/real.c
similarity index 100%
rename from src/arith/real.c
rename to src/c/arith/real.c
diff --git a/src/arith/real.h b/src/c/arith/real.h
similarity index 100%
rename from src/arith/real.h
rename to src/c/arith/real.h
diff --git a/src/authorise.c b/src/c/authorise.c
similarity index 100%
rename from src/authorise.c
rename to src/c/authorise.c
diff --git a/src/authorise.h b/src/c/authorise.h
similarity index 100%
rename from src/authorise.h
rename to src/c/authorise.h
diff --git a/src/debug.c b/src/c/debug.c
similarity index 100%
rename from src/debug.c
rename to src/c/debug.c
diff --git a/src/debug.h b/src/c/debug.h
similarity index 100%
rename from src/debug.h
rename to src/c/debug.h
diff --git a/src/init.c b/src/c/init.c
similarity index 100%
rename from src/init.c
rename to src/c/init.c
diff --git a/src/io/fopen.c b/src/c/io/fopen.c
similarity index 100%
rename from src/io/fopen.c
rename to src/c/io/fopen.c
diff --git a/src/io/fopen.h b/src/c/io/fopen.h
similarity index 100%
rename from src/io/fopen.h
rename to src/c/io/fopen.h
diff --git a/src/io/history.c b/src/c/io/history.c
similarity index 100%
rename from src/io/history.c
rename to src/c/io/history.c
diff --git a/src/io/history.h b/src/c/io/history.h
similarity index 100%
rename from src/io/history.h
rename to src/c/io/history.h
diff --git a/src/io/io.c b/src/c/io/io.c
similarity index 100%
rename from src/io/io.c
rename to src/c/io/io.c
diff --git a/src/io/io.h b/src/c/io/io.h
similarity index 100%
rename from src/io/io.h
rename to src/c/io/io.h
diff --git a/src/io/print.c b/src/c/io/print.c
similarity index 100%
rename from src/io/print.c
rename to src/c/io/print.c
diff --git a/src/io/print.h b/src/c/io/print.h
similarity index 100%
rename from src/io/print.h
rename to src/c/io/print.h
diff --git a/src/io/read.c b/src/c/io/read.c
similarity index 100%
rename from src/io/read.c
rename to src/c/io/read.c
diff --git a/src/io/read.h b/src/c/io/read.h
similarity index 100%
rename from src/io/read.h
rename to src/c/io/read.h
diff --git a/src/memory/conspage.c b/src/c/memory/conspage.c
similarity index 100%
rename from src/memory/conspage.c
rename to src/c/memory/conspage.c
diff --git a/src/memory/conspage.h b/src/c/memory/conspage.h
similarity index 100%
rename from src/memory/conspage.h
rename to src/c/memory/conspage.h
diff --git a/src/memory/consspaceobject.c b/src/c/memory/consspaceobject.c
similarity index 100%
rename from src/memory/consspaceobject.c
rename to src/c/memory/consspaceobject.c
diff --git a/src/memory/consspaceobject.h b/src/c/memory/consspaceobject.h
similarity index 100%
rename from src/memory/consspaceobject.h
rename to src/c/memory/consspaceobject.h
diff --git a/src/memory/cursor.c b/src/c/memory/cursor.c
similarity index 100%
rename from src/memory/cursor.c
rename to src/c/memory/cursor.c
diff --git a/src/memory/cursor.h b/src/c/memory/cursor.h
similarity index 100%
rename from src/memory/cursor.h
rename to src/c/memory/cursor.h
diff --git a/src/memory/dump.c b/src/c/memory/dump.c
similarity index 100%
rename from src/memory/dump.c
rename to src/c/memory/dump.c
diff --git a/src/memory/dump.h b/src/c/memory/dump.h
similarity index 100%
rename from src/memory/dump.h
rename to src/c/memory/dump.h
diff --git a/src/memory/hashmap.c b/src/c/memory/hashmap.c
similarity index 100%
rename from src/memory/hashmap.c
rename to src/c/memory/hashmap.c
diff --git a/src/memory/hashmap.h b/src/c/memory/hashmap.h
similarity index 100%
rename from src/memory/hashmap.h
rename to src/c/memory/hashmap.h
diff --git a/src/memory/lookup3.c b/src/c/memory/lookup3.c
similarity index 100%
rename from src/memory/lookup3.c
rename to src/c/memory/lookup3.c
diff --git a/src/memory/lookup3.h b/src/c/memory/lookup3.h
similarity index 100%
rename from src/memory/lookup3.h
rename to src/c/memory/lookup3.h
diff --git a/src/memory/stack.c b/src/c/memory/stack.c
similarity index 100%
rename from src/memory/stack.c
rename to src/c/memory/stack.c
diff --git a/src/memory/stack.h b/src/c/memory/stack.h
similarity index 100%
rename from src/memory/stack.h
rename to src/c/memory/stack.h
diff --git a/src/memory/vectorspace.c b/src/c/memory/vectorspace.c
similarity index 100%
rename from src/memory/vectorspace.c
rename to src/c/memory/vectorspace.c
diff --git a/src/memory/vectorspace.h b/src/c/memory/vectorspace.h
similarity index 100%
rename from src/memory/vectorspace.h
rename to src/c/memory/vectorspace.h
diff --git a/src/ops/equal.c b/src/c/ops/equal.c
similarity index 100%
rename from src/ops/equal.c
rename to src/c/ops/equal.c
diff --git a/src/ops/equal.h b/src/c/ops/equal.h
similarity index 100%
rename from src/ops/equal.h
rename to src/c/ops/equal.h
diff --git a/src/ops/intern.c b/src/c/ops/intern.c
similarity index 100%
rename from src/ops/intern.c
rename to src/c/ops/intern.c
diff --git a/src/ops/intern.h b/src/c/ops/intern.h
similarity index 100%
rename from src/ops/intern.h
rename to src/c/ops/intern.h
diff --git a/src/ops/lispops.c b/src/c/ops/lispops.c
similarity index 100%
rename from src/ops/lispops.c
rename to src/c/ops/lispops.c
diff --git a/src/ops/lispops.h b/src/c/ops/lispops.h
similarity index 100%
rename from src/ops/lispops.h
rename to src/c/ops/lispops.h
diff --git a/src/ops/loop.c b/src/c/ops/loop.c
similarity index 100%
rename from src/ops/loop.c
rename to src/c/ops/loop.c
diff --git a/src/ops/loop.h b/src/c/ops/loop.h
similarity index 100%
rename from src/ops/loop.h
rename to src/c/ops/loop.h
diff --git a/src/ops/meta.c b/src/c/ops/meta.c
similarity index 100%
rename from src/ops/meta.c
rename to src/c/ops/meta.c
diff --git a/src/ops/meta.h b/src/c/ops/meta.h
similarity index 100%
rename from src/ops/meta.h
rename to src/c/ops/meta.h
diff --git a/src/repl.c b/src/c/repl.c
similarity index 100%
rename from src/repl.c
rename to src/c/repl.c
diff --git a/src/repl.h b/src/c/repl.h
similarity index 100%
rename from src/repl.h
rename to src/c/repl.h
diff --git a/src/time/psse_time.c b/src/c/time/psse_time.c
similarity index 100%
rename from src/time/psse_time.c
rename to src/c/time/psse_time.c
diff --git a/src/time/psse_time.h b/src/c/time/psse_time.h
similarity index 100%
rename from src/time/psse_time.h
rename to src/c/time/psse_time.h
diff --git a/src/utils.c b/src/c/utils.c
similarity index 100%
rename from src/utils.c
rename to src/c/utils.c
diff --git a/src/utils.h b/src/c/utils.h
similarity index 100%
rename from src/utils.h
rename to src/c/utils.h
diff --git a/src/version.h b/src/c/version.h
similarity index 87%
rename from src/version.h
rename to src/c/version.h
index 462f9be..6548d30 100644
--- a/src/version.h
+++ b/src/c/version.h
@@ -8,4 +8,4 @@
  *  Licensed under GPL version 2.0, or, at your option, any later version.
  */
 
-#define VERSION "0.0.6-SNAPSHOT"
+#define VERSION "0.0.7-SNAPSHOT"