diff --git a/log4j2-appender/pom.xml b/loki-log4j2-appender/pom.xml
similarity index 100%
rename from log4j2-appender/pom.xml
rename to loki-log4j2-appender/pom.xml
diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogic.java b/loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogic.java
similarity index 100%
rename from log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogic.java
rename to loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogic.java
diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinations.java b/loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinations.java
similarity index 100%
rename from log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinations.java
rename to loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinations.java
diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Header.java b/loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Header.java
similarity index 100%
rename from log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Header.java
rename to loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Header.java
diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Label.java b/loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Label.java
similarity index 100%
rename from log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Label.java
rename to loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Label.java
diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppender.java b/loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppender.java
similarity index 100%
rename from log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppender.java
rename to loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppender.java
diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Property.java b/loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Property.java
similarity index 100%
rename from log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Property.java
rename to loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Property.java
diff --git a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderTest.java b/loki-log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderTest.java
similarity index 100%
rename from log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderTest.java
rename to loki-log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderTest.java
diff --git a/log4j2-appender/src/test/resources/log4j2.xml b/loki-log4j2-appender/src/test/resources/log4j2.xml
similarity index 100%
rename from log4j2-appender/src/test/resources/log4j2.xml
rename to loki-log4j2-appender/src/test/resources/log4j2.xml
diff --git a/core/src/test/resources/loki-config.yaml b/loki-log4j2-appender/src/test/resources/loki-config.yaml
similarity index 100%
rename from core/src/test/resources/loki-config.yaml
rename to loki-log4j2-appender/src/test/resources/loki-config.yaml
diff --git a/pom.xml b/pom.xml
index 4563dfa..74ece89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,9 +12,9 @@
https://github.com/tkowalcz/tjahzi
- loki-protobuf
- log4j2-appender
- core
+ tjahzi-protobuf
+ loki-log4j2-appender
+ tjahzi-core
diff --git a/core/pom.xml b/tjahzi-core/pom.xml
similarity index 100%
rename from core/pom.xml
rename to tjahzi-core/pom.xml
diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java
similarity index 100%
rename from core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java
rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java
diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/LoggingSystem.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LoggingSystem.java
similarity index 100%
rename from core/src/main/java/pl/tkowalcz/tjahzi/LoggingSystem.java
rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LoggingSystem.java
diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java
similarity index 100%
rename from core/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java
rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java
diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/TjahziLogger.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/TjahziLogger.java
similarity index 100%
rename from core/src/main/java/pl/tkowalcz/tjahzi/TjahziLogger.java
rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/TjahziLogger.java
diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfiguration.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfiguration.java
similarity index 100%
rename from core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfiguration.java
rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfiguration.java
diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfigurationBuilder.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfigurationBuilder.java
similarity index 100%
rename from core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfigurationBuilder.java
rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfigurationBuilder.java
diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientFactory.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientFactory.java
similarity index 100%
rename from core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientFactory.java
rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientFactory.java
diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientInitializer.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientInitializer.java
similarity index 100%
rename from core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientInitializer.java
rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientInitializer.java
diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java
similarity index 100%
rename from core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java
rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java
diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/http/TextBuilders.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/TextBuilders.java
similarity index 100%
rename from core/src/main/java/pl/tkowalcz/tjahzi/http/TextBuilders.java
rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/TextBuilders.java
diff --git a/core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemSanityCheckTest.java b/tjahzi-core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemSanityCheckTest.java
similarity index 100%
rename from core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemSanityCheckTest.java
rename to tjahzi-core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemSanityCheckTest.java
diff --git a/core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemTest.java b/tjahzi-core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemTest.java
similarity index 100%
rename from core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemTest.java
rename to tjahzi-core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemTest.java
diff --git a/log4j2-appender/src/test/resources/loki-config.yaml b/tjahzi-core/src/test/resources/loki-config.yaml
similarity index 100%
rename from log4j2-appender/src/test/resources/loki-config.yaml
rename to tjahzi-core/src/test/resources/loki-config.yaml
diff --git a/loki-protobuf/pom.xml b/tjahzi-protobuf/pom.xml
similarity index 100%
rename from loki-protobuf/pom.xml
rename to tjahzi-protobuf/pom.xml
diff --git a/loki-protobuf/src/main/resources/github.com/gogo/protobuf/gogoproto/gogo.proto b/tjahzi-protobuf/src/main/resources/github.com/gogo/protobuf/gogoproto/gogo.proto
similarity index 100%
rename from loki-protobuf/src/main/resources/github.com/gogo/protobuf/gogoproto/gogo.proto
rename to tjahzi-protobuf/src/main/resources/github.com/gogo/protobuf/gogoproto/gogo.proto
diff --git a/loki-protobuf/src/main/resources/google/protobuf/descriptor.proto b/tjahzi-protobuf/src/main/resources/google/protobuf/descriptor.proto
similarity index 100%
rename from loki-protobuf/src/main/resources/google/protobuf/descriptor.proto
rename to tjahzi-protobuf/src/main/resources/google/protobuf/descriptor.proto
diff --git a/loki-protobuf/src/main/resources/google/protobuf/timestamp.proto b/tjahzi-protobuf/src/main/resources/google/protobuf/timestamp.proto
similarity index 100%
rename from loki-protobuf/src/main/resources/google/protobuf/timestamp.proto
rename to tjahzi-protobuf/src/main/resources/google/protobuf/timestamp.proto
diff --git a/loki-protobuf/src/main/resources/logproto.proto b/tjahzi-protobuf/src/main/resources/logproto.proto
similarity index 100%
rename from loki-protobuf/src/main/resources/logproto.proto
rename to tjahzi-protobuf/src/main/resources/logproto.proto