diff --git a/app/src/main/jniLibs/arm64-v9a/install/inc/board_controller.h b/app/src/main/jniLibs/arm64-v8a/install/inc/board_controller.h
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/inc/board_controller.h
rename to app/src/main/jniLibs/arm64-v8a/install/inc/board_controller.h
diff --git a/app/src/main/jniLibs/arm64-v9a/install/inc/board_info_getter.h b/app/src/main/jniLibs/arm64-v8a/install/inc/board_info_getter.h
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/inc/board_info_getter.h
rename to app/src/main/jniLibs/arm64-v8a/install/inc/board_info_getter.h
diff --git a/app/src/main/jniLibs/arm64-v9a/install/inc/board_shim.h b/app/src/main/jniLibs/arm64-v8a/install/inc/board_shim.h
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/inc/board_shim.h
rename to app/src/main/jniLibs/arm64-v8a/install/inc/board_shim.h
diff --git a/app/src/main/jniLibs/arm64-v9a/install/inc/brainflow_array.h b/app/src/main/jniLibs/arm64-v8a/install/inc/brainflow_array.h
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/inc/brainflow_array.h
rename to app/src/main/jniLibs/arm64-v8a/install/inc/brainflow_array.h
diff --git a/app/src/main/jniLibs/arm64-v9a/install/inc/brainflow_constants.h b/app/src/main/jniLibs/arm64-v8a/install/inc/brainflow_constants.h
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/inc/brainflow_constants.h
rename to app/src/main/jniLibs/arm64-v8a/install/inc/brainflow_constants.h
diff --git a/app/src/main/jniLibs/arm64-v9a/install/inc/brainflow_exception.h b/app/src/main/jniLibs/arm64-v8a/install/inc/brainflow_exception.h
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/inc/brainflow_exception.h
rename to app/src/main/jniLibs/arm64-v8a/install/inc/brainflow_exception.h
diff --git a/app/src/main/jniLibs/arm64-v9a/install/inc/brainflow_input_params.h b/app/src/main/jniLibs/arm64-v8a/install/inc/brainflow_input_params.h
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/inc/brainflow_input_params.h
rename to app/src/main/jniLibs/arm64-v8a/install/inc/brainflow_input_params.h
diff --git a/app/src/main/jniLibs/arm64-v9a/install/inc/brainflow_model_params.h b/app/src/main/jniLibs/arm64-v8a/install/inc/brainflow_model_params.h
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/inc/brainflow_model_params.h
rename to app/src/main/jniLibs/arm64-v8a/install/inc/brainflow_model_params.h
diff --git a/app/src/main/jniLibs/arm64-v9a/install/inc/data_filter.h b/app/src/main/jniLibs/arm64-v8a/install/inc/data_filter.h
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/inc/data_filter.h
rename to app/src/main/jniLibs/arm64-v8a/install/inc/data_filter.h
diff --git a/app/src/main/jniLibs/arm64-v9a/install/inc/data_handler.h b/app/src/main/jniLibs/arm64-v8a/install/inc/data_handler.h
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/inc/data_handler.h
rename to app/src/main/jniLibs/arm64-v8a/install/inc/data_handler.h
diff --git a/app/src/main/jniLibs/arm64-v9a/install/inc/json.hpp b/app/src/main/jniLibs/arm64-v8a/install/inc/json.hpp
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/inc/json.hpp
rename to app/src/main/jniLibs/arm64-v8a/install/inc/json.hpp
diff --git a/app/src/main/jniLibs/arm64-v9a/install/inc/ml_model.h b/app/src/main/jniLibs/arm64-v8a/install/inc/ml_model.h
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/inc/ml_model.h
rename to app/src/main/jniLibs/arm64-v8a/install/inc/ml_model.h
diff --git a/app/src/main/jniLibs/arm64-v9a/install/inc/ml_module.h b/app/src/main/jniLibs/arm64-v8a/install/inc/ml_module.h
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/inc/ml_module.h
rename to app/src/main/jniLibs/arm64-v8a/install/inc/ml_module.h
diff --git a/app/src/main/jniLibs/arm64-v9a/install/inc/shared_export.h b/app/src/main/jniLibs/arm64-v8a/install/inc/shared_export.h
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/inc/shared_export.h
rename to app/src/main/jniLibs/arm64-v8a/install/inc/shared_export.h
diff --git a/app/src/main/jniLibs/arm64-v9a/install/lib/brainflow_svm.model b/app/src/main/jniLibs/arm64-v8a/install/lib/brainflow_svm.model
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/lib/brainflow_svm.model
rename to app/src/main/jniLibs/arm64-v8a/install/lib/brainflow_svm.model
diff --git a/app/src/main/jniLibs/arm64-v9a/install/lib/cmake/brainflow/brainflowConfig.cmake b/app/src/main/jniLibs/arm64-v8a/install/lib/cmake/brainflow/brainflowConfig.cmake
similarity index 86%
rename from app/src/main/jniLibs/arm64-v9a/install/lib/cmake/brainflow/brainflowConfig.cmake
rename to app/src/main/jniLibs/arm64-v8a/install/lib/cmake/brainflow/brainflowConfig.cmake
index 2e0ce981f74c6a8b5e70198c7556d1cfe92ada80..8ff9da05e0be9149edf99643213474720e143f2f 100644
--- a/app/src/main/jniLibs/arm64-v9a/install/lib/cmake/brainflow/brainflowConfig.cmake
+++ b/app/src/main/jniLibs/arm64-v8a/install/lib/cmake/brainflow/brainflowConfig.cmake
@@ -33,8 +33,8 @@ check_required_components("brainflow")
 # but it doesn't link libraries so it leads to linking error and I have no idea why
 # workaround - set variables for include and library path and use these variables in package consumer code
 
