diff --git a/Makefile b/Makefile
index aab59ed..4ff0f33 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 CXX=clang++
 CXX_FLAGS=-std=c++11 -stdlib=libc++ `pkg-config capnp --cflags --libs`
 
-CAPNPC_JAVA_SOURCES=generator/src/main/cpp/compiler/capnpc-java.c++
+CAPNPC_JAVA_SOURCES=compiler/src/main/cpp/capnpc-java.c++
 
 .PHONY: all clean addressbook
 
@@ -16,4 +16,4 @@ capnpc-java : $(CAPNPC_JAVA_SOURCES)
 addressbook : capnpc-java
 	PWD=pwd
 	mkdir -p examples/src/main/generated
-	capnp compile -I$(PWD)/generator/src/main/cpp/compiler --src-prefix=examples/src/main/schema -o./capnpc-java:examples/src/main/generated examples/src/main/schema/addressbook.capnp
+	capnp compile -I$(PWD)/compiler/src/main/cpp --src-prefix=examples/src/main/schema -o./capnpc-java:examples/src/main/generated examples/src/main/schema/addressbook.capnp
diff --git a/generator/src/main/cpp/compiler/capnpc-java.c++ b/compiler/src/main/cpp/capnpc-java.c++
similarity index 100%
rename from generator/src/main/cpp/compiler/capnpc-java.c++
rename to compiler/src/main/cpp/capnpc-java.c++
diff --git a/generator/src/main/cpp/compiler/java_support/java.capnp b/compiler/src/main/cpp/java_support/java.capnp
similarity index 100%
rename from generator/src/main/cpp/compiler/java_support/java.capnp
rename to compiler/src/main/cpp/java_support/java.capnp
diff --git a/generator/src/main/cpp/compiler/java_support/java.capnp.c++ b/compiler/src/main/cpp/java_support/java.capnp.c++
similarity index 100%
rename from generator/src/main/cpp/compiler/java_support/java.capnp.c++
rename to compiler/src/main/cpp/java_support/java.capnp.c++
diff --git a/generator/src/main/cpp/compiler/java_support/java.capnp.h b/compiler/src/main/cpp/java_support/java.capnp.h
similarity index 100%
rename from generator/src/main/cpp/compiler/java_support/java.capnp.h
rename to compiler/src/main/cpp/java_support/java.capnp.h
diff --git a/project/build.scala b/project/build.scala
index 9a826f9..37240f8 100644
--- a/project/build.scala
+++ b/project/build.scala
@@ -7,22 +7,27 @@ object Build extends sbt.Build {
     project(
       id = "capnproto-java",
       base = file(".")
-    ).aggregate(generator, examples)
+    ).aggregate(compiler, runtime, examples)
       .settings(cleanFiles <+= baseDirectory { base => base / "capnpc-java"})
 
-  lazy val generator =
+  lazy val compiler =
     project(
-      id = "generator",
-      base = file("generator")
-    ).settings(Defaults.itSettings: _*)
-      .settings(makeCppTask)
+      id = "compiler",
+      base = file("compiler")
+    ).settings(makeCppTask)
       .settings(compile <<= compile in Compile dependsOn makeCpp)
 
+  lazy val runtime =
+    project(
+      id = "runtime",
+      base = file("runtime")
+    )
+
   lazy val examples =
     project(
       id = "examples",
       base = file("examples")
-    ).dependsOn(generator)
+    ).dependsOn(runtime)
       .settings(makeExamplesTask)
       .settings(compile <<= compile in Compile dependsOn makeExamples)
       .settings(unmanagedSourceDirectories in Compile += sourceDirectory.value / "main" / "generated")
