diff --git a/.gitignore b/.gitignore
index 911e01c..066987a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ build/
 .idea
 .gradle
 .iml
+target
 
diff --git a/server_extensions_api/build.xml b/server_extensions_api/build.xml
index 65ece64..a695634 100644
--- a/server_extensions_api/build.xml
+++ b/server_extensions_api/build.xml
@@ -20,38 +20,38 @@
     <description>
         BATM server extensions API
     </description>
-  <!-- set global properties for this build -->
-  <property name="src" location="src"/>
-  <property name="build" location="build"/>
-  <property name="dist"  location="dist"/>
-  <property name="libs"  location="libs"/>
+    <!-- set global properties for this build -->
+    <property name="src" location="src/main/java"/>
+    <property name="res" location="src/main/resources"/>
+    <property name="build" location="build"/>
+    <property name="dist" location="dist"/>
+    <property name="libs" location="libs"/>
 
-  <target name="init">
-    <tstamp/>
-    <delete dir="${build}" />
-    <mkdir dir="${build}"/>
-  </target>
+    <target name="init">
+        <tstamp/>
+        <delete dir="${build}"/>
+        <mkdir dir="${build}"/>
+    </target>
 
     <path id="classpath">
         <fileset dir="${libs}" includes="**/*.jar"/>
     </path>
 
-    <target name="compile" depends="init" description="compile the source " >
-    <javac srcdir="${src}" destdir="${build}" debug="true" debuglevel="lines,vars,source">
-      <classpath>
-          <path refid="classpath" />
-      </classpath>
-    </javac>
+    <target name="compile" depends="init" description="compile the source ">
+        <javac srcdir="${src}" destdir="${build}" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+                <path refid="classpath"/>
+            </classpath>
+        </javac>
+    </target>
 
-  </target>
+    <target name="dist" depends="compile" description="generate the distribution">
+        <mkdir dir="${dist}"/>
+        <jar jarfile="${dist}/${ant.project.name}.jar" basedir="${build}"/>
+    </target>
 
-  <target name="dist" depends="compile" description="generate the distribution" >
-    	<mkdir dir="${dist}"/>
-    	<jar jarfile="${dist}/${ant.project.name}.jar" basedir="${build}"/>    	
-  </target>
-
-  <target name="clean" description="clean up" >
-    <delete dir="${build}"/>
-    <delete dir="${dist}"/>
-  </target>
+    <target name="clean" description="clean up">
+        <delete dir="${build}"/>
+        <delete dir="${dist}"/>
+    </target>
 </project>
\ No newline at end of file
diff --git a/server_extensions_extra/build.xml b/server_extensions_extra/build.xml
index 33dc4e3..39ad871 100644
--- a/server_extensions_extra/build.xml
+++ b/server_extensions_extra/build.xml
@@ -21,18 +21,18 @@
     <description>
         BATM server extra extensions
     </description>
-  <!-- set global properties for this build -->
-  <property name="src" location="src"/>
-  <property name="res" location="res"/>
-  <property name="build" location="build"/>
-  <property name="dist"  location="dist"/>
-  <property name="libs"  location="libs"/>
+    <!-- set global properties for this build -->
+    <property name="src" location="src/main/java"/>
+    <property name="res" location="src/main/resources"/>
+    <property name="build" location="build"/>
+    <property name="dist" location="dist"/>
+    <property name="libs" location="libs"/>
 
-  <target name="init">
-    <tstamp/>
-    <delete dir="${build}" />
-    <mkdir dir="${build}"/>
-  </target>
+    <target name="init">
+        <tstamp/>
+        <delete dir="${build}"/>
+        <mkdir dir="${build}"/>
+    </target>
 
     <path id="classpath">
         <fileset dir="${libs}" includes="**/*.jar"/>
@@ -40,28 +40,26 @@
         <fileset dir="../server_extensions_api/dist" includes="**/*.jar"/>
     </path>
 