-set (brainflow_INCLUDE_DIRS D:/Mindrove/SDK_Core/tools/arm64-v9a/install/inc)
-set (brainflow_LIBRARY_DIRS D:/Mindrove/SDK_Core/tools/arm64-v9a/install/lib)
+set (brainflow_INCLUDE_DIRS D:/Mindrove/SDK_Core/tools/armeabi-v7a/install/inc)
+set (brainflow_LIBRARY_DIRS D:/Mindrove/SDK_Core/tools/armeabi-v7a/install/lib)
 
 if (CMAKE_SIZEOF_VOID_P EQUAL 8)
     MESSAGE ("64 bits compiler detected")
@@ -62,23 +62,23 @@ endif (CMAKE_SIZEOF_VOID_P EQUAL 8)
 find_library (
     BoardControllerPath
     ${BOARD_CONTROLLER_NAME}
-    PATHS D:/Mindrove/SDK_Core/tools/arm64-v9a/install/lib
+    PATHS D:/Mindrove/SDK_Core/tools/armeabi-v7a/install/lib
 )
 
 find_library (
     DataHandlerPath
     ${DATA_HANDLER_NAME}
-    PATHS D:/Mindrove/SDK_Core/tools/arm64-v9a/install/lib
+    PATHS D:/Mindrove/SDK_Core/tools/armeabi-v7a/install/lib
 )
 
 find_library (
     BrainflowPath
     ${BRAINFLOW_NAME}
-    PATHS D:/Mindrove/SDK_Core/tools/arm64-v9a/install/lib
+    PATHS D:/Mindrove/SDK_Core/tools/armeabi-v7a/install/lib
 )
 
 find_library (
     MLModulePath
     ${ML_MODULE_NAME}
-    PATHS D:/Mindrove/SDK_Core/tools/arm64-v9a/install/lib
+    PATHS D:/Mindrove/SDK_Core/tools/armeabi-v7a/install/lib
 )
diff --git a/app/src/main/jniLibs/arm64-v9a/install/lib/cmake/brainflow/brainflowConfigVersion.cmake b/app/src/main/jniLibs/arm64-v8a/install/lib/cmake/brainflow/brainflowConfigVersion.cmake
similarity index 93%
rename from app/src/main/jniLibs/arm64-v9a/install/lib/cmake/brainflow/brainflowConfigVersion.cmake
rename to app/src/main/jniLibs/arm64-v8a/install/lib/cmake/brainflow/brainflowConfigVersion.cmake
index 5d05786f4a4c5ad72942618b05386e849f7c86a2..8ce3a6a871875eee228e5e94a700ce1f0a5a2281 100644
--- a/app/src/main/jniLibs/arm64-v9a/install/lib/cmake/brainflow/brainflowConfigVersion.cmake
+++ b/app/src/main/jniLibs/arm64-v8a/install/lib/cmake/brainflow/brainflowConfigVersion.cmake
@@ -36,13 +36,13 @@ if("FALSE")
 endif()
 
 # if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "4" STREQUAL "")
   return()
 endif()
 
 # check that the installed version has the same 32/64bit-ness as the one which is currently searching:
