diff --git a/.gitignore b/.gitignore
index 76baee6..dbc40ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/target
 *.class
 
 # Mobile Tools for Java (J2ME)
@@ -11,3 +12,9 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 .idea/workspace.xml
+
+# Intellij IDEA #
+.idea
+*.iws
+#*.iml
+*.ipr
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 9c515c7..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-CmdParser4J
\ No newline at end of file
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index b1daa4b..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <MarkdownNavigatorCodeStyleSettings>
-          <option name="RIGHT_MARGIN" value="72" />
-        </MarkdownNavigatorCodeStyleSettings>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-        <codeStyleSettings language="JAVA">
-          <indentOptions>
-            <option name="USE_TAB_CHARACTER" value="true" />
-            <option name="SMART_TABS" value="true" />
-          </indentOptions>
-        </codeStyleSettings>
-      </value>
-    </option>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 96cc43e..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/dictionaries/perma.xml b/.idea/dictionaries/perma.xml
deleted file mode 100644
index 26bae61..0000000
--- a/.idea/dictionaries/perma.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="perma">
-    <words>
-      <w>noninfringement</w>
-    </words>
-  </dictionary>
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/libraries/hamcrest_core_1_3.xml b/.idea/libraries/hamcrest_core_1_3.xml
deleted file mode 100644
index f803d78..0000000
--- a/.idea/libraries/hamcrest_core_1_3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="hamcrest-core-1.3">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/hamcrest-core-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/junit_4_12.xml b/.idea/libraries/junit_4_12.xml
deleted file mode 100644
index d90f745..0000000
--- a/.idea/libraries/junit_4_12.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="junit-4.12">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/junit-4.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 7468127..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" project-jdk-name="1.6" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index c5cc114..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/CmdParser4J.iml" filepath="$PROJECT_DIR$/CmdParser4J.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Test_all.xml b/.idea/runConfigurations/Test_all.xml
deleted file mode 100644
index 7308334..0000000
--- a/.idea/runConfigurations/Test_all.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test all" type="JUnit" factoryName="JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <module name="" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="PACKAGE_NAME" value="" />
-    <option name="MAIN_CLASS_NAME" value="" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="wholeProject" />
-    </option>
-    <envs />
-    <patterns />
-    <method />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index e96534f..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/CmdParser4J.iml b/CmdParser4J.iml
index fe7c8fa..671c8a7 100644
--- a/CmdParser4J.iml
+++ b/CmdParser4J.iml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -26,5 +29,7 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/lib/hamcrest-core-1.3.jar b/lib/hamcrest-core-1.3.jar
deleted file mode 100644
index 9d5fe16..0000000
Binary files a/lib/hamcrest-core-1.3.jar and /dev/null differ
diff --git a/lib/junit-4.12.jar b/lib/junit-4.12.jar
deleted file mode 100644
index 3a7fc26..0000000
Binary files a/lib/junit-4.12.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..265438c
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.snowsoftware</groupId>
+    <artifactId>CmdParser4J</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>com.snowsoftware</groupId>
+        <artifactId>default-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>
diff --git a/src/cmdparser4j/Argument.java b/src/main/java/cmdparser4j/Argument.java
similarity index 100%
rename from src/cmdparser4j/Argument.java
rename to src/main/java/cmdparser4j/Argument.java
diff --git a/src/cmdparser4j/BaseType.java b/src/main/java/cmdparser4j/BaseType.java
similarity index 100%
rename from src/cmdparser4j/BaseType.java
rename to src/main/java/cmdparser4j/BaseType.java
diff --git a/src/cmdparser4j/BooleanType.java b/src/main/java/cmdparser4j/BooleanType.java
similarity index 100%
rename from src/cmdparser4j/BooleanType.java
rename to src/main/java/cmdparser4j/BooleanType.java
diff --git a/src/cmdparser4j/Changeable.java b/src/main/java/cmdparser4j/Changeable.java
similarity index 100%
rename from src/cmdparser4j/Changeable.java
rename to src/main/java/cmdparser4j/Changeable.java
diff --git a/src/cmdparser4j/CmdParser4J.java b/src/main/java/cmdparser4j/CmdParser4J.java
similarity index 100%
rename from src/cmdparser4j/CmdParser4J.java
rename to src/main/java/cmdparser4j/CmdParser4J.java
diff --git a/src/cmdparser4j/Constructor.java b/src/main/java/cmdparser4j/Constructor.java
similarity index 100%
rename from src/cmdparser4j/Constructor.java
rename to src/main/java/cmdparser4j/Constructor.java
diff --git a/src/cmdparser4j/IConfigurationReader.java b/src/main/java/cmdparser4j/IConfigurationReader.java
similarity index 100%
rename from src/cmdparser4j/IConfigurationReader.java
rename to src/main/java/cmdparser4j/IConfigurationReader.java
diff --git a/src/cmdparser4j/IParseResult.java b/src/main/java/cmdparser4j/IParseResult.java
similarity index 100%
rename from src/cmdparser4j/IParseResult.java
rename to src/main/java/cmdparser4j/IParseResult.java
diff --git a/src/cmdparser4j/IUsageFormatter.java b/src/main/java/cmdparser4j/IUsageFormatter.java
similarity index 100%
rename from src/cmdparser4j/IUsageFormatter.java
rename to src/main/java/cmdparser4j/IUsageFormatter.java
diff --git a/src/cmdparser4j/IntegerType.java b/src/main/java/cmdparser4j/IntegerType.java
similarity index 100%
rename from src/cmdparser4j/IntegerType.java
rename to src/main/java/cmdparser4j/IntegerType.java
diff --git a/src/cmdparser4j/ResultEnvelope.java b/src/main/java/cmdparser4j/ResultEnvelope.java
similarity index 100%
rename from src/cmdparser4j/ResultEnvelope.java
rename to src/main/java/cmdparser4j/ResultEnvelope.java
diff --git a/src/cmdparser4j/SingleBooleanType.java b/src/main/java/cmdparser4j/SingleBooleanType.java
similarity index 100%
rename from src/cmdparser4j/SingleBooleanType.java
rename to src/main/java/cmdparser4j/SingleBooleanType.java
diff --git a/src/cmdparser4j/StringType.java b/src/main/java/cmdparser4j/StringType.java
similarity index 100%
rename from src/cmdparser4j/StringType.java
rename to src/main/java/cmdparser4j/StringType.java
diff --git a/src/cmdparser4j/SystemOutputParseResult.java b/src/main/java/cmdparser4j/SystemOutputParseResult.java
similarity index 100%
rename from src/cmdparser4j/SystemOutputParseResult.java
rename to src/main/java/cmdparser4j/SystemOutputParseResult.java
diff --git a/src/cmdparser4j/SystemOutputUsageFormatter.java b/src/main/java/cmdparser4j/SystemOutputUsageFormatter.java
similarity index 100%
rename from src/cmdparser4j/SystemOutputUsageFormatter.java
rename to src/main/java/cmdparser4j/SystemOutputUsageFormatter.java
diff --git a/src/cmdparser4j/TypeConstructor.java b/src/main/java/cmdparser4j/TypeConstructor.java
similarity index 100%
rename from src/cmdparser4j/TypeConstructor.java
rename to src/main/java/cmdparser4j/TypeConstructor.java
diff --git a/src/cmdparser4j/XMLConfigurationReader.java b/src/main/java/cmdparser4j/XMLConfigurationReader.java
similarity index 100%
rename from src/cmdparser4j/XMLConfigurationReader.java
rename to src/main/java/cmdparser4j/XMLConfigurationReader.java
diff --git a/src/cmdparser4j/envelopes/IBooleanTypeEnvelope.java b/src/main/java/cmdparser4j/envelopes/IBooleanTypeEnvelope.java
similarity index 100%
rename from src/cmdparser4j/envelopes/IBooleanTypeEnvelope.java
rename to src/main/java/cmdparser4j/envelopes/IBooleanTypeEnvelope.java
diff --git a/src/cmdparser4j/envelopes/IIntegerTypeEnvelope.java b/src/main/java/cmdparser4j/envelopes/IIntegerTypeEnvelope.java
similarity index 100%
rename from src/cmdparser4j/envelopes/IIntegerTypeEnvelope.java
rename to src/main/java/cmdparser4j/envelopes/IIntegerTypeEnvelope.java
diff --git a/src/cmdparser4j/envelopes/IStringTypeEnvelope.java b/src/main/java/cmdparser4j/envelopes/IStringTypeEnvelope.java
similarity index 100%
rename from src/cmdparser4j/envelopes/IStringTypeEnvelope.java
rename to src/main/java/cmdparser4j/envelopes/IStringTypeEnvelope.java
diff --git a/src/cmdparser4j/limits/NumericLimit.java b/src/main/java/cmdparser4j/limits/NumericLimit.java
similarity index 100%
rename from src/cmdparser4j/limits/NumericLimit.java
rename to src/main/java/cmdparser4j/limits/NumericLimit.java
diff --git a/src/cmdparser4j/limits/StringLengthLimit.java b/src/main/java/cmdparser4j/limits/StringLengthLimit.java
similarity index 100%
rename from src/cmdparser4j/limits/StringLengthLimit.java
rename to src/main/java/cmdparser4j/limits/StringLengthLimit.java
diff --git a/src/cmdparser4j/limits/UnboundIntegerLimit.java b/src/main/java/cmdparser4j/limits/UnboundIntegerLimit.java
similarity index 100%
rename from src/cmdparser4j/limits/UnboundIntegerLimit.java
rename to src/main/java/cmdparser4j/limits/UnboundIntegerLimit.java
diff --git a/src/cmdparser4j/limits/UnboundStringLimit.java b/src/main/java/cmdparser4j/limits/UnboundStringLimit.java
similarity index 100%
rename from src/cmdparser4j/limits/UnboundStringLimit.java
rename to src/main/java/cmdparser4j/limits/UnboundStringLimit.java
diff --git a/test/cmdparser4j/ChangeableTest.java b/src/test/java/cmdparser4j/ChangeableTest.java
similarity index 100%
rename from test/cmdparser4j/ChangeableTest.java
rename to src/test/java/cmdparser4j/ChangeableTest.java
diff --git a/test/cmdparser4j/CmdParser4JTest.java b/src/test/java/cmdparser4j/CmdParser4JTest.java
similarity index 100%
rename from test/cmdparser4j/CmdParser4JTest.java
rename to src/test/java/cmdparser4j/CmdParser4JTest.java