diff --git a/README.md b/README.md
index e72f980..7e229a5 100644
--- a/README.md
+++ b/README.md
@@ -21,10 +21,9 @@ features, e.g., per-transaction-type latency and throughput logs.
   ```
 + Run the following commands to build:
   ```bash
-  ant bootstrap
-  ant resolve
-  ant build
+  mvn clean install
   ```
++ Copy and unpack `target/tpcc.tar.gz` file on client machine
 
 ## Setup of the Database
 The DB connection details should be as follows:
@@ -45,38 +44,63 @@ The workload descriptor works the same way as it does in the upstream branch and
 
 
 ## Running the Benchmark
-A utility script (./tpccbenchmark) is provided for running the benchmark. The options are
+A utility script `./tpccbenchmark` is provided for running the benchmark. The options are
 
 ```
--c,--config <arg>            [required] Workload configuration file
-   --clear <arg>             Clear all records in the database for this
-                             benchmark
-   --create <arg>            Initialize the database for this benchmark
-   --execute <arg>           Execute the benchmark workload
--h,--help                    Print this help
-   --histograms              Print txn histograms
-   --load <arg>              Load data using the benchmark's data loader
--o,--output <arg>            Output file (default System.out)
-   --runscript <arg>         Run an SQL script
--s,--sample <arg>            Sampling window
--v,--verbose                 Display Messages
+ -c,--config <arg>                    Workload configuration file
+                                      [default: config/workload_all.xml]
+    --clear <arg>                     Clear all records in the database
+                                      for this benchmark
+    --create <arg>                    Initialize the database for this
+                                      benchmark
+    --create-sql-procedures <arg>     Creates the SQL procedures
+    --dir <arg>                       Directory containing the csv files
+    --enable-foreign-keys <arg>       Whether to enable foregin keys
+    --execute <arg>                   Execute the benchmark workload
+ -gpc,--geopartitioned-config <arg>   GeoPartitioning configuration file
+                                      [default:
+                                      config/geopartitioned_workload.xml]
+ -h,--help                            Print this help
+    --histograms                      Print txn histograms
+ -im,--interval-monitor <arg>         Throughput Monitoring Interval in
+                                      milliseconds
+    --initial-delay-secs <arg>        Delay in seconds for starting the
+                                      benchmark
+    --load <arg>                      Load data using the benchmark's data
+                                      loader
+    --loaderthreads <arg>             Number of loader threads (default
+                                      10)
+    --merge-results <arg>             Merge results from various output
+                                      files
+    --nodes <arg>                     comma separated list of nodes
+                                      (default 127.0.0.1)
+    --num-connections <arg>           Number of connections used
+    --output-raw <arg>                Output raw data
+    --output-samples <arg>            Output sample data
+    --start-warehouse-id <arg>        Start warehouse id
+    --total-warehouses <arg>          Total number of warehouses across
+                                      all executions
+    --vv                              Output verbose execute results
+    --warehouses <arg>                Number of warehouses (default 10)
+    --warmup-time-secs <arg>          Warmup time in seconds for the
+                                      benchmark
 ```
 
 ## Example
-The following command for example initiates a tpcc database (--create=true --load=true) and a then run a workload as described in config/workload_all.xml file. The results (latency, throughput) are summarized and written into two files: outputfile.res (aggregated) and outputfile.raw (detailed):
+First step is to create tables and indexes, can be done by calling following command
 
 ```
-./tpccbenchmark -c config/workload_all.xml --create=true --load=true --execute=true -s 300 -o outputfile
+./tpccbenchmark --nodes $COMMA_SEPARATED_IPS --create true --vv
 ```
 
-Since data loading can be a lengthy process, one could first create a and populate a database which can be reused for multiple experiments:
+Since data loading can be a lengthy process,one can be used to populate a database which can be reused for multiple experiments:
 
 ```
-./tpccbenchmark -c config/workload_all.xml --create=true --load=true
+./tpccbenchmark --nodes $COMMA_SEPARATED_IPS --load true --warehouses $WAREHOUSES --loaderthreads $LOADER_THREADS --vv
 ```
 
 Then running an experiment could be simply done with the following command on a fresh or used database.
 
 ```
