diff --git a/OCH/mogo-och-sweeper/.gitignore b/OCH/sweeper/sweeper/.gitignore
similarity index 100%
rename from OCH/mogo-och-sweeper/.gitignore
rename to OCH/sweeper/sweeper/.gitignore
diff --git a/OCH/mogo-och-sweeper/build.gradle b/OCH/sweeper/sweeper/build.gradle
similarity index 100%
rename from OCH/mogo-och-sweeper/build.gradle
rename to OCH/sweeper/sweeper/build.gradle
diff --git a/OCH/mogo-och-sweeper/gradle.properties b/OCH/sweeper/sweeper/gradle.properties
similarity index 100%
rename from OCH/mogo-och-sweeper/gradle.properties
rename to OCH/sweeper/sweeper/gradle.properties
diff --git a/OCH/mogo-och-sweeper/proguard-rules.pro b/OCH/sweeper/sweeper/proguard-rules.pro
similarity index 100%
rename from OCH/mogo-och-sweeper/proguard-rules.pro
rename to OCH/sweeper/sweeper/proguard-rules.pro
diff --git a/OCH/mogo-och-sweeper/src/androidTest/java/com/mogo/och/sweeper/ExampleInstrumentedTest.kt b/OCH/sweeper/sweeper/src/androidTest/java/com/mogo/och/sweeper/ExampleInstrumentedTest.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/androidTest/java/com/mogo/och/sweeper/ExampleInstrumentedTest.kt
rename to OCH/sweeper/sweeper/src/androidTest/java/com/mogo/och/sweeper/ExampleInstrumentedTest.kt
diff --git a/OCH/mogo-och-sweeper/src/main/AndroidManifest.xml b/OCH/sweeper/sweeper/src/main/AndroidManifest.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/AndroidManifest.xml
rename to OCH/sweeper/sweeper/src/main/AndroidManifest.xml
diff --git a/OCH/mogo-och-sweeper/src/main/assets/map_style.data b/OCH/sweeper/sweeper/src/main/assets/map_style.data
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/assets/map_style.data
rename to OCH/sweeper/sweeper/src/main/assets/map_style.data
diff --git a/OCH/mogo-och-sweeper/src/main/assets/map_style_extra.data b/OCH/sweeper/sweeper/src/main/assets/map_style_extra.data
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/assets/map_style_extra.data
rename to OCH/sweeper/sweeper/src/main/assets/map_style_extra.data
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/IMogoOCH.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/IMogoOCH.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/IMogoOCH.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/IMogoOCH.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
similarity index 98%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
index 6d8ef217fe..4691f4f95b 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
+++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
@@ -9,7 +9,6 @@ import androidx.fragment.app.FragmentManager;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.och.sweeper.constant.SweeperConst;
 import com.mogo.och.sweeper.fragment.SweeperFragment;
 
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/BaseResponse.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/BaseResponse.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/BaseResponse.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/BaseResponse.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SubStartRequest.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SubStartRequest.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SubStartRequest.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SubStartRequest.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperMainTaskBean.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperMainTaskBean.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperMainTaskBean.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperMainTaskBean.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutePlanningUpdateReqBean.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutePlanningUpdateReqBean.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutePlanningUpdateReqBean.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutePlanningUpdateReqBean.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskBean.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskBean.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskBean.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskBean.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskDetailBean.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskDetailBean.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskDetailBean.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperSubTaskDetailBean.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ICleaningModeStateCallback.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ICleaningModeStateCallback.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ICleaningModeStateCallback.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ICleaningModeStateCallback.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperADASStatusCallback.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperADASStatusCallback.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperADASStatusCallback.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperADASStatusCallback.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperControllerStatusCallback.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperControllerStatusCallback.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperControllerStatusCallback.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperControllerStatusCallback.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskCallback.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskCallback.kt
similarity index 96%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskCallback.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskCallback.kt
index 182d0b9c4f..377eb91145 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskCallback.kt
+++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskCallback.kt
@@ -36,7 +36,7 @@ interface ISweeperTaskCallback {
     /**
      *  获取子任务详情包括轨迹信息
      */
-    fun setSubTakDetail(subTaskDetailBean: SweeperSubTaskDetailBean,subTaskTypeEnum: SubTaskTypeEnum)
+    fun setSubTakDetail(subTaskDetailBean: SweeperSubTaskDetailBean, subTaskTypeEnum: SubTaskTypeEnum)
 
     /**
      * 设置轨迹坐标点集合
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskDataToFragmentCallback.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskDataToFragmentCallback.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskDataToFragmentCallback.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskDataToFragmentCallback.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskRouteCallback.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskRouteCallback.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskRouteCallback.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/ISweeperTaskRouteCallback.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/IWeltMapSwitchToSmallCallback.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/IWeltMapSwitchToSmallCallback.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/callback/IWeltMapSwitchToSmallCallback.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/callback/IWeltMapSwitchToSmallCallback.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/OperateStateEnum.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/OperateStateEnum.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/OperateStateEnum.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/OperateStateEnum.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/SubTaskTypeEnum.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/SubTaskTypeEnum.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/SubTaskTypeEnum.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/SubTaskTypeEnum.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/TaskStatusEnum.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/TaskStatusEnum.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/TaskStatusEnum.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/constant/TaskStatusEnum.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/database/MyDataBase.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/database/MyDataBase.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/database/MyDataBase.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/database/MyDataBase.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/database/bean/WeltDataBean.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/database/bean/WeltDataBean.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/database/bean/WeltDataBean.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/database/bean/WeltDataBean.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/database/dao/WeltDataDao.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/database/dao/WeltDataDao.java
similarity index 96%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/database/dao/WeltDataDao.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/database/dao/WeltDataDao.java
index 7647d29a08..097be3af3e 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/database/dao/WeltDataDao.java
+++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/database/dao/WeltDataDao.java
@@ -2,7 +2,6 @@ package com.mogo.och.sweeper.database.dao;
 
 import com.mogo.och.sweeper.database.bean.WeltDataBean;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import androidx.room.Dao;
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/event/WeltDataEvent.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/event/WeltDataEvent.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/event/WeltDataEvent.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/event/WeltDataEvent.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
similarity index 99%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
index 274f62d862..5832c58081 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
+++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
@@ -42,7 +42,6 @@ import com.mogo.och.sweeper.view.WeltSmallMapView;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
-import java.util.List;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperUIFragment.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperUIFragment.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperUIFragment.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperUIFragment.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
similarity index 99%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
index 79b6a19381..de0eae391b 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
+++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
@@ -3,7 +3,6 @@ package com.mogo.och.sweeper.fragment
 import android.graphics.Color
 import android.os.Bundle
 import android.view.View
-import android.view.View.OnClickListener
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import chassis.ChassisStatesOuterClass
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/ISweeperApiService.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/net/ISweeperApiService.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/ISweeperApiService.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/net/ISweeperApiService.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/receiver/TestSweeperBroadcastReceiver.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperManualDrivingDialog.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperManualDrivingDialog.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperManualDrivingDialog.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperManualDrivingDialog.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperNoTitleCommonDialog.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperNoTitleCommonDialog.kt
similarity index 98%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperNoTitleCommonDialog.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperNoTitleCommonDialog.kt
index 4f05e7cee9..57618ccb5f 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperNoTitleCommonDialog.kt
+++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/dialog/SweeperNoTitleCommonDialog.kt
@@ -1,6 +1,5 @@
 package com.mogo.och.sweeper.ui.dialog
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.widget.TextView
 import androidx.lifecycle.LifecycleObserver
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/popwindow/MenuPopWindow.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/popwindow/MenuPopWindow.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/popwindow/MenuPopWindow.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/popwindow/MenuPopWindow.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/popwindow/SweeperOperatePanelPopWindow.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/popwindow/SweeperOperatePanelPopWindow.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/popwindow/SweeperOperatePanelPopWindow.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/ui/popwindow/SweeperOperatePanelPopWindow.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperFutianCmdUtil.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperFutianCmdUtil.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperFutianCmdUtil.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperFutianCmdUtil.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperMapAssetStyleUtil.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperMapAssetStyleUtil.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperMapAssetStyleUtil.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperMapAssetStyleUtil.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/BusArcView.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/BusArcView.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/BusArcView.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/BusArcView.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/LegendItemView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/LegendItemView.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/LegendItemView.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/LegendItemView.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/NoTouchConstraintLayout.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/NoTouchConstraintLayout.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/NoTouchConstraintLayout.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/NoTouchConstraintLayout.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/NoTouchFrameLayout.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/NoTouchFrameLayout.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/NoTouchFrameLayout.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/NoTouchFrameLayout.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SlidePanelView.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SlidePanelView.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SlidePanelView.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SlidePanelView.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SubTaskView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SubTaskView.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SubTaskView.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SubTaskView.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperWorkModeView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperWorkModeView.kt
similarity index 99%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperWorkModeView.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperWorkModeView.kt
index eb90c33411..fae8cfd18f 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperWorkModeView.kt
+++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperWorkModeView.kt
@@ -20,7 +20,8 @@ import kotlinx.android.synthetic.main.sweeper_work_mode.view.*
 /**
  * 清扫车模式信息展示
  */
-class SweeperWorkModeView : ConstraintLayout, ICleaningModeStateCallback {
+class SweeperWorkModeView : ConstraintLayout,
+    ICleaningModeStateCallback {
 
     private var isSelectPureSweepMode: Boolean = false
     private val TAG = "SweeperWorkModeView"
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/TurnSignalView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/TurnSignalView.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/TurnSignalView.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/TurnSignalView.kt
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/VerticalDashLineView.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/VerticalDashLineView.java
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/VerticalDashLineView.java
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/VerticalDashLineView.java
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt
similarity index 99%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt
index 6092a9029c..438b14b0e9 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt
+++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt
@@ -110,7 +110,7 @@ class WeltMapOverView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener {
      */
     private fun getRouteColorList(weltData: MutableList<WeltDataBean>):MutableList<Int> {
         val colorList= mutableListOf<Int>()
-        var nextWeltDataBean:WeltDataBean?=null
+        var nextWeltDataBean: WeltDataBean?=null
         for (i in weltData.indices) {
             val weltDataBean = weltData[i]
             if(i+1<weltData.size){
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt
similarity index 99%
rename from OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt
rename to OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt
index 20ce2a54c3..c6082d34cf 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt
+++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt
@@ -168,7 +168,7 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener {
      */
     private fun getRouteColorList(weltData: MutableList<WeltDataBean>): MutableList<Int> {
         val colorList = mutableListOf<Int>()
-        var nextWeltDataBean:WeltDataBean?=null
+        var nextWeltDataBean: WeltDataBean?=null
         for (i in weltData.indices) {
             val weltDataBean = weltData[i]
             if(i+1<weltData.size){
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/bg_shape_work_mode.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/bg_shape_work_mode.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/bg_shape_work_mode.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/bg_shape_work_mode.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/bg_sweeper_operate_panel.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/bg_sweeper_operate_panel.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/bg_sweeper_operate_panel.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/bg_sweeper_operate_panel.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_ai_normal.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_ai_normal.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_ai_normal.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_ai_normal.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_battery.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_battery.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_battery.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_battery.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_message_box.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_message_box.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_message_box.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_message_box.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_message_box_pressed.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_message_box_pressed.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_message_box_pressed.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_message_box_pressed.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_right_down_arrow.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_right_down_arrow.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_right_down_arrow.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_right_down_arrow.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_water_level_warning.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_level_warning.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_water_level_warning.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_level_warning.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_water_nor.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_nor.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_water_nor.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_nor.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_water_select.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_select.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/icon_water_select.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/icon_water_select.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/no_task_data.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/no_task_data.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/no_task_data.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/no_task_data.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_base_slide_block.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_base_slide_block.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_base_slide_block.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_base_slide_block.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data_speed.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data_speed.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data_speed.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_bg_traffic_data_speed.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_big_end_maker_icon.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_big_end_maker_icon.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_big_end_maker_icon.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_big_end_maker_icon.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_big_start_maker_icon.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_big_start_maker_icon.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_big_start_maker_icon.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_big_start_maker_icon.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_car_big.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_car_big.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_car_big.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_car_big.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_car_small.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_car_small.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_car_small.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_car_small.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_card_normal.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_card_normal.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_card_normal.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_card_normal.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_card_pressed.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_card_pressed.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_card_pressed.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_card_pressed.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_clean_mode_icon.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_clean_mode_icon.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_clean_mode_icon.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_clean_mode_icon.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_close_navi_icon.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_close_navi_icon.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_close_navi_icon.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_close_navi_icon.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_collect_normal.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_collect_normal.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_collect_normal.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_collect_normal.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_collect_pressed.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_collect_pressed.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_collect_pressed.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_collect_pressed.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_full_screen_icon.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_full_screen_icon.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_full_screen_icon.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_full_screen_icon.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_ai_select.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_ai_select.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_ai_select.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_ai_select.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_normal.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_normal.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_normal.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_normal.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_select.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_select.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_select.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_bad_case_select.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_close.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_close.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_close.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_close.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_open.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_open.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_open.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_msg_box_open.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_not_select_subtask.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_not_select_subtask.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_not_select_subtask.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_not_select_subtask.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_select_subtask.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_select_subtask.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_icon_select_subtask.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_icon_select_subtask.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_light_gay_nor.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_gay_nor.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_light_gay_nor.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_gay_nor.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_light_green_nor.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_green_nor.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_light_green_nor.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_green_nor.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_light_red_nor.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_red_nor.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_light_red_nor.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_light_red_nor.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_lightyellow_nor.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_lightyellow_nor.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_lightyellow_nor.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_lightyellow_nor.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_line.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_line.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_line.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_line.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_loading_nor.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_loading_nor.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_loading_nor.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_loading_nor.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_navi_refresh.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_navi_refresh.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_navi_refresh.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_navi_refresh.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_och_dot_line.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_och_dot_line.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_och_dot_line.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_och_dot_line.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_setting_btn_bg.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_btn_bg.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_setting_btn_bg.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_btn_bg.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_setting_normal.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_normal.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_setting_normal.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_normal.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_setting_pressed.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_pressed.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_setting_pressed.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_setting_pressed.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_small_end_marker_icon.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_small_end_marker_icon.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_small_end_marker_icon.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_small_end_marker_icon.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_small_start_marker_icon.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_small_start_marker_icon.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_small_start_marker_icon.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_small_start_marker_icon.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_start_auto_not_running.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_start_auto_not_running.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_start_auto_not_running.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_start_auto_not_running.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_start_auto_running.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_start_auto_running.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_start_auto_running.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_start_auto_running.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_big_normal.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_big_normal.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_big_normal.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_big_normal.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_big_pressed.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_big_pressed.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_big_pressed.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_big_pressed.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_long.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_long.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_long.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_long.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_medium.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_medium.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_medium.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_medium.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_small_normal.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_small_normal.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_small_normal.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_small_normal.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_small_pressed.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_small_pressed.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_small_pressed.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_switch_map_small_pressed.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_task_list_left_select_icon.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_list_left_select_icon.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_task_list_left_select_icon.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_list_left_select_icon.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_task_not_working.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_not_working.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_task_not_working.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_not_working.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_task_working.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_working.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_task_working.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_task_working.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_traffic_data_speed_warning.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_traffic_data_speed_warning.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_traffic_data_speed_warning.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_traffic_data_speed_warning.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_unselect_btn.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_unselect_btn.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_unselect_btn.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/sweeper_unselect_btn.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/turn_signal_left_nor.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_left_nor.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/turn_signal_left_nor.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_left_nor.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/turn_signal_left_select.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_left_select.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/turn_signal_left_select.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_left_select.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/turn_signal_right_nor.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_right_nor.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/turn_signal_right_nor.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_right_nor.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/turn_signal_right_select.png b/OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_right_select.png
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/turn_signal_right_select.png
rename to OCH/sweeper/sweeper/src/main/res/drawable-xhdpi/turn_signal_right_select.png
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_bubble.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_bubble.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/bg_bubble.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/bg_bubble.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_clean_mode.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_clean_mode.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_clean_mode.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_clean_mode.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_dialog_no_title.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_dialog_no_title.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_dialog_no_title.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_dialog_no_title.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_left_bottom_round.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_left_bottom_round.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_left_bottom_round.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_left_bottom_round.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_left_right_bottom_round.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_left_right_bottom_round.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_left_right_bottom_round.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_left_right_bottom_round.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_right_bottom_round.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_right_bottom_round.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_right_bottom_round.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_right_bottom_round.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_task_panel.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_panel.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_task_panel.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_panel.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_task_state_not_ready.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_state_not_ready.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_task_state_not_ready.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_state_not_ready.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_task_state_working.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_state_working.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_task_state_working.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_task_state_working.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_welt_panel.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_welt_panel.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/bg_shape_welt_panel.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/bg_shape_welt_panel.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_close.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_close.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_close.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_close.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_default.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_default.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_default.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_default.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_disabled.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_disabled.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_disabled.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_disabled.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_open.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_open.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_open.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_open.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_pressed.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_pressed.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_pressed.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/bg_sweeper_operate_panel_btn_pressed.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_task_menu.xml b/OCH/sweeper/sweeper/src/main/res/drawable/bg_task_menu.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/bg_task_menu.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/bg_task_menu.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/icon_more.xml b/OCH/sweeper/sweeper/src/main/res/drawable/icon_more.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/icon_more.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/icon_more.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_ai_collect_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_ai_collect_selector.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_ai_collect_selector.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_ai_collect_selector.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_bad_case_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_bad_case_selector.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_bad_case_selector.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_bad_case_selector.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_bg_waring_limiting_velocity.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_bg_waring_limiting_velocity.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_bg_waring_limiting_velocity.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_bg_waring_limiting_velocity.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_collect_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_collect_selector.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_collect_selector.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_collect_selector.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_legend1.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend1.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_legend1.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend1.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_legend2.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend2.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_legend2.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend2.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_legend3.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend3.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_legend3.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend3.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_legend4.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend4.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_legend4.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend4.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_legend5.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend5.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_legend5.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend5.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_legend6.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend6.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_legend6.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_legend6.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_list_left_top_line.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_list_left_top_line.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_list_left_top_line.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_list_left_top_line.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_message_box.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_message_box.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_message_box.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_message_box.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_operate_panel_btn1_bg_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operate_panel_btn1_bg_selector.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_operate_panel_btn1_bg_selector.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operate_panel_btn1_bg_selector.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_operate_panel_btn2_bg_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operate_panel_btn2_bg_selector.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_operate_panel_btn2_bg_selector.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operate_panel_btn2_bg_selector.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_operation_status_bg.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_bg.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_operation_status_bg.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_bg.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_operation_status_bg_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_bg_selector.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_operation_status_bg_selector.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_bg_selector.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_operation_status_select_bg.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_select_bg.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_operation_status_select_bg.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_operation_status_select_bg.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_oprate_panel_cancel_btn.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_oprate_panel_cancel_btn.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_oprate_panel_cancel_btn.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_oprate_panel_cancel_btn.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_oprate_panel_reset_btn.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_oprate_panel_reset_btn.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_oprate_panel_reset_btn.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_oprate_panel_reset_btn.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_panel_anchor_bkg.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_panel_anchor_bkg.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_panel_anchor_bkg.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_panel_anchor_bkg.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_panel_bkg.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_panel_bkg.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_panel_bkg.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_panel_bkg.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_refresh.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_refresh.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_refresh.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_refresh.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_selector_msg_box.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_selector_msg_box.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_selector_msg_box.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_selector_msg_box.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_setting_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_setting_selector.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_setting_selector.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_setting_selector.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_station_green_dash_line.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_station_green_dash_line.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_station_green_dash_line.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_station_green_dash_line.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_station_v_green_dash.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_station_v_green_dash.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_station_v_green_dash.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_station_v_green_dash.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_switch_card_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_card_selector.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_switch_card_selector.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_card_selector.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_switch_map_bg.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_bg.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_switch_map_bg.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_bg.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_switch_map_big_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_big_selector.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_switch_map_big_selector.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_big_selector.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_switch_map_small_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_small_selector.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_switch_map_small_selector.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_switch_map_small_selector.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_dividing_line1_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_dividing_line1_selector.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_dividing_line1_selector.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_dividing_line1_selector.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_dividing_line2_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_dividing_line2_selector.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_dividing_line2_selector.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_dividing_line2_selector.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_list_btn.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_list_btn.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_list_btn.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_list_btn.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_list_not_selected.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_list_not_selected.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_list_not_selected.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_list_not_selected.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_list_selected.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_list_selected.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_task_list_selected.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_task_list_selected.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_water_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/sweeper_water_selector.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_water_selector.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/sweeper_water_selector.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/turn_signal_left_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/turn_signal_left_selector.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/turn_signal_left_selector.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/turn_signal_left_selector.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/turn_signal_right_selector.xml b/OCH/sweeper/sweeper/src/main/res/drawable/turn_signal_right_selector.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/drawable/turn_signal_right_selector.xml
rename to OCH/sweeper/sweeper/src/main/res/drawable/turn_signal_right_selector.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/dialog_sweeper_manual_driving.xml b/OCH/sweeper/sweeper/src/main/res/layout/dialog_sweeper_manual_driving.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/dialog_sweeper_manual_driving.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/dialog_sweeper_manual_driving.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/dialog_sweeper_no_title.xml b/OCH/sweeper/sweeper/src/main/res/layout/dialog_sweeper_no_title.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/dialog_sweeper_no_title.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/dialog_sweeper_no_title.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/fragment_och_sweeper.xml b/OCH/sweeper/sweeper/src/main/res/layout/fragment_och_sweeper.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/fragment_och_sweeper.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/fragment_och_sweeper.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/fragment_welt_map_overview.xml b/OCH/sweeper/sweeper/src/main/res/layout/fragment_welt_map_overview.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/fragment_welt_map_overview.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/fragment_welt_map_overview.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_amap_navi_view.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_amap_navi_view.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/sweeper_amap_navi_view.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/sweeper_amap_navi_view.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_base_fragment.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/sweeper_base_fragment.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_current_task_info.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_current_task_info.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/sweeper_current_task_info.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/sweeper_current_task_info.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_item_legend.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_item_legend.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/sweeper_item_legend.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/sweeper_item_legend.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_item_task_info.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_item_task_info.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/sweeper_item_task_info.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/sweeper_item_task_info.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_limiting_speed.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_limiting_speed.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/sweeper_limiting_speed.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/sweeper_limiting_speed.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_no_data_common_view.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_no_data_common_view.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/sweeper_no_data_common_view.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/sweeper_no_data_common_view.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_operate_panel_view.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_operate_panel_view.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/sweeper_operate_panel_view.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/sweeper_operate_panel_view.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_popwindow_operate_panel.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_popwindow_operate_panel.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/sweeper_popwindow_operate_panel.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/sweeper_popwindow_operate_panel.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_subtask_view.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_subtask_view.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/sweeper_subtask_view.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/sweeper_subtask_view.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_task_menu.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_task_menu.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/sweeper_task_menu.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/sweeper_task_menu.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_test_bar_view.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_test_bar_view.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/sweeper_test_bar_view.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/sweeper_test_bar_view.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_traffic_data.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_traffic_data.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/sweeper_traffic_data.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/sweeper_traffic_data.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_traffic_light_view.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_traffic_light_view.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/sweeper_traffic_light_view.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/sweeper_traffic_light_view.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_turn_signal.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_turn_signal.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/sweeper_turn_signal.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/sweeper_turn_signal.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_map_overview.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_welt_map_overview.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_map_overview.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/sweeper_welt_map_overview.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_small_map_view.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_welt_small_map_view.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/sweeper_welt_small_map_view.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/sweeper_welt_small_map_view.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_work_mode.xml b/OCH/sweeper/sweeper/src/main/res/layout/sweeper_work_mode.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/layout/sweeper_work_mode.xml
rename to OCH/sweeper/sweeper/src/main/res/layout/sweeper_work_mode.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/values/attrs.xml b/OCH/sweeper/sweeper/src/main/res/values/attrs.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/values/attrs.xml
rename to OCH/sweeper/sweeper/src/main/res/values/attrs.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/values/colors.xml b/OCH/sweeper/sweeper/src/main/res/values/colors.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/values/colors.xml
rename to OCH/sweeper/sweeper/src/main/res/values/colors.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/values/dimens.xml b/OCH/sweeper/sweeper/src/main/res/values/dimens.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/values/dimens.xml
rename to OCH/sweeper/sweeper/src/main/res/values/dimens.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/values/strings.xml b/OCH/sweeper/sweeper/src/main/res/values/strings.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/values/strings.xml
rename to OCH/sweeper/sweeper/src/main/res/values/strings.xml
diff --git a/OCH/mogo-och-sweeper/src/main/res/values/style.xml b/OCH/sweeper/sweeper/src/main/res/values/style.xml
similarity index 100%
rename from OCH/mogo-och-sweeper/src/main/res/values/style.xml
rename to OCH/sweeper/sweeper/src/main/res/values/style.xml
diff --git a/OCH/mogo-och-sweeper/src/test/java/com/mogo/och/sweeper/ExampleUnitTest.kt b/OCH/sweeper/sweeper/src/test/java/com/mogo/och/sweeper/ExampleUnitTest.kt
similarity index 100%
rename from OCH/mogo-och-sweeper/src/test/java/com/mogo/och/sweeper/ExampleUnitTest.kt
rename to OCH/sweeper/sweeper/src/test/java/com/mogo/och/sweeper/ExampleUnitTest.kt
diff --git a/app/script/productFlavors/sweeper.gradle b/app/script/productFlavors/sweeper.gradle
index 48a93a6e1e..8493f0b84b 100644
--- a/app/script/productFlavors/sweeper.gradle
+++ b/app/script/productFlavors/sweeper.gradle
@@ -26,7 +26,7 @@ project.android.productFlavors {
 
 
         if(isCurrentFlavors("sweeper")){
-            project.dependencies.add('implementation', project.project(':OCH:mogo-och-sweeper'))
+            project.dependencies.add('implementation', project.project(':OCH:sweeper:sweeper'))
         }
     }
 }
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index c52260c59e..2099541b75 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -63,7 +63,7 @@ include ':OCH:mogo-och-taxi'
 include ':OCH:mogo-och-taxi-passenger'
 include ':OCH:mogo-och-noop'
 include(':OCH:mogo-och-common-module')
-include ':OCH:mogo-och-sweeper'
+include ':OCH:sweeper:sweeper'
 include ':OCH:mogo-och-charter'
 include ':OCH:mogo-och-charter-passenger'
 include ':OCH:mogo-och-shuttle'