-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
-  math(EXPR installedBits "8 * 8")
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "4")
+  math(EXPR installedBits "4 * 8")
   set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
   set(PACKAGE_VERSION_UNSUITABLE TRUE)
 endif()
diff --git a/app/src/main/jniLibs/arm64-v9a/install/lib/cmake/brainflow/brainflowTargets-relwithdebinfo.cmake b/app/src/main/jniLibs/arm64-v8a/install/lib/cmake/brainflow/brainflowTargets-relwithdebinfo.cmake
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/lib/cmake/brainflow/brainflowTargets-relwithdebinfo.cmake
rename to app/src/main/jniLibs/arm64-v8a/install/lib/cmake/brainflow/brainflowTargets-relwithdebinfo.cmake
diff --git a/app/src/main/jniLibs/arm64-v9a/install/lib/cmake/brainflow/brainflowTargets.cmake b/app/src/main/jniLibs/arm64-v8a/install/lib/cmake/brainflow/brainflowTargets.cmake
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/lib/cmake/brainflow/brainflowTargets.cmake
rename to app/src/main/jniLibs/arm64-v8a/install/lib/cmake/brainflow/brainflowTargets.cmake
diff --git a/app/src/main/jniLibs/arm64-v8a/install/lib/libBoardController.so b/app/src/main/jniLibs/arm64-v8a/install/lib/libBoardController.so
new file mode 100644
index 0000000000000000000000000000000000000000..b09ad430c83f21bc1b84660dc826b0a9ad385bbb
Binary files /dev/null and b/app/src/main/jniLibs/arm64-v8a/install/lib/libBoardController.so differ
diff --git a/app/src/main/jniLibs/arm64-v9a/install/lib/libBrainBitLib.so b/app/src/main/jniLibs/arm64-v8a/install/lib/libBrainBitLib.so
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/lib/libBrainBitLib.so
rename to app/src/main/jniLibs/arm64-v8a/install/lib/libBrainBitLib.so
diff --git a/app/src/main/jniLibs/arm64-v8a/install/lib/libBrainflow.a b/app/src/main/jniLibs/arm64-v8a/install/lib/libBrainflow.a
new file mode 100644
index 0000000000000000000000000000000000000000..fce1a661ef295c66a437b230d8ff6d9f47772f50
Binary files /dev/null and b/app/src/main/jniLibs/arm64-v8a/install/lib/libBrainflow.a differ
diff --git a/app/src/main/jniLibs/arm64-v8a/install/lib/libDSPFilters.a b/app/src/main/jniLibs/arm64-v8a/install/lib/libDSPFilters.a
new file mode 100644
index 0000000000000000000000000000000000000000..6a90e72325d5611fcd5e56c454f51f50461876e1
Binary files /dev/null and b/app/src/main/jniLibs/arm64-v8a/install/lib/libDSPFilters.a differ
diff --git a/app/src/main/jniLibs/arm64-v9a/install/lib/libDataHandler.so b/app/src/main/jniLibs/arm64-v8a/install/lib/libDataHandler.so
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/lib/libDataHandler.so
rename to app/src/main/jniLibs/arm64-v8a/install/lib/libDataHandler.so
diff --git a/app/src/main/jniLibs/arm64-v9a/install/lib/libGanglionLib.so b/app/src/main/jniLibs/arm64-v8a/install/lib/libGanglionLib.so
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/lib/libGanglionLib.so
rename to app/src/main/jniLibs/arm64-v8a/install/lib/libGanglionLib.so
diff --git a/app/src/main/jniLibs/arm64-v9a/install/lib/libMLModule.so b/app/src/main/jniLibs/arm64-v8a/install/lib/libMLModule.so
similarity index 58%
rename from app/src/main/jniLibs/arm64-v9a/install/lib/libMLModule.so
rename to app/src/main/jniLibs/arm64-v8a/install/lib/libMLModule.so
index ed9b89caa33fd640f4f73ece3799a10c4d3666f1..4a6b96dd97aaefe2cc8c37809db8811fe33c8c64 100644
Binary files a/app/src/main/jniLibs/arm64-v9a/install/lib/libMLModule.so and b/app/src/main/jniLibs/arm64-v8a/install/lib/libMLModule.so differ
diff --git a/app/src/main/jniLibs/arm64-v9a/install/lib/libMuseLib.so b/app/src/main/jniLibs/arm64-v8a/install/lib/libMuseLib.so
similarity index 100%
rename from app/src/main/jniLibs/arm64-v9a/install/lib/libMuseLib.so
rename to app/src/main/jniLibs/arm64-v8a/install/lib/libMuseLib.so
diff --git a/app/src/main/jniLibs/arm64-v8a/install/lib/libWaveLib.a b/app/src/main/jniLibs/arm64-v8a/install/lib/libWaveLib.a
new file mode 100644
index 0000000000000000000000000000000000000000..9226f72e507c0f4974f5ca2e2437883444479906
Binary files /dev/null and b/app/src/main/jniLibs/arm64-v8a/install/lib/libWaveLib.a differ
diff --git a/app/src/main/jniLibs/arm64-v9a/install/lib/libBoardController.so b/app/src/main/jniLibs/arm64-v8a/libBoardController.so
old mode 100644
new mode 100755
similarity index 61%
rename from app/src/main/jniLibs/arm64-v9a/install/lib/libBoardController.so
rename to app/src/main/jniLibs/arm64-v8a/libBoardController.so
index 22177ce0710c878a1074e6239656ed6d9239240e..830f124f3eeab30a71d827e937302668ab0e27b9
Binary files a/app/src/main/jniLibs/arm64-v9a/install/lib/libBoardController.so and b/app/src/main/jniLibs/arm64-v8a/libBoardController.so differ
diff --git a/app/src/main/jniLibs/arm64-v8a/libDataHandler.so b/app/src/main/jniLibs/arm64-v8a/libDataHandler.so
new file mode 100755
index 0000000000000000000000000000000000000000..e431af5546da01884c954e6364ad6654ca06caad
Binary files /dev/null and b/app/src/main/jniLibs/arm64-v8a/libDataHandler.so differ
diff --git a/app/src/main/jniLibs/arm64-v8a/libMLModule.so b/app/src/main/jniLibs/arm64-v8a/libMLModule.so
new file mode 100755
index 0000000000000000000000000000000000000000..ad4ab62f4715291afd45fe7ddb572f2dd421629e
Binary files /dev/null and b/app/src/main/jniLibs/arm64-v8a/libMLModule.so differ
diff --git a/app/src/main/jniLibs/arm64-v8a/libftdi1.so b/app/src/main/jniLibs/arm64-v8a/libftdi1.so
new file mode 100644
index 0000000000000000000000000000000000000000..63d78ee32a6914619e003b5aec5c2af4ed041860
Binary files /dev/null and b/app/src/main/jniLibs/arm64-v8a/libftdi1.so differ
diff --git a/app/src/main/jniLibs/arm64-v8a/libjnidispatch.so b/app/src/main/jniLibs/arm64-v8a/libjnidispatch.so
new file mode 100644
index 0000000000000000000000000000000000000000..3e8847dddfdaa94ab1e8cad30ac4324199727c3a
Binary files /dev/null and b/app/src/main/jniLibs/arm64-v8a/libjnidispatch.so differ
diff --git a/app/src/main/jniLibs/arm64-v8a/libusb1.0.so b/app/src/main/jniLibs/arm64-v8a/libusb1.0.so
new file mode 100755
index 0000000000000000000000000000000000000000..be7376d38cbbd24409f5f924f98732363ad54b3a
Binary files /dev/null and b/app/src/main/jniLibs/arm64-v8a/libusb1.0.so differ
diff --git a/app/src/main/jniLibs/arm64-v9a/install/lib/libBrainflow.a b/app/src/main/jniLibs/arm64-v9a/install/lib/libBrainflow.a
deleted file mode 100644
index f2fbc3f4c4736252f86e7294786d2d47dbb2d352..0000000000000000000000000000000000000000
Binary files a/app/src/main/jniLibs/arm64-v9a/install/lib/libBrainflow.a and /dev/null differ
diff --git a/app/src/main/jniLibs/arm64-v9a/install/lib/libDSPFilters.a b/app/src/main/jniLibs/arm64-v9a/install/lib/libDSPFilters.a
deleted file mode 100644
index fd76641cdc1d56c172b74cad846dec2091bc4ca7..0000000000000000000000000000000000000000
Binary files a/app/src/main/jniLibs/arm64-v9a/install/lib/libDSPFilters.a and /dev/null differ
diff --git a/app/src/main/jniLibs/arm64-v9a/install/lib/libWaveLib.a b/app/src/main/jniLibs/arm64-v9a/install/lib/libWaveLib.a
deleted file mode 100644
index 2c5ac2234fb22d62be66c13c883f2645085fb0a4..0000000000000000000000000000000000000000
Binary files a/app/src/main/jniLibs/arm64-v9a/install/lib/libWaveLib.a and /dev/null differ