diff --git a/pom.xml b/pom.xml
index 6d2d30e..1cef3ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
           </descriptors>
           <archive>
             <manifest>
-              <mainClass>org.gaul.s3proxy.S3Proxy</mainClass>
+              <mainClass>org.gaul.s3proxy.Main</mainClass>
             </manifest>
           </archive>
         </configuration>
diff --git a/src/main/java/org/gaul/s3proxy/Main.java b/src/main/java/org/gaul/s3proxy/Main.java
new file mode 100644
index 0000000..fed1530
--- /dev/null
+++ b/src/main/java/org/gaul/s3proxy/Main.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2014 Andrew Gaul <andrew@gaul.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.gaul.s3proxy;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.net.URI;
+import java.util.Properties;
+
+import com.google.common.collect.ImmutableList;
+import com.google.inject.Module;
+
+import org.jclouds.Constants;
+import org.jclouds.ContextBuilder;
+import org.jclouds.blobstore.BlobStoreContext;
+import org.jclouds.logging.slf4j.config.SLF4JLoggingModule;
+
+public final class Main {
+    private Main() {
+        throw new AssertionError("intentionally not implemented");
+    }
+
+    public static void main(String[] args) throws Exception {
+        if (args.length == 1 && args[0].equals("--version")) {
+            System.err.println(
+                    Main.class.getPackage().getImplementationVersion());
+            System.exit(0);
+        } else if (args.length != 2) {
+            System.err.println("Usage: s3proxy --properties FILE");
+            System.exit(1);
+        }
+        Properties properties = new Properties();
+        try (InputStream is = new FileInputStream(new File(args[1]))) {
+            properties.load(is);
+        }
+        properties.putAll(System.getProperties());
+
+        String provider = properties.getProperty(Constants.PROPERTY_PROVIDER);
+        String identity = properties.getProperty(Constants.PROPERTY_IDENTITY);
+        String credential = properties.getProperty(
+                Constants.PROPERTY_CREDENTIAL);
+        String endpoint = properties.getProperty(Constants.PROPERTY_ENDPOINT);
+        String s3ProxyEndpointString = properties.getProperty(
+                S3ProxyConstants.PROPERTY_ENDPOINT);
+        String s3ProxyAuthorization = properties.getProperty(
+                S3ProxyConstants.PROPERTY_AUTHORIZATION);
+        if (provider == null || identity == null || credential == null ||
+                s3ProxyEndpointString == null ||
+                s3ProxyAuthorization == null) {
+            System.err.println("Properties file must contain:\n" +
+                    Constants.PROPERTY_PROVIDER + "\n" +
+                    Constants.PROPERTY_IDENTITY + "\n" +
+                    Constants.PROPERTY_CREDENTIAL + "\n" +
+                    S3ProxyConstants.PROPERTY_ENDPOINT + "\n" +
+                    S3ProxyConstants.PROPERTY_AUTHORIZATION);
+            System.exit(1);
+        }
+
+        String localIdentity = null;
+        String localCredential = null;
+        if (s3ProxyAuthorization.equalsIgnoreCase("aws-v2")) {
+            localIdentity = properties.getProperty(
+                    S3ProxyConstants.PROPERTY_IDENTITY);
+            localCredential = properties.getProperty(
+                    S3ProxyConstants.PROPERTY_CREDENTIAL);
+        } else if (!s3ProxyAuthorization.equalsIgnoreCase("none")) {
+            System.err.println(S3ProxyConstants.PROPERTY_AUTHORIZATION +
+                    " must be aws-v2 or none, was: " + s3ProxyAuthorization);
+            System.exit(1);
+        }
+
+        String keyStorePath = properties.getProperty(
+                S3ProxyConstants.PROPERTY_KEYSTORE_PATH);
+        String keyStorePassword = properties.getProperty(
+                S3ProxyConstants.PROPERTY_KEYSTORE_PASSWORD);
+        String virtualHost = properties.getProperty(
+                S3ProxyConstants.PROPERTY_VIRTUAL_HOST);
+
+        ContextBuilder builder = ContextBuilder
+                .newBuilder(provider)
+                .credentials(identity, credential)
+                .modules(ImmutableList.<Module>of(new SLF4JLoggingModule()))
+                .overrides(properties);
+        if (endpoint != null) {
+            builder = builder.endpoint(endpoint);
+        }
+        BlobStoreContext context = builder.build(BlobStoreContext.class);
+        URI s3ProxyEndpoint = new URI(s3ProxyEndpointString);
+
+        S3Proxy s3Proxy;
+        try {
+            S3Proxy.Builder s3ProxyBuilder = S3Proxy.builder()
+                    .blobStore(context.getBlobStore())
+                    .endpoint(s3ProxyEndpoint);
+            if (localIdentity != null || localCredential != null) {
+                s3ProxyBuilder.awsAuthentication(localIdentity,
+                        localCredential);
+            }
+            if (keyStorePath != null || keyStorePassword != null) {
+                s3ProxyBuilder.keyStore(keyStorePath, keyStorePassword);
+            }
+            if (virtualHost != null) {
+                s3ProxyBuilder.virtualHost(virtualHost);
+            }
+            s3Proxy = s3ProxyBuilder.build();
+        } catch (IllegalArgumentException | IllegalStateException e) {
+            System.err.println(e.getMessage());
+            System.exit(1);
+            throw e;
+        }
+        s3Proxy.start();
+    }
+}
diff --git a/src/main/java/org/gaul/s3proxy/S3Proxy.java b/src/main/java/org/gaul/s3proxy/S3Proxy.java
index 33311e4..b123f6f 100644
--- a/src/main/java/org/gaul/s3proxy/S3Proxy.java
+++ b/src/main/java/org/gaul/s3proxy/S3Proxy.java
@@ -20,26 +20,16 @@ import static java.util.Objects.requireNonNull;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
 import java.net.URI;
