diff --git a/.classpath b/.classpath
index 4a9e343..a5c0a90 100755
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="financial/src/main/java/base"/>
-	<classpathentry kind="src" path="core/src/main/java/base"/>
-	<classpathentry kind="src" path="withholding/src/main/java"/>
-	<classpathentry kind="src" path="human_resource/src/main/java/base"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk8"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Withholding"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/adempiereFork"/>
-	<classpathentry kind="lib" path="lib/jackcess-3.0.1.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" output="bin/main" path="core/src/main/java/base">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/main" path="financial/src/main/java/base">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/main" path="withholding/src/main/java/base">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/main" path="human_resource/src/main/java/base">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
index 9110730..c980326 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ out/
 target/
 /bin/
 /.gradle/
+/build/
diff --git a/.project b/.project
index 3df0ff8..ccc9da7 100755
--- a/.project
+++ b/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 0000000..e889521
--- /dev/null
+++ b/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1
diff --git a/build.gradle b/build.gradle
index b9903ed..c56801d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ repositories {
 sourceSets {
     main {
          java {
-            srcDirs = ['core', 'financial', 'withholding', 'human_resource']
+            srcDirs = ['core/src/main/java/base', 'financial/src/main/java/base', 'withholding/src/main/java/base', 'human_resource/src/main/java/base']
          }
     }
 }
@@ -22,6 +22,7 @@ dependencies {
     implementation name: 'Withholding'
     implementation name: 'HumanResourceAndPayroll'
     implementation name: 'jackcess-3.0.1'
+    compile 'com.sun.jersey:jersey-client:1.19.4'
 }
 
 jar {
diff --git a/withholding/src/main/java/org/erpya/lve/model/I_LVE_WithholdingTax.java b/withholding/src/main/java/base/org/erpya/lve/model/I_LVE_WithholdingTax.java
similarity index 100%
rename from withholding/src/main/java/org/erpya/lve/model/I_LVE_WithholdingTax.java
rename to withholding/src/main/java/base/org/erpya/lve/model/I_LVE_WithholdingTax.java
diff --git a/withholding/src/main/java/org/erpya/lve/model/MLVEWithholdingTax.java b/withholding/src/main/java/base/org/erpya/lve/model/MLVEWithholdingTax.java
similarity index 100%
rename from withholding/src/main/java/org/erpya/lve/model/MLVEWithholdingTax.java
rename to withholding/src/main/java/base/org/erpya/lve/model/MLVEWithholdingTax.java
diff --git a/withholding/src/main/java/org/erpya/lve/model/X_LVE_WithholdingTax.java b/withholding/src/main/java/base/org/erpya/lve/model/X_LVE_WithholdingTax.java
similarity index 100%
rename from withholding/src/main/java/org/erpya/lve/model/X_LVE_WithholdingTax.java
rename to withholding/src/main/java/base/org/erpya/lve/model/X_LVE_WithholdingTax.java
diff --git a/withholding/src/main/java/org/erpya/lve/process/ARWithholdingProcess.java b/withholding/src/main/java/base/org/erpya/lve/process/ARWithholdingProcess.java
similarity index 100%
rename from withholding/src/main/java/org/erpya/lve/process/ARWithholdingProcess.java
rename to withholding/src/main/java/base/org/erpya/lve/process/ARWithholdingProcess.java
diff --git a/withholding/src/main/java/org/erpya/lve/process/ARWithholdingProcessAbstract.java b/withholding/src/main/java/base/org/erpya/lve/process/ARWithholdingProcessAbstract.java
similarity index 100%
rename from withholding/src/main/java/org/erpya/lve/process/ARWithholdingProcessAbstract.java
rename to withholding/src/main/java/base/org/erpya/lve/process/ARWithholdingProcessAbstract.java
diff --git a/withholding/src/main/java/org/erpya/lve/util/APInvoiceIM.java b/withholding/src/main/java/base/org/erpya/lve/util/APInvoiceIM.java
similarity index 100%
rename from withholding/src/main/java/org/erpya/lve/util/APInvoiceIM.java
rename to withholding/src/main/java/base/org/erpya/lve/util/APInvoiceIM.java
diff --git a/withholding/src/main/java/org/erpya/lve/util/APInvoiceISLR.java b/withholding/src/main/java/base/org/erpya/lve/util/APInvoiceISLR.java
similarity index 99%
rename from withholding/src/main/java/org/erpya/lve/util/APInvoiceISLR.java
rename to withholding/src/main/java/base/org/erpya/lve/util/APInvoiceISLR.java
index 2feaea0..9ae6569 100644
--- a/withholding/src/main/java/org/erpya/lve/util/APInvoiceISLR.java
+++ b/withholding/src/main/java/base/org/erpya/lve/util/APInvoiceISLR.java
@@ -30,7 +30,6 @@
 import org.compiere.model.MDocType;
 import org.compiere.model.MInvoice;
 import org.compiere.model.MInvoiceLine;
-import org.compiere.model.MPeriod;
 import org.compiere.model.MProduct;
 import org.compiere.model.Query;
 import org.compiere.util.Env;
@@ -71,8 +70,6 @@ public APInvoiceISLR(MWHSetting setting) {
 	private static BigDecimal FACTOR = new BigDecimal(83.3334);
 	/**Currency Precision */
 	int curPrecision = 0 ;
-	/**Period*/
-	private MPeriod invoicePeriod = null;
 	
 	@Override
 	public boolean isValid() {
diff --git a/withholding/src/main/java/org/erpya/lve/util/APInvoiceIVA.java b/withholding/src/main/java/base/org/erpya/lve/util/APInvoiceIVA.java
similarity index 100%
rename from withholding/src/main/java/org/erpya/lve/util/APInvoiceIVA.java
rename to withholding/src/main/java/base/org/erpya/lve/util/APInvoiceIVA.java
diff --git a/withholding/src/main/java/org/erpya/lve/util/ARInvoice.java b/withholding/src/main/java/base/org/erpya/lve/util/ARInvoice.java
similarity index 100%
rename from withholding/src/main/java/org/erpya/lve/util/ARInvoice.java
rename to withholding/src/main/java/base/org/erpya/lve/util/ARInvoice.java
diff --git a/withholding/src/main/java/org/erpya/lve/util/exp/ExportFormatTXT_IVA.java b/withholding/src/main/java/base/org/erpya/lve/util/exp/ExportFormatTXT_IVA.java
similarity index 100%
rename from withholding/src/main/java/org/erpya/lve/util/exp/ExportFormatTXT_IVA.java
rename to withholding/src/main/java/base/org/erpya/lve/util/exp/ExportFormatTXT_IVA.java
diff --git a/withholding/src/main/java/org/erpya/lve/util/exp/ExportFormatXML_ISLR.java b/withholding/src/main/java/base/org/erpya/lve/util/exp/ExportFormatXML_ISLR.java
similarity index 100%
rename from withholding/src/main/java/org/erpya/lve/util/exp/ExportFormatXML_ISLR.java
rename to withholding/src/main/java/base/org/erpya/lve/util/exp/ExportFormatXML_ISLR.java
diff --git a/withholding/src/main/java/org/erpya/lve/util/exp/WithholdingReportExport.java b/withholding/src/main/java/base/org/erpya/lve/util/exp/WithholdingReportExport.java
similarity index 100%
rename from withholding/src/main/java/org/erpya/lve/util/exp/WithholdingReportExport.java
rename to withholding/src/main/java/base/org/erpya/lve/util/exp/WithholdingReportExport.java