diff --git a/README.md b/README.md
index 077ec0b..3f199e3 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,23 @@ This tool is based on [RISE V2G shared library](https://github.com/V2GClarity/RI
 
 A release is available with a compiled Java Runtime binary there: https://github.com/FlUxIuS/V2Gdecoder/releases
 
+## How to compile
+Install maven
+Build risev2g (or use utilities/rise-v2g-shared-1.2.6.jar):
+`git clone https://github.com/V2GClarity/RISE-V2G/`
+`cd RISE-V2G/RISE-V2G-PARENT`
+`mvn install`
+Now install the RISE-V2G-Shared in our project:
+`mvn org.apache.maven.plugins:maven-install-plugin:2.5.2:install-file -Dfile=utilities/rise-v2g-shared-1.2.6.jar`
+
+To compile
+`mvn package`
+
+Fix risev2g inclusion:
+-com.v2gclarity.risev2g.shared.enumerations
+-com.v2gclarity.risev2g.shared.messageHandling
+-com.v2gclarity.risev2g.shared.utils
+
 ## How to use
 
 V2Gdecoder supports many methods to encode XML/decode EXI data as follows:
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..4309531
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,85 @@
+<?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.fluxlus.V2Gdecoder</groupId>
+  <artifactId>V2Gdecoder</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>V2Gdecoder</name>
+  <url>https://github.com/FlUxIuS/V2Gdecoder</url>
+
+  <packaging>jar</packaging> <!-- new -->
+  <description>V2Gdecoder description. </description>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <!-- https://mvnrepository.com/artifact/com.siemens.ct.exi/exificient -->
+    <dependency>
+        <groupId>com.siemens.ct.exi</groupId>
+        <artifactId>exificient</artifactId>
+        <version>1.0.4</version>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/commons-cli/commons-cli -->
+    <dependency>
+        <groupId>commons-cli</groupId>
+        <artifactId>commons-cli</artifactId>
+        <version>1.4</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <finalName>V2Gdecoder</finalName> <!-- added now-->
+    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.22.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.5.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.7.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
+        <!-- https://mvnrepository.com/artifact/com.siemens.ct.exi/exificient-core -->
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
deleted file mode 100644
index 54aa8ec..0000000
--- a/src/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Archiver-Version: Plexus Archiver
-Built-By: fluxius
-Created-By: Apache Maven 3.5.0
-Build-Jdk: 1.8.0_191
-
diff --git a/src/META-INF/maven/com.v2gclarity.risev2g/rise-v2g-shared/.project b/src/META-INF/maven/com.v2gclarity.risev2g/rise-v2g-shared/.project
deleted file mode 100644
index dbe7ca7..0000000
--- a/src/META-INF/maven/com.v2gclarity.risev2g/rise-v2g-shared/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.v2gclarity.risev2g_rise-v2g-shared</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/src/META-INF/maven/com.v2gclarity.risev2g/rise-v2g-shared/pom.properties b/src/META-INF/maven/com.v2gclarity.risev2g/rise-v2g-shared/pom.properties
deleted file mode 100644
index 0483b6f..0000000
--- a/src/META-INF/maven/com.v2gclarity.risev2g/rise-v2g-shared/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Thu Jan 24 11:57:05 CET 2019
-version=1.1.4-SNAPSHOT
-groupId=com.v2gclarity.risev2g
-artifactId=rise-v2g-shared
diff --git a/src/META-INF/maven/com.v2gclarity.risev2g/rise-v2g-shared/pom.xml b/src/META-INF/maven/com.v2gclarity.risev2g/rise-v2g-shared/pom.xml
deleted file mode 100644
index 28a08db..0000000
--- a/src/META-INF/maven/com.v2gclarity.risev2g/rise-v2g-shared/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<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/maven-v4_0_0.xsd">
-
-	<parent>
-		<groupId>com.v2gclarity.risev2g</groupId>
-		<artifactId>rise-v2g-parent</artifactId>
-		<version>1.1.4-SNAPSHOT</version>
-		<relativePath>../RISE-V2G-PARENT</relativePath>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>rise-v2g-shared</artifactId>
-	<name>rise-v2g-shared</name>
-	
-	<repositories>
-		<!-- OpenEXI jars deployed in the /repo folder of RISE-V2G-Shared.
-			 See https://devcenter.heroku.com/articles/local-maven-dependencies for how to deploy .jars locally which are not 
-			 published in a public Maven repo. -->
-		<repository> 
-			<id>project.local</id>
-			<name>project</name>
-			<url>file:${project.basedir}/repo</url>
-		</repository>
-	</repositories>
-	
-	<dependencies>
-		<dependency>
-		    <groupId>com.siemens.ct.exi</groupId>
-		    <artifactId>exificient</artifactId>
-		    <version>0.9.6</version>
-		</dependency>
-		<dependency>
-			<groupId>xerces</groupId>
-			<artifactId>xercesImpl</artifactId>
-			<version>2.11.0</version>
-		</dependency>
-		<dependency>
-		    <groupId>org.apache.logging.log4j</groupId>
-		    <artifactId>log4j-api</artifactId>
-		    <version>2.9.1</version>
-		</dependency>
-		<dependency>
-		    <groupId>org.apache.logging.log4j</groupId>
-		    <artifactId>log4j-core</artifactId>
-		    <version>2.9.1</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sourceforge.openexi</groupId>
-			<artifactId>nagasena</artifactId>
-			<version>0000.0002.0052.0</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sourceforge.openexi</groupId>
-			<artifactId>nagasena-rta</artifactId>
-			<version>0000.0002.0052.0</version>
-		</dependency>
-	</dependencies>
-	
-</project>
\ No newline at end of file
diff --git a/src/ReadMe.txt b/src/main/java/com/fluxlus/V2Gdecoder/ReadMe.txt
similarity index 100%
rename from src/ReadMe.txt
rename to src/main/java/com/fluxlus/V2Gdecoder/ReadMe.txt
diff --git a/src/V2Gdecoder.java b/src/main/java/com/fluxlus/V2Gdecoder/V2Gdecoder.java
similarity index 94%
rename from src/V2Gdecoder.java
rename to src/main/java/com/fluxlus/V2Gdecoder/V2Gdecoder.java
index 329a0ec..2af6aed 100644
--- a/src/V2Gdecoder.java
+++ b/src/main/java/com/fluxlus/V2Gdecoder/V2Gdecoder.java
@@ -1,9 +1,11 @@
-import server.MultiThreadedServer;
+package com.fluxlus.V2Gdecoder;
+
+import com.fluxlus.V2Gdecoder.server.MultiThreadedServer;
 import java.io.IOException;
 import org.apache.commons.cli.*;
 import org.xml.sax.SAXException;
-import com.siemens.ct.exi.exceptions.EXIException;
-import dataprocess.*;
+import com.siemens.ct.exi.core.exceptions.EXIException;
+import com.fluxlus.V2Gdecoder.dataprocess.*;
 
 /*
  *  Copyright (C) V2Gdecoder by FlUxIuS (Sebastien Dudek)
diff --git a/src/binascii/BinAscii.java b/src/main/java/com/fluxlus/V2Gdecoder/binascii/BinAscii.java
similarity index 97%
rename from src/binascii/BinAscii.java
rename to src/main/java/com/fluxlus/V2Gdecoder/binascii/BinAscii.java
index 99bfa2a..3fadda4 100644
--- a/src/binascii/BinAscii.java
+++ b/src/main/java/com/fluxlus/V2Gdecoder/binascii/BinAscii.java
@@ -1,4 +1,4 @@
-package binascii;
+package com.fluxlus.V2Gdecoder.binascii;
 
 /*
  *  code from: https://github.com/EverythingMe/inbloom/blob/master/java/src/main/java/me/everything/inbloom/BinAscii.java
diff --git a/src/dataprocess/dataprocess.java b/src/main/java/com/fluxlus/V2Gdecoder/dataprocess/dataprocess.java
similarity index 90%
rename from src/dataprocess/dataprocess.java
rename to src/main/java/com/fluxlus/V2Gdecoder/dataprocess/dataprocess.java
index bec9f32..1d95945 100644
--- a/src/dataprocess/dataprocess.java
+++ b/src/main/java/com/fluxlus/V2Gdecoder/dataprocess/dataprocess.java
@@ -1,4 +1,4 @@
-package dataprocess;
+package com.fluxlus.V2Gdecoder.dataprocess;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -17,22 +17,22 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.messageHandling.MessageHandler;
-import org.eclipse.risev2g.shared.utils.MiscUtils;
+import com.v2gclarity.risev2g.shared.enumerations.GlobalValues;
+import com.v2gclarity.risev2g.shared.messageHandling.MessageHandler;
+import com.v2gclarity.risev2g.shared.utils.MiscUtils;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
 
-import com.siemens.ct.exi.EXIFactory;
-import com.siemens.ct.exi.GrammarFactory;
-import com.siemens.ct.exi.api.sax.EXIResult;
-import com.siemens.ct.exi.api.sax.EXISource;
-import com.siemens.ct.exi.exceptions.EXIException;
-import com.siemens.ct.exi.helpers.DefaultEXIFactory;
+import com.siemens.ct.exi.core.EXIFactory;
+import com.siemens.ct.exi.grammars.GrammarFactory;
+import com.siemens.ct.exi.main.api.sax.EXIResult;
+import com.siemens.ct.exi.main.api.sax.EXISource;
+import com.siemens.ct.exi.core.exceptions.EXIException;
+import com.siemens.ct.exi.core.helpers.DefaultEXIFactory;
 
-import binascii.BinAscii;
+import com.fluxlus.V2Gdecoder.binascii.BinAscii;
 
 /*
  *  Copyright (C) V2Gdecoder by FlUxIuS (Sebastien Dudek)
diff --git a/src/dataprocess/decodeMode.java b/src/main/java/com/fluxlus/V2Gdecoder/dataprocess/decodeMode.java
similarity index 77%
rename from src/dataprocess/decodeMode.java
rename to src/main/java/com/fluxlus/V2Gdecoder/dataprocess/decodeMode.java
index 42c5d19..838d5c7 100644
--- a/src/dataprocess/decodeMode.java
+++ b/src/main/java/com/fluxlus/V2Gdecoder/dataprocess/decodeMode.java
@@ -1,4 +1,4 @@
-package dataprocess;
+package com.fluxlus.V2Gdecoder.dataprocess;
 
 /*
  *  Copyright (C) V2Gdecoder by FlUxIuS (Sebastien Dudek)
diff --git a/src/server/MultiThreadedServer.java b/src/main/java/com/fluxlus/V2Gdecoder/server/MultiThreadedServer.java
similarity index 97%
rename from src/server/MultiThreadedServer.java
rename to src/main/java/com/fluxlus/V2Gdecoder/server/MultiThreadedServer.java
index ab07681..0850f73 100644
--- a/src/server/MultiThreadedServer.java
+++ b/src/main/java/com/fluxlus/V2Gdecoder/server/MultiThreadedServer.java
@@ -1,4 +1,4 @@
-package server;
+package com.fluxlus.V2Gdecoder.server;
 
 import java.net.ServerSocket;
 
diff --git a/src/server/WorkerRunnable.java b/src/main/java/com/fluxlus/V2Gdecoder/server/WorkerRunnable.java
similarity index 94%
rename from src/server/WorkerRunnable.java
rename to src/main/java/com/fluxlus/V2Gdecoder/server/WorkerRunnable.java
index c749d12..8a87a17 100644
--- a/src/server/WorkerRunnable.java
+++ b/src/main/java/com/fluxlus/V2Gdecoder/server/WorkerRunnable.java
@@ -1,4 +1,4 @@
-package server;
+package com.fluxlus.V2Gdecoder.server;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -11,10 +11,10 @@ import java.util.Map;
 
 import org.xml.sax.SAXException;
 
-import com.siemens.ct.exi.exceptions.EXIException;
+import com.siemens.ct.exi.core.exceptions.EXIException;
 
-import dataprocess.dataprocess;
-import dataprocess.decodeMode;
+import com.fluxlus.V2Gdecoder.dataprocess.dataprocess;
+import com.fluxlus.V2Gdecoder.dataprocess.decodeMode;
 
 public class WorkerRunnable implements Runnable{
 
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..e69de29
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..73d7e3c
--- /dev/null
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,6 @@
+/home/luca/Desktop/V2GdecoderRepo/src/main/java/com/fluxlus/V2Gdecoder/V2Gdecoder.java
+/home/luca/Desktop/V2GdecoderRepo/src/main/java/com/fluxlus/V2Gdecoder/binascii/BinAscii.java
+/home/luca/Desktop/V2GdecoderRepo/src/main/java/com/fluxlus/V2Gdecoder/dataprocess/dataprocess.java
+/home/luca/Desktop/V2GdecoderRepo/src/main/java/com/fluxlus/V2Gdecoder/server/WorkerRunnable.java
+/home/luca/Desktop/V2GdecoderRepo/src/main/java/com/fluxlus/V2Gdecoder/dataprocess/decodeMode.java
+/home/luca/Desktop/V2GdecoderRepo/src/main/java/com/fluxlus/V2Gdecoder/server/MultiThreadedServer.java
diff --git a/utilities/rise-v2g-shared-1.2.6.jar b/utilities/rise-v2g-shared-1.2.6.jar
new file mode 100644
index 0000000..765b905
Binary files /dev/null and b/utilities/rise-v2g-shared-1.2.6.jar differ