-import java.util.Properties;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableList;
-import com.google.inject.Module;
 
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.jclouds.Constants;
-import org.jclouds.ContextBuilder;
 import org.jclouds.blobstore.BlobStore;
-import org.jclouds.blobstore.BlobStoreContext;
-import org.jclouds.logging.slf4j.config.SLF4JLoggingModule;
 
 /**
  * S3Proxy translates S3 HTTP operations into jclouds provider-agnostic
@@ -160,95 +150,4 @@ public final class S3Proxy {
     public String getState() {
         return server.getState();
     }
-
-    public static void main(String[] args) throws Exception {
-        if (args.length == 1 && args[0].equals("--version")) {
-            System.err.println(
-                    S3Proxy.class.getPackage().getImplementationVersion());
-            System.exit(0);
-        } else if (args.length != 2) {
-            System.err.println("Usage: s3proxy --properties FILE");
-            System.exit(1);
-        }
-        Properties properties = new Properties();
-        try (InputStream is = new FileInputStream(new File(args[1]))) {
-            properties.load(is);
-        }
-        properties.putAll(System.getProperties());
-
-        String provider = properties.getProperty(Constants.PROPERTY_PROVIDER);
-        String identity = properties.getProperty(Constants.PROPERTY_IDENTITY);
-        String credential = properties.getProperty(
-                Constants.PROPERTY_CREDENTIAL);
-        String endpoint = properties.getProperty(Constants.PROPERTY_ENDPOINT);
-        String s3ProxyEndpointString = properties.getProperty(
-                S3ProxyConstants.PROPERTY_ENDPOINT);
-        String s3ProxyAuthorization = properties.getProperty(
-                S3ProxyConstants.PROPERTY_AUTHORIZATION);
-        if (provider == null || identity == null || credential == null ||
-                s3ProxyEndpointString == null ||
-                s3ProxyAuthorization == null) {
-            System.err.println("Properties file must contain:\n" +
-                    Constants.PROPERTY_PROVIDER + "\n" +
-                    Constants.PROPERTY_IDENTITY + "\n" +
-                    Constants.PROPERTY_CREDENTIAL + "\n" +
-                    S3ProxyConstants.PROPERTY_ENDPOINT + "\n" +
-                    S3ProxyConstants.PROPERTY_AUTHORIZATION);
-            System.exit(1);
-        }
-
-        String localIdentity = null;
-        String localCredential = null;
-        if (s3ProxyAuthorization.equalsIgnoreCase("aws-v2")) {
-            localIdentity = properties.getProperty(
-                    S3ProxyConstants.PROPERTY_IDENTITY);
-            localCredential = properties.getProperty(
-                    S3ProxyConstants.PROPERTY_CREDENTIAL);
-        } else if (!s3ProxyAuthorization.equalsIgnoreCase("none")) {
-            System.err.println(S3ProxyConstants.PROPERTY_AUTHORIZATION +
-                    " must be aws-v2 or none, was: " + s3ProxyAuthorization);
-            System.exit(1);
-        }
-
-        String keyStorePath = properties.getProperty(
-                S3ProxyConstants.PROPERTY_KEYSTORE_PATH);
-        String keyStorePassword = properties.getProperty(
-                S3ProxyConstants.PROPERTY_KEYSTORE_PASSWORD);
-        String virtualHost = properties.getProperty(
-                S3ProxyConstants.PROPERTY_VIRTUAL_HOST);
-
-        ContextBuilder builder = ContextBuilder
-                .newBuilder(provider)
-                .credentials(identity, credential)
-                .modules(ImmutableList.<Module>of(new SLF4JLoggingModule()))
-                .overrides(properties);
-        if (endpoint != null) {
-            builder = builder.endpoint(endpoint);
-        }
-        BlobStoreContext context = builder.build(BlobStoreContext.class);
-        URI s3ProxyEndpoint = new URI(s3ProxyEndpointString);
-
-        S3Proxy s3Proxy;
-        try {
-            S3Proxy.Builder s3ProxyBuilder = S3Proxy.builder()
-                    .blobStore(context.getBlobStore())
-                    .endpoint(s3ProxyEndpoint);
-            if (localIdentity != null || localCredential != null) {
-                s3ProxyBuilder.awsAuthentication(localIdentity,
-                        localCredential);
-            }
-            if (keyStorePath != null || keyStorePassword != null) {
-                s3ProxyBuilder.keyStore(keyStorePath, keyStorePassword);
-            }
-            if (virtualHost != null) {
-                s3ProxyBuilder.virtualHost(virtualHost);
-            }
-            s3Proxy = s3ProxyBuilder.build();
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            System.err.println(e.getMessage());
-            System.exit(1);
-            throw e;
-        }
-        s3Proxy.start();
-    }
 }