diff --git a/scripts/core/compile_tdjni.sh b/scripts/core/compile_tdjni.sh
index 2b11228..69bf8bb 100755
--- a/scripts/core/compile_tdjni.sh
+++ b/scripts/core/compile_tdjni.sh
@@ -119,13 +119,13 @@ cd ..
# Copy to resources
echo "Copying to resources..."
-[ -d ./src/main/resources/libs/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/ ] || mkdir -p ./src/main/resources/libs/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/
+[ -d ./src/main/resources/META-INF/tdlight-jni/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/ ] || mkdir -p ./src/main/resources/META-INF/tdlight-jni/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/
if [[ "$OPERATING_SYSTEM_NAME" == "windows" ]]; then
- cp ./tdjni_bin/tdjni.dll ./src/main/resources/libs/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/tdjni.dll
+ cp ./tdjni_bin/tdjni.dll ./src/main/resources/META-INF/tdlight-jni/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/tdjni.dll
elif [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then
- cp ./tdjni_bin/libtdjni.dylib ./src/main/resources/libs/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/tdjni.dylib
+ cp ./tdjni_bin/libtdjni.dylib ./src/main/resources/META-INF/tdlight-jni/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/tdjni.dylib
elif [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then
- cp ./tdjni_bin/libtdjni.so ./src/main/resources/libs/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/tdjni.so
+ cp ./tdjni_bin/libtdjni.so ./src/main/resources/META-INF/tdlight-jni/${OPERATING_SYSTEM_NAME_SHORT}/${CPU_ARCHITECTURE_NAME}/tdjni.so
fi
echo "Done."
diff --git a/src/main/java/it/tdlight/jni/implementation_name/operating_system_name/cpu_architecture_name/version/LoadLibrary.java b/src/main/java/it/tdlight/jni/implementation_name/operating_system_name/cpu_architecture_name/version/LoadLibrary.java
deleted file mode 100644
index 48ccb70..0000000
--- a/src/main/java/it/tdlight/jni/implementation_name/operating_system_name/cpu_architecture_name/version/LoadLibrary.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package it.tdlight.jni.implementation_name.operating_system_name.cpu_architecture_name.version;
-
-import java.lang.ClassLoader;
-import java.io.InputStream;
-import java.io.File;
-
-public class LoadLibrary {
- public static InputStream getLibraryAsStream() {
- return LoadLibrary.class.getResourceAsStream("/libs/" + getOsName() + "/" + getArchName() + "/"
- + getFileName() + getExtension());
- }
-
- private static String getOsName() {
- return LoadLibrary.class.getPackage().getName().split("\\.")[4];
- }
-
- private static String getArchName() {
- return LoadLibrary.class.getPackage().getName().split("\\.")[5];
- }
-
- private static String getVersionName() {
- return LoadLibrary.class.getPackage().getName().split("\\.")[6];
- }
-
- private static String getFileName() {
- return "tdjni";
- }
-
- private static String getExtension() {
- switch (getOsName()) {
- case "win":
- return ".dll";
- case "osx":
- return ".dylib";
- case "linux":
- default:
- return ".so";
- }
- }
-}
diff --git a/src/main/jni-project-src/pom.template.xml b/src/main/jni-project-src/pom.template.xml
index 424db6d..9e9057b 100644
--- a/src/main/jni-project-src/pom.template.xml
+++ b/src/main/jni-project-src/pom.template.xml
@@ -73,39 +73,6 @@
maven-deploy-plugin
2.8.2
-
- org.apache.maven.plugins
- maven-shade-plugin
- 3.2.4
-
-
- package
-
- shade
-
-
-
-
- it.tdlight.jni.implementation_name.operating_system_name.cpu_architecture_name.version
- it.tdlight.jni.${IMPLEMENTATION_NAME}.${OPERATING_SYSTEM_NAME_SHORT}.${CPU_ARCHITECTURE_NAME}.${safeVersionName}
-
-
- it.tdlight.jni.implementation_name.operating_system_name.cpu_architecture_name
- it.tdlight.jni.${IMPLEMENTATION_NAME}.${OPERATING_SYSTEM_NAME_SHORT}.${CPU_ARCHITECTURE_NAME}
-
-
- it.tdlight.jni.implementation_name.operating_system_name
- it.tdlight.jni.${IMPLEMENTATION_NAME}.${OPERATING_SYSTEM_NAME_SHORT}
-
-
- it.tdlight.jni.implementation_name
- it.tdlight.jni.${IMPLEMENTATION_NAME}
-
-
-
-
-
-