diff --git a/README.md b/README.md
index 0b9303f..443f3bc 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,7 @@ The configuration values should be present under maven plugin's configuration.
         <plugin>
             <groupId>org.lambadaframework</groupId>
             <artifactId>maven-plugin</artifactId>
-            <version>0.0.3</version>
+            <version>0.0.4</version>
             <configuration>
 	            ...
 				<!-- Configuration options -->
diff --git a/jax-rs-extractor/pom.xml b/jax-rs-extractor/pom.xml
index 81127fa..c2b1e73 100644
--- a/jax-rs-extractor/pom.xml
+++ b/jax-rs-extractor/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.lambadaframework</groupId>
         <artifactId>lambada</artifactId>
-        <version>0.0.3</version>
+        <version>0.0.4</version>
     </parent>
     <artifactId>jax-rs-extractor</artifactId>
     <packaging>jar</packaging>
diff --git a/jax-rs-extractor/tests/java/org/lambadaframework/jaxrs/JAXRSParserTest.java b/jax-rs-extractor/tests/java/org/lambadaframework/jaxrs/JAXRSParserTest.java
index 41888f3..4baeb65 100644
--- a/jax-rs-extractor/tests/java/org/lambadaframework/jaxrs/JAXRSParserTest.java
+++ b/jax-rs-extractor/tests/java/org/lambadaframework/jaxrs/JAXRSParserTest.java
@@ -20,7 +20,7 @@ public class JAXRSParserTest {
     @Test
     public void testScanJar() throws Exception {
         JAXRSParser parser = new JAXRSParser().withJarFile(
-                "../stub-handlers/target/stub-handlers-0.0.3.jar",
+                "../stub-handlers/target/stub-handlers-0.0.4.jar",
                 "org.lambadaframework");
         List<Resource> resourceList = parser.scan();
         assertTrue(resourceList.size() > 0);
diff --git a/maven-plugin/aws/resources.json b/lambada-maven-plugin/aws/resources.json
similarity index 99%
rename from maven-plugin/aws/resources.json
rename to lambada-maven-plugin/aws/resources.json
index c4b2cd1..dcd986c 100644
--- a/maven-plugin/aws/resources.json
+++ b/lambada-maven-plugin/aws/resources.json
@@ -15,8 +15,8 @@
     "DeploymentS3Bucket": {
       "Description": "Deployment S3 Bucket is where project is deployed after mvn deploy command.",
       "Type": "String",
-      "MinLength": "1",
-      "MaxLength": "25"
+      "MinLength": "3",
+      "MaxLength": "63"
     },
     "DeploymentS3Key": {
       "Description": "Deployment S3 Key is the S3 Path where project is deployed after mvn deploy command.",
diff --git a/maven-plugin/pom.xml b/lambada-maven-plugin/pom.xml
similarity index 92%
rename from maven-plugin/pom.xml
rename to lambada-maven-plugin/pom.xml
index 0e0cccd..fb992db 100644
--- a/maven-plugin/pom.xml
+++ b/lambada-maven-plugin/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.lambadaframework</groupId>
         <artifactId>lambada</artifactId>
-        <version>0.0.3</version>
+        <version>0.0.4</version>
     </parent>
 
-    <artifactId>maven-plugin</artifactId>
+    <artifactId>lambada-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
 
     <properties>
@@ -42,12 +42,6 @@
             <version>${aws-sdk.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-kms</artifactId>
-            <version>${aws-sdk.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-core</artifactId>
diff --git a/maven-plugin/src/main/java/org/lambadaframework/AbstractMojoPlugin.java b/lambada-maven-plugin/src/main/java/org/lambadaframework/AbstractMojoPlugin.java
similarity index 100%
rename from maven-plugin/src/main/java/org/lambadaframework/AbstractMojoPlugin.java
rename to lambada-maven-plugin/src/main/java/org/lambadaframework/AbstractMojoPlugin.java
diff --git a/maven-plugin/src/main/java/org/lambadaframework/aws/AWSTools.java b/lambada-maven-plugin/src/main/java/org/lambadaframework/aws/AWSTools.java
similarity index 100%
rename from maven-plugin/src/main/java/org/lambadaframework/aws/AWSTools.java
rename to lambada-maven-plugin/src/main/java/org/lambadaframework/aws/AWSTools.java
diff --git a/maven-plugin/src/main/java/org/lambadaframework/aws/ApiGateway.java b/lambada-maven-plugin/src/main/java/org/lambadaframework/aws/ApiGateway.java
similarity index 99%
rename from maven-plugin/src/main/java/org/lambadaframework/aws/ApiGateway.java
rename to lambada-maven-plugin/src/main/java/org/lambadaframework/aws/ApiGateway.java
index 93c4cb4..d8ccad4 100644
--- a/maven-plugin/src/main/java/org/lambadaframework/aws/ApiGateway.java
+++ b/lambada-maven-plugin/src/main/java/org/lambadaframework/aws/ApiGateway.java
@@ -418,7 +418,7 @@ protected void deployMethods(Resource jerseyResource, com.amazonaws.services.api
                 /**
                  * To prevent TooManyRequestsException errors from API Gateway
                  */
-                Thread.sleep(500);
+                Thread.sleep(1000);
 
                 if (log != null) {
                     log.info(methodToDelete + " method deleted on resource id " + apiGatewayResource.getId());
diff --git a/maven-plugin/src/main/java/org/lambadaframework/aws/Cloudformation.java b/lambada-maven-plugin/src/main/java/org/lambadaframework/aws/Cloudformation.java
similarity index 99%
rename from maven-plugin/src/main/java/org/lambadaframework/aws/Cloudformation.java
rename to lambada-maven-plugin/src/main/java/org/lambadaframework/aws/Cloudformation.java
index 05d42bd..da155fb 100644
--- a/maven-plugin/src/main/java/org/lambadaframework/aws/Cloudformation.java
+++ b/lambada-maven-plugin/src/main/java/org/lambadaframework/aws/Cloudformation.java
@@ -29,8 +29,8 @@ public class Cloudformation extends AWSTools {
             "    \"DeploymentS3Bucket\": {\n" +
             "      \"Description\": \"Deployment S3 Bucket is where project is deployed after mvn deploy command.\",\n" +
             "      \"Type\": \"String\",\n" +
-            "      \"MinLength\": \"1\",\n" +
-            "      \"MaxLength\": \"25\"\n" +
+            "      \"MinLength\": \"3\",\n" +
+            "      \"MaxLength\": \"63\"\n" +
             "    },\n" +
             "    \"DeploymentS3Key\": {\n" +
             "      \"Description\": \"Deployment S3 Key is the S3 Path where project is deployed after mvn deploy command.\",\n" +
diff --git a/maven-plugin/src/main/java/org/lambadaframework/aws/LambdaFunction.java b/lambada-maven-plugin/src/main/java/org/lambadaframework/aws/LambdaFunction.java
similarity index 100%
rename from maven-plugin/src/main/java/org/lambadaframework/aws/LambdaFunction.java
rename to lambada-maven-plugin/src/main/java/org/lambadaframework/aws/LambdaFunction.java
diff --git a/maven-plugin/src/main/java/org/lambadaframework/aws/S3.java b/lambada-maven-plugin/src/main/java/org/lambadaframework/aws/S3.java
similarity index 100%
rename from maven-plugin/src/main/java/org/lambadaframework/aws/S3.java
rename to lambada-maven-plugin/src/main/java/org/lambadaframework/aws/S3.java
diff --git a/maven-plugin/src/main/java/org/lambadaframework/deployer/Deployment.java b/lambada-maven-plugin/src/main/java/org/lambadaframework/deployer/Deployment.java
similarity index 100%
rename from maven-plugin/src/main/java/org/lambadaframework/deployer/Deployment.java
rename to lambada-maven-plugin/src/main/java/org/lambadaframework/deployer/Deployment.java
diff --git a/maven-plugin/src/main/java/org/lambadaframework/deployer/LambadaDeployer.java b/lambada-maven-plugin/src/main/java/org/lambadaframework/deployer/LambadaDeployer.java
similarity index 100%
rename from maven-plugin/src/main/java/org/lambadaframework/deployer/LambadaDeployer.java
rename to lambada-maven-plugin/src/main/java/org/lambadaframework/deployer/LambadaDeployer.java
diff --git a/maven-plugin/src/main/java/org/lambadaframework/deployer/Prepare.java b/lambada-maven-plugin/src/main/java/org/lambadaframework/deployer/Prepare.java
similarity index 100%
rename from maven-plugin/src/main/java/org/lambadaframework/deployer/Prepare.java
rename to lambada-maven-plugin/src/main/java/org/lambadaframework/deployer/Prepare.java
diff --git a/maven-plugin/src/main/java/org/lambadaframework/deployer/stubs/StubHandler.java b/lambada-maven-plugin/src/main/java/org/lambadaframework/deployer/stubs/StubHandler.java
similarity index 100%
rename from maven-plugin/src/main/java/org/lambadaframework/deployer/stubs/StubHandler.java
rename to lambada-maven-plugin/src/main/java/org/lambadaframework/deployer/stubs/StubHandler.java
diff --git a/maven-plugin/src/main/java/org/lambadaframework/server/LambadaServer.java b/lambada-maven-plugin/src/main/java/org/lambadaframework/server/LambadaServer.java
similarity index 100%
rename from maven-plugin/src/main/java/org/lambadaframework/server/LambadaServer.java
rename to lambada-maven-plugin/src/main/java/org/lambadaframework/server/LambadaServer.java
diff --git a/maven-plugin/tests/java/org/lambadaframework/aws/ApiGatewayTest.java b/lambada-maven-plugin/tests/java/org/lambadaframework/aws/ApiGatewayTest.java
similarity index 100%
rename from maven-plugin/tests/java/org/lambadaframework/aws/ApiGatewayTest.java
rename to lambada-maven-plugin/tests/java/org/lambadaframework/aws/ApiGatewayTest.java
diff --git a/maven-plugin/tests/java/org/lambadaframework/aws/CloudformationTest.java b/lambada-maven-plugin/tests/java/org/lambadaframework/aws/CloudformationTest.java
similarity index 100%
rename from maven-plugin/tests/java/org/lambadaframework/aws/CloudformationTest.java
rename to lambada-maven-plugin/tests/java/org/lambadaframework/aws/CloudformationTest.java
diff --git a/maven-plugin/tests/java/org/lambadaframework/deployer/MainTest.java b/lambada-maven-plugin/tests/java/org/lambadaframework/deployer/MainTest.java
similarity index 100%
rename from maven-plugin/tests/java/org/lambadaframework/deployer/MainTest.java
rename to lambada-maven-plugin/tests/java/org/lambadaframework/deployer/MainTest.java
diff --git a/logger/pom.xml b/logger/pom.xml
index 229ac9b..9ecfde3 100644
--- a/logger/pom.xml
+++ b/logger/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lambada</artifactId>
         <groupId>org.lambadaframework</groupId>
-        <version>0.0.3</version>
+        <version>0.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>Log support</name>
diff --git a/pom.xml b/pom.xml
index 9d99bd4..abc194f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.lambadaframework</groupId>
     <artifactId>lambada</artifactId>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
     <packaging>pom</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
@@ -50,7 +50,7 @@
         <module>stub-handlers</module>
         <module>jax-rs-extractor</module>
         <module>runtime</module>
-        <module>maven-plugin</module>
+        <module>lambada-maven-plugin</module>
         <module>wagon</module>
     </modules>
 
diff --git a/runtime/pom.xml b/runtime/pom.xml
index 2b0b4ec..82fcd4d 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.lambadaframework</groupId>
         <artifactId>lambada</artifactId>
-        <version>0.0.3</version>
+        <version>0.0.4</version>
     </parent>
     <artifactId>runtime</artifactId>
     <packaging>jar</packaging>
@@ -43,12 +43,6 @@
             <version>${project.parent.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.ini4j</groupId>
-            <artifactId>ini4j</artifactId>
-            <version>${ini4j.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
diff --git a/runtime/src/main/java/org/lambadaframework/runtime/Handler.java b/runtime/src/main/java/org/lambadaframework/runtime/Handler.java
index 31321bf..3809938 100644
--- a/runtime/src/main/java/org/lambadaframework/runtime/Handler.java
+++ b/runtime/src/main/java/org/lambadaframework/runtime/Handler.java
@@ -2,8 +2,6 @@
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
-import org.ini4j.Ini;
-import org.ini4j.IniPreferences;
 import org.lambadaframework.jaxrs.model.ResourceMethod;
 import org.lambadaframework.logger.LambdaLogger;
 import org.lambadaframework.runtime.errorhandling.ErrorHandler;
@@ -12,18 +10,6 @@
 import org.lambadaframework.runtime.router.Router;
 import org.apache.log4j.Logger;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.nio.file.*;
-import java.nio.file.attribute.BasicFileAttributes;
-
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-
 
 public class Handler
         implements RequestHandler<Request, Response> {
diff --git a/stub-handlers/pom.xml b/stub-handlers/pom.xml
index 1ba1d46..08f6507 100644
--- a/stub-handlers/pom.xml
+++ b/stub-handlers/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lambada</artifactId>
         <groupId>org.lambadaframework</groupId>
-        <version>0.0.3</version>
+        <version>0.0.4</version>
     </parent>
     <name>Stub Handlers for Tests</name>
     <modelVersion>4.0.0</modelVersion>
diff --git a/wagon/pom.xml b/wagon/pom.xml
index a51aae3..d4bda76 100644
--- a/wagon/pom.xml
+++ b/wagon/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lambada</artifactId>
         <groupId>org.lambadaframework</groupId>
-        <version>0.0.3</version>
+        <version>0.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>S3 Wagon</name>