diff --git a/tjahzi-core/pom.xml b/core/pom.xml
similarity index 94%
rename from tjahzi-core/pom.xml
rename to core/pom.xml
index a579679..6cb8fa3 100644
--- a/tjahzi-core/pom.xml
+++ b/core/pom.xml
@@ -3,12 +3,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>pl.tkowalcz</groupId>
-        <artifactId>tjahzi</artifactId>
+        <groupId>pl.tkowalcz.tjahzi</groupId>
+        <artifactId>tjahzi-parent</artifactId>
         <version>0.9.2-SNAPSHOT</version>
     </parent>
 
-    <name>tjahzi-core</name>
+    <name>core</name>
     <artifactId>core</artifactId>
     <packaging>jar</packaging>
 
@@ -34,9 +34,9 @@
 
         <!-- Test dependencies -->
         <dependency>
-            <groupId>pl.tkowalcz</groupId>
+            <groupId>pl.tkowalcz.tjahzi</groupId>
             <artifactId>loki-protobuf</artifactId>
-            <version>${project.version}</version>
+            <version>0.9.2-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java b/core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LogBufferSerializer.java b/core/src/main/java/pl/tkowalcz/tjahzi/LogBufferSerializer.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LogBufferSerializer.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/LogBufferSerializer.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LogBufferTranscoder.java b/core/src/main/java/pl/tkowalcz/tjahzi/LogBufferTranscoder.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LogBufferTranscoder.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/LogBufferTranscoder.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LoggingSystem.java b/core/src/main/java/pl/tkowalcz/tjahzi/LoggingSystem.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LoggingSystem.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/LoggingSystem.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/OutputBuffer.java b/core/src/main/java/pl/tkowalcz/tjahzi/OutputBuffer.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/OutputBuffer.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/OutputBuffer.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java b/core/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/TjahziLogger.java b/core/src/main/java/pl/tkowalcz/tjahzi/TjahziLogger.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/TjahziLogger.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/TjahziLogger.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/github/ExceptionWithGitHubReference.java b/core/src/main/java/pl/tkowalcz/tjahzi/github/ExceptionWithGitHubReference.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/github/ExceptionWithGitHubReference.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/github/ExceptionWithGitHubReference.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/github/GitHubDocs.java b/core/src/main/java/pl/tkowalcz/tjahzi/github/GitHubDocs.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/github/GitHubDocs.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/github/GitHubDocs.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/BlockingRetry.java b/core/src/main/java/pl/tkowalcz/tjahzi/http/BlockingRetry.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/BlockingRetry.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/http/BlockingRetry.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/BootstrapUtil.java b/core/src/main/java/pl/tkowalcz/tjahzi/http/BootstrapUtil.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/BootstrapUtil.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/http/BootstrapUtil.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfiguration.java b/core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfiguration.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfiguration.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfiguration.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfigurationBuilder.java b/core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfigurationBuilder.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfigurationBuilder.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfigurationBuilder.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/EventLoopGroupRetry.java b/core/src/main/java/pl/tkowalcz/tjahzi/http/EventLoopGroupRetry.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/EventLoopGroupRetry.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/http/EventLoopGroupRetry.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/ExponentialBackoffStrategy.java b/core/src/main/java/pl/tkowalcz/tjahzi/http/ExponentialBackoffStrategy.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/ExponentialBackoffStrategy.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/http/ExponentialBackoffStrategy.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientFactory.java b/core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientFactory.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientFactory.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientFactory.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/HttpConnection.java b/core/src/main/java/pl/tkowalcz/tjahzi/http/HttpConnection.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/HttpConnection.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/http/HttpConnection.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java b/core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/Retry.java b/core/src/main/java/pl/tkowalcz/tjahzi/http/Retry.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/Retry.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/http/Retry.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/Snappy.java b/core/src/main/java/pl/tkowalcz/tjahzi/http/Snappy.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/Snappy.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/http/Snappy.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/TextBuilders.java b/core/src/main/java/pl/tkowalcz/tjahzi/http/TextBuilders.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/TextBuilders.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/http/TextBuilders.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/javolution/text/TextBuilder.java b/core/src/main/java/pl/tkowalcz/tjahzi/javolution/text/TextBuilder.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/javolution/text/TextBuilder.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/javolution/text/TextBuilder.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/protobuf/EntrySerializer.java b/core/src/main/java/pl/tkowalcz/tjahzi/protobuf/EntrySerializer.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/protobuf/EntrySerializer.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/protobuf/EntrySerializer.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/protobuf/Protobuf.java b/core/src/main/java/pl/tkowalcz/tjahzi/protobuf/Protobuf.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/protobuf/Protobuf.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/protobuf/Protobuf.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/protobuf/PushRequestSerializer.java b/core/src/main/java/pl/tkowalcz/tjahzi/protobuf/PushRequestSerializer.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/protobuf/PushRequestSerializer.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/protobuf/PushRequestSerializer.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/protobuf/StreamSerializer.java b/core/src/main/java/pl/tkowalcz/tjahzi/protobuf/StreamSerializer.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/protobuf/StreamSerializer.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/protobuf/StreamSerializer.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/protobuf/StringSerializer.java b/core/src/main/java/pl/tkowalcz/tjahzi/protobuf/StringSerializer.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/protobuf/StringSerializer.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/protobuf/StringSerializer.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/protobuf/TimestampSerializer.java b/core/src/main/java/pl/tkowalcz/tjahzi/protobuf/TimestampSerializer.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/protobuf/TimestampSerializer.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/protobuf/TimestampSerializer.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/stats/DropwizardMonitoringModule.java b/core/src/main/java/pl/tkowalcz/tjahzi/stats/DropwizardMonitoringModule.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/stats/DropwizardMonitoringModule.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/stats/DropwizardMonitoringModule.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/stats/EmptyMonitoringModule.java b/core/src/main/java/pl/tkowalcz/tjahzi/stats/EmptyMonitoringModule.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/stats/EmptyMonitoringModule.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/stats/EmptyMonitoringModule.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/stats/MonitoringModule.java b/core/src/main/java/pl/tkowalcz/tjahzi/stats/MonitoringModule.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/stats/MonitoringModule.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/stats/MonitoringModule.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/stats/MutableMonitoringModuleWrapper.java b/core/src/main/java/pl/tkowalcz/tjahzi/stats/MutableMonitoringModuleWrapper.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/stats/MutableMonitoringModuleWrapper.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/stats/MutableMonitoringModuleWrapper.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/stats/StandardMonitoringModule.java b/core/src/main/java/pl/tkowalcz/tjahzi/stats/StandardMonitoringModule.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/stats/StandardMonitoringModule.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/stats/StandardMonitoringModule.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/stats/StatsDumpingThread.java b/core/src/main/java/pl/tkowalcz/tjahzi/stats/StatsDumpingThread.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/stats/StatsDumpingThread.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/stats/StatsDumpingThread.java
diff --git a/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/stats/TimingRingBuffer.java b/core/src/main/java/pl/tkowalcz/tjahzi/stats/TimingRingBuffer.java
similarity index 100%
rename from tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/stats/TimingRingBuffer.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/stats/TimingRingBuffer.java
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/thjazi/protobuf/ProtobufDeserializer.java b/core/src/test/java/pl/tkowalcz/thjazi/protobuf/ProtobufDeserializer.java
similarity index 100%
rename from tjahzi-core/src/test/java/pl/tkowalcz/thjazi/protobuf/ProtobufDeserializer.java
rename to core/src/test/java/pl/tkowalcz/thjazi/protobuf/ProtobufDeserializer.java
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/HeadersTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/HeadersTest.java
similarity index 100%
rename from tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/HeadersTest.java
rename to core/src/test/java/pl/tkowalcz/tjahzi/HeadersTest.java
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/LogBufferAgentTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferAgentTest.java
similarity index 100%
rename from tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/LogBufferAgentTest.java
rename to core/src/test/java/pl/tkowalcz/tjahzi/LogBufferAgentTest.java
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/LogBufferSerializerDeserializerTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferSerializerDeserializerTest.java
similarity index 100%
rename from tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/LogBufferSerializerDeserializerTest.java
rename to core/src/test/java/pl/tkowalcz/tjahzi/LogBufferSerializerDeserializerTest.java
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/LogBufferSerializerTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferSerializerTest.java
similarity index 100%
rename from tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/LogBufferSerializerTest.java
rename to core/src/test/java/pl/tkowalcz/tjahzi/LogBufferSerializerTest.java
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/LogBufferTranscoderTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferTranscoderTest.java
similarity index 100%
rename from tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/LogBufferTranscoderTest.java
rename to core/src/test/java/pl/tkowalcz/tjahzi/LogBufferTranscoderTest.java
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemSanityCheckTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemSanityCheckTest.java
similarity index 100%
rename from tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemSanityCheckTest.java
rename to core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemSanityCheckTest.java
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemTest.java
similarity index 100%
rename from tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemTest.java
rename to core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemTest.java
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/ReconnectTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/ReconnectTest.java
similarity index 100%
rename from tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/ReconnectTest.java
rename to core/src/test/java/pl/tkowalcz/tjahzi/ReconnectTest.java
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/ResourcesCleanupOnCloseTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/ResourcesCleanupOnCloseTest.java
similarity index 100%
rename from tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/ResourcesCleanupOnCloseTest.java
rename to core/src/test/java/pl/tkowalcz/tjahzi/ResourcesCleanupOnCloseTest.java
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/TjahziInitializerTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/TjahziInitializerTest.java
similarity index 100%
rename from tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/TjahziInitializerTest.java
rename to core/src/test/java/pl/tkowalcz/tjahzi/TjahziInitializerTest.java
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/http/BlockingRetryTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/http/BlockingRetryTest.java
similarity index 100%
rename from tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/http/BlockingRetryTest.java
rename to core/src/test/java/pl/tkowalcz/tjahzi/http/BlockingRetryTest.java
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/http/EventLoopGroupRetryTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/http/EventLoopGroupRetryTest.java
similarity index 100%
rename from tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/http/EventLoopGroupRetryTest.java
rename to core/src/test/java/pl/tkowalcz/tjahzi/http/EventLoopGroupRetryTest.java
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/http/ExponentialBackoffStrategyTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/http/ExponentialBackoffStrategyTest.java
similarity index 100%
rename from tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/http/ExponentialBackoffStrategyTest.java
rename to core/src/test/java/pl/tkowalcz/tjahzi/http/ExponentialBackoffStrategyTest.java
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/http/PipelinedHttpRequestTimerTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/http/PipelinedHttpRequestTimerTest.java
similarity index 100%
rename from tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/http/PipelinedHttpRequestTimerTest.java
rename to core/src/test/java/pl/tkowalcz/tjahzi/http/PipelinedHttpRequestTimerTest.java
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/http/SnappyTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/http/SnappyTest.java
similarity index 100%
rename from tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/http/SnappyTest.java
rename to core/src/test/java/pl/tkowalcz/tjahzi/http/SnappyTest.java
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/stats/SettableClock.java b/core/src/test/java/pl/tkowalcz/tjahzi/stats/SettableClock.java
similarity index 100%
rename from tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/stats/SettableClock.java
rename to core/src/test/java/pl/tkowalcz/tjahzi/stats/SettableClock.java
diff --git a/tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/stats/TimingRingBufferTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/stats/TimingRingBufferTest.java
similarity index 100%
rename from tjahzi-core/src/test/java/pl/tkowalcz/tjahzi/stats/TimingRingBufferTest.java
rename to core/src/test/java/pl/tkowalcz/tjahzi/stats/TimingRingBufferTest.java
diff --git a/tjahzi-core/src/test/resources/loki-config.yaml b/core/src/test/resources/loki-config.yaml
similarity index 100%
rename from tjahzi-core/src/test/resources/loki-config.yaml
rename to core/src/test/resources/loki-config.yaml
diff --git a/log4j2-appender-nodep/pom.xml b/log4j2-appender-nodep/pom.xml
index 0fce5ca..23db3d6 100644
--- a/log4j2-appender-nodep/pom.xml
+++ b/log4j2-appender-nodep/pom.xml
@@ -15,9 +15,10 @@
 
     <dependencies>
         <dependency>
