diff --git a/MagicEarth/Android.mk b/MagicEarth/Android.mk
index 227b159934ec89e9df0e2f8e639334bdad103c03..fa0299f3875c0e6074731e446fbb142e813efbae 100644
--- a/MagicEarth/Android.mk
+++ b/MagicEarth/Android.mk
@@ -1,31 +1,29 @@
 LOCAL_PATH := $(call my-dir)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := MagicEarth
-
-ifeq ($(TARGET_CPU_ABI), arm64-v8a)
-        LOCAL_SRC_FILES := MagicEarth-arm64.apk
-else
-        LOCAL_SRC_FILES := MagicEarth-arm.apk
-endif
-
+LOCAL_SRC_FILES := MagicEarth-$(TARGET_ARCH).apk
 LOCAL_MODULE_CLASS := APPS
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_REQUIRED_MODULES := libMagicEarthNative.so
 include $(BUILD_PREBUILT)
 
+ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH), arm64))
+    LIB_PATH := lib/arm64-v8a
+else ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH), arm))
+    LIB_PATH := lib/armeabi-v7a
+else ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH), x86_64))
+    LIB_PATH := lib/x86_64
+else ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH), x86))
+    LIB_PATH := lib/x86
+endif
 
 include $(CLEAR_VARS)
-
 LOCAL_MODULE := libMagicEarthNative.so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_CHECK_ELF_FILES := false
-ifeq ($(TARGET_CPU_ABI), arm64-v8a)
-        LOCAL_MODULE_PATH := $(TARGET_OUT)/lib64
-        LOCAL_SRC_FILES := arm64-v8a/libMagicEarthNative.so
-else
-        LOCAL_MODULE_PATH := $(TARGET_OUT)/lib
-        LOCAL_SRC_FILES := armeabi-v7a/libMagicEarthNative.so
-endif
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
+LOCAL_SRC_FILES := $(LIB_PATH)/libMagicEarthNative.so
 include $(BUILD_PREBUILT)
diff --git a/MagicEarth/MagicEarth-arm.apk b/MagicEarth/MagicEarth-arm.apk
index 59642973b929be95fbe6ad3807852b511ca1bfa3..b593a8ceef22e2879b46f9cd0c74b8435d197e74 100644
--- a/MagicEarth/MagicEarth-arm.apk
+++ b/MagicEarth/MagicEarth-arm.apk
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0959f13a5b18a29d419dd469adfc131e1dd665587357f30e3b64fdee8f0a3ff5
-size 50524022
+oid sha256:6a998d45cff725c944de791f5fb490061f5436e1d1afb0b23ad44e87caeb0d86
+size 50082616
diff --git a/MagicEarth/MagicEarth-arm64.apk b/MagicEarth/MagicEarth-arm64.apk
index cba5757f515e87cb9af8fc7918f333e60363d3d4..16a0da9648fc39f1768b073ce5f416aef6bb06bc 100644
--- a/MagicEarth/MagicEarth-arm64.apk
+++ b/MagicEarth/MagicEarth-arm64.apk
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4110a43d595bbcb1a708f5080b1a251784e3b609d8f91e5c98c14df2de70155d
-size 52492665
+oid sha256:3000e372cf078273490d3313a033cbc6f483ddd1f6f0fbf85a8b9a1f501f962b
+size 52171859
diff --git a/MagicEarth/MagicEarth-x86.apk b/MagicEarth/MagicEarth-x86.apk
new file mode 100644
index 0000000000000000000000000000000000000000..fbb8e505ed6936f67f42659daaa2976794101cca
--- /dev/null
+++ b/MagicEarth/MagicEarth-x86.apk
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dac9f688e90efab59864d12e76051b81dd25423da9a506887a0bd7fae5398e04
+size 53442581
diff --git a/MagicEarth/MagicEarth-x86_64.apk b/MagicEarth/MagicEarth-x86_64.apk
new file mode 100644
index 0000000000000000000000000000000000000000..61e7a4d5030ceb259f9ceb9f98540d8a397d36e3
--- /dev/null
+++ b/MagicEarth/MagicEarth-x86_64.apk
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9748877bb18b8fea4379e933709f6c1582f2ce46df1740c40ee141af6938b5ee
+size 54074381
diff --git a/MagicEarth/arm64-v8a/libMagicEarthNative.so b/MagicEarth/lib/arm64-v8a/libMagicEarthNative.so
similarity index 80%
rename from MagicEarth/arm64-v8a/libMagicEarthNative.so
rename to MagicEarth/lib/arm64-v8a/libMagicEarthNative.so
index 95d7771ad7d4c1efe5b8b529242fab66407b2b7c..d433d5935ff797bb0dc179d1252ba9daeb3825fa 100644
Binary files a/MagicEarth/arm64-v8a/libMagicEarthNative.so and b/MagicEarth/lib/arm64-v8a/libMagicEarthNative.so differ
diff --git a/MagicEarth/armeabi-v7a/libMagicEarthNative.so b/MagicEarth/lib/armeabi-v7a/libMagicEarthNative.so
similarity index 78%
rename from MagicEarth/armeabi-v7a/libMagicEarthNative.so
rename to MagicEarth/lib/armeabi-v7a/libMagicEarthNative.so
index addb9ec6ad4f6ea270fa744673e4bbddbc9340dd..bd629b9e231933889fe2d47685abaa1018384e0f 100644
Binary files a/MagicEarth/armeabi-v7a/libMagicEarthNative.so and b/MagicEarth/lib/armeabi-v7a/libMagicEarthNative.so differ
diff --git a/MagicEarth/lib/x86/libMagicEarthNative.so b/MagicEarth/lib/x86/libMagicEarthNative.so
new file mode 100644
index 0000000000000000000000000000000000000000..9e15847b295610db2e30e6649cdb7a2a8032dacf
Binary files /dev/null and b/MagicEarth/lib/x86/libMagicEarthNative.so differ
diff --git a/MagicEarth/lib/x86_64/libMagicEarthNative.so b/MagicEarth/lib/x86_64/libMagicEarthNative.so
new file mode 100644
index 0000000000000000000000000000000000000000..584c935499f8348205ad8e3eb35bddc74c3fc8f7
Binary files /dev/null and b/MagicEarth/lib/x86_64/libMagicEarthNative.so differ