diff --git a/.gitignore b/.gitignore
index 6f3894d06..c14aad97b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -55,9 +55,10 @@ build/Xcode/FlatBuffers.xcodeproj/xcuserdata/**
 FlatBuffers.xcodeproj/
 java/.idea
 java/*.iml
-java/target
-**/*.pyc
 .idea
+*.iml
+target
+**/*.pyc
 build/VS2010/FlatBuffers.sdf
 build/VS2010/FlatBuffers.opensdf
 build/VS2010/ipch/**/*.ipch
diff --git a/java/pom.xml b/pom.xml
similarity index 98%
rename from java/pom.xml
rename to pom.xml
index dd92b9d55..28d50d283 100644
--- a/java/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
   <dependencies>
   </dependencies>
   <build>
-    <sourceDirectory>./</sourceDirectory>
+    <sourceDirectory>java</sourceDirectory>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>