-            <groupId>pl.tkowalcz</groupId>
+            <groupId>pl.tkowalcz.tjahzi</groupId>
             <artifactId>log4j2-appender</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 
@@ -39,7 +40,6 @@
                                     <exclude>org.apache.logging.log4j</exclude>
                                 </excludes>
                             </artifactSet>
-                            <minimizeJar>true</minimizeJar>
                             <relocations>
                                 <relocation>
                                     <pattern>org.agrona</pattern>
diff --git a/log4j2-appender/pom.xml b/log4j2-appender/pom.xml
index a31d17b..f15a664 100644
--- a/log4j2-appender/pom.xml
+++ b/log4j2-appender/pom.xml
@@ -15,9 +15,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>pl.tkowalcz</groupId>
+            <groupId>pl.tkowalcz.tjahzi</groupId>
             <artifactId>core</artifactId>
-            <version>${project.version}</version>
+            <version>0.9.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/tjahzi-protobuf/pom.xml b/loki-protobuf/pom.xml
similarity index 100%
rename from tjahzi-protobuf/pom.xml
rename to loki-protobuf/pom.xml
diff --git a/tjahzi-protobuf/src/main/resources/github.com/gogo/protobuf/gogoproto/gogo.proto b/loki-protobuf/src/main/resources/github.com/gogo/protobuf/gogoproto/gogo.proto
similarity index 100%
rename from tjahzi-protobuf/src/main/resources/github.com/gogo/protobuf/gogoproto/gogo.proto
rename to loki-protobuf/src/main/resources/github.com/gogo/protobuf/gogoproto/gogo.proto
diff --git a/tjahzi-protobuf/src/main/resources/google/protobuf/descriptor.proto b/loki-protobuf/src/main/resources/google/protobuf/descriptor.proto
similarity index 100%
rename from tjahzi-protobuf/src/main/resources/google/protobuf/descriptor.proto
rename to loki-protobuf/src/main/resources/google/protobuf/descriptor.proto
diff --git a/tjahzi-protobuf/src/main/resources/google/protobuf/timestamp.proto b/loki-protobuf/src/main/resources/google/protobuf/timestamp.proto
similarity index 100%
rename from tjahzi-protobuf/src/main/resources/google/protobuf/timestamp.proto
rename to loki-protobuf/src/main/resources/google/protobuf/timestamp.proto
diff --git a/tjahzi-protobuf/src/main/resources/logproto.proto b/loki-protobuf/src/main/resources/logproto.proto
similarity index 100%
rename from tjahzi-protobuf/src/main/resources/logproto.proto
rename to loki-protobuf/src/main/resources/logproto.proto
diff --git a/pom.xml b/pom.xml
index 23e764f..75ba193 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,10 +13,10 @@
     <url>https://github.com/tkowalcz/tjahzi</url>
 
     <modules>
-        <module>tjahzi-protobuf</module>
-        <module>tjahzi-log4j2-appender</module>
-        <module>tjahzi-log4j2-appender-nodep</module>
-        <module>tjahzi-core</module>
+        <module>loki-protobuf</module>
+        <module>log4j2-appender</module>
+        <module>log4j2-appender-nodep</module>
+        <module>core</module>
     </modules>
 
     <scm>