diff --git a/generator/src/main/java/org/capnproto/AnyPointer.java b/runtime/src/main/java/org/capnproto/AnyPointer.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/AnyPointer.java
rename to runtime/src/main/java/org/capnproto/AnyPointer.java
diff --git a/generator/src/main/java/org/capnproto/DecodeException.java b/runtime/src/main/java/org/capnproto/DecodeException.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/DecodeException.java
rename to runtime/src/main/java/org/capnproto/DecodeException.java
diff --git a/generator/src/main/java/org/capnproto/FieldSize.java b/runtime/src/main/java/org/capnproto/FieldSize.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/FieldSize.java
rename to runtime/src/main/java/org/capnproto/FieldSize.java
diff --git a/generator/src/main/java/org/capnproto/FromStructBuilder.java b/runtime/src/main/java/org/capnproto/FromStructBuilder.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/FromStructBuilder.java
rename to runtime/src/main/java/org/capnproto/FromStructBuilder.java
diff --git a/generator/src/main/java/org/capnproto/FromStructReader.java b/runtime/src/main/java/org/capnproto/FromStructReader.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/FromStructReader.java
rename to runtime/src/main/java/org/capnproto/FromStructReader.java
diff --git a/generator/src/main/java/org/capnproto/InputStreamMessageReader.java b/runtime/src/main/java/org/capnproto/InputStreamMessageReader.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/InputStreamMessageReader.java
rename to runtime/src/main/java/org/capnproto/InputStreamMessageReader.java
diff --git a/generator/src/main/java/org/capnproto/ListBuilder.java b/runtime/src/main/java/org/capnproto/ListBuilder.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/ListBuilder.java
rename to runtime/src/main/java/org/capnproto/ListBuilder.java
diff --git a/generator/src/main/java/org/capnproto/ListPointer.java b/runtime/src/main/java/org/capnproto/ListPointer.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/ListPointer.java
rename to runtime/src/main/java/org/capnproto/ListPointer.java
diff --git a/generator/src/main/java/org/capnproto/ListReader.java b/runtime/src/main/java/org/capnproto/ListReader.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/ListReader.java
rename to runtime/src/main/java/org/capnproto/ListReader.java
diff --git a/generator/src/main/java/org/capnproto/MessageBuilder.java b/runtime/src/main/java/org/capnproto/MessageBuilder.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/MessageBuilder.java
rename to runtime/src/main/java/org/capnproto/MessageBuilder.java
diff --git a/generator/src/main/java/org/capnproto/MessageReader.java b/runtime/src/main/java/org/capnproto/MessageReader.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/MessageReader.java
rename to runtime/src/main/java/org/capnproto/MessageReader.java
diff --git a/generator/src/main/java/org/capnproto/PointerBuilder.java b/runtime/src/main/java/org/capnproto/PointerBuilder.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/PointerBuilder.java
rename to runtime/src/main/java/org/capnproto/PointerBuilder.java
diff --git a/generator/src/main/java/org/capnproto/PointerReader.java b/runtime/src/main/java/org/capnproto/PointerReader.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/PointerReader.java
rename to runtime/src/main/java/org/capnproto/PointerReader.java
diff --git a/generator/src/main/java/org/capnproto/SegmentBuilder.java b/runtime/src/main/java/org/capnproto/SegmentBuilder.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/SegmentBuilder.java
rename to runtime/src/main/java/org/capnproto/SegmentBuilder.java
diff --git a/generator/src/main/java/org/capnproto/SegmentReader.java b/runtime/src/main/java/org/capnproto/SegmentReader.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/SegmentReader.java
rename to runtime/src/main/java/org/capnproto/SegmentReader.java
diff --git a/generator/src/main/java/org/capnproto/StructBuilder.java b/runtime/src/main/java/org/capnproto/StructBuilder.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/StructBuilder.java
rename to runtime/src/main/java/org/capnproto/StructBuilder.java
diff --git a/generator/src/main/java/org/capnproto/StructList.java b/runtime/src/main/java/org/capnproto/StructList.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/StructList.java
rename to runtime/src/main/java/org/capnproto/StructList.java
diff --git a/generator/src/main/java/org/capnproto/StructPointer.java b/runtime/src/main/java/org/capnproto/StructPointer.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/StructPointer.java
rename to runtime/src/main/java/org/capnproto/StructPointer.java
diff --git a/generator/src/main/java/org/capnproto/StructReader.java b/runtime/src/main/java/org/capnproto/StructReader.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/StructReader.java
rename to runtime/src/main/java/org/capnproto/StructReader.java
diff --git a/generator/src/main/java/org/capnproto/StructSize.java b/runtime/src/main/java/org/capnproto/StructSize.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/StructSize.java
rename to runtime/src/main/java/org/capnproto/StructSize.java
diff --git a/generator/src/main/java/org/capnproto/Text.java b/runtime/src/main/java/org/capnproto/Text.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/Text.java
rename to runtime/src/main/java/org/capnproto/Text.java
diff --git a/generator/src/main/java/org/capnproto/WireHelpers.java b/runtime/src/main/java/org/capnproto/WireHelpers.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/WireHelpers.java
rename to runtime/src/main/java/org/capnproto/WireHelpers.java
diff --git a/generator/src/main/java/org/capnproto/WirePointer.java b/runtime/src/main/java/org/capnproto/WirePointer.java
similarity index 100%
rename from generator/src/main/java/org/capnproto/WirePointer.java
rename to runtime/src/main/java/org/capnproto/WirePointer.java