-./tpccbenchmark -c config/workload_all.xml --execute=true -s 300 -o outputfile
+./tpccbenchmark--nodes $COMMA_SEPARATED_IPS --execute true --warehouses $WAREHOUSES --warmup-time-secs 30 --vv
 ```
diff --git a/assembly/bin.xml b/assembly/bin.xml
new file mode 100644
index 0000000..dc33e42
--- /dev/null
+++ b/assembly/bin.xml
@@ -0,0 +1,50 @@
+<assembly>
+
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+
+<!--        configs -->
+        <fileSet>
+            <directory>config</directory>
+            <outputDirectory>tpcc/config</outputDirectory>
+            <includes>
+                <include>*.xml</include>
+            </includes>
+        </fileSet>
+
+<!--        execute file, LICENSE, README.md and log4j.properies file-->
+        <fileSet>
+            <outputDirectory>tpcc</outputDirectory>
+            <includes>
+                <include>tpccbenchmark</include>
+                <include>LICENSE</include>
+                <include>README.md</include>
+                <include>log4j.properties</include>
+            </includes>
+        </fileSet>
+
+<!--        oltbenchmark jar file-->
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory>tpcc/libs</outputDirectory>
+            <includes>
+                <include>oltpbench-*.jar</include>
+            </includes>
+        </fileSet>
+
+<!--        dependencies except hsqldb (provided scope, excluded from assembly) -->
+        <fileSet>
+            <directory>target/libs</directory>
+            <outputDirectory>tpcc/libs</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 64dff8d..0000000
--- a/build.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project name="oltpbench" default="build" xmlns:ivy="antlib:org.apache.ivy.ant">
-    <property environment="env"/>
-    <property name="debuglevel" value="source,lines,vars"/>
-<!--     <property name="javac.target" value="1.10"/> -->
-<!--     <property name="javac.source" value="1.10"/> -->
-
-    <!-- *************************************** CONFIGURATION *************************************** -->
-    
-    <property name="src.dir"                    location="src" />
-    <property name="lib.dir"                    location="lib" />
-    <property name="build.dir"                  location="build" />
-    <property name='build.testoutput.dir'       location='${build.dir}/testoutput' />
-
-    <path id='project.classpath'>
-        <pathelement location='${build.dir}' />
-        <fileset dir='${lib.dir}'>
-            <include name='*.jar' />
-            <exclude name='ant.jar' />
-
-            <!-- We need to make sure that we use hsqldb-2 -->
-            <exclude name='hsqldb-1.*.jar'/>
-        </fileset>
-        <pathelement path="${java.class.path}"/>
-    </path>
-    
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties">
-        <classpath>
-            <pathelement location="${lib.dir}/ant-contrib.jar"/>
-        </classpath>
-    </taskdef>
-    
-    <!-- EXEC ASSERTS -->
-    <condition property="assertions" value="false">
-        <not><isset property="assertions"/></not>
-    </condition>
-    <if>
-        <equals arg1="${assertions}" arg2="true" />
-        <then>
-            <assertions id="assertions"><enable /></assertions>
-        </then>
-        <else>
-            <assertions id="assertions"><disable /></assertions>
-        </else>
-    </if>
-
-    <!-- ************************************** BOOTSTRAP IVY ************************************** -->
-
-    <!-- You have to invoke this *before* you can download the dependencies -->
-
-    <target name="bootstrap" description="Used to install the ivy task jar">
-        <mkdir dir="${user.home}/.ant/lib"/>
-        <get dest="${user.home}/.ant/lib/ivy.jar"
-             src="http://search.maven.org/remotecontent?filepath=org/apache/ivy/ivy/2.2.0/ivy-2.2.0.jar"/>
-    </target>
-
-    <!-- ************************************* DEPENDENCIES ************************************* -->
-
-    <target name="resolve" description="Retrieve dependencies with ivy">
-        <ivy:retrieve />
-    </target>
-
-    <!-- *************************************** BUILDING *************************************** -->
-    
-    <target name="build"
-            description="Build the entire framework">
-        <fileset dir="${src.dir}" excludes="**/*.launch, **/*.java"/>
-        <!-- <echo message="${ant.project.name}: ${ant.file}"/> -->
-        
-        <mkdir dir="${build.dir}/META-INF"/>
-        <copy file="${src.dir}/META-INF/persistence.xml" todir="${build.dir}/META-INF"/>
-        <javac debug="true" debuglevel="${debuglevel}" includeantruntime="false"
-               destdir="${build.dir}">
-            <src path="${src.dir}"/>
-            <classpath refid="project.classpath" />
-        </javac>
-        
-        <!-- Copy Files -->
-        <copy todir="${build.dir}">
-            <fileset dir="${src.dir}">
-                <include name="**/*-ddl.sql"/>
-                <include name="**/*-dialects.xml"/>
-                <include name="**/*.xsd"/>
-                <include name="**/histogram.*.gz"/>
-                <include name="**/table.*.gz"/>
-            </fileset>
-        </copy>
-        
-    </target>
-
-    <target name="clean" description="Destroys all generated files and dirs.">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <!-- *************************************** EXECUTING *************************************** -->
-    
-    <target name="execute" description="Execute a benchmark">
-        <condition property="benchmark" value="">
-            <not><isset property="benchmark"/></not>
-        </condition>
-        <condition property="config" value="">
-            <not><isset property="config"/></not>
-        </condition>
-        <condition property="create" value="false">
-            <not><isset property="create"/></not>
-        </condition>
-    	<condition property="clear" value="false">
-            <not><isset property="clear"/></not>
-        </condition>
-        <condition property="load" value="false">
-            <not><isset property="load"/></not>
-        </condition>
-        <condition property="extra" value="">
-            <not><isset property="extra"/></not>
-        </condition>
-        
-        <java fork="yes" failonerror="true" classname="com.oltpbenchmark.DBWorkload">
-            <jvmarg value="-Xmx2048m" />
-            <jvmarg value="-Dlog4j.configuration=${basedir}/log4j.properties"/>
-            <jvmarg value="-client" />
-            <arg line="-b ${benchmark}" />
-            <arg line="-c ${config}" />
-            <arg line="--create ${create}" />
-            <arg line="--clear ${clear}" />
-            <arg line="--load ${load}" />
-            <arg line="--execute ${execute}" />
-            <arg line="${extra}" />
-            <classpath refid='project.classpath' />
-            
-            <assertions refid="assertions"/>
-        </java>
-    </target>
-    
-    <!-- *************************************** UTILITY *************************************** -->
-
-    <target name="dialects-export"
-            description="Export all of the SQL for a given benchmark to a dialects file">
-        <condition property="benchmark" value="">
-            <not><isset property="benchmark"/></not>
-        </condition>
-        <condition property="config" value="">
-            <not><isset property="config"/></not>
-        </condition>
-        
-        <java fork="yes" failonerror="true" classname="com.oltpbenchmark.DBWorkload">
-            <jvmarg value="-Xmx1024m" />
-            <jvmarg value="-Dlog4j.configuration=${basedir}/log4j.properties"/>
-            <jvmarg value="-client" />
-            <arg line="-b ${benchmark}" />
-            <arg line="-c ${config}" />
-            <arg line="--dialects-export true" />
-            <classpath refid='project.classpath' />
-            <assertions><enable/></assertions>
-        </java>
-    </target>
-    
-    
-</project>
diff --git a/classpath.sh b/classpath.sh
deleted file mode 100755
index d383091..0000000
--- a/classpath.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-echo -ne "build"
-for i in `ls lib/*.jar`; do
-    # IMPORTANT: Make sure that we do not include hsqldb v1
-    if [[ $i =~ .*hsqldb-1.* ]]; then
-        continue
-    fi
-    echo -ne ":$i"
-done
diff --git a/ivy.xml b/ivy.xml
deleted file mode 100644
index 1bad0c8..0000000
--- a/ivy.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="1.0">
-	<info organisation="com.oltpbenchmark"
-		module="oltpbench"
-		revision="1.0"
-		status="integration"
-		publication="20190513211538"
-	/>
-	<configurations>
-		<conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/>
-		<conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/>
-		<conf name="compile" visibility="public" description="this is the default scope, used if none is specified. Compile dependencies are available in all classpaths."/>
-		<conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
-		<conf name="runtime" visibility="public" description="this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath." extends="compile"/>
-		<conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
-		<conf name="system" visibility="public" description="this scope is similar to provided except that you have to provide the JAR which contains it explicitly. The artifact is always available and is not looked up in a repository."/>
-	</configurations>
-	<publications>
-		<artifact name="oltpbench" type="jar" ext="jar" conf="master"/>
-	</publications>
-	<dependencies>
-      <!-- JDBC Drivers -->
-		<dependency org="com.yugabyte" name="jdbc-yugabytedb" rev="42.2.7-yb-3" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="org.hsqldb" name="hsqldb" rev="2.4.1" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-
-		<dependency org="com.zaxxer" name="HikariCP" rev="3.4.5" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-
-		<!-- Core Libraries -->
-		<dependency org="org.apache.httpcomponents" name="httpclient" rev="4.3" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="org.apache.httpcomponents" name="httpcore" rev="4.3" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="org.apache.httpcomponents" name="httpmime" rev="4.3" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="log4j" name="log4j" rev="1.2.17" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="net.sourceforge.collections" name="collections-generic" rev="4.01" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="commons-configuration" name="commons-configuration" rev="1.6" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="net.sf.opencsv" name="opencsv" rev="2.3" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="ch.ethz.ganymed" name="ganymed-ssh2" rev="261" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="commons-cli" name="commons-cli" rev="1.2" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="org.hibernate" name="hibernate-core" rev="3.3.0.GA" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.6.10.Final" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="org.hibernate" name="hibernate-annotations" rev="3.5.6-Final" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="commons-jxpath" name="commons-jxpath" rev="1.3" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="commons-io" name="commons-io" rev="2.2" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="org.hdrhistogram" name="HdrHistogram" rev="2.1.4" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="com.google.code.gson" name="gson" rev="2.8.7" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-      <!-- Javax Stuff -->
-		<dependency org="javax.persistence" name="persistence-api" rev="1.0" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="javax.activation" name="activation" rev="1.1.1"/>
-		<dependency org="javax.jdo" name="jdo2-api" rev="2.3-eb" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="javax.xml.bind" name="jaxb-api" rev="2.3.0" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="com.sun.xml.bind" name="jaxb-core" rev="2.3.0" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-		<dependency org="com.sun.xml.bind" name="jaxb-impl" rev="2.3.0" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-	</dependencies>
-</ivy-module>
diff --git a/ivysettings.xml b/ivysettings.xml
deleted file mode 100644
index aa911ee..0000000
--- a/ivysettings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<ivysettings>
-    <settings defaultResolver="chain"/>
-    <resolvers>
-        <chain name="chain">
-            <ibiblio name="maven" m2compatible="true" root="https://repo1.maven.org/maven2/"/>
-            <ibiblio name="apache" m2compatible="true" root="https://repo.maven.apache.org/maven2/"/>
-        </chain>
-    </resolvers>
-</ivysettings>
-
diff --git a/pom.xml b/pom.xml
index 78fb23a..4347979 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,8 +10,8 @@
     <packaging>jar</packaging>
 
     <properties>
-        <maven.compiler.source>1.10</maven.compiler.source>
-        <maven.compiler.target>1.10</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <!-- *************************************** BUILDING *************************************** -->
@@ -32,6 +32,28 @@
                 JAR with dependencies
             -->
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/libs</outputDirectory>
+                            <excludeScope>provided</excludeScope>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>false</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
                     <archive>
@@ -42,6 +64,8 @@
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
                     </descriptorRefs>
+                    <descriptor>assembly/bin.xml</descriptor>
+                    <finalName>tpcc</finalName>
                 </configuration>
                 <executions>
                     <execution>
@@ -86,6 +110,7 @@
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb-j5</artifactId>
             <version>2.0.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.persistence</groupId>
@@ -105,7 +130,12 @@
         <dependency>
             <groupId>commons-configuration</groupId>
             <artifactId>commons-configuration</artifactId>
-            <version>1.6</version>
+            <version>1.10</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.1</version>
         </dependency>
         <dependency>
             <groupId>net.sf.opencsv</groupId>
diff --git a/tpccbenchmark b/tpccbenchmark
index 4a03fcf..b86c50c 100755
--- a/tpccbenchmark
+++ b/tpccbenchmark
@@ -1,3 +1,3 @@
 #!/bin/bash
 memory='8G'
-java -Xmx$memory -cp `./classpath.sh bin` -Dlog4j.configuration=log4j.properties com.oltpbenchmark.DBWorkload $@
+java -Xmx$memory -cp "libs/*" -Dlog4j.configuration=log4j.properties com.oltpbenchmark.DBWorkload $@