diff --git a/src/main/java/it/tdlight/tdlib/FatalErrorCallbackPtr.java b/src/main/java/it/tdlight/jni/FatalErrorCallbackPtr.java
similarity index 97%
rename from src/main/java/it/tdlight/tdlib/FatalErrorCallbackPtr.java
rename to src/main/java/it/tdlight/jni/FatalErrorCallbackPtr.java
index bdb697a..5bf1e43 100644
--- a/src/main/java/it/tdlight/tdlib/FatalErrorCallbackPtr.java
+++ b/src/main/java/it/tdlight/jni/FatalErrorCallbackPtr.java
@@ -15,7 +15,7 @@
  *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package it.tdlight.tdlib;
+package it.tdlight.jni;
 
 /**
  * A type of callback function that will be called when a fatal error happens.
diff --git a/src/main/java/it/tdlight/tdlib/NativeClient.java b/src/main/java/it/tdlight/jni/NativeClient.java
similarity index 93%
rename from src/main/java/it/tdlight/tdlib/NativeClient.java
rename to src/main/java/it/tdlight/jni/NativeClient.java
index b27ad13..30f85d7 100644
--- a/src/main/java/it/tdlight/tdlib/NativeClient.java
+++ b/src/main/java/it/tdlight/jni/NativeClient.java
@@ -1,4 +1,4 @@
-package it.tdlight.tdlib;
+package it.tdlight.jni;
 /*
  * Copyright (c) 2018. Ernesto Castellotti <erny.castell@gmail.com>
  * This file is part of JTdlib.
@@ -18,8 +18,8 @@ package it.tdlight.tdlib;
 
 
 
-import it.tdlight.tdlib.TdApi.Function;
-import it.tdlight.tdlib.TdApi.Object;
+import it.tdlight.jni.TdApi.Function;
+import it.tdlight.jni.TdApi.Object;
 
 public class NativeClient {
     protected static native long createNativeClient();
diff --git a/src/main/java/it/tdlight/tdlib/NativeLog.java b/src/main/java/it/tdlight/jni/NativeLog.java
similarity index 99%
rename from src/main/java/it/tdlight/tdlib/NativeLog.java
rename to src/main/java/it/tdlight/jni/NativeLog.java
index 6bb56f7..2a8b36f 100644
--- a/src/main/java/it/tdlight/tdlib/NativeLog.java
+++ b/src/main/java/it/tdlight/jni/NativeLog.java
@@ -15,7 +15,7 @@
  *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package it.tdlight.tdlib;
+package it.tdlight.jni;
 
 /**
  * Class used for managing internal TDLib logging.
diff --git a/src/main/java/it/tdlight/tdlib/ObjectsUtils.java b/src/main/java/it/tdlight/jni/ObjectsUtils.java
similarity index 98%
rename from src/main/java/it/tdlight/tdlib/ObjectsUtils.java
rename to src/main/java/it/tdlight/jni/ObjectsUtils.java
index 8d9f544..ea5a7f8 100644
--- a/src/main/java/it/tdlight/tdlib/ObjectsUtils.java
+++ b/src/main/java/it/tdlight/jni/ObjectsUtils.java
@@ -1,4 +1,4 @@
-package it.tdlight.tdlib;
+package it.tdlight.jni;
 
 public class ObjectsUtils {
 	/**
diff --git a/src/main/java/it/tdlight/tdlight/Client.java b/src/main/java/it/tdlight/tdlight/Client.java
index d66c985..3a7bc5a 100644
--- a/src/main/java/it/tdlight/tdlight/Client.java
+++ b/src/main/java/it/tdlight/tdlight/Client.java
@@ -1,14 +1,14 @@
 package it.tdlight.tdlight;
 
-import it.tdlight.tdlib.NativeClient;
-import it.tdlight.tdlib.TdApi;
-import it.tdlight.tdlib.TdApi.AuthorizationStateClosed;
-import it.tdlight.tdlib.TdApi.AuthorizationStateClosing;
-import it.tdlight.tdlib.TdApi.AuthorizationStateWaitTdlibParameters;
-import it.tdlight.tdlib.TdApi.GetOption;
-import it.tdlight.tdlib.TdApi.Object;
-import it.tdlight.tdlib.TdApi.SetOption;
-import it.tdlight.tdlib.TdApi.UpdateAuthorizationState;
+import it.tdlight.jni.NativeClient;
+import it.tdlight.jni.TdApi;
+import it.tdlight.jni.TdApi.AuthorizationStateClosed;
+import it.tdlight.jni.TdApi.AuthorizationStateClosing;
+import it.tdlight.jni.TdApi.AuthorizationStateWaitTdlibParameters;
+import it.tdlight.jni.TdApi.GetOption;
+import it.tdlight.jni.TdApi.Object;
+import it.tdlight.jni.TdApi.SetOption;
+import it.tdlight.jni.TdApi.UpdateAuthorizationState;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/src/main/java/it/tdlight/tdlight/ConstructorDetector.java b/src/main/java/it/tdlight/tdlight/ConstructorDetector.java
index 95779e1..020b64a 100644
--- a/src/main/java/it/tdlight/tdlight/ConstructorDetector.java
+++ b/src/main/java/it/tdlight/tdlight/ConstructorDetector.java
@@ -17,7 +17,7 @@
 
 package it.tdlight.tdlight;
 
-import it.tdlight.tdlib.TdApi;
+import it.tdlight.jni.TdApi;
 import java.lang.reflect.Field;
 import java.util.concurrent.ConcurrentHashMap;
 
diff --git a/src/main/java/it/tdlight/tdlight/Log.java b/src/main/java/it/tdlight/tdlight/Log.java
index f2b9030..ca20d28 100644
--- a/src/main/java/it/tdlight/tdlight/Log.java
+++ b/src/main/java/it/tdlight/tdlight/Log.java
@@ -1,8 +1,8 @@
 package it.tdlight.tdlight;
 
-import it.tdlight.tdlib.FatalErrorCallbackPtr;
-import it.tdlight.tdlib.NativeLog;
-import it.tdlight.tdlib.TdApi;
+import it.tdlight.jni.FatalErrorCallbackPtr;
+import it.tdlight.jni.NativeLog;
+import it.tdlight.jni.TdApi;
 
 /**
  * Class used for managing internal TDLib logging.
diff --git a/src/main/java/it/tdlight/tdlight/Request.java b/src/main/java/it/tdlight/tdlight/Request.java
index c1f5a99..f0f1afa 100644
--- a/src/main/java/it/tdlight/tdlight/Request.java
+++ b/src/main/java/it/tdlight/tdlight/Request.java
@@ -17,7 +17,7 @@
 
 package it.tdlight.tdlight;
 
-import it.tdlight.tdlib.TdApi.Function;
+import it.tdlight.jni.TdApi.Function;
 
 /**
  * A request to the TDLib.
diff --git a/src/main/java/it/tdlight/tdlight/Response.java b/src/main/java/it/tdlight/tdlight/Response.java
index 6446a77..4c361a0 100644
--- a/src/main/java/it/tdlight/tdlight/Response.java
+++ b/src/main/java/it/tdlight/tdlight/Response.java
@@ -17,7 +17,7 @@
 
 package it.tdlight.tdlight;
 
-import it.tdlight.tdlib.TdApi.Object;
+import it.tdlight.jni.TdApi.Object;
 
 /**
  * A response to a request, or an incoming update from TDLib.