-    <target name="compile" depends="init" description="compile the source " >
-    <javac srcdir="${src}" destdir="${build}" debug="true" debuglevel="lines,vars,source">
-      <classpath>
-          <path refid="classpath" />
-      </classpath>
-    </javac>
-    <copy todir="${build}">
-        <fileset dir="${res}">
-            <include name="**/*"/>
-        </fileset>
-    </copy>
-
-
+    <target name="compile" depends="init" description="compile the source ">
+        <javac srcdir="${src}" destdir="${build}" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+                <path refid="classpath"/>
+            </classpath>
+        </javac>
+        <copy todir="${build}">
+            <fileset dir="${res}">
+                <include name="**/*"/>
+            </fileset>
+        </copy>
     </target>
 
-  <target name="dist" depends="compile" description="generate the distribution" >
-    	<mkdir dir="${dist}"/>
-    	<jar jarfile="${dist}/${ant.project.name}.jar" basedir="${build}"/>    	
-  </target>
+    <target name="dist" depends="compile" description="generate the distribution">
+        <mkdir dir="${dist}"/>
+        <jar jarfile="${dist}/${ant.project.name}.jar" basedir="${build}"/>
+    </target>
 
-  <target name="clean" description="clean up" >
-    <delete dir="${build}"/>
-    <delete dir="${dist}"/>
-  </target>
+    <target name="clean" description="clean up">
+        <delete dir="${build}"/>
+        <delete dir="${dist}"/>
+    </target>
 </project>
\ No newline at end of file
diff --git a/server_extensions_test/build.xml b/server_extensions_test/build.xml
index 59dabd1..704a037 100644
--- a/server_extensions_test/build.xml
+++ b/server_extensions_test/build.xml
@@ -21,18 +21,18 @@
     <description>
         BATM server extra extensions
     </description>
-  <!-- set global properties for this build -->
-  <property name="src" location="src"/>
-  <property name="res" location="res"/>
-  <property name="build" location="build"/>
-  <property name="dist"  location="dist"/>
-  <property name="libs"  location="libs"/>
+    <!-- set global properties for this build -->
+    <property name="src" location="src/main/java"/>
+    <property name="res" location="src/main/resources"/>
+    <property name="build" location="build"/>
+    <property name="dist" location="dist"/>
+    <property name="libs" location="libs"/>
 
-  <target name="init">
-    <tstamp/>
-    <delete dir="${build}" />
-    <mkdir dir="${build}"/>
-  </target>
+    <target name="init">
+        <tstamp/>
+        <delete dir="${build}"/>
+        <mkdir dir="${build}"/>
+    </target>
 
     <path id="classpath">
         <fileset dir="${libs}" includes="**/*.jar"/>
@@ -42,26 +42,23 @@
         <fileset dir="../server_extensions_extra/dist" includes="**/*.jar"/>
     </path>
 
-    <target name="compile" depends="init" description="compile the source " >
-    <javac srcdir="${src}" destdir="${build}" debug="true" debuglevel="lines,vars,source">
-      <classpath>
-          <path refid="classpath" />
-      </classpath>
-    </javac>
-
-
-
+    <target name="compile" depends="init" description="compile the source ">
+        <javac srcdir="${src}" destdir="${build}" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+                <path refid="classpath"/>
+            </classpath>
+        </javac>
     </target>
 
-  <target name="dist" depends="compile" description="generate the distribution" >
-    	<mkdir dir="${dist}"/>
-    	<jar jarfile="${dist}/${ant.project.name}.jar" basedir="${build}"/>
+    <target name="dist" depends="compile" description="generate the distribution">
+        <mkdir dir="${dist}"/>
+        <jar jarfile="${dist}/${ant.project.name}.jar" basedir="${build}"/>
         <copy file="${res}/tester.sh" todir="${dist}"/>
         <chmod file="${dist}/tester.sh" perm="ugo+x"/>
-  </target>
+    </target>
 
-  <target name="clean" description="clean up" >
-    <delete dir="${build}"/>
-    <delete dir="${dist}"/>
-  </target>
+    <target name="clean" description="clean up">
+        <delete dir="${build}"/>
+        <delete dir="${dist}"/>
+    </target>
 </project>
\ No newline at end of file