diff --git a/.classpath b/.classpath
index de3fdb02..299b68db 100644
--- a/.classpath
+++ b/.classpath
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/build.xml b/build.xml
index b9b17d0f..1815b049 100644
--- a/build.xml
+++ b/build.xml
@@ -22,8 +22,14 @@
 		CHARBA SHOWCASE - install new CHARBA LIB 
 	-->
 	<target name="installCharba" description="Install new CHARBA lib">
-		 <exec dir="." executable="cmd">
-		 	<arg line="/c mvn install:install-file -DgroupId=org.pepstock -Dfile=./lib/charba-6.4.jar -DartifactId=charba -Dversion=6.4 -Dpackaging=jar  --no-transfer-progress"/>
+		 <exec dir="." executable="mvn">
+		 	<arg value="install:install-file"/>
+		 	<arg value="-Dfile=./lib/charba-6.4.jar"/>
+		 	<arg value="-DgroupId=org.pepstock"/>
+		 	<arg value="-DartifactId=charba"/>
+		 	<arg value="-Dversion=6.4"/>
+		 	<arg value="-Dpackaging=jar"/>
+		 	<arg value="--no-transfer-progress"/>
 		  </exec>
 	</target>
 
@@ -31,8 +37,9 @@
 		CHARBA SHOWCASE - MVN clean 
 	-->
 	<target name="clean" description="MVN clean">
-		 <exec dir="." executable="cmd">
-		 	<arg line="/c mvn clean --no-transfer-progress"/>
+		 <exec dir="." executable="mvn">
+		 	<arg value="clean"/>
+		 	<arg value="--no-transfer-progress"/>
 		  </exec>
 	</target>
 
@@ -40,8 +47,9 @@
 		CHARBA SHOWCASE - MVN install 
 	-->
 	<target name="install" description="MVN install">
-		 <exec dir="." executable="cmd">
-		 	<arg line="/c mvn install --no-transfer-progress"/>
+		 <exec dir="." executable="mvn">
+		 	<arg value="install"/>
+		 	<arg value="--no-transfer-progress"/>
 		  </exec>
 	</target>