diff --git a/pom.xml b/pom.xml
index 94889df..216d772 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>anthunt.aws</groupId>
   <artifactId>aws-exporter</artifactId>
-  <version>2.0.3-RELEASE</version>
+  <version>2.1.0-SNAPSHOT</version>
   
   <name>aws-exporter</name>
   
@@ -168,7 +168,7 @@
 			    <configuration>
 			        <archive>
 			            <manifest>
-			                <mainClass>anthunt.aws.exporter.Installer</mainClass>
+			                <mainClass>anthunt.aws.exporter.install.Installer</mainClass>
 			            </manifest>
 			        </archive>
 			        <descriptors>
diff --git a/src/main/java/anthunt/aws/exporter/AWSExportStarter.java b/src/main/java/anthunt/aws/exporter/AWSExportStarter.java
index 9b6a419..08c0000 100644
--- a/src/main/java/anthunt/aws/exporter/AWSExportStarter.java
+++ b/src/main/java/anthunt/aws/exporter/AWSExportStarter.java
@@ -1,6 +1,10 @@
 package anthunt.aws.exporter;
 
 import com.amazonaws.regions.Regions;
+
+import anthunt.aws.exporter.model.AmazonAccess;
+import anthunt.aws.exporter.model.CrossAccountRole;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/src/main/java/anthunt/aws/exporter/AWSExporter.java b/src/main/java/anthunt/aws/exporter/AWSExporter.java
index c3cd353..464763c 100644
--- a/src/main/java/anthunt/aws/exporter/AWSExporter.java
+++ b/src/main/java/anthunt/aws/exporter/AWSExporter.java
@@ -219,6 +219,8 @@
 import com.amazonaws.services.s3.model.SourceSelectionCriteria;
 import com.amazonaws.services.s3.model.SseKmsEncryptedObjects;
 import com.amazonaws.services.s3.model.TagSet;
+
+import anthunt.aws.exporter.model.AmazonAccess;
 import anthunt.poi.helper.XSSFHelper;
 
 public class AWSExporter
diff --git a/src/main/java/anthunt/aws/exporter/AmazonClients.java b/src/main/java/anthunt/aws/exporter/AmazonClients.java
index 63d5460..1948f04 100644
--- a/src/main/java/anthunt/aws/exporter/AmazonClients.java
+++ b/src/main/java/anthunt/aws/exporter/AmazonClients.java
@@ -38,6 +38,9 @@
 import com.amazonaws.services.securitytoken.model.AssumeRoleResult;
 import com.amazonaws.services.securitytoken.model.Credentials;
 
+import anthunt.aws.exporter.model.AmazonAccess;
+import anthunt.aws.exporter.model.CrossAccountRole;
+
 public class AmazonClients
 {
 	public AmazonEC2 AmazonEC2;
diff --git a/src/main/java/anthunt/aws/exporter/InstallEventListener.java b/src/main/java/anthunt/aws/exporter/install/InstallEventListener.java
similarity index 94%
rename from src/main/java/anthunt/aws/exporter/InstallEventListener.java
rename to src/main/java/anthunt/aws/exporter/install/InstallEventListener.java
index f6879ac..a3fc731 100644
--- a/src/main/java/anthunt/aws/exporter/InstallEventListener.java
+++ b/src/main/java/anthunt/aws/exporter/install/InstallEventListener.java
@@ -1,4 +1,4 @@
-package anthunt.aws.exporter;
+package anthunt.aws.exporter.install;
 
 import org.eclipse.aether.AbstractRepositoryListener;
 import org.eclipse.aether.RepositoryEvent;
diff --git a/src/main/java/anthunt/aws/exporter/Installer.java b/src/main/java/anthunt/aws/exporter/install/Installer.java
similarity index 95%
rename from src/main/java/anthunt/aws/exporter/Installer.java
rename to src/main/java/anthunt/aws/exporter/install/Installer.java
index 30d827a..2ceb84b 100644
--- a/src/main/java/anthunt/aws/exporter/Installer.java
+++ b/src/main/java/anthunt/aws/exporter/install/Installer.java
@@ -1,4 +1,4 @@
-package anthunt.aws.exporter;
+package anthunt.aws.exporter.install;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/src/main/java/anthunt/aws/exporter/AmazonAccess.java b/src/main/java/anthunt/aws/exporter/model/AmazonAccess.java
similarity index 98%
rename from src/main/java/anthunt/aws/exporter/AmazonAccess.java
rename to src/main/java/anthunt/aws/exporter/model/AmazonAccess.java
index aa88d30..0af411e 100644
--- a/src/main/java/anthunt/aws/exporter/AmazonAccess.java
+++ b/src/main/java/anthunt/aws/exporter/model/AmazonAccess.java
@@ -1,4 +1,4 @@
-package anthunt.aws.exporter;
+package anthunt.aws.exporter.model;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/anthunt/aws/exporter/CrossAccountRole.java b/src/main/java/anthunt/aws/exporter/model/CrossAccountRole.java
similarity index 93%
rename from src/main/java/anthunt/aws/exporter/CrossAccountRole.java
rename to src/main/java/anthunt/aws/exporter/model/CrossAccountRole.java
index 9df62cd..3285d8a 100644
--- a/src/main/java/anthunt/aws/exporter/CrossAccountRole.java
+++ b/src/main/java/anthunt/aws/exporter/model/CrossAccountRole.java
@@ -1,4 +1,4 @@
-package anthunt.aws.exporter;
+package anthunt.aws.exporter.model;
 
 public class CrossAccountRole {