diff --git a/build.gradle b/build.gradle
index 6d41f93..cf66f2c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,6 +20,28 @@ apply plugin: 'com.github.sherter.google-java-format'
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
+dependencies {
+    // TODO make this provided instead of compile?
+    implementation 'com.amazonaws:aws-lambda-java-core:1.1.0'
+    implementation 'com.amazonaws:aws-lambda-java-events:2.2.2' // 2.2.2 is earliest version that has all needed event sources
+    implementation 'com.amazonaws:aws-java-sdk-s3:1.11.163'
+    implementation 'com.amazonaws:aws-java-sdk-kinesis:1.11.163'
+    implementation 'com.amazonaws:aws-java-sdk-dynamodb:1.11.163'
+    implementation 'com.googlecode.json-simple:json-simple:1.1'
+    implementation('io.opentracing:opentracing-api:0.31.0') { transitive = false }
+    implementation('io.opentracing:opentracing-util:0.31.0') { transitive = false }
+    implementation('io.opentracing:opentracing-noop:0.31.0') { transitive = false }
+
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'io.opentracing:opentracing-mock:0.31.0'
+}
+
+jar {
+    manifest {
+        attributes 'Implementation-Title': 'AWS Lambda OpenTracing Java SDK', 'Implementation-Version': '1.0.1'
+    }
+}
+
 allprojects {
     repositories {
         mavenCentral()
diff --git a/java-aws-lambda/build.gradle b/java-aws-lambda/build.gradle
deleted file mode 100644
index 9c9b2bd..0000000
--- a/java-aws-lambda/build.gradle
+++ /dev/null
@@ -1,32 +0,0 @@
-apply plugin: 'java'
-
-dependencies {
-    // TODO make this provided instead of compile?
-    compile 'com.amazonaws:aws-lambda-java-core:1.1.0'
-    compile 'com.amazonaws:aws-lambda-java-events:2.2.2' // 2.2.2 is earliest version that has all needed event sources
-    compile 'com.amazonaws:aws-java-sdk-s3:1.11.163'
-    compile 'com.amazonaws:aws-java-sdk-kinesis:1.11.163'
-    compile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.163'
-    compile 'com.googlecode.json-simple:json-simple:1.1'
-    compile('io.opentracing:opentracing-api:0.31.0') { transitive = false }
-    compile('io.opentracing:opentracing-util:0.31.0') { transitive = false }
-    compile('io.opentracing:opentracing-noop:0.31.0') { transitive = false }
-
-    testCompile 'junit:junit:4.12'
-    testCompile 'io.opentracing:opentracing-mock:0.31.0'
-}
-
-jar {
-    manifest {
-        attributes 'Implementation-Title': 'Java AWS Lambda OpenTracing Instrumentation', 'Implementation-Version': '1.0.1'
-    }
-
-    // TODO, we don't really want all deps, at least I don't think
-    from {
-        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
-    }
-}
-
-
-
-
diff --git a/java-aws-lambda/src/main/java/io/opentracing/contrib/aws/EventSourceParser.java b/src/main/java/io/opentracing/contrib/aws/EventSourceParser.java
similarity index 100%
rename from java-aws-lambda/src/main/java/io/opentracing/contrib/aws/EventSourceParser.java
rename to src/main/java/io/opentracing/contrib/aws/EventSourceParser.java
diff --git a/java-aws-lambda/src/main/java/io/opentracing/contrib/aws/HeadersParser.java b/src/main/java/io/opentracing/contrib/aws/HeadersParser.java
similarity index 100%
rename from java-aws-lambda/src/main/java/io/opentracing/contrib/aws/HeadersParser.java
rename to src/main/java/io/opentracing/contrib/aws/HeadersParser.java
diff --git a/java-aws-lambda/src/main/java/io/opentracing/contrib/aws/ResponseParser.java b/src/main/java/io/opentracing/contrib/aws/ResponseParser.java
similarity index 100%
rename from java-aws-lambda/src/main/java/io/opentracing/contrib/aws/ResponseParser.java
rename to src/main/java/io/opentracing/contrib/aws/ResponseParser.java
diff --git a/java-aws-lambda/src/main/java/io/opentracing/contrib/aws/SpanUtil.java b/src/main/java/io/opentracing/contrib/aws/SpanUtil.java
similarity index 100%
rename from java-aws-lambda/src/main/java/io/opentracing/contrib/aws/SpanUtil.java
rename to src/main/java/io/opentracing/contrib/aws/SpanUtil.java
diff --git a/java-aws-lambda/src/main/java/io/opentracing/contrib/aws/TracingRequestHandler.java b/src/main/java/io/opentracing/contrib/aws/TracingRequestHandler.java
similarity index 100%
rename from java-aws-lambda/src/main/java/io/opentracing/contrib/aws/TracingRequestHandler.java
rename to src/main/java/io/opentracing/contrib/aws/TracingRequestHandler.java
diff --git a/java-aws-lambda/src/main/java/io/opentracing/contrib/aws/TracingRequestStreamHandler.java b/src/main/java/io/opentracing/contrib/aws/TracingRequestStreamHandler.java
similarity index 100%
rename from java-aws-lambda/src/main/java/io/opentracing/contrib/aws/TracingRequestStreamHandler.java
rename to src/main/java/io/opentracing/contrib/aws/TracingRequestStreamHandler.java
diff --git a/java-aws-lambda/src/test/java/io/opentracing/GlobalTracerTestUtils.java b/src/test/java/io/opentracing/GlobalTracerTestUtils.java
similarity index 100%
rename from java-aws-lambda/src/test/java/io/opentracing/GlobalTracerTestUtils.java
rename to src/test/java/io/opentracing/GlobalTracerTestUtils.java
diff --git a/java-aws-lambda/src/test/java/io/opentracing/contrib/aws/TracingRequestHandlerTest.java b/src/test/java/io/opentracing/contrib/aws/TracingRequestHandlerTest.java
similarity index 100%
rename from java-aws-lambda/src/test/java/io/opentracing/contrib/aws/TracingRequestHandlerTest.java
rename to src/test/java/io/opentracing/contrib/aws/TracingRequestHandlerTest.java
diff --git a/java-aws-lambda/src/test/java/io/opentracing/contrib/aws/TracingRequestStreamHandlerTest.java b/src/test/java/io/opentracing/contrib/aws/TracingRequestStreamHandlerTest.java
similarity index 100%
rename from java-aws-lambda/src/test/java/io/opentracing/contrib/aws/TracingRequestStreamHandlerTest.java
rename to src/test/java/io/opentracing/contrib/aws/TracingRequestStreamHandlerTest.java