diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
index 35985f13fe..306adcaf1a 100644
--- a/TMessagesProj/build.gradle
+++ b/TMessagesProj/build.gradle
@@ -266,8 +266,8 @@ dependencies {
 
     implementation "com.google.code.gson:gson:2.10"
     implementation "org.osmdroid:osmdroid-android:6.1.10"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.23"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
 
     implementation "com.squareup.okhttp3:okhttp:5.0.0-alpha.10"
     implementation 'com.neovisionaries:nv-websocket-client:2.14'
diff --git a/TMessagesProj/src/main/java/java/nekox/messenger/NekoLocationSource.java b/TMessagesProj/src/main/java/nekox/messenger/NekoLocationSource.java
similarity index 99%
rename from TMessagesProj/src/main/java/java/nekox/messenger/NekoLocationSource.java
rename to TMessagesProj/src/main/java/nekox/messenger/NekoLocationSource.java
index 278fdc4c04..cd80ec24b8 100644
--- a/TMessagesProj/src/main/java/java/nekox/messenger/NekoLocationSource.java
+++ b/TMessagesProj/src/main/java/nekox/messenger/NekoLocationSource.java
@@ -1,4 +1,4 @@
-package java.nekox.messenger;
+package nekox.messenger;
 
 import android.Manifest;
 import android.app.Activity;
diff --git a/TMessagesProj/src/main/java/java/org/telegram/messenger/GcmPushListenerService.java b/TMessagesProj/src/main/java/org/telegram/messenger/GcmPushListenerService.java
similarity index 97%
rename from TMessagesProj/src/main/java/java/org/telegram/messenger/GcmPushListenerService.java
rename to TMessagesProj/src/main/java/org/telegram/messenger/GcmPushListenerService.java
index 66e2779f12..af46e75c7a 100644
--- a/TMessagesProj/src/main/java/java/org/telegram/messenger/GcmPushListenerService.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/GcmPushListenerService.java
@@ -6,7 +6,7 @@
  * Copyright Nikolai Kudashov, 2013-2018.
  */
 
-package java.org.telegram.messenger;
+package org.telegram.messenger;
 
 import androidx.annotation.NonNull;
 
diff --git a/TMessagesProj/src/main/java/java/org/telegram/messenger/GoogleLocationProvider.java b/TMessagesProj/src/main/java/org/telegram/messenger/GoogleLocationProvider.java
similarity index 99%
rename from TMessagesProj/src/main/java/java/org/telegram/messenger/GoogleLocationProvider.java
rename to TMessagesProj/src/main/java/org/telegram/messenger/GoogleLocationProvider.java
index c80138d4be..5859be8bdb 100644
--- a/TMessagesProj/src/main/java/java/org/telegram/messenger/GoogleLocationProvider.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/GoogleLocationProvider.java
@@ -1,4 +1,4 @@
-package java.org.telegram.messenger;
+package org.telegram.messenger;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/TMessagesProj/src/main/java/java/org/telegram/messenger/GoogleMapsProvider.java b/TMessagesProj/src/main/java/org/telegram/messenger/GoogleMapsProvider.java
similarity index 99%
rename from TMessagesProj/src/main/java/java/org/telegram/messenger/GoogleMapsProvider.java
rename to TMessagesProj/src/main/java/org/telegram/messenger/GoogleMapsProvider.java
index 6a83e3e768..8e49ee2a10 100644
--- a/TMessagesProj/src/main/java/java/org/telegram/messenger/GoogleMapsProvider.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/GoogleMapsProvider.java
@@ -1,4 +1,4 @@
-package java.org.telegram.messenger;
+package org.telegram.messenger;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -34,7 +34,7 @@
 import org.telegram.messenger.IMapsProvider;
 import org.telegram.messenger.R;
 
-import java.nekox.messenger.NekoLocationSource;
+import nekox.messenger.NekoLocationSource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/TMessagesProj/src/main/java/java/org/telegram/messenger/GooglePushListenerServiceProvider.java b/TMessagesProj/src/main/java/org/telegram/messenger/GooglePushListenerServiceProvider.java
similarity index 98%
rename from TMessagesProj/src/main/java/java/org/telegram/messenger/GooglePushListenerServiceProvider.java
rename to TMessagesProj/src/main/java/org/telegram/messenger/GooglePushListenerServiceProvider.java
index b5e576336a..0c70b0f375 100644
--- a/TMessagesProj/src/main/java/java/org/telegram/messenger/GooglePushListenerServiceProvider.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/GooglePushListenerServiceProvider.java
@@ -1,4 +1,4 @@
-package java.org.telegram.messenger;
+package org.telegram.messenger;
 
 import android.os.SystemClock;
 import android.text.TextUtils;
diff --git a/build.gradle b/build.gradle
index fcf4f05e42..f1675f42d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,9 +7,9 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.3.1'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'
-        classpath 'com.google.gms:google-services:4.3.14'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0'
+        classpath 'com.google.gms:google-services:4.4.1'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
         classpath 'gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.9.0'
         //noinspection GradleDependency
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"