diff --git a/makeabx/.gitignore b/makeabx/.gitignore
new file mode 100644
index 0000000..aebe684
--- /dev/null
+++ b/makeabx/.gitignore
@@ -0,0 +1,4 @@
+/target/
+.classpath
+.project
+.settings/
diff --git a/makeabx/README.md b/makeabx/README.md
new file mode 100644
index 0000000..37785d3
--- /dev/null
+++ b/makeabx/README.md
@@ -0,0 +1,23 @@
+# makeabx
+java module for compiling XML files to the abx format
+
+## Command line usage
+
+`java -jar makeabx.jar <input.xml> <optional output.xml>`
+
+```
+Converts an XML file to an ABX file (the output will have the same path as the input if none was specified
+with an '.abx' extension added).
+
+If one of the following suffixes are found on an attribute's name, they will be
+treated as typed values:
+-int, -inthex -long -longhex -float -double -bool -byteshex -base64
+eg. <element myvalue-inthex='4a7f'>Attribute will be parsed as hex</element>
+
+```
+
+## Building
+`mvn clean install
+
+## Already built version
+available at the "dist" directory
diff --git a/makeabx/dist/makeabx.jar b/makeabx/dist/makeabx.jar
new file mode 100644
index 0000000..a3f1abc
Binary files /dev/null and b/makeabx/dist/makeabx.jar differ
diff --git a/makeabx/pom.xml b/makeabx/pom.xml
new file mode 100644
index 0000000..b2c5514
--- /dev/null
+++ b/makeabx/pom.xml
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>makeabx</groupId>
+	<artifactId>makeabx</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<mainClass>com.ccl.abxmaker.Main</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/makeabx/src/META-INF/MANIFEST.MF b/makeabx/src/META-INF/MANIFEST.MF
deleted file mode 100644
index 0860908..0000000
--- a/makeabx/src/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: com.ccl.abxmaker.Main
-
diff --git a/makeabx/src/com/android/org/kxml2/io/KXmlParser.java b/makeabx/src/main/java/com/android/org/kxml2/io/KXmlParser.java
similarity index 100%
rename from makeabx/src/com/android/org/kxml2/io/KXmlParser.java
rename to makeabx/src/main/java/com/android/org/kxml2/io/KXmlParser.java
diff --git a/makeabx/src/com/ccl/abxmaker/BinaryXmlSerializer.java b/makeabx/src/main/java/com/ccl/abxmaker/BinaryXmlSerializer.java
similarity index 100%
rename from makeabx/src/com/ccl/abxmaker/BinaryXmlSerializer.java
rename to makeabx/src/main/java/com/ccl/abxmaker/BinaryXmlSerializer.java
diff --git a/makeabx/src/com/ccl/abxmaker/Converter.java b/makeabx/src/main/java/com/ccl/abxmaker/Converter.java
similarity index 100%
rename from makeabx/src/com/ccl/abxmaker/Converter.java
rename to makeabx/src/main/java/com/ccl/abxmaker/Converter.java
diff --git a/makeabx/src/com/ccl/abxmaker/FastDataOutput.java b/makeabx/src/main/java/com/ccl/abxmaker/FastDataOutput.java
similarity index 100%
rename from makeabx/src/com/ccl/abxmaker/FastDataOutput.java
rename to makeabx/src/main/java/com/ccl/abxmaker/FastDataOutput.java
diff --git a/makeabx/src/com/ccl/abxmaker/FastXmlSerializer.java b/makeabx/src/main/java/com/ccl/abxmaker/FastXmlSerializer.java
similarity index 100%
rename from makeabx/src/com/ccl/abxmaker/FastXmlSerializer.java
rename to makeabx/src/main/java/com/ccl/abxmaker/FastXmlSerializer.java
diff --git a/makeabx/src/com/ccl/abxmaker/Main.java b/makeabx/src/main/java/com/ccl/abxmaker/Main.java
similarity index 87%
rename from makeabx/src/com/ccl/abxmaker/Main.java
rename to makeabx/src/main/java/com/ccl/abxmaker/Main.java
index 13081bd..edfcbfc 100644
--- a/makeabx/src/com/ccl/abxmaker/Main.java
+++ b/makeabx/src/main/java/com/ccl/abxmaker/Main.java
@@ -11,9 +11,9 @@ public static void main(String[] args) throws IOException, URISyntaxException {
             String me = new File(Main.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getName();
 
             System.out.println();
-            System.out.printf("USAGE: %s <input.xml>\n", me);
+            System.out.printf("USAGE: %s <input.xml> <optional output.xml>\n", me);
             System.out.println();
-            System.out.println("Converts an XML file to an ABX file (the output will have the same path as the input");
+            System.out.println("Converts an XML file to an ABX file (the output will have the same path as the input if none was specified");
             System.out.println("with an '.abx' extension added).");
             System.out.println();
             System.out.println("If one of the following suffixes are found on an attribute's name, they will be");
@@ -32,6 +32,9 @@ public static void main(String[] args) throws IOException, URISyntaxException {
             return;
         }
         String outputPath = inputPath + ".abx";
+        if(args.length>1) {
+        	outputPath = args[1];
+        }
         if(new File(outputPath).exists()){
             System.out.printf("ERROR: '%s' already exists\n", outputPath);
         }
diff --git a/makeabx/src/com/ccl/abxmaker/TypedXmlSerializer.java b/makeabx/src/main/java/com/ccl/abxmaker/TypedXmlSerializer.java
similarity index 100%
rename from makeabx/src/com/ccl/abxmaker/TypedXmlSerializer.java
rename to makeabx/src/main/java/com/ccl/abxmaker/TypedXmlSerializer.java
diff --git a/makeabx/src/libcore/internal/StringPool.java b/makeabx/src/main/java/libcore/internal/StringPool.java
similarity index 100%
rename from makeabx/src/libcore/internal/StringPool.java
rename to makeabx/src/main/java/libcore/internal/StringPool.java
diff --git a/makeabx/src/org/xmlpull/v1/XmlPullParser.java b/makeabx/src/main/java/org/xmlpull/v1/XmlPullParser.java
similarity index 100%
rename from makeabx/src/org/xmlpull/v1/XmlPullParser.java
rename to makeabx/src/main/java/org/xmlpull/v1/XmlPullParser.java
diff --git a/makeabx/src/org/xmlpull/v1/XmlPullParserException.java b/makeabx/src/main/java/org/xmlpull/v1/XmlPullParserException.java
similarity index 100%
rename from makeabx/src/org/xmlpull/v1/XmlPullParserException.java
rename to makeabx/src/main/java/org/xmlpull/v1/XmlPullParserException.java
diff --git a/makeabx/src/org/xmlpull/v1/XmlPullParserFactory.java b/makeabx/src/main/java/org/xmlpull/v1/XmlPullParserFactory.java
similarity index 100%
rename from makeabx/src/org/xmlpull/v1/XmlPullParserFactory.java
rename to makeabx/src/main/java/org/xmlpull/v1/XmlPullParserFactory.java
diff --git a/makeabx/src/org/xmlpull/v1/XmlSerializer.java b/makeabx/src/main/java/org/xmlpull/v1/XmlSerializer.java
similarity index 100%
rename from makeabx/src/org/xmlpull/v1/XmlSerializer.java
rename to makeabx/src/main/java/org/xmlpull/v1/XmlSerializer.java