diff --git a/code-gen/build.xml b/code-gen/build.xml
index 848c2102015..0002fda20f5 100644
--- a/code-gen/build.xml
+++ b/code-gen/build.xml
@@ -5,6 +5,11 @@
 		<isset property="env.BUILD_COMMON" />
 	</condition>
 
+        <mkdir dir="lib"/>
+        <mkdir dir="lib/ext"/>
+        <mkdir dir="build"/>
+	<mkdir dir="src/main/scala"/>
+
 	<echo message="using build common dir: ${build.common.dir}"/>
 	<import file="${build.common.dir}/ant/ant-common.xml" />
 	<import file="${build.common.dir}/ant/ant-server.xml" />
diff --git a/java/.build.xml.swp b/java/.build.xml.swp
deleted file mode 100644
index 4f004f8504f..00000000000
Binary files a/java/.build.xml.swp and /dev/null differ
diff --git a/java/.ivy.xml.swp b/java/.ivy.xml.swp
deleted file mode 100644
index 5ac72b28975..00000000000
Binary files a/java/.ivy.xml.swp and /dev/null differ
diff --git a/java/build.xml b/java/build.xml
index c08b9189d7f..5e662ecf0da 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -3,6 +3,10 @@
 	<property environment="env" />
         <property name="version.identifier" value="4.04" />
 
+	<mkdir dir="lib"/>
+	<mkdir dir="lib/ext"/>
+	<mkdir dir="build"/>
+
 	<!-- property name="application.description" value="Wordnik Java Driver"/>
 	<property name="application.name" value="java-driver"/ -->
 	<condition property="build.common.dir" value="${env.BUILD_COMMON}">