diff --git a/SmartDevice/.gitignore b/.gitignore
similarity index 100%
rename from SmartDevice/.gitignore
rename to .gitignore
diff --git a/SmartDevice/README.md b/README.md
similarity index 100%
rename from SmartDevice/README.md
rename to README.md
diff --git a/SmartDevice/.idea/.gitignore b/SmartDevice/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/SmartDevice/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/SmartDevice/.idea/AndroidProjectSystem.xml b/SmartDevice/.idea/AndroidProjectSystem.xml
deleted file mode 100644
index 4a53bee..0000000
--- a/SmartDevice/.idea/AndroidProjectSystem.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SmartDevice/.idea/appInsightsSettings.xml b/SmartDevice/.idea/appInsightsSettings.xml
deleted file mode 100644
index fd8246c..0000000
--- a/SmartDevice/.idea/appInsightsSettings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SmartDevice/.idea/compiler.xml b/SmartDevice/.idea/compiler.xml
deleted file mode 100644
index b86273d..0000000
--- a/SmartDevice/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SmartDevice/.idea/deploymentTargetSelector.xml b/SmartDevice/.idea/deploymentTargetSelector.xml
deleted file mode 100644
index 99c2a85..0000000
--- a/SmartDevice/.idea/deploymentTargetSelector.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SmartDevice/.idea/deviceManager.xml b/SmartDevice/.idea/deviceManager.xml
deleted file mode 100644
index 81c3e56..0000000
--- a/SmartDevice/.idea/deviceManager.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SmartDevice/.idea/gradle.xml b/SmartDevice/.idea/gradle.xml
deleted file mode 100644
index 02c4aa5..0000000
--- a/SmartDevice/.idea/gradle.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SmartDevice/.idea/inspectionProfiles/Project_Default.xml b/SmartDevice/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index c8f004d..0000000
--- a/SmartDevice/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SmartDevice/.idea/migrations.xml b/SmartDevice/.idea/migrations.xml
deleted file mode 100644
index f8051a6..0000000
--- a/SmartDevice/.idea/migrations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SmartDevice/.idea/misc.xml b/SmartDevice/.idea/misc.xml
deleted file mode 100644
index b2c751a..0000000
--- a/SmartDevice/.idea/misc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SmartDevice/.idea/runConfigurations.xml b/SmartDevice/.idea/runConfigurations.xml
deleted file mode 100644
index 16660f1..0000000
--- a/SmartDevice/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SmartDevice/app/.gitignore b/app/.gitignore
similarity index 100%
rename from SmartDevice/app/.gitignore
rename to app/.gitignore
diff --git a/SmartDevice/app/build.gradle b/app/build.gradle
similarity index 100%
rename from SmartDevice/app/build.gradle
rename to app/build.gradle
diff --git a/SmartDevice/app/libs/navigationtabbar-1.2.5.aar b/app/libs/navigationtabbar-1.2.5.aar
similarity index 100%
rename from SmartDevice/app/libs/navigationtabbar-1.2.5.aar
rename to app/libs/navigationtabbar-1.2.5.aar
diff --git a/SmartDevice/app/proguard-rules.pro b/app/proguard-rules.pro
similarity index 100%
rename from SmartDevice/app/proguard-rules.pro
rename to app/proguard-rules.pro
diff --git a/SmartDevice/app/src/androidTest/java/com/unibuy/smartdevice/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/unibuy/smartdevice/ExampleInstrumentedTest.java
similarity index 100%
rename from SmartDevice/app/src/androidTest/java/com/unibuy/smartdevice/ExampleInstrumentedTest.java
rename to app/src/androidTest/java/com/unibuy/smartdevice/ExampleInstrumentedTest.java
diff --git a/SmartDevice/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
similarity index 100%
rename from SmartDevice/app/src/main/AndroidManifest.xml
rename to app/src/main/AndroidManifest.xml
diff --git a/SmartDevice/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
similarity index 100%
rename from SmartDevice/app/src/main/ic_launcher-playstore.png
rename to app/src/main/ic_launcher-playstore.png
diff --git a/SmartDevice/app/src/main/ic_launchers-playstore.png b/app/src/main/ic_launchers-playstore.png
similarity index 100%
rename from SmartDevice/app/src/main/ic_launchers-playstore.png
rename to app/src/main/ic_launchers-playstore.png
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/AppCompatActivityAbstract.java b/app/src/main/java/com/unibuy/smartdevice/AppCompatActivityAbstract.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/AppCompatActivityAbstract.java
rename to app/src/main/java/com/unibuy/smartdevice/AppCompatActivityAbstract.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/DialogAbstract.java b/app/src/main/java/com/unibuy/smartdevice/DialogAbstract.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/DialogAbstract.java
rename to app/src/main/java/com/unibuy/smartdevice/DialogAbstract.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/FragmentAbstract.java b/app/src/main/java/com/unibuy/smartdevice/FragmentAbstract.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/FragmentAbstract.java
rename to app/src/main/java/com/unibuy/smartdevice/FragmentAbstract.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/HandlerAbstract.java b/app/src/main/java/com/unibuy/smartdevice/HandlerAbstract.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/HandlerAbstract.java
rename to app/src/main/java/com/unibuy/smartdevice/HandlerAbstract.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/HomeActivity.java b/app/src/main/java/com/unibuy/smartdevice/HomeActivity.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/HomeActivity.java
rename to app/src/main/java/com/unibuy/smartdevice/HomeActivity.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/MainActivity.java b/app/src/main/java/com/unibuy/smartdevice/MainActivity.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/MainActivity.java
rename to app/src/main/java/com/unibuy/smartdevice/MainActivity.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/MyApp.java b/app/src/main/java/com/unibuy/smartdevice/MyApp.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/MyApp.java
rename to app/src/main/java/com/unibuy/smartdevice/MyApp.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/SchedulerAbstract.java b/app/src/main/java/com/unibuy/smartdevice/SchedulerAbstract.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/SchedulerAbstract.java
rename to app/src/main/java/com/unibuy/smartdevice/SchedulerAbstract.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/controller/DevBarCodeController.java b/app/src/main/java/com/unibuy/smartdevice/controller/DevBarCodeController.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/controller/DevBarCodeController.java
rename to app/src/main/java/com/unibuy/smartdevice/controller/DevBarCodeController.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/controller/DevController.java b/app/src/main/java/com/unibuy/smartdevice/controller/DevController.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/controller/DevController.java
rename to app/src/main/java/com/unibuy/smartdevice/controller/DevController.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/controller/DevDigitalDisplayController.java b/app/src/main/java/com/unibuy/smartdevice/controller/DevDigitalDisplayController.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/controller/DevDigitalDisplayController.java
rename to app/src/main/java/com/unibuy/smartdevice/controller/DevDigitalDisplayController.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/controller/DevElectricController.java b/app/src/main/java/com/unibuy/smartdevice/controller/DevElectricController.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/controller/DevElectricController.java
rename to app/src/main/java/com/unibuy/smartdevice/controller/DevElectricController.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/controller/DevNFCPayController.java b/app/src/main/java/com/unibuy/smartdevice/controller/DevNFCPayController.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/controller/DevNFCPayController.java
rename to app/src/main/java/com/unibuy/smartdevice/controller/DevNFCPayController.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/controller/DevXinYuanController.java b/app/src/main/java/com/unibuy/smartdevice/controller/DevXinYuanController.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/controller/DevXinYuanController.java
rename to app/src/main/java/com/unibuy/smartdevice/controller/DevXinYuanController.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/controller/UseAllComPortSendController.java b/app/src/main/java/com/unibuy/smartdevice/controller/UseAllComPortSendController.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/controller/UseAllComPortSendController.java
rename to app/src/main/java/com/unibuy/smartdevice/controller/UseAllComPortSendController.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/database/DatabaseHelper.java b/app/src/main/java/com/unibuy/smartdevice/database/DatabaseHelper.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/database/DatabaseHelper.java
rename to app/src/main/java/com/unibuy/smartdevice/database/DatabaseHelper.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/database/MemoDao.java b/app/src/main/java/com/unibuy/smartdevice/database/MemoDao.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/database/MemoDao.java
rename to app/src/main/java/com/unibuy/smartdevice/database/MemoDao.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/database/ProductsDao.java b/app/src/main/java/com/unibuy/smartdevice/database/ProductsDao.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/database/ProductsDao.java
rename to app/src/main/java/com/unibuy/smartdevice/database/ProductsDao.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/database/SettinglogsDao.java b/app/src/main/java/com/unibuy/smartdevice/database/SettinglogsDao.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/database/SettinglogsDao.java
rename to app/src/main/java/com/unibuy/smartdevice/database/SettinglogsDao.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/database/SettingsDao.java b/app/src/main/java/com/unibuy/smartdevice/database/SettingsDao.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/database/SettingsDao.java
rename to app/src/main/java/com/unibuy/smartdevice/database/SettingsDao.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/database/SlotsDao.java b/app/src/main/java/com/unibuy/smartdevice/database/SlotsDao.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/database/SlotsDao.java
rename to app/src/main/java/com/unibuy/smartdevice/database/SlotsDao.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/ComPort.java b/app/src/main/java/com/unibuy/smartdevice/devices/ComPort.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/ComPort.java
rename to app/src/main/java/com/unibuy/smartdevice/devices/ComPort.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/DevDigitalDisplay.java b/app/src/main/java/com/unibuy/smartdevice/devices/DevDigitalDisplay.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/DevDigitalDisplay.java
rename to app/src/main/java/com/unibuy/smartdevice/devices/DevDigitalDisplay.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/DevNFCPay.java b/app/src/main/java/com/unibuy/smartdevice/devices/DevNFCPay.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/DevNFCPay.java
rename to app/src/main/java/com/unibuy/smartdevice/devices/DevNFCPay.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/DevXinYuan.java b/app/src/main/java/com/unibuy/smartdevice/devices/DevXinYuan.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/DevXinYuan.java
rename to app/src/main/java/com/unibuy/smartdevice/devices/DevXinYuan.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/DeviceType.java b/app/src/main/java/com/unibuy/smartdevice/devices/DeviceType.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/DeviceType.java
rename to app/src/main/java/com/unibuy/smartdevice/devices/DeviceType.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/PortTools.java b/app/src/main/java/com/unibuy/smartdevice/devices/PortTools.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/PortTools.java
rename to app/src/main/java/com/unibuy/smartdevice/devices/PortTools.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/Rs232Dev.java b/app/src/main/java/com/unibuy/smartdevice/devices/Rs232Dev.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/Rs232Dev.java
rename to app/src/main/java/com/unibuy/smartdevice/devices/Rs232Dev.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/SerialPort.java b/app/src/main/java/com/unibuy/smartdevice/devices/SerialPort.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/SerialPort.java
rename to app/src/main/java/com/unibuy/smartdevice/devices/SerialPort.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/SlotField.java b/app/src/main/java/com/unibuy/smartdevice/devices/SlotField.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/SlotField.java
rename to app/src/main/java/com/unibuy/smartdevice/devices/SlotField.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/UsbDev.java b/app/src/main/java/com/unibuy/smartdevice/devices/UsbDev.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/devices/UsbDev.java
rename to app/src/main/java/com/unibuy/smartdevice/devices/UsbDev.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/ErrorCode.java b/app/src/main/java/com/unibuy/smartdevice/exception/ErrorCode.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/ErrorCode.java
rename to app/src/main/java/com/unibuy/smartdevice/exception/ErrorCode.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/Logs.java b/app/src/main/java/com/unibuy/smartdevice/exception/Logs.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/Logs.java
rename to app/src/main/java/com/unibuy/smartdevice/exception/Logs.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsEmptyException.java b/app/src/main/java/com/unibuy/smartdevice/exception/LogsEmptyException.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsEmptyException.java
rename to app/src/main/java/com/unibuy/smartdevice/exception/LogsEmptyException.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsException.java b/app/src/main/java/com/unibuy/smartdevice/exception/LogsException.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsException.java
rename to app/src/main/java/com/unibuy/smartdevice/exception/LogsException.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsFileNullException.java b/app/src/main/java/com/unibuy/smartdevice/exception/LogsFileNullException.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsFileNullException.java
rename to app/src/main/java/com/unibuy/smartdevice/exception/LogsFileNullException.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsIOException.java b/app/src/main/java/com/unibuy/smartdevice/exception/LogsIOException.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsIOException.java
rename to app/src/main/java/com/unibuy/smartdevice/exception/LogsIOException.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsMalformedURLException.java b/app/src/main/java/com/unibuy/smartdevice/exception/LogsMalformedURLException.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsMalformedURLException.java
rename to app/src/main/java/com/unibuy/smartdevice/exception/LogsMalformedURLException.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsNoSuchElementException.java b/app/src/main/java/com/unibuy/smartdevice/exception/LogsNoSuchElementException.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsNoSuchElementException.java
rename to app/src/main/java/com/unibuy/smartdevice/exception/LogsNoSuchElementException.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsNullPointerException.java b/app/src/main/java/com/unibuy/smartdevice/exception/LogsNullPointerException.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsNullPointerException.java
rename to app/src/main/java/com/unibuy/smartdevice/exception/LogsNullPointerException.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsParseException.java b/app/src/main/java/com/unibuy/smartdevice/exception/LogsParseException.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsParseException.java
rename to app/src/main/java/com/unibuy/smartdevice/exception/LogsParseException.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsSecurityException.java b/app/src/main/java/com/unibuy/smartdevice/exception/LogsSecurityException.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsSecurityException.java
rename to app/src/main/java/com/unibuy/smartdevice/exception/LogsSecurityException.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsSettingEmptyException.java b/app/src/main/java/com/unibuy/smartdevice/exception/LogsSettingEmptyException.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsSettingEmptyException.java
rename to app/src/main/java/com/unibuy/smartdevice/exception/LogsSettingEmptyException.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsUnsupportedOperationException.java b/app/src/main/java/com/unibuy/smartdevice/exception/LogsUnsupportedOperationException.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/exception/LogsUnsupportedOperationException.java
rename to app/src/main/java/com/unibuy/smartdevice/exception/LogsUnsupportedOperationException.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/external/HttpAPI.java b/app/src/main/java/com/unibuy/smartdevice/external/HttpAPI.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/external/HttpAPI.java
rename to app/src/main/java/com/unibuy/smartdevice/external/HttpAPI.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/external/HttpTapPay.java b/app/src/main/java/com/unibuy/smartdevice/external/HttpTapPay.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/external/HttpTapPay.java
rename to app/src/main/java/com/unibuy/smartdevice/external/HttpTapPay.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/AccessCodeStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/AccessCodeStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/AccessCodeStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/AccessCodeStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/BuyStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/BuyStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/BuyStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/BuyStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/CashSetStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/CashSetStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/CashSetStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/CashSetStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/CreditCardReceiptStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/CreditCardReceiptStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/CreditCardReceiptStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/CreditCardReceiptStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/DevSetStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/DevSetStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/DevSetStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/DevSetStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/DispatchStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/DispatchStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/DispatchStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/DispatchStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/EsunpayStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/EsunpayStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/EsunpayStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/EsunpayStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/FreeGiftStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/FreeGiftStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/FreeGiftStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/FreeGiftStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/GreenInvoiceStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/GreenInvoiceStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/GreenInvoiceStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/GreenInvoiceStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/GreenpayMerchantStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/GreenpayMerchantStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/GreenpayMerchantStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/GreenpayMerchantStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/GreenpaySettingStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/GreenpaySettingStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/GreenpaySettingStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/GreenpaySettingStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/InvoiceItemStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/InvoiceItemStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/InvoiceItemStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/InvoiceItemStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/InvoiceStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/InvoiceStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/InvoiceStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/InvoiceStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/MachineStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/MachineStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/MachineStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/MachineStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/MarketingPlanStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/MarketingPlanStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/MarketingPlanStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/MarketingPlanStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/MemberVerificationStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/MemberVerificationStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/MemberVerificationStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/MemberVerificationStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/MemoStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/MemoStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/MemoStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/MemoStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/PostInvoiceByGreenStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/PostInvoiceByGreenStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/PostInvoiceByGreenStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/PostInvoiceByGreenStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/ProductStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/ProductStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/ProductStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/ProductStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/ReportAccessCodeStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/ReportAccessCodeStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/ReportAccessCodeStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/ReportAccessCodeStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/ReportDispatchInfoStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/ReportDispatchInfoStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/ReportDispatchInfoStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/ReportDispatchInfoStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/ReportFlowInfoStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/ReportFlowInfoStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/ReportFlowInfoStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/ReportFlowInfoStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/ReportFreeGiftCodeStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/ReportFreeGiftCodeStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/ReportFreeGiftCodeStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/ReportFreeGiftCodeStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/ReportInvoiceInfoStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/ReportInvoiceInfoStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/ReportInvoiceInfoStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/ReportInvoiceInfoStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/ReportSlotListStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/ReportSlotListStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/ReportSlotListStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/ReportSlotListStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/SettingStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/SettingStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/SettingStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/SettingStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/SlotStructure.java b/app/src/main/java/com/unibuy/smartdevice/structure/SlotStructure.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/structure/SlotStructure.java
rename to app/src/main/java/com/unibuy/smartdevice/structure/SlotStructure.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/ApiPostMainScheduler.java b/app/src/main/java/com/unibuy/smartdevice/tools/ApiPostMainScheduler.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/ApiPostMainScheduler.java
rename to app/src/main/java/com/unibuy/smartdevice/tools/ApiPostMainScheduler.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/AppUtils.java b/app/src/main/java/com/unibuy/smartdevice/tools/AppUtils.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/AppUtils.java
rename to app/src/main/java/com/unibuy/smartdevice/tools/AppUtils.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/FormPostMainScheduler.java b/app/src/main/java/com/unibuy/smartdevice/tools/FormPostMainScheduler.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/FormPostMainScheduler.java
rename to app/src/main/java/com/unibuy/smartdevice/tools/FormPostMainScheduler.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/FormPutMainScheduler.java b/app/src/main/java/com/unibuy/smartdevice/tools/FormPutMainScheduler.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/FormPutMainScheduler.java
rename to app/src/main/java/com/unibuy/smartdevice/tools/FormPutMainScheduler.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/HandlerMain.java b/app/src/main/java/com/unibuy/smartdevice/tools/HandlerMain.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/HandlerMain.java
rename to app/src/main/java/com/unibuy/smartdevice/tools/HandlerMain.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/HandlerMainAdpter.java b/app/src/main/java/com/unibuy/smartdevice/tools/HandlerMainAdpter.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/HandlerMainAdpter.java
rename to app/src/main/java/com/unibuy/smartdevice/tools/HandlerMainAdpter.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/HandlerMainCountdown.java b/app/src/main/java/com/unibuy/smartdevice/tools/HandlerMainCountdown.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/HandlerMainCountdown.java
rename to app/src/main/java/com/unibuy/smartdevice/tools/HandlerMainCountdown.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/HandlerMainScheduler.java b/app/src/main/java/com/unibuy/smartdevice/tools/HandlerMainScheduler.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/HandlerMainScheduler.java
rename to app/src/main/java/com/unibuy/smartdevice/tools/HandlerMainScheduler.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/HandlerMainSchedulerOnClick.java b/app/src/main/java/com/unibuy/smartdevice/tools/HandlerMainSchedulerOnClick.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/HandlerMainSchedulerOnClick.java
rename to app/src/main/java/com/unibuy/smartdevice/tools/HandlerMainSchedulerOnClick.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/HttpConnect.java b/app/src/main/java/com/unibuy/smartdevice/tools/HttpConnect.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/HttpConnect.java
rename to app/src/main/java/com/unibuy/smartdevice/tools/HttpConnect.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/OwnScheduler.java b/app/src/main/java/com/unibuy/smartdevice/tools/OwnScheduler.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/OwnScheduler.java
rename to app/src/main/java/com/unibuy/smartdevice/tools/OwnScheduler.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/SimpleCashAcceptorHandler.java b/app/src/main/java/com/unibuy/smartdevice/tools/SimpleCashAcceptorHandler.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/SimpleCashAcceptorHandler.java
rename to app/src/main/java/com/unibuy/smartdevice/tools/SimpleCashAcceptorHandler.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/ToastHandlerMain.java b/app/src/main/java/com/unibuy/smartdevice/tools/ToastHandlerMain.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/ToastHandlerMain.java
rename to app/src/main/java/com/unibuy/smartdevice/tools/ToastHandlerMain.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/Tools.java b/app/src/main/java/com/unibuy/smartdevice/tools/Tools.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/tools/Tools.java
rename to app/src/main/java/com/unibuy/smartdevice/tools/Tools.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/DebugActivity.java b/app/src/main/java/com/unibuy/smartdevice/ui/DebugActivity.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/DebugActivity.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/DebugActivity.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/FontendActivity.java b/app/src/main/java/com/unibuy/smartdevice/ui/FontendActivity.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/FontendActivity.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/FontendActivity.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/ProductListActivity.java b/app/src/main/java/com/unibuy/smartdevice/ui/ProductListActivity.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/ProductListActivity.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/ProductListActivity.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/ProductSearchActivity.java b/app/src/main/java/com/unibuy/smartdevice/ui/ProductSearchActivity.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/ProductSearchActivity.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/ProductSearchActivity.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/RestartActivity.java b/app/src/main/java/com/unibuy/smartdevice/ui/RestartActivity.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/RestartActivity.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/RestartActivity.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/RestartHostActivity.java b/app/src/main/java/com/unibuy/smartdevice/ui/RestartHostActivity.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/RestartHostActivity.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/RestartHostActivity.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/SettingActivity.java b/app/src/main/java/com/unibuy/smartdevice/ui/SettingActivity.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/SettingActivity.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/SettingActivity.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/SettingTestActivity.java b/app/src/main/java/com/unibuy/smartdevice/ui/SettingTestActivity.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/SettingTestActivity.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/SettingTestActivity.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/SystemSetActivity.java b/app/src/main/java/com/unibuy/smartdevice/ui/SystemSetActivity.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/SystemSetActivity.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/SystemSetActivity.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/XyshjTestActivity.java b/app/src/main/java/com/unibuy/smartdevice/ui/XyshjTestActivity.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/XyshjTestActivity.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/XyshjTestActivity.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/ElectricFragment.java b/app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/ElectricFragment.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/ElectricFragment.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/ElectricFragment.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/ElectricSlotListActivity.java b/app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/ElectricSlotListActivity.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/ElectricSlotListActivity.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/ElectricSlotListActivity.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/ElectricViewModel.java b/app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/ElectricViewModel.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/ElectricViewModel.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/ElectricViewModel.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/RecyclerElectricBuyListAdpter.java b/app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/RecyclerElectricBuyListAdpter.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/RecyclerElectricBuyListAdpter.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/RecyclerElectricBuyListAdpter.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/RecyclerElectricSlotListAdpter.java b/app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/RecyclerElectricSlotListAdpter.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/RecyclerElectricSlotListAdpter.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/devs/electric/RecyclerElectricSlotListAdpter.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/RecyclerVmcBuyListAdpter.java b/app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/RecyclerVmcBuyListAdpter.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/RecyclerVmcBuyListAdpter.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/RecyclerVmcBuyListAdpter.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/RecyclerVmcSlotListAdpter.java b/app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/RecyclerVmcSlotListAdpter.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/RecyclerVmcSlotListAdpter.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/RecyclerVmcSlotListAdpter.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/VmcFragment.java b/app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/VmcFragment.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/VmcFragment.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/VmcFragment.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/VmcSlotListActivity.java b/app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/VmcSlotListActivity.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/VmcSlotListActivity.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/VmcSlotListActivity.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/VmcViewModel.java b/app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/VmcViewModel.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/VmcViewModel.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/devs/vmc/VmcViewModel.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/BuyDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/BuyDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/BuyDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/BuyDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/BuyPickupCodeDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/BuyPickupCodeDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/BuyPickupCodeDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/BuyPickupCodeDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CashPayDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CashPayDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CashPayDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/CashPayDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutAccessCodeDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutAccessCodeDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutAccessCodeDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutAccessCodeDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutCashDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutCashDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutCashDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutCashDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutEsunPayDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutEsunPayDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutEsunPayDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutEsunPayDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutFreeGiftCodeDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutFreeGiftCodeDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutFreeGiftCodeDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutFreeGiftCodeDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutLinePayDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutLinePayDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutLinePayDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutLinePayDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutNfcCardDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutNfcCardDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutNfcCardDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutNfcCardDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutNfcPhoneDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutNfcPhoneDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutNfcPhoneDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutNfcPhoneDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutNfcRechargeDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutNfcRechargeDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutNfcRechargeDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutNfcRechargeDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutTapPayDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutTapPayDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutTapPayDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/CheckoutTapPayDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CloseAccessCodeDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CloseAccessCodeDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CloseAccessCodeDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/CloseAccessCodeDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CreditCardReceiptDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CreditCardReceiptDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/CreditCardReceiptDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/CreditCardReceiptDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/DispatchDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/DispatchDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/DispatchDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/DispatchDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/FontendPickupCodeDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/FontendPickupCodeDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/FontendPickupCodeDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/FontendPickupCodeDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/InvoiceBarcodeDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/InvoiceBarcodeDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/InvoiceBarcodeDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/InvoiceBarcodeDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/InvoiceCustomerIdentifierDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/InvoiceCustomerIdentifierDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/InvoiceCustomerIdentifierDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/InvoiceCustomerIdentifierDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/MarketingPlanDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/MarketingPlanDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/MarketingPlanDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/MarketingPlanDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/MemberCardPickupDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/MemberCardPickupDialog.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/dialog/MemberCardPickupDialog.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/dialog/MemberCardPickupDialog.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/notifications/NotificationsFragment.java b/app/src/main/java/com/unibuy/smartdevice/ui/notifications/NotificationsFragment.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/notifications/NotificationsFragment.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/notifications/NotificationsFragment.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/notifications/NotificationsViewModel.java b/app/src/main/java/com/unibuy/smartdevice/ui/notifications/NotificationsViewModel.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/notifications/NotificationsViewModel.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/notifications/NotificationsViewModel.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDebugAdpter.java b/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDebugAdpter.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDebugAdpter.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDebugAdpter.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogBuyListAdpter.java b/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogBuyListAdpter.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogBuyListAdpter.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogBuyListAdpter.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogDispatchListAdpter.java b/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogDispatchListAdpter.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogDispatchListAdpter.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogDispatchListAdpter.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogMarketingPlanListAdpter.java b/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogMarketingPlanListAdpter.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogMarketingPlanListAdpter.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogMarketingPlanListAdpter.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogPickupCodeBuyListAdpter.java b/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogPickupCodeBuyListAdpter.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogPickupCodeBuyListAdpter.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogPickupCodeBuyListAdpter.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerProductListAdpter.java b/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerProductListAdpter.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerProductListAdpter.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerProductListAdpter.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerProductSearchAdpter.java b/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerProductSearchAdpter.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerProductSearchAdpter.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerProductSearchAdpter.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerSearchTextAdpter.java b/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerSearchTextAdpter.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerSearchTextAdpter.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerSearchTextAdpter.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerSettingListAdpter.java b/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerSettingListAdpter.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerSettingListAdpter.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerSettingListAdpter.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/tools/CashMachineSettings.java b/app/src/main/java/com/unibuy/smartdevice/ui/tools/CashMachineSettings.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/tools/CashMachineSettings.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/tools/CashMachineSettings.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/tools/ImageGlide.java b/app/src/main/java/com/unibuy/smartdevice/ui/tools/ImageGlide.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/tools/ImageGlide.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/tools/ImageGlide.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/tools/MediaCacheHelper.java b/app/src/main/java/com/unibuy/smartdevice/ui/tools/MediaCacheHelper.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/tools/MediaCacheHelper.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/tools/MediaCacheHelper.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/tools/StringRefactoring.java b/app/src/main/java/com/unibuy/smartdevice/ui/tools/StringRefactoring.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/tools/StringRefactoring.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/tools/StringRefactoring.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/tools/VideoEoxPlayer.java b/app/src/main/java/com/unibuy/smartdevice/ui/tools/VideoEoxPlayer.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/tools/VideoEoxPlayer.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/tools/VideoEoxPlayer.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/tools/VideoImageMixedPlayer.java b/app/src/main/java/com/unibuy/smartdevice/ui/tools/VideoImageMixedPlayer.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/tools/VideoImageMixedPlayer.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/tools/VideoImageMixedPlayer.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/tools/VideoImageMixedPlayerOptimized.java b/app/src/main/java/com/unibuy/smartdevice/ui/tools/VideoImageMixedPlayerOptimized.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/ui/tools/VideoImageMixedPlayerOptimized.java
rename to app/src/main/java/com/unibuy/smartdevice/ui/tools/VideoImageMixedPlayerOptimized.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/utils/LanguageHelper.java b/app/src/main/java/com/unibuy/smartdevice/utils/LanguageHelper.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/utils/LanguageHelper.java
rename to app/src/main/java/com/unibuy/smartdevice/utils/LanguageHelper.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/worker/AppCrashHandler.java b/app/src/main/java/com/unibuy/smartdevice/worker/AppCrashHandler.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/worker/AppCrashHandler.java
rename to app/src/main/java/com/unibuy/smartdevice/worker/AppCrashHandler.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/worker/BootReceiver.java b/app/src/main/java/com/unibuy/smartdevice/worker/BootReceiver.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/worker/BootReceiver.java
rename to app/src/main/java/com/unibuy/smartdevice/worker/BootReceiver.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/worker/EthernetTetherHelper.java b/app/src/main/java/com/unibuy/smartdevice/worker/EthernetTetherHelper.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/worker/EthernetTetherHelper.java
rename to app/src/main/java/com/unibuy/smartdevice/worker/EthernetTetherHelper.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/worker/UploadLogOneTimeWorker.java b/app/src/main/java/com/unibuy/smartdevice/worker/UploadLogOneTimeWorker.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/worker/UploadLogOneTimeWorker.java
rename to app/src/main/java/com/unibuy/smartdevice/worker/UploadLogOneTimeWorker.java
diff --git a/SmartDevice/app/src/main/java/com/unibuy/smartdevice/worker/UploadLogPeriodicWorker.java b/app/src/main/java/com/unibuy/smartdevice/worker/UploadLogPeriodicWorker.java
similarity index 100%
rename from SmartDevice/app/src/main/java/com/unibuy/smartdevice/worker/UploadLogPeriodicWorker.java
rename to app/src/main/java/com/unibuy/smartdevice/worker/UploadLogPeriodicWorker.java
diff --git a/SmartDevice/app/src/main/res/drawable-anydpi/ic_pickup_code.xml b/app/src/main/res/drawable-anydpi/ic_pickup_code.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable-anydpi/ic_pickup_code.xml
rename to app/src/main/res/drawable-anydpi/ic_pickup_code.xml
diff --git a/SmartDevice/app/src/main/res/drawable-hdpi/ic_pickup_code.png b/app/src/main/res/drawable-hdpi/ic_pickup_code.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable-hdpi/ic_pickup_code.png
rename to app/src/main/res/drawable-hdpi/ic_pickup_code.png
diff --git a/SmartDevice/app/src/main/res/drawable-mdpi/ic_pickup_code.png b/app/src/main/res/drawable-mdpi/ic_pickup_code.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable-mdpi/ic_pickup_code.png
rename to app/src/main/res/drawable-mdpi/ic_pickup_code.png
diff --git a/SmartDevice/app/src/main/res/drawable-xhdpi/ic_pickup_code.png b/app/src/main/res/drawable-xhdpi/ic_pickup_code.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable-xhdpi/ic_pickup_code.png
rename to app/src/main/res/drawable-xhdpi/ic_pickup_code.png
diff --git a/SmartDevice/app/src/main/res/drawable-xxhdpi/ic_pickup_code.png b/app/src/main/res/drawable-xxhdpi/ic_pickup_code.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable-xxhdpi/ic_pickup_code.png
rename to app/src/main/res/drawable-xxhdpi/ic_pickup_code.png
diff --git a/SmartDevice/app/src/main/res/drawable/baseline_add_shopping_cart_24.xml b/app/src/main/res/drawable/baseline_add_shopping_cart_24.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/baseline_add_shopping_cart_24.xml
rename to app/src/main/res/drawable/baseline_add_shopping_cart_24.xml
diff --git a/SmartDevice/app/src/main/res/drawable/bg_dialog_rounded.xml b/app/src/main/res/drawable/bg_dialog_rounded.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/bg_dialog_rounded.xml
rename to app/src/main/res/drawable/bg_dialog_rounded.xml
diff --git a/SmartDevice/app/src/main/res/drawable/bill100.png b/app/src/main/res/drawable/bill100.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/bill100.png
rename to app/src/main/res/drawable/bill100.png
diff --git a/SmartDevice/app/src/main/res/drawable/bill1000.png b/app/src/main/res/drawable/bill1000.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/bill1000.png
rename to app/src/main/res/drawable/bill1000.png
diff --git a/SmartDevice/app/src/main/res/drawable/bill500.png b/app/src/main/res/drawable/bill500.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/bill500.png
rename to app/src/main/res/drawable/bill500.png
diff --git a/SmartDevice/app/src/main/res/drawable/cash.png b/app/src/main/res/drawable/cash.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/cash.png
rename to app/src/main/res/drawable/cash.png
diff --git a/SmartDevice/app/src/main/res/drawable/checkout_access_code.png b/app/src/main/res/drawable/checkout_access_code.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/checkout_access_code.png
rename to app/src/main/res/drawable/checkout_access_code.png
diff --git a/SmartDevice/app/src/main/res/drawable/checkout_barcode.png b/app/src/main/res/drawable/checkout_barcode.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/checkout_barcode.png
rename to app/src/main/res/drawable/checkout_barcode.png
diff --git a/SmartDevice/app/src/main/res/drawable/checkout_cash.png b/app/src/main/res/drawable/checkout_cash.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/checkout_cash.png
rename to app/src/main/res/drawable/checkout_cash.png
diff --git a/SmartDevice/app/src/main/res/drawable/checkout_nfc_card.png b/app/src/main/res/drawable/checkout_nfc_card.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/checkout_nfc_card.png
rename to app/src/main/res/drawable/checkout_nfc_card.png
diff --git a/SmartDevice/app/src/main/res/drawable/checkout_nfc_phone.png b/app/src/main/res/drawable/checkout_nfc_phone.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/checkout_nfc_phone.png
rename to app/src/main/res/drawable/checkout_nfc_phone.png
diff --git a/SmartDevice/app/src/main/res/drawable/checkout_nfc_recharge.png b/app/src/main/res/drawable/checkout_nfc_recharge.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/checkout_nfc_recharge.png
rename to app/src/main/res/drawable/checkout_nfc_recharge.png
diff --git a/SmartDevice/app/src/main/res/drawable/checkout_wait.png b/app/src/main/res/drawable/checkout_wait.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/checkout_wait.png
rename to app/src/main/res/drawable/checkout_wait.png
diff --git a/SmartDevice/app/src/main/res/drawable/coin1.png b/app/src/main/res/drawable/coin1.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/coin1.png
rename to app/src/main/res/drawable/coin1.png
diff --git a/SmartDevice/app/src/main/res/drawable/coin10.png b/app/src/main/res/drawable/coin10.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/coin10.png
rename to app/src/main/res/drawable/coin10.png
diff --git a/SmartDevice/app/src/main/res/drawable/coin5.png b/app/src/main/res/drawable/coin5.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/coin5.png
rename to app/src/main/res/drawable/coin5.png
diff --git a/SmartDevice/app/src/main/res/drawable/coin50.png b/app/src/main/res/drawable/coin50.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/coin50.png
rename to app/src/main/res/drawable/coin50.png
diff --git a/SmartDevice/app/src/main/res/drawable/cpu.png b/app/src/main/res/drawable/cpu.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/cpu.png
rename to app/src/main/res/drawable/cpu.png
diff --git a/SmartDevice/app/src/main/res/drawable/default_product.jpg b/app/src/main/res/drawable/default_product.jpg
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/default_product.jpg
rename to app/src/main/res/drawable/default_product.jpg
diff --git a/SmartDevice/app/src/main/res/drawable/dispatch_wait.png b/app/src/main/res/drawable/dispatch_wait.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/dispatch_wait.png
rename to app/src/main/res/drawable/dispatch_wait.png
diff --git a/SmartDevice/app/src/main/res/drawable/esun_pay_barcode.png b/app/src/main/res/drawable/esun_pay_barcode.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/esun_pay_barcode.png
rename to app/src/main/res/drawable/esun_pay_barcode.png
diff --git a/SmartDevice/app/src/main/res/drawable/freegift.png b/app/src/main/res/drawable/freegift.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/freegift.png
rename to app/src/main/res/drawable/freegift.png
diff --git a/SmartDevice/app/src/main/res/drawable/ic_dashboard_black_24dp.xml b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/ic_dashboard_black_24dp.xml
rename to app/src/main/res/drawable/ic_dashboard_black_24dp.xml
diff --git a/SmartDevice/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/ic_home_black_24dp.xml
rename to app/src/main/res/drawable/ic_home_black_24dp.xml
diff --git a/SmartDevice/app/src/main/res/drawable/ic_launcher.xml b/app/src/main/res/drawable/ic_launcher.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/ic_launcher.xml
rename to app/src/main/res/drawable/ic_launcher.xml
diff --git a/SmartDevice/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/ic_launcher_background.xml
rename to app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/SmartDevice/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/ic_launcher_foreground.xml
rename to app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/SmartDevice/app/src/main/res/drawable/ic_launchers_background.xml b/app/src/main/res/drawable/ic_launchers_background.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/ic_launchers_background.xml
rename to app/src/main/res/drawable/ic_launchers_background.xml
diff --git a/SmartDevice/app/src/main/res/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/ic_notifications_black_24dp.xml
rename to app/src/main/res/drawable/ic_notifications_black_24dp.xml
diff --git a/SmartDevice/app/src/main/res/drawable/img.png b/app/src/main/res/drawable/img.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/img.png
rename to app/src/main/res/drawable/img.png
diff --git a/SmartDevice/app/src/main/res/drawable/img_1.png b/app/src/main/res/drawable/img_1.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/img_1.png
rename to app/src/main/res/drawable/img_1.png
diff --git a/SmartDevice/app/src/main/res/drawable/img_2.png b/app/src/main/res/drawable/img_2.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/img_2.png
rename to app/src/main/res/drawable/img_2.png
diff --git a/SmartDevice/app/src/main/res/drawable/img_3.png b/app/src/main/res/drawable/img_3.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/img_3.png
rename to app/src/main/res/drawable/img_3.png
diff --git a/SmartDevice/app/src/main/res/drawable/img_4.png b/app/src/main/res/drawable/img_4.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/img_4.png
rename to app/src/main/res/drawable/img_4.png
diff --git a/SmartDevice/app/src/main/res/drawable/line_pay_barcode.png b/app/src/main/res/drawable/line_pay_barcode.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/line_pay_barcode.png
rename to app/src/main/res/drawable/line_pay_barcode.png
diff --git a/SmartDevice/app/src/main/res/drawable/linepay_qrcode.png b/app/src/main/res/drawable/linepay_qrcode.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/linepay_qrcode.png
rename to app/src/main/res/drawable/linepay_qrcode.png
diff --git a/SmartDevice/app/src/main/res/drawable/loading.jpg b/app/src/main/res/drawable/loading.jpg
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/loading.jpg
rename to app/src/main/res/drawable/loading.jpg
diff --git a/SmartDevice/app/src/main/res/drawable/nccc_logo.png b/app/src/main/res/drawable/nccc_logo.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/nccc_logo.png
rename to app/src/main/res/drawable/nccc_logo.png
diff --git a/SmartDevice/app/src/main/res/drawable/oval_background.xml b/app/src/main/res/drawable/oval_background.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/oval_background.xml
rename to app/src/main/res/drawable/oval_background.xml
diff --git a/SmartDevice/app/src/main/res/drawable/pay_barcode0.png b/app/src/main/res/drawable/pay_barcode0.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/pay_barcode0.png
rename to app/src/main/res/drawable/pay_barcode0.png
diff --git a/SmartDevice/app/src/main/res/drawable/pay_cash0.png b/app/src/main/res/drawable/pay_cash0.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/pay_cash0.png
rename to app/src/main/res/drawable/pay_cash0.png
diff --git a/SmartDevice/app/src/main/res/drawable/pay_cash1.png b/app/src/main/res/drawable/pay_cash1.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/pay_cash1.png
rename to app/src/main/res/drawable/pay_cash1.png
diff --git a/SmartDevice/app/src/main/res/drawable/pay_nfc_card0.png b/app/src/main/res/drawable/pay_nfc_card0.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/pay_nfc_card0.png
rename to app/src/main/res/drawable/pay_nfc_card0.png
diff --git a/SmartDevice/app/src/main/res/drawable/pay_nfc_card1.png b/app/src/main/res/drawable/pay_nfc_card1.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/pay_nfc_card1.png
rename to app/src/main/res/drawable/pay_nfc_card1.png
diff --git a/SmartDevice/app/src/main/res/drawable/pay_nfc_phone0.png b/app/src/main/res/drawable/pay_nfc_phone0.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/pay_nfc_phone0.png
rename to app/src/main/res/drawable/pay_nfc_phone0.png
diff --git a/SmartDevice/app/src/main/res/drawable/pay_nfc_phone1.png b/app/src/main/res/drawable/pay_nfc_phone1.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/pay_nfc_phone1.png
rename to app/src/main/res/drawable/pay_nfc_phone1.png
diff --git a/SmartDevice/app/src/main/res/drawable/pay_nfc_recharge0.png b/app/src/main/res/drawable/pay_nfc_recharge0.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/pay_nfc_recharge0.png
rename to app/src/main/res/drawable/pay_nfc_recharge0.png
diff --git a/SmartDevice/app/src/main/res/drawable/pay_nfc_recharge1.png b/app/src/main/res/drawable/pay_nfc_recharge1.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/pay_nfc_recharge1.png
rename to app/src/main/res/drawable/pay_nfc_recharge1.png
diff --git a/SmartDevice/app/src/main/res/drawable/pay_nfc_recharge1_easycard.png b/app/src/main/res/drawable/pay_nfc_recharge1_easycard.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/pay_nfc_recharge1_easycard.png
rename to app/src/main/res/drawable/pay_nfc_recharge1_easycard.png
diff --git a/SmartDevice/app/src/main/res/drawable/pay_other0.png b/app/src/main/res/drawable/pay_other0.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/pay_other0.png
rename to app/src/main/res/drawable/pay_other0.png
diff --git a/SmartDevice/app/src/main/res/drawable/pay_other1.png b/app/src/main/res/drawable/pay_other1.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/pay_other1.png
rename to app/src/main/res/drawable/pay_other1.png
diff --git a/SmartDevice/app/src/main/res/drawable/pickup_code.png b/app/src/main/res/drawable/pickup_code.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/pickup_code.png
rename to app/src/main/res/drawable/pickup_code.png
diff --git a/SmartDevice/app/src/main/res/drawable/progress_bg.xml b/app/src/main/res/drawable/progress_bg.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/progress_bg.xml
rename to app/src/main/res/drawable/progress_bg.xml
diff --git a/SmartDevice/app/src/main/res/drawable/qrcode_msg.jpg b/app/src/main/res/drawable/qrcode_msg.jpg
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/qrcode_msg.jpg
rename to app/src/main/res/drawable/qrcode_msg.jpg
diff --git a/SmartDevice/app/src/main/res/drawable/qrcode_msg_sevensea.jpg b/app/src/main/res/drawable/qrcode_msg_sevensea.jpg
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/qrcode_msg_sevensea.jpg
rename to app/src/main/res/drawable/qrcode_msg_sevensea.jpg
diff --git a/SmartDevice/app/src/main/res/drawable/rounded_background.xml b/app/src/main/res/drawable/rounded_background.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/rounded_background.xml
rename to app/src/main/res/drawable/rounded_background.xml
diff --git a/SmartDevice/app/src/main/res/drawable/rounded_background_gary.xml b/app/src/main/res/drawable/rounded_background_gary.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/rounded_background_gary.xml
rename to app/src/main/res/drawable/rounded_background_gary.xml
diff --git a/SmartDevice/app/src/main/res/drawable/rounded_background_red.xml b/app/src/main/res/drawable/rounded_background_red.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/rounded_background_red.xml
rename to app/src/main/res/drawable/rounded_background_red.xml
diff --git a/SmartDevice/app/src/main/res/drawable/rounded_button.xml b/app/src/main/res/drawable/rounded_button.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/rounded_button.xml
rename to app/src/main/res/drawable/rounded_button.xml
diff --git a/SmartDevice/app/src/main/res/drawable/search.png b/app/src/main/res/drawable/search.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/search.png
rename to app/src/main/res/drawable/search.png
diff --git a/SmartDevice/app/src/main/res/drawable/searchclose.png b/app/src/main/res/drawable/searchclose.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/searchclose.png
rename to app/src/main/res/drawable/searchclose.png
diff --git a/SmartDevice/app/src/main/res/drawable/searchopen.png b/app/src/main/res/drawable/searchopen.png
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/searchopen.png
rename to app/src/main/res/drawable/searchopen.png
diff --git a/SmartDevice/app/src/main/res/drawable/textview_border.xml b/app/src/main/res/drawable/textview_border.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/textview_border.xml
rename to app/src/main/res/drawable/textview_border.xml
diff --git a/SmartDevice/app/src/main/res/drawable/unibuy_demo.jpg b/app/src/main/res/drawable/unibuy_demo.jpg
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/unibuy_demo.jpg
rename to app/src/main/res/drawable/unibuy_demo.jpg
diff --git a/SmartDevice/app/src/main/res/drawable/unibuy_transfer_page.jpg b/app/src/main/res/drawable/unibuy_transfer_page.jpg
similarity index 100%
rename from SmartDevice/app/src/main/res/drawable/unibuy_transfer_page.jpg
rename to app/src/main/res/drawable/unibuy_transfer_page.jpg
diff --git a/SmartDevice/app/src/main/res/layout/activity_cash_machine_settings.xml b/app/src/main/res/layout/activity_cash_machine_settings.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/activity_cash_machine_settings.xml
rename to app/src/main/res/layout/activity_cash_machine_settings.xml
diff --git a/SmartDevice/app/src/main/res/layout/activity_debug.xml b/app/src/main/res/layout/activity_debug.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/activity_debug.xml
rename to app/src/main/res/layout/activity_debug.xml
diff --git a/SmartDevice/app/src/main/res/layout/activity_electric_slot_list.xml b/app/src/main/res/layout/activity_electric_slot_list.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/activity_electric_slot_list.xml
rename to app/src/main/res/layout/activity_electric_slot_list.xml
diff --git a/SmartDevice/app/src/main/res/layout/activity_fontend.xml b/app/src/main/res/layout/activity_fontend.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/activity_fontend.xml
rename to app/src/main/res/layout/activity_fontend.xml
diff --git a/SmartDevice/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/activity_home.xml
rename to app/src/main/res/layout/activity_home.xml
diff --git a/SmartDevice/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/activity_main.xml
rename to app/src/main/res/layout/activity_main.xml
diff --git a/SmartDevice/app/src/main/res/layout/activity_product_list.xml b/app/src/main/res/layout/activity_product_list.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/activity_product_list.xml
rename to app/src/main/res/layout/activity_product_list.xml
diff --git a/SmartDevice/app/src/main/res/layout/activity_product_search.xml b/app/src/main/res/layout/activity_product_search.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/activity_product_search.xml
rename to app/src/main/res/layout/activity_product_search.xml
diff --git a/SmartDevice/app/src/main/res/layout/activity_restart.xml b/app/src/main/res/layout/activity_restart.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/activity_restart.xml
rename to app/src/main/res/layout/activity_restart.xml
diff --git a/SmartDevice/app/src/main/res/layout/activity_restart_host.xml b/app/src/main/res/layout/activity_restart_host.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/activity_restart_host.xml
rename to app/src/main/res/layout/activity_restart_host.xml
diff --git a/SmartDevice/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/activity_setting.xml
rename to app/src/main/res/layout/activity_setting.xml
diff --git a/SmartDevice/app/src/main/res/layout/activity_setting_test.xml b/app/src/main/res/layout/activity_setting_test.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/activity_setting_test.xml
rename to app/src/main/res/layout/activity_setting_test.xml
diff --git a/SmartDevice/app/src/main/res/layout/activity_system_set.xml b/app/src/main/res/layout/activity_system_set.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/activity_system_set.xml
rename to app/src/main/res/layout/activity_system_set.xml
diff --git a/SmartDevice/app/src/main/res/layout/activity_vmc_slot_list.xml b/app/src/main/res/layout/activity_vmc_slot_list.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/activity_vmc_slot_list.xml
rename to app/src/main/res/layout/activity_vmc_slot_list.xml
diff --git a/SmartDevice/app/src/main/res/layout/activity_xyshj_test.xml b/app/src/main/res/layout/activity_xyshj_test.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/activity_xyshj_test.xml
rename to app/src/main/res/layout/activity_xyshj_test.xml
diff --git a/SmartDevice/app/src/main/res/layout/custom_bottom_nav_item.xml b/app/src/main/res/layout/custom_bottom_nav_item.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/custom_bottom_nav_item.xml
rename to app/src/main/res/layout/custom_bottom_nav_item.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_access_code.xml b/app/src/main/res/layout/dialog_access_code.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_access_code.xml
rename to app/src/main/res/layout/dialog_access_code.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_buy.xml b/app/src/main/res/layout/dialog_buy.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_buy.xml
rename to app/src/main/res/layout/dialog_buy.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_checkout_cash.xml b/app/src/main/res/layout/dialog_checkout_cash.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_checkout_cash.xml
rename to app/src/main/res/layout/dialog_checkout_cash.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_checkout_cash_pay.xml b/app/src/main/res/layout/dialog_checkout_cash_pay.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_checkout_cash_pay.xml
rename to app/src/main/res/layout/dialog_checkout_cash_pay.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_checkout_esun_pay.xml b/app/src/main/res/layout/dialog_checkout_esun_pay.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_checkout_esun_pay.xml
rename to app/src/main/res/layout/dialog_checkout_esun_pay.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_checkout_line_pay.xml b/app/src/main/res/layout/dialog_checkout_line_pay.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_checkout_line_pay.xml
rename to app/src/main/res/layout/dialog_checkout_line_pay.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_checkout_nfc_card.xml b/app/src/main/res/layout/dialog_checkout_nfc_card.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_checkout_nfc_card.xml
rename to app/src/main/res/layout/dialog_checkout_nfc_card.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_checkout_nfc_phone.xml b/app/src/main/res/layout/dialog_checkout_nfc_phone.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_checkout_nfc_phone.xml
rename to app/src/main/res/layout/dialog_checkout_nfc_phone.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_checkout_nfc_recharge.xml b/app/src/main/res/layout/dialog_checkout_nfc_recharge.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_checkout_nfc_recharge.xml
rename to app/src/main/res/layout/dialog_checkout_nfc_recharge.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_checkout_tap_pay.xml b/app/src/main/res/layout/dialog_checkout_tap_pay.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_checkout_tap_pay.xml
rename to app/src/main/res/layout/dialog_checkout_tap_pay.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_close_access_code.xml b/app/src/main/res/layout/dialog_close_access_code.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_close_access_code.xml
rename to app/src/main/res/layout/dialog_close_access_code.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_credit_card_receipt.xml b/app/src/main/res/layout/dialog_credit_card_receipt.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_credit_card_receipt.xml
rename to app/src/main/res/layout/dialog_credit_card_receipt.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_customer_identifier.xml b/app/src/main/res/layout/dialog_customer_identifier.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_customer_identifier.xml
rename to app/src/main/res/layout/dialog_customer_identifier.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_dispatch.xml b/app/src/main/res/layout/dialog_dispatch.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_dispatch.xml
rename to app/src/main/res/layout/dialog_dispatch.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_donation.xml b/app/src/main/res/layout/dialog_donation.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_donation.xml
rename to app/src/main/res/layout/dialog_donation.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_free_gift_code.xml b/app/src/main/res/layout/dialog_free_gift_code.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_free_gift_code.xml
rename to app/src/main/res/layout/dialog_free_gift_code.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_invoice_barcode.xml b/app/src/main/res/layout/dialog_invoice_barcode.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_invoice_barcode.xml
rename to app/src/main/res/layout/dialog_invoice_barcode.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_marketing_plan.xml b/app/src/main/res/layout/dialog_marketing_plan.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_marketing_plan.xml
rename to app/src/main/res/layout/dialog_marketing_plan.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_member_card_pickup.xml b/app/src/main/res/layout/dialog_member_card_pickup.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_member_card_pickup.xml
rename to app/src/main/res/layout/dialog_member_card_pickup.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_pickup_code_buy.xml b/app/src/main/res/layout/dialog_pickup_code_buy.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_pickup_code_buy.xml
rename to app/src/main/res/layout/dialog_pickup_code_buy.xml
diff --git a/SmartDevice/app/src/main/res/layout/dialog_pickup_code_fontend.xml b/app/src/main/res/layout/dialog_pickup_code_fontend.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/dialog_pickup_code_fontend.xml
rename to app/src/main/res/layout/dialog_pickup_code_fontend.xml
diff --git a/SmartDevice/app/src/main/res/layout/fragment_electric.xml b/app/src/main/res/layout/fragment_electric.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/fragment_electric.xml
rename to app/src/main/res/layout/fragment_electric.xml
diff --git a/SmartDevice/app/src/main/res/layout/fragment_notifications.xml b/app/src/main/res/layout/fragment_notifications.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/fragment_notifications.xml
rename to app/src/main/res/layout/fragment_notifications.xml
diff --git a/SmartDevice/app/src/main/res/layout/fragment_vmc.xml b/app/src/main/res/layout/fragment_vmc.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/fragment_vmc.xml
rename to app/src/main/res/layout/fragment_vmc.xml
diff --git a/SmartDevice/app/src/main/res/layout/mydialog1.xml b/app/src/main/res/layout/mydialog1.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/mydialog1.xml
rename to app/src/main/res/layout/mydialog1.xml
diff --git a/SmartDevice/app/src/main/res/layout/recycler_debug.xml b/app/src/main/res/layout/recycler_debug.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/recycler_debug.xml
rename to app/src/main/res/layout/recycler_debug.xml
diff --git a/SmartDevice/app/src/main/res/layout/recycler_dialog_buy_list.xml b/app/src/main/res/layout/recycler_dialog_buy_list.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/recycler_dialog_buy_list.xml
rename to app/src/main/res/layout/recycler_dialog_buy_list.xml
diff --git a/SmartDevice/app/src/main/res/layout/recycler_dialog_dispatch_list.xml b/app/src/main/res/layout/recycler_dialog_dispatch_list.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/recycler_dialog_dispatch_list.xml
rename to app/src/main/res/layout/recycler_dialog_dispatch_list.xml
diff --git a/SmartDevice/app/src/main/res/layout/recycler_dialog_marketing_plan_list.xml b/app/src/main/res/layout/recycler_dialog_marketing_plan_list.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/recycler_dialog_marketing_plan_list.xml
rename to app/src/main/res/layout/recycler_dialog_marketing_plan_list.xml
diff --git a/SmartDevice/app/src/main/res/layout/recycler_dialog_pickup_code_buy_list.xml b/app/src/main/res/layout/recycler_dialog_pickup_code_buy_list.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/recycler_dialog_pickup_code_buy_list.xml
rename to app/src/main/res/layout/recycler_dialog_pickup_code_buy_list.xml
diff --git a/SmartDevice/app/src/main/res/layout/recycler_electric_buy_list.xml b/app/src/main/res/layout/recycler_electric_buy_list.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/recycler_electric_buy_list.xml
rename to app/src/main/res/layout/recycler_electric_buy_list.xml
diff --git a/SmartDevice/app/src/main/res/layout/recycler_electric_slot_list.xml b/app/src/main/res/layout/recycler_electric_slot_list.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/recycler_electric_slot_list.xml
rename to app/src/main/res/layout/recycler_electric_slot_list.xml
diff --git a/SmartDevice/app/src/main/res/layout/recycler_product_list.xml b/app/src/main/res/layout/recycler_product_list.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/recycler_product_list.xml
rename to app/src/main/res/layout/recycler_product_list.xml
diff --git a/SmartDevice/app/src/main/res/layout/recycler_product_search.xml b/app/src/main/res/layout/recycler_product_search.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/recycler_product_search.xml
rename to app/src/main/res/layout/recycler_product_search.xml
diff --git a/SmartDevice/app/src/main/res/layout/recycler_search_text.xml b/app/src/main/res/layout/recycler_search_text.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/recycler_search_text.xml
rename to app/src/main/res/layout/recycler_search_text.xml
diff --git a/SmartDevice/app/src/main/res/layout/recycler_setting_list.xml b/app/src/main/res/layout/recycler_setting_list.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/recycler_setting_list.xml
rename to app/src/main/res/layout/recycler_setting_list.xml
diff --git a/SmartDevice/app/src/main/res/layout/recycler_vmc_buy_list.xml b/app/src/main/res/layout/recycler_vmc_buy_list.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/recycler_vmc_buy_list.xml
rename to app/src/main/res/layout/recycler_vmc_buy_list.xml
diff --git a/SmartDevice/app/src/main/res/layout/recycler_vmc_slot_list.xml b/app/src/main/res/layout/recycler_vmc_slot_list.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/recycler_vmc_slot_list.xml
rename to app/src/main/res/layout/recycler_vmc_slot_list.xml
diff --git a/SmartDevice/app/src/main/res/layout/spinner_item.xml b/app/src/main/res/layout/spinner_item.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/layout/spinner_item.xml
rename to app/src/main/res/layout/spinner_item.xml
diff --git a/SmartDevice/app/src/main/res/mipmap-anydpi-v26/ic_launchers.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launchers.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/mipmap-anydpi-v26/ic_launchers.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launchers.xml
diff --git a/SmartDevice/app/src/main/res/mipmap-anydpi-v26/ic_launchers_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launchers_round.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/mipmap-anydpi-v26/ic_launchers_round.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launchers_round.xml
diff --git a/SmartDevice/app/src/main/res/mipmap-hdpi/ic_launchers.webp b/app/src/main/res/mipmap-hdpi/ic_launchers.webp
similarity index 100%
rename from SmartDevice/app/src/main/res/mipmap-hdpi/ic_launchers.webp
rename to app/src/main/res/mipmap-hdpi/ic_launchers.webp
diff --git a/SmartDevice/app/src/main/res/mipmap-hdpi/ic_launchers_round.webp b/app/src/main/res/mipmap-hdpi/ic_launchers_round.webp
similarity index 100%
rename from SmartDevice/app/src/main/res/mipmap-hdpi/ic_launchers_round.webp
rename to app/src/main/res/mipmap-hdpi/ic_launchers_round.webp
diff --git a/SmartDevice/app/src/main/res/mipmap-mdpi/ic_launchers.webp b/app/src/main/res/mipmap-mdpi/ic_launchers.webp
similarity index 100%
rename from SmartDevice/app/src/main/res/mipmap-mdpi/ic_launchers.webp
rename to app/src/main/res/mipmap-mdpi/ic_launchers.webp
diff --git a/SmartDevice/app/src/main/res/mipmap-mdpi/ic_launchers_round.webp b/app/src/main/res/mipmap-mdpi/ic_launchers_round.webp
similarity index 100%
rename from SmartDevice/app/src/main/res/mipmap-mdpi/ic_launchers_round.webp
rename to app/src/main/res/mipmap-mdpi/ic_launchers_round.webp
diff --git a/SmartDevice/app/src/main/res/mipmap-xhdpi/ic_launchers.webp b/app/src/main/res/mipmap-xhdpi/ic_launchers.webp
similarity index 100%
rename from SmartDevice/app/src/main/res/mipmap-xhdpi/ic_launchers.webp
rename to app/src/main/res/mipmap-xhdpi/ic_launchers.webp
diff --git a/SmartDevice/app/src/main/res/mipmap-xhdpi/ic_launchers_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launchers_round.webp
similarity index 100%
rename from SmartDevice/app/src/main/res/mipmap-xhdpi/ic_launchers_round.webp
rename to app/src/main/res/mipmap-xhdpi/ic_launchers_round.webp
diff --git a/SmartDevice/app/src/main/res/mipmap-xxhdpi/ic_launchers.webp b/app/src/main/res/mipmap-xxhdpi/ic_launchers.webp
similarity index 100%
rename from SmartDevice/app/src/main/res/mipmap-xxhdpi/ic_launchers.webp
rename to app/src/main/res/mipmap-xxhdpi/ic_launchers.webp
diff --git a/SmartDevice/app/src/main/res/mipmap-xxhdpi/ic_launchers_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launchers_round.webp
similarity index 100%
rename from SmartDevice/app/src/main/res/mipmap-xxhdpi/ic_launchers_round.webp
rename to app/src/main/res/mipmap-xxhdpi/ic_launchers_round.webp
diff --git a/SmartDevice/app/src/main/res/mipmap-xxxhdpi/ic_launchers.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launchers.webp
similarity index 100%
rename from SmartDevice/app/src/main/res/mipmap-xxxhdpi/ic_launchers.webp
rename to app/src/main/res/mipmap-xxxhdpi/ic_launchers.webp
diff --git a/SmartDevice/app/src/main/res/mipmap-xxxhdpi/ic_launchers_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launchers_round.webp
similarity index 100%
rename from SmartDevice/app/src/main/res/mipmap-xxxhdpi/ic_launchers_round.webp
rename to app/src/main/res/mipmap-xxxhdpi/ic_launchers_round.webp
diff --git a/SmartDevice/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/values-en/strings.xml
rename to app/src/main/res/values-en/strings.xml
diff --git a/SmartDevice/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/values-ja/strings.xml
rename to app/src/main/res/values-ja/strings.xml
diff --git a/SmartDevice/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/values-night/themes.xml
rename to app/src/main/res/values-night/themes.xml
diff --git a/SmartDevice/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/values/colors.xml
rename to app/src/main/res/values/colors.xml
diff --git a/SmartDevice/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/values/dimens.xml
rename to app/src/main/res/values/dimens.xml
diff --git a/SmartDevice/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/values/strings.xml
rename to app/src/main/res/values/strings.xml
diff --git a/SmartDevice/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/values/styles.xml
rename to app/src/main/res/values/styles.xml
diff --git a/SmartDevice/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/values/themes.xml
rename to app/src/main/res/values/themes.xml
diff --git a/SmartDevice/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/xml/backup_rules.xml
rename to app/src/main/res/xml/backup_rules.xml
diff --git a/SmartDevice/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/xml/data_extraction_rules.xml
rename to app/src/main/res/xml/data_extraction_rules.xml
diff --git a/SmartDevice/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
similarity index 100%
rename from SmartDevice/app/src/main/res/xml/network_security_config.xml
rename to app/src/main/res/xml/network_security_config.xml
diff --git a/SmartDevice/app/src/test/java/com/unibuy/smartdevice/ExampleUnitTest.java b/app/src/test/java/com/unibuy/smartdevice/ExampleUnitTest.java
similarity index 100%
rename from SmartDevice/app/src/test/java/com/unibuy/smartdevice/ExampleUnitTest.java
rename to app/src/test/java/com/unibuy/smartdevice/ExampleUnitTest.java
diff --git a/SmartDevice/build.gradle b/build.gradle
similarity index 100%
rename from SmartDevice/build.gradle
rename to build.gradle
diff --git a/SmartDevice/gradle.properties b/gradle.properties
similarity index 100%
rename from SmartDevice/gradle.properties
rename to gradle.properties
diff --git a/SmartDevice/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties
similarity index 100%
rename from SmartDevice/gradle/gradle-daemon-jvm.properties
rename to gradle/gradle-daemon-jvm.properties
diff --git a/SmartDevice/gradle/libs.versions.toml b/gradle/libs.versions.toml
similarity index 100%
rename from SmartDevice/gradle/libs.versions.toml
rename to gradle/libs.versions.toml
diff --git a/SmartDevice/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from SmartDevice/gradle/wrapper/gradle-wrapper.jar
rename to gradle/wrapper/gradle-wrapper.jar
diff --git a/SmartDevice/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from SmartDevice/gradle/wrapper/gradle-wrapper.properties
rename to gradle/wrapper/gradle-wrapper.properties
diff --git a/SmartDevice/gradlew b/gradlew
similarity index 100%
rename from SmartDevice/gradlew
rename to gradlew
diff --git a/SmartDevice/gradlew.bat b/gradlew.bat
similarity index 100%
rename from SmartDevice/gradlew.bat
rename to gradlew.bat
diff --git a/SmartDevice/rockchip-SX-F4-Android-7.1.2_2025-01-13_172057.logcat b/rockchip-SX-F4-Android-7.1.2_2025-01-13_172057.logcat
similarity index 100%
rename from SmartDevice/rockchip-SX-F4-Android-7.1.2_2025-01-13_172057.logcat
rename to rockchip-SX-F4-Android-7.1.2_2025-01-13_172057.logcat
diff --git a/SmartDevice/settings.gradle b/settings.gradle
similarity index 100%
rename from SmartDevice/settings.gradle
rename to settings.gradle