diff --git a/.gitignore b/.gitignore
index dae3f48..560059e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,4 +40,4 @@ bin/
 
 ### Mac OS ###
 .DS_Store
-/src/main/java/hdvtdev/telegram/Count.java
+/core/src/main/java/hdvtdev/telegram/Count.java
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ce1c62c..7244181 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,6 +8,11 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/core" />
+            <option value="$PROJECT_DIR$/longpolling" />
+            <option value="$PROJECT_DIR$/longpolling-okhttp" />
+            <option value="$PROJECT_DIR$/longpolling/longpolling-okhttp" />
+            <option value="$PROJECT_DIR$/test" />
           </set>
         </option>
       </GradleProjectSettings>
diff --git a/build.gradle b/build.gradle
index 8035c26..a662c31 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,18 +10,18 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.3'
-    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+    implementation(project(":core"))
+    implementation(project(":longpolling-okhttp"))
+    implementation(project(":test"))
 }
 
-jar {
-
-    manifest {
-        attributes(
-                'Main-Class': 'hdvtdev.telegram.Main'
-        )
-    }
-    from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
+tasks.register('fat', Jar) {
+    archiveClassifier.set('all')
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    from sourceSets.main.output
 
+    from {
+        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+    }
 }
+
diff --git a/settings.gradle b/settings.gradle
index ef3e3e5..8c3e3e0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,8 @@
 rootProject.name = 'TeleJ'
+include 'longpolling'
+include 'core'
+include 'longpolling:longpolling-okhttp'
+findProject(':longpolling:longpolling-okhttp')?.name = 'longpolling-okhttp'
+include 'test'
+include 'longpolling-okhttp'