diff --git a/.classpath b/.classpath
deleted file mode 100644
index 8424151..0000000
--- a/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7c9f4df
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,67 @@
+
+# Created by https://www.gitignore.io/api/maven,eclipse
+
+### Maven ###
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+
+### Eclipse ###
+
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
diff --git a/.project b/.project
deleted file mode 100644
index ec62144..0000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- CommerceAPIJava
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3a21537..0000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/README.md b/README.md
index 20bcd7a..9ac1cb8 100644
--- a/README.md
+++ b/README.md
@@ -23,33 +23,11 @@ ApiEndpoint=https://api.cp.microsoft.com
Follow these steps
-1. Download the following jars and save them in a local folder
- * Apache HttpClient 4.5 is located at https://hc.apache.org/downloads.cgi
- * Download and extract the .zip file httpcomponents-client-4.5-bin.zip in to a folder
- * Download JSON parser - json_simple-1.1.jar from https://code.google.com/p/json-simple/downloads/detail?name=json_simple-1.1.jar&can=2&q= in to a folder
-2. Download and extract the Commerce-API-Java source code zip file from GIT hub
-3. Eclipse IDE is required to run the Commerce-API-Java project, please download the same from https://www.eclipse.org/downloads/
-4. If JDK is not installed, download & install latest jdk from http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
-5. Open the eclipse IDE and click on File->Import
-
- 
-6. Select “Existing Projects into Workspace” option and click next
-
- 
-7. Select the root directory option and browse for the extracted code, an example illustration is shown below. Click Finish
-
- 
-8. The code along with the project should appear as below in the eclipse IDE
-
- 
-9. Configure the Java Build Path
- 1. Right click on the project and click on “Properties->Java Build Path”
- 2. Click “Add External JARs” and choose the following jar files from the local folders where they were downloaded earlier
- * httpclient-4.5.jar
- * httpcore-4.4.1.jar
- * commons-logging-1.2.jar
- * json-simple-1.1.1.jar
-
- 
-10. Eclipse should now build the project with no errors.
-11. To run the sample right click on the file TestCrestApi.java, select Debug-As, and select Java Application.
+1. Eclipse IDE is optional to run the Commerce-API-Java project, please download the same from https://www.eclipse.org/downloads/
+2. If JDK is not installed, download & install latest jdk from http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
+3. Open the eclipse IDE and click on File->Import
+4. 
+6. Select “Maven > Existing Maven Projects” option and click next
+7. Select the root directory option and browse for the extracted code. Click Finish
+8. Eclipse should now build the project with no errors.
+9. To run the sample right click on the file TestCrestApi.java, select Debug-As, and select Java Application.
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..144695a
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,24 @@
+
+ 4.0.0
+ com.microsoft.partnercenter
+ Commerce-API-Java
+ 1.0
+ jar
+
+ 1.8
+ 1.8
+
+
+
+ org.apache.httpcomponents
+ httpclient
+ 4.5.2
+
+
+ com.googlecode.json-simple
+ json-simple
+ 1.1.1
+
+
+
diff --git a/src/microsoft/partner/csp/api/v1/samples/AADToken.java b/src/main/java/microsoft/partner/csp/api/v1/samples/AADToken.java
similarity index 100%
rename from src/microsoft/partner/csp/api/v1/samples/AADToken.java
rename to src/main/java/microsoft/partner/csp/api/v1/samples/AADToken.java
diff --git a/src/microsoft/partner/csp/api/v1/samples/CrestApiUtilities.java b/src/main/java/microsoft/partner/csp/api/v1/samples/CrestApiUtilities.java
similarity index 100%
rename from src/microsoft/partner/csp/api/v1/samples/CrestApiUtilities.java
rename to src/main/java/microsoft/partner/csp/api/v1/samples/CrestApiUtilities.java
diff --git a/src/microsoft/partner/csp/api/v1/samples/Customer.java b/src/main/java/microsoft/partner/csp/api/v1/samples/Customer.java
similarity index 100%
rename from src/microsoft/partner/csp/api/v1/samples/Customer.java
rename to src/main/java/microsoft/partner/csp/api/v1/samples/Customer.java
diff --git a/src/microsoft/partner/csp/api/v1/samples/Entitlement.java b/src/main/java/microsoft/partner/csp/api/v1/samples/Entitlement.java
similarity index 100%
rename from src/microsoft/partner/csp/api/v1/samples/Entitlement.java
rename to src/main/java/microsoft/partner/csp/api/v1/samples/Entitlement.java
diff --git a/src/microsoft/partner/csp/api/v1/samples/Order.java b/src/main/java/microsoft/partner/csp/api/v1/samples/Order.java
similarity index 100%
rename from src/microsoft/partner/csp/api/v1/samples/Order.java
rename to src/main/java/microsoft/partner/csp/api/v1/samples/Order.java
diff --git a/src/microsoft/partner/csp/api/v1/samples/PartnerAPiCredentialsProvider.java b/src/main/java/microsoft/partner/csp/api/v1/samples/PartnerAPiCredentialsProvider.java
similarity index 100%
rename from src/microsoft/partner/csp/api/v1/samples/PartnerAPiCredentialsProvider.java
rename to src/main/java/microsoft/partner/csp/api/v1/samples/PartnerAPiCredentialsProvider.java
diff --git a/src/microsoft/partner/csp/api/v1/samples/Profile.java b/src/main/java/microsoft/partner/csp/api/v1/samples/Profile.java
similarity index 100%
rename from src/microsoft/partner/csp/api/v1/samples/Profile.java
rename to src/main/java/microsoft/partner/csp/api/v1/samples/Profile.java
diff --git a/src/microsoft/partner/csp/api/v1/samples/Reseller.java b/src/main/java/microsoft/partner/csp/api/v1/samples/Reseller.java
similarity index 100%
rename from src/microsoft/partner/csp/api/v1/samples/Reseller.java
rename to src/main/java/microsoft/partner/csp/api/v1/samples/Reseller.java
diff --git a/src/microsoft/partner/csp/api/v1/samples/SAToken.java b/src/main/java/microsoft/partner/csp/api/v1/samples/SAToken.java
similarity index 100%
rename from src/microsoft/partner/csp/api/v1/samples/SAToken.java
rename to src/main/java/microsoft/partner/csp/api/v1/samples/SAToken.java
diff --git a/src/microsoft/partner/csp/api/v1/samples/Subscriptions.java b/src/main/java/microsoft/partner/csp/api/v1/samples/Subscriptions.java
similarity index 100%
rename from src/microsoft/partner/csp/api/v1/samples/Subscriptions.java
rename to src/main/java/microsoft/partner/csp/api/v1/samples/Subscriptions.java
diff --git a/src/microsoft/partner/csp/api/v1/samples/TestCrestApi.java b/src/main/java/microsoft/partner/csp/api/v1/samples/TestCrestApi.java
similarity index 100%
rename from src/microsoft/partner/csp/api/v1/samples/TestCrestApi.java
rename to src/main/java/microsoft/partner/csp/api/v1/samples/TestCrestApi.java