diff --git a/build.xml b/build.xml
index b395acf7a6..9f16ebd45f 100644
--- a/build.xml
+++ b/build.xml
@@ -10,6 +10,8 @@
     <property name="build.test.dir" value="${build.dir}/test"/>
     <property name="build.classes" value="${build.dir}/classes"/>
     <property name="javadoc.dir" value="${build.dir}/javadoc"/>
+    <property name="interface.dir" value="${basedir}/interface"/>
+    <property name="interface.src.dir" value="${interface.dir}/gen-java"/>
     <property name="test.dir" value="${basedir}/test"/>
     <property name="test.classes" value="${build.dir}/test/classes"/>
     <property name="test.conf" value="${test.dir}/conf"/>
@@ -108,6 +110,7 @@
         <echo message="${ant.project.name}: ${ant.file}"/>
         <javac debug="true" debuglevel="${debuglevel}" destdir="${build.classes}">
             <src path="${build.src}"/>
+            <src path="${interface.src.dir}"/>
             <classpath refid="cassandra.classpath"/>
         </javac>
     </target>
diff --git a/src/org/apache/cassandra/service/Cassandra.java b/interface/gen-java/org/apache/cassandra/service/Cassandra.java
similarity index 100%
rename from src/org/apache/cassandra/service/Cassandra.java
rename to interface/gen-java/org/apache/cassandra/service/Cassandra.java
diff --git a/src/org/apache/cassandra/service/CqlResult_t.java b/interface/gen-java/org/apache/cassandra/service/CqlResult_t.java
similarity index 100%
rename from src/org/apache/cassandra/service/CqlResult_t.java
rename to interface/gen-java/org/apache/cassandra/service/CqlResult_t.java
diff --git a/src/org/apache/cassandra/service/InvalidRequestException.java b/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java
similarity index 100%
rename from src/org/apache/cassandra/service/InvalidRequestException.java
rename to interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java
diff --git a/src/org/apache/cassandra/service/NotFoundException.java b/interface/gen-java/org/apache/cassandra/service/NotFoundException.java
similarity index 100%
rename from src/org/apache/cassandra/service/NotFoundException.java
rename to interface/gen-java/org/apache/cassandra/service/NotFoundException.java
diff --git a/src/org/apache/cassandra/service/batch_mutation_super_t.java b/interface/gen-java/org/apache/cassandra/service/batch_mutation_super_t.java
similarity index 100%
rename from src/org/apache/cassandra/service/batch_mutation_super_t.java
rename to interface/gen-java/org/apache/cassandra/service/batch_mutation_super_t.java
diff --git a/src/org/apache/cassandra/service/batch_mutation_t.java b/interface/gen-java/org/apache/cassandra/service/batch_mutation_t.java
similarity index 100%
rename from src/org/apache/cassandra/service/batch_mutation_t.java
rename to interface/gen-java/org/apache/cassandra/service/batch_mutation_t.java
diff --git a/src/org/apache/cassandra/service/column_t.java b/interface/gen-java/org/apache/cassandra/service/column_t.java
similarity index 100%
rename from src/org/apache/cassandra/service/column_t.java
rename to interface/gen-java/org/apache/cassandra/service/column_t.java
diff --git a/src/org/apache/cassandra/service/superColumn_t.java b/interface/gen-java/org/apache/cassandra/service/superColumn_t.java
similarity index 100%
rename from src/org/apache/cassandra/service/superColumn_t.java
rename to interface/gen-java/org/apache/cassandra/service/superColumn_t.java