diff --git a/dd-trace/pom.xml b/dd-trace/pom.xml
new file mode 100644
index 0000000000..31c57c8b51
--- /dev/null
+++ b/dd-trace/pom.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.datadoghq</groupId>
+        <artifactId>dd-trace-java</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>dd-trace</artifactId>
+    <packaging>jar</packaging>
+    <name>dd-trace</name>
+
+    <dependencies>
+
+        <!-- Opentracing core -->
+        <dependency>
+            <groupId>io.opentracing</groupId>
+            <artifactId>opentracing-api</artifactId>
+            <version>${opentracing.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.opentracing</groupId>
+            <artifactId>opentracing-noop</artifactId>
+            <version>${opentracing.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.opentracing</groupId>
+            <artifactId>opentracing-util</artifactId>
+            <version>${opentracing.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.opentracing.contrib</groupId>
+            <artifactId>opentracing-tracerresolver</artifactId>
+            <version>0.1.0</version>
+        </dependency>
+
+        <!-- Other libs used -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.8.8</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+            <version>2.8.8</version>
+        </dependency>
+
+        <!-- Logging dependencies -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.25</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.3</version>
+        </dependency>
+
+        <!-- Required for the tracer resolver / annotation -->
+        <dependency>
+            <groupId>com.google.auto.service</groupId>
+            <artifactId>auto-service</artifactId>
+            <version>1.0-rc3</version>
+        </dependency>
+
+        <!-- Testing dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.6.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>2.7.22</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/src/main/java/com/datadoghq/trace/DDSpan.java b/dd-trace/src/main/java/com/datadoghq/trace/DDSpan.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/DDSpan.java
rename to dd-trace/src/main/java/com/datadoghq/trace/DDSpan.java
diff --git a/src/main/java/com/datadoghq/trace/DDSpanContext.java b/dd-trace/src/main/java/com/datadoghq/trace/DDSpanContext.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/DDSpanContext.java
rename to dd-trace/src/main/java/com/datadoghq/trace/DDSpanContext.java
diff --git a/src/main/java/com/datadoghq/trace/DDTags.java b/dd-trace/src/main/java/com/datadoghq/trace/DDTags.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/DDTags.java
rename to dd-trace/src/main/java/com/datadoghq/trace/DDTags.java
diff --git a/src/main/java/com/datadoghq/trace/DDTracer.java b/dd-trace/src/main/java/com/datadoghq/trace/DDTracer.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/DDTracer.java
rename to dd-trace/src/main/java/com/datadoghq/trace/DDTracer.java
diff --git a/src/main/java/com/datadoghq/trace/integration/DBServiceDecorator.java b/dd-trace/src/main/java/com/datadoghq/trace/integration/DBServiceDecorator.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/integration/DBServiceDecorator.java
rename to dd-trace/src/main/java/com/datadoghq/trace/integration/DBServiceDecorator.java
diff --git a/src/main/java/com/datadoghq/trace/integration/DDSpanContextDecorator.java b/dd-trace/src/main/java/com/datadoghq/trace/integration/DDSpanContextDecorator.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/integration/DDSpanContextDecorator.java
rename to dd-trace/src/main/java/com/datadoghq/trace/integration/DDSpanContextDecorator.java
diff --git a/src/main/java/com/datadoghq/trace/integration/HTTPServiceDecorator.java b/dd-trace/src/main/java/com/datadoghq/trace/integration/HTTPServiceDecorator.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/integration/HTTPServiceDecorator.java
rename to dd-trace/src/main/java/com/datadoghq/trace/integration/HTTPServiceDecorator.java
diff --git a/src/main/java/com/datadoghq/trace/integration/MapperDecorator.java b/dd-trace/src/main/java/com/datadoghq/trace/integration/MapperDecorator.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/integration/MapperDecorator.java
rename to dd-trace/src/main/java/com/datadoghq/trace/integration/MapperDecorator.java
diff --git a/src/main/java/com/datadoghq/trace/propagation/Codec.java b/dd-trace/src/main/java/com/datadoghq/trace/propagation/Codec.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/propagation/Codec.java
rename to dd-trace/src/main/java/com/datadoghq/trace/propagation/Codec.java
diff --git a/src/main/java/com/datadoghq/trace/propagation/HTTPCodec.java b/dd-trace/src/main/java/com/datadoghq/trace/propagation/HTTPCodec.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/propagation/HTTPCodec.java
rename to dd-trace/src/main/java/com/datadoghq/trace/propagation/HTTPCodec.java
diff --git a/src/main/java/com/datadoghq/trace/resolver/DDTracerResolver.java b/dd-trace/src/main/java/com/datadoghq/trace/resolver/DDTracerResolver.java
similarity index 98%
rename from src/main/java/com/datadoghq/trace/resolver/DDTracerResolver.java
rename to dd-trace/src/main/java/com/datadoghq/trace/resolver/DDTracerResolver.java
index 095c067586..b7d60e19b5 100644
--- a/src/main/java/com/datadoghq/trace/resolver/DDTracerResolver.java
+++ b/dd-trace/src/main/java/com/datadoghq/trace/resolver/DDTracerResolver.java
@@ -35,7 +35,7 @@ public class DDTracerResolver extends TracerResolver {
 
     private final static Logger logger = LoggerFactory.getLogger(DDTracerResolver.class);
 
-    public static final String TRACER_CONFIG = "dd-trace.yaml";
+    public static final String TRACER_CONFIG = "src/test/resources/dd-trace.yaml";
     private final ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory());
 
     @Override
diff --git a/src/main/java/com/datadoghq/trace/resolver/TracerConfig.java b/dd-trace/src/main/java/com/datadoghq/trace/resolver/TracerConfig.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/resolver/TracerConfig.java
rename to dd-trace/src/main/java/com/datadoghq/trace/resolver/TracerConfig.java
diff --git a/src/main/java/com/datadoghq/trace/sampling/AllSampler.java b/dd-trace/src/main/java/com/datadoghq/trace/sampling/AllSampler.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/sampling/AllSampler.java
rename to dd-trace/src/main/java/com/datadoghq/trace/sampling/AllSampler.java
diff --git a/src/main/java/com/datadoghq/trace/sampling/RateSampler.java b/dd-trace/src/main/java/com/datadoghq/trace/sampling/RateSampler.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/sampling/RateSampler.java
rename to dd-trace/src/main/java/com/datadoghq/trace/sampling/RateSampler.java
diff --git a/src/main/java/com/datadoghq/trace/sampling/Sampler.java b/dd-trace/src/main/java/com/datadoghq/trace/sampling/Sampler.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/sampling/Sampler.java
rename to dd-trace/src/main/java/com/datadoghq/trace/sampling/Sampler.java
diff --git a/src/main/java/com/datadoghq/trace/writer/DDAgentWriter.java b/dd-trace/src/main/java/com/datadoghq/trace/writer/DDAgentWriter.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/writer/DDAgentWriter.java
rename to dd-trace/src/main/java/com/datadoghq/trace/writer/DDAgentWriter.java
diff --git a/src/main/java/com/datadoghq/trace/writer/DDApi.java b/dd-trace/src/main/java/com/datadoghq/trace/writer/DDApi.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/writer/DDApi.java
rename to dd-trace/src/main/java/com/datadoghq/trace/writer/DDApi.java
diff --git a/src/main/java/com/datadoghq/trace/writer/DDSpanSerializer.java b/dd-trace/src/main/java/com/datadoghq/trace/writer/DDSpanSerializer.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/writer/DDSpanSerializer.java
rename to dd-trace/src/main/java/com/datadoghq/trace/writer/DDSpanSerializer.java
diff --git a/src/main/java/com/datadoghq/trace/writer/LoggingWritter.java b/dd-trace/src/main/java/com/datadoghq/trace/writer/LoggingWritter.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/writer/LoggingWritter.java
rename to dd-trace/src/main/java/com/datadoghq/trace/writer/LoggingWritter.java
diff --git a/src/main/java/com/datadoghq/trace/writer/Writer.java b/dd-trace/src/main/java/com/datadoghq/trace/writer/Writer.java
similarity index 100%
rename from src/main/java/com/datadoghq/trace/writer/Writer.java
rename to dd-trace/src/main/java/com/datadoghq/trace/writer/Writer.java
diff --git a/src/main/resources/dd-trace.yaml b/dd-trace/src/main/resources/dd-trace.yaml
similarity index 100%
rename from src/main/resources/dd-trace.yaml
rename to dd-trace/src/main/resources/dd-trace.yaml
diff --git a/src/main/resources/logback.xml b/dd-trace/src/main/resources/logback.xml
similarity index 100%
rename from src/main/resources/logback.xml
rename to dd-trace/src/main/resources/logback.xml
diff --git a/src/test/java/ExampleWithDDAgentWriter.java b/dd-trace/src/test/java/ExampleWithDDAgentWriter.java
similarity index 100%
rename from src/test/java/ExampleWithDDAgentWriter.java
rename to dd-trace/src/test/java/ExampleWithDDAgentWriter.java
diff --git a/src/test/java/ExampleWithLoggingWriter.java b/dd-trace/src/test/java/ExampleWithLoggingWriter.java
similarity index 100%
rename from src/test/java/ExampleWithLoggingWriter.java
rename to dd-trace/src/test/java/ExampleWithLoggingWriter.java
diff --git a/src/test/java/com/datadoghq/trace/DDSpanBuilderTest.java b/dd-trace/src/test/java/com/datadoghq/trace/DDSpanBuilderTest.java
similarity index 100%
rename from src/test/java/com/datadoghq/trace/DDSpanBuilderTest.java
rename to dd-trace/src/test/java/com/datadoghq/trace/DDSpanBuilderTest.java
diff --git a/src/test/java/com/datadoghq/trace/DDSpanSerializerTest.java b/dd-trace/src/test/java/com/datadoghq/trace/DDSpanSerializerTest.java
similarity index 100%
rename from src/test/java/com/datadoghq/trace/DDSpanSerializerTest.java
rename to dd-trace/src/test/java/com/datadoghq/trace/DDSpanSerializerTest.java
diff --git a/src/test/java/com/datadoghq/trace/DDSpanTest.java b/dd-trace/src/test/java/com/datadoghq/trace/DDSpanTest.java
similarity index 100%
rename from src/test/java/com/datadoghq/trace/DDSpanTest.java
rename to dd-trace/src/test/java/com/datadoghq/trace/DDSpanTest.java
diff --git a/src/test/java/com/datadoghq/trace/DDTracerTest.java b/dd-trace/src/test/java/com/datadoghq/trace/DDTracerTest.java
similarity index 100%
rename from src/test/java/com/datadoghq/trace/DDTracerTest.java
rename to dd-trace/src/test/java/com/datadoghq/trace/DDTracerTest.java
diff --git a/src/test/java/com/datadoghq/trace/RateSamplerTest.java b/dd-trace/src/test/java/com/datadoghq/trace/RateSamplerTest.java
similarity index 100%
rename from src/test/java/com/datadoghq/trace/RateSamplerTest.java
rename to dd-trace/src/test/java/com/datadoghq/trace/RateSamplerTest.java
diff --git a/src/test/java/com/datadoghq/trace/resolver/TracerResolverTest.java b/dd-trace/src/test/java/com/datadoghq/trace/resolver/TracerResolverTest.java
similarity index 100%
rename from src/test/java/com/datadoghq/trace/resolver/TracerResolverTest.java
rename to dd-trace/src/test/java/com/datadoghq/trace/resolver/TracerResolverTest.java
diff --git a/src/test/java/com/datadoghq/trace/writer/impl/DDAgentWriterTest.java b/dd-trace/src/test/java/com/datadoghq/trace/writer/impl/DDAgentWriterTest.java
similarity index 100%
rename from src/test/java/com/datadoghq/trace/writer/impl/DDAgentWriterTest.java
rename to dd-trace/src/test/java/com/datadoghq/trace/writer/impl/DDAgentWriterTest.java
diff --git a/src/test/resources/dd-trace.yaml b/dd-trace/src/test/resources/dd-trace.yaml
similarity index 100%
rename from src/test/resources/dd-trace.yaml
rename to dd-trace/src/test/resources/dd-trace.yaml
diff --git a/pom.xml b/pom.xml
index 336c0a1519..529a90c725 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.datadoghq</groupId>
     <artifactId>dd-trace-java</artifactId>
-    <version>1.0</version>
+    <version>1.0-SNAPSHOT</version>
 
     <properties>
         <opentracing.version>0.22.0</opentracing.version>
@@ -27,89 +28,17 @@
     </scm>
 
     <developers>
-        <developer> <!-- Additions for new Datadog features -->
+        <developer>
             <id>datadog</id>
             <name>Datadog developers</name>
             <email>dev@datadoghq.com</email>
         </developer>
     </developers>
 
+    <modules>
+        <module>dd-trace</module>
+    </modules>
 
-    <dependencies>
-
-        <!-- Opentracing core -->
-        <dependency>
-            <groupId>io.opentracing</groupId>
-            <artifactId>opentracing-api</artifactId>
-            <version>${opentracing.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.opentracing</groupId>
-            <artifactId>opentracing-noop</artifactId>
-            <version>${opentracing.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.opentracing</groupId>
-            <artifactId>opentracing-util</artifactId>
-            <version>${opentracing.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.opentracing.contrib</groupId>
-            <artifactId>opentracing-tracerresolver</artifactId>
-            <version>0.1.0</version>
-        </dependency>
-
-        <!-- Other libs used -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.8.8</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.8.8</version>
-        </dependency>
-
-        <!-- Logging dependencies -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.25</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
-        </dependency>
-
-        <!-- Required for the tracer resolver / annotation -->
-        <dependency>
-            <groupId>com.google.auto.service</groupId>
-            <artifactId>auto-service</artifactId>
-            <version>1.0-rc3</version>
-        </dependency>
-
-        <!-- Testing dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>3.6.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>2.7.22</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
 
     <distributionManagement>
         <snapshotRepository>