diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/grab_failure_anmi_flow.xml b/OCH/mogo-och-taxi/src/main/res/drawable/grab_failure_anmi_flow.xml deleted file mode 100644 index 5a0649a2c5..0000000000 --- a/OCH/mogo-och-taxi/src/main/res/drawable/grab_failure_anmi_flow.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/grab_success_anmi_flow.xml b/OCH/mogo-och-taxi/src/main/res/drawable/grab_success_anmi_flow.xml deleted file mode 100644 index 0447f8441d..0000000000 --- a/OCH/mogo-och-taxi/src/main/res/drawable/grab_success_anmi_flow.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/.gitignore b/OCH/taxi/mogo-och-taxi-passenger/.gitignore similarity index 100% rename from OCH/mogo-och-taxi-passenger/.gitignore rename to OCH/taxi/mogo-och-taxi-passenger/.gitignore diff --git a/OCH/mogo-och-taxi-passenger/build.gradle b/OCH/taxi/mogo-och-taxi-passenger/build.gradle similarity index 100% rename from OCH/mogo-och-taxi-passenger/build.gradle rename to OCH/taxi/mogo-och-taxi-passenger/build.gradle diff --git a/OCH/mogo-och-taxi-passenger/consumer-rules.pro b/OCH/taxi/mogo-och-taxi-passenger/consumer-rules.pro similarity index 100% rename from OCH/mogo-och-taxi-passenger/consumer-rules.pro rename to OCH/taxi/mogo-och-taxi-passenger/consumer-rules.pro diff --git a/OCH/mogo-och-taxi-passenger/gradle.properties b/OCH/taxi/mogo-och-taxi-passenger/gradle.properties similarity index 100% rename from OCH/mogo-och-taxi-passenger/gradle.properties rename to OCH/taxi/mogo-och-taxi-passenger/gradle.properties diff --git a/OCH/mogo-och-taxi-passenger/proguard-rules.pro b/OCH/taxi/mogo-och-taxi-passenger/proguard-rules.pro similarity index 100% rename from OCH/mogo-och-taxi-passenger/proguard-rules.pro rename to OCH/taxi/mogo-och-taxi-passenger/proguard-rules.pro diff --git a/OCH/mogo-och-taxi-passenger/src/main/AndroidManifest.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/AndroidManifest.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/AndroidManifest.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/AndroidManifest.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/assets/style.data b/OCH/taxi/mogo-och-taxi-passenger/src/main/assets/style.data similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/assets/style.data rename to OCH/taxi/mogo-och-taxi-passenger/src/main/assets/style.data diff --git a/OCH/mogo-och-taxi-passenger/src/main/assets/style_extra.data b/OCH/taxi/mogo-och-taxi-passenger/src/main/assets/style_extra.data similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/assets/style_extra.data rename to OCH/taxi/mogo-och-taxi-passenger/src/main/assets/style_extra.data diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/IMogoOCH.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/IMogoOCH.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/IMogoOCH.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/IMogoOCH.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerAllStarWorld.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerAllStarWorld.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerAllStarWorld.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerAllStarWorld.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerBaseRespBean.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerBaseRespBean.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerBaseRespBean.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerBaseRespBean.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerCarHeartbeatReqBean.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerCarHeartbeatReqBean.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerCarHeartbeatReqBean.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerCarHeartbeatReqBean.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerCheckPhoneUpdateOrderReqBean.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerCheckPhoneUpdateOrderReqBean.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerCheckPhoneUpdateOrderReqBean.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerCheckPhoneUpdateOrderReqBean.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRemainingResp.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRemainingResp.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRemainingResp.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRemainingResp.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryReqBean.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryReqBean.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryReqBean.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryReqBean.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerQueryOrderRouteResp.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerQueryOrderRouteResp.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerQueryOrderRouteResp.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerQueryOrderRouteResp.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerScoreUpdateOrderReqBean.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerScoreUpdateOrderReqBean.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerScoreUpdateOrderReqBean.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerScoreUpdateOrderReqBean.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerStartReqBean.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerStartReqBean.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerStartReqBean.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerStartReqBean.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerVideoPlay.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerVideoPlay.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerVideoPlay.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerVideoPlay.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerNaviChangedCallback.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerNaviChangedCallback.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerNaviChangedCallback.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerNaviChangedCallback.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerCommonCallback.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerCommonCallback.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerCommonCallback.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerCommonCallback.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerCommonValueCallback.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerCommonValueCallback.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerCommonValueCallback.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerCommonValueCallback.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerMapViewCallback.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerMapViewCallback.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerMapViewCallback.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerMapViewCallback.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerVeloctityCallback.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerVeloctityCallback.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerVeloctityCallback.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerVeloctityCallback.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerOrderStatusEnum.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerOrderStatusEnum.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerOrderStatusEnum.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerOrderStatusEnum.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/event/FinishActivity.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/event/FinishActivity.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/event/FinishActivity.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/event/FinishActivity.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/provider/StatusViewManager.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/provider/StatusViewManager.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/provider/StatusViewManager.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/provider/StatusViewManager.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerTaxiView.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerTaxiView.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerTaxiView.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerTaxiView.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/AroundProviderImpl.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/AroundProviderImpl.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/AroundProviderImpl.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/AroundProviderImpl.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedViewModel.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamSurfaceView.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamSurfaceView.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamSurfaceView.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamSurfaceView.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/RightRearCamView.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomCheckView.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomCheckView.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomCheckView.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomCheckView.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/TaxiPassengerCheckView.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/TaxiPassengerCheckView.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/TaxiPassengerCheckView.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/check/TaxiPassengerCheckView.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugEvent.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugEvent.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugEvent.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugEvent.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotViewModel.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/StatusBarView.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/statusview/TaxiPBlueToothView.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FloatingDistanceInfoUtils.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FloatingDistanceInfoUtils.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FloatingDistanceInfoUtils.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FloatingDistanceInfoUtils.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FullVideoUtils.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FullVideoUtils.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FullVideoUtils.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FullVideoUtils.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerItemVideoHolder.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerItemVideoHolder.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerItemVideoHolder.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerItemVideoHolder.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/RecyclerVideoAdapter.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselLayoutManager.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselLayoutManager.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselLayoutManager.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselLayoutManager.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselZoomPostLayoutListener.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselZoomPostLayoutListener.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselZoomPostLayoutListener.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CarouselZoomPostLayoutListener.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CenterScrollListener.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CenterScrollListener.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CenterScrollListener.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/CenterScrollListener.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/ItemTransformation.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/ItemTransformation.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/ItemTransformation.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/layoutmanage/ItemTransformation.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/FixMemoryLeak.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/FixMemoryLeak.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/FixMemoryLeak.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/FixMemoryLeak.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/OrderUtil.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/OrderUtil.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/OrderUtil.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/OrderUtil.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/PermissionUtil.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/PermissionUtil.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/PermissionUtil.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/PermissionUtil.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerMapAssetStyleUtil.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerMapAssetStyleUtil.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerMapAssetStyleUtil.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerMapAssetStyleUtil.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/ZoomDrawable.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/ZoomDrawable.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/ZoomDrawable.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/ZoomDrawable.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/DiskLruCache.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/DiskLruCache.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/DiskLruCache.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/DiskLruCache.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/DiskLruCacheManager.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/DiskLruCacheManager.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/DiskLruCacheManager.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/DiskLruCacheManager.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/FastBlurUtil.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/FastBlurUtil.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/FastBlurUtil.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/FastBlurUtil.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/GlideBlurTransform.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/GlideBlurTransform.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/GlideBlurTransform.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/GlideBlurTransform.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/StrictLineReader.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/StrictLineReader.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/StrictLineReader.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/StrictLineReader.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/Util.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/Util.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/Util.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/blur/Util.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/windowdispatch/OnComputeInternalInsetsListener.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/windowdispatch/OnComputeInternalInsetsListener.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/windowdispatch/OnComputeInternalInsetsListener.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/windowdispatch/OnComputeInternalInsetsListener.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/windowdispatch/ReflectionUtils.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/windowdispatch/ReflectionUtils.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/windowdispatch/ReflectionUtils.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/windowdispatch/ReflectionUtils.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ResizeAnimation.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ResizeAnimation.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ResizeAnimation.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ResizeAnimation.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/WindowRelativeLayout.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/WindowRelativeLayout.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/WindowRelativeLayout.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/WindowRelativeLayout.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/animutils/AnimationsContainer.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/animutils/AnimationsContainer.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/animutils/AnimationsContainer.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/animutils/AnimationsContainer.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/IndicatorView.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/IndicatorView.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/IndicatorView.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/IndicatorView.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/annotation/AIndicatorOrientation.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/annotation/AIndicatorOrientation.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/annotation/AIndicatorOrientation.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/annotation/AIndicatorOrientation.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/annotation/AIndicatorSlideMode.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/annotation/AIndicatorSlideMode.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/annotation/AIndicatorSlideMode.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/annotation/AIndicatorSlideMode.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/annotation/AIndicatorStyle.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/annotation/AIndicatorStyle.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/annotation/AIndicatorStyle.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/annotation/AIndicatorStyle.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/base/BaseIndicatorView.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/base/BaseIndicatorView.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/base/BaseIndicatorView.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/base/BaseIndicatorView.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/base/IIndicator.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/base/IIndicator.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/base/IIndicator.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/base/IIndicator.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/BaseDrawer.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/BaseDrawer.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/BaseDrawer.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/BaseDrawer.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/CircleDrawer.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/CircleDrawer.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/CircleDrawer.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/CircleDrawer.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DashDrawer.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DashDrawer.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DashDrawer.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DashDrawer.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DrawerFactory.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DrawerFactory.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DrawerFactory.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DrawerFactory.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DrawerProxy.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DrawerProxy.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DrawerProxy.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/DrawerProxy.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/IDrawer.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/IDrawer.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/IDrawer.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/IDrawer.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RectDrawer.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RectDrawer.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RectDrawer.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RectDrawer.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RoundRectDrawer.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RoundRectDrawer.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RoundRectDrawer.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/drawer/RoundRectDrawer.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorOrientation.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorOrientation.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorOrientation.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorOrientation.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorSlideMode.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorSlideMode.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorSlideMode.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorSlideMode.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorStyle.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorStyle.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorStyle.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/enums/IndicatorStyle.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/utils/IndicatorUtils.kt b/OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/utils/IndicatorUtils.kt similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/utils/IndicatorUtils.kt rename to OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/utils/IndicatorUtils.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/anim/alpha_hide_show.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/anim/alpha_hide_show.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/anim/alpha_hide_show.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/anim/alpha_hide_show.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/anim/alpha_show_hide.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/anim/alpha_show_hide.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/anim/alpha_show_hide.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/anim/alpha_show_hide.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/anim/left_to_right.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/anim/left_to_right.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/anim/left_to_right.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/anim/left_to_right.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/anim/right_to_left.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/anim/right_to_left.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/anim/right_to_left.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/anim/right_to_left.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/animator/alpha_hide_hide_f.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/animator/alpha_hide_hide_f.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/animator/alpha_hide_hide_f.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/animator/alpha_hide_hide_f.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/animator/alpha_hide_show_f.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/animator/alpha_hide_show_f.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/animator/alpha_hide_show_f.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/animator/alpha_hide_show_f.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/color/taxi_autopilot_text_color_selector.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/color/taxi_autopilot_text_color_selector.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/color/taxi_autopilot_text_color_selector.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/color/taxi_autopilot_text_color_selector.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_order_process.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_order_process.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_order_process.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_order_process.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_progress_bar.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_progress_bar.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_progress_bar.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_progress_bar.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_arrived_info_floating.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_arrived_info_floating.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_arrived_info_floating.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_arrived_info_floating.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_checked_input_background.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_checked_input_background.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_checked_input_background.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_checked_input_background.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_video_index.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_video_index.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_video_index.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_video_index.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/img_taxi_operation_status_bg.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/img_taxi_operation_status_bg.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/img_taxi_operation_status_bg.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/img_taxi_operation_status_bg.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_base_icon_in_autopilot.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_base_icon_in_autopilot.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_base_icon_in_autopilot.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_base_icon_in_autopilot.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_base_notice_box_bg.9.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_base_notice_box_bg.9.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_base_notice_box_bg.9.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_base_notice_box_bg.9.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_disable.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_disable.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_disable.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_disable.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_failed.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_failed.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_failed.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_failed.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_loading.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_loading.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_loading.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_loading.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_success.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_success.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_success.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_ic_autopilot_success.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrive_end_panel_bg.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrive_end_panel_bg.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrive_end_panel_bg.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrive_end_panel_bg.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrived_end_light.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrived_end_light.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrived_end_light.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrived_end_light.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrived_glide.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrived_glide.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrived_glide.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrived_glide.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrow_nor.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrow_nor.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrow_nor.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_arrow_nor.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_auto_nor.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_auto_nor.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_auto_nor.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_auto_nor.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_open.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_open.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_open.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_open.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_bg.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_select_bg.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_select_bg.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_select_bg.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_bar_select_bg.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_overmap_normal.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_overmap_normal.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_overmap_normal.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_overmap_normal.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_overmap_press.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_overmap_press.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_overmap_press.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_overmap_press.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_precisionmap_normal.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_precisionmap_normal.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_precisionmap_normal.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_precisionmap_normal.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_precisionmap_press.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_precisionmap_press.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_precisionmap_press.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_precisionmap_press.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_video_normal.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_video_normal.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_video_normal.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_video_normal.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_video_press.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_video_press.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_video_press.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_bottom_video_press.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_change_full.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_change_full.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_change_full.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_change_full.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_change_normal.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_change_normal.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_change_normal.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_change_normal.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_dot_line.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_dot_line.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_dot_line.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_dot_line.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_front_left_door_bg.9.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_front_left_door_bg.9.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_front_left_door_bg.9.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_front_left_door_bg.9.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_front_right_door_bg.9.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_front_right_door_bg.9.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_front_right_door_bg.9.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_front_right_door_bg.9.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_ic_autopilot_loading.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_ic_autopilot_loading.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_ic_autopilot_loading.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_ic_autopilot_loading.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_itinerary_bg.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_itinerary_bg.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_itinerary_bg.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_itinerary_bg.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_light_green_nor.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_light_green_nor.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_light_green_nor.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_light_green_nor.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_light_red_nor.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_light_red_nor.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_light_red_nor.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_light_red_nor.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_lightyellow_nor.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_lightyellow_nor.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_lightyellow_nor.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_location_center.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_location_center.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_location_center.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_location_center.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_arrived.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_arrived.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_arrived.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_arrived.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_un_arrive.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_un_arrive.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_un_arrive.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow_un_arrive.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_car_light.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_end.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_end.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_end.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_end.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_start.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_start.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_start.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_start.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_consult_title_icon.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_consult_title_icon.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_consult_title_icon.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_consult_title_icon.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_logo.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_logo.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_logo.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_logo.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_movies_title_icon.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_movies_title_icon.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_movies_title_icon.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_movies_title_icon.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_video_play.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_video_play.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_video_play.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogo_video_play.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogologo_nor.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogologo_nor.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogologo_nor.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_mogologo_nor.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_panel_bottom_bg.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_panel_bottom_bg.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_panel_bottom_bg.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_panel_bottom_bg.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_arrived_close.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_arrived_close.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_arrived_close.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_arrived_close.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_end_boll.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_end_boll.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_end_boll.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_end_boll.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_input_bg.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_input_bg.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_input_bg.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_input_bg.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_logo.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_logo.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_logo.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_logo.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_panel_bg.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_panel_bg.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_panel_bg.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_panel_bg.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_robot.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_robot.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_robot.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_robot.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_start_boll.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_start_boll.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_start_boll.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_start_boll.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_start_end_line.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_start_end_line.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_start_end_line.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_start_end_line.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_star.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_star.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_star.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_star.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_star_check.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_star_check.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_star_check.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_star_check.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_start_panel_bg.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_start_panel_bg.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_start_panel_bg.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_start_panel_bg.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_pnc_bg.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_pnc_bg.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_pnc_bg.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_pnc_bg.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_rear_left_door_bg.9.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_rear_left_door_bg.9.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_rear_left_door_bg.9.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_rear_left_door_bg.9.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_rear_right_door_bg.9.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_rear_right_door_bg.9.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_rear_right_door_bg.9.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_rear_right_door_bg.9.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_right_rear_cam.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_right_rear_cam.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_right_rear_cam.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_right_rear_cam.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_roma_checked.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_roma_checked.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_roma_checked.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_roma_checked.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_roma_normal.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_roma_normal.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_roma_normal.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_roma_normal.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_seekbar_point_icon.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_seekbar_point_icon.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_seekbar_point_icon.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_seekbar_point_icon.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_setting_checked.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_setting_checked.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_setting_checked.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_setting_checked.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_setting_normal.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_setting_normal.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_setting_normal.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_setting_normal.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_speed_light_green_bg.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_speed_light_green_bg.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_speed_light_green_bg.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_speed_light_green_bg.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_speed_light_red_bg.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_speed_light_red_bg.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_speed_light_red_bg.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_speed_light_red_bg.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_status_bg.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_switch_map_long.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_switch_map_long.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_switch_map_long.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_switch_map_long.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_switch_map_medium.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_switch_map_medium.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_switch_map_medium.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_switch_map_medium.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_un_auto_nor.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_un_auto_nor.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_un_auto_nor.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_un_auto_nor.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_bottom.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_bottom.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_bottom.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_bottom.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_top.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_top.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_top.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_bg_top.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_holder.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_holder.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_holder.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_holder.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_light_bg.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_light_bg.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_light_bg.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_light_bg.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow11.9.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow11.9.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow11.9.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_video_shadow11.9.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_speed_bg.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_speed_bg.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_speed_bg.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_speed_bg.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_switch_map_bg.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_switch_map_bg.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_switch_map_bg.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_switch_map_bg.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/anmi_flow.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/anmi_flow.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/anmi_flow.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/anmi_flow.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_arrived_info.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_arrived_info.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_arrived_info.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_arrived_info.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_arrived_info_line.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_arrived_info_line.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_arrived_info_line.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_arrived_info_line.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_arrived_info_yello_v.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_arrived_info_yello_v.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_arrived_info_yello_v.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_arrived_info_yello_v.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_check_input_background.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_check_input_background.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_check_input_background.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_check_input_background.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_keyboard_background.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_keyboard_background.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_keyboard_background.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_keyboard_background.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_keyboard_submit_background.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_keyboard_submit_background.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_keyboard_submit_background.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_keyboard_submit_background.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_traffic_light_background.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_traffic_light_background.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_traffic_light_background.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_traffic_light_background.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_v2x_notification_view.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_v2x_notification_view.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_v2x_notification_view.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_v2x_notification_view.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_light_bg_shape.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_light_bg_shape.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_light_bg_shape.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_light_bg_shape.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/ic_baseline_arrow_left_24.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/ic_baseline_arrow_left_24.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/ic_baseline_arrow_left_24.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/ic_baseline_arrow_left_24.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/ic_baseline_arrow_right_24.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/ic_baseline_arrow_right_24.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/ic_baseline_arrow_right_24.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/ic_baseline_arrow_right_24.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00000.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00000.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00000.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00000.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00001.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00001.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00001.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00001.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00002.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00002.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00002.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00002.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00003.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00003.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00003.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00003.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00004.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00004.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00004.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00004.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00005.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00005.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00005.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00005.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00006.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00006.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00006.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00006.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00007.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00007.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00007.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00007.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00008.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00008.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00008.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00008.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00009.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00009.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00009.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00009.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00010.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00010.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00010.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00010.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00011.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00011.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00011.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00011.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00012.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00012.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00012.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00012.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00013.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00013.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00013.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00013.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00014.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00014.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00014.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00014.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00015.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00015.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00015.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00015.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00016.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00016.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00016.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00016.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00017.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00017.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00017.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00017.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00018.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00018.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00018.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00018.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00019.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00019.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00019.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00019.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00020.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00020.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00020.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00020.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00021.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00021.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00021.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00021.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00022.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00022.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00022.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00022.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00023.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00023.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00023.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00023.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00024.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00024.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00024.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00024.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00025.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00025.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00025.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00025.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00026.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00026.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00026.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00026.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00027.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00027.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00027.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00027.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00028.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00028.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00028.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00028.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00029.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00029.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00029.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00029.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00030.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00030.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00030.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00030.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00031.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00031.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00031.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00031.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00032.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00032.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00032.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00032.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00033.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00033.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00033.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00033.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00034.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00034.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/image_00034.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/image_00034.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/iv_light_increase_set.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/iv_light_increase_set.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/iv_light_increase_set.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/iv_light_increase_set.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/iv_light_set.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/iv_light_set.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/iv_light_set.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/iv_light_set.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/iv_voice_increase_set.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/iv_voice_increase_set.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/iv_voice_increase_set.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/iv_voice_increase_set.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/iv_voice_set.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/iv_voice_set.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/iv_voice_set.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/iv_voice_set.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00000.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00000.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00000.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00000.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00001.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00001.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00001.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00001.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00002.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00002.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00002.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00002.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00003.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00003.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00003.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00003.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00004.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00004.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00004.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00004.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00005.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00005.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00005.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00005.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00006.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00006.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00006.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00006.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00007.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00007.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00007.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00007.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00008.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00008.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00008.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00008.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00009.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00009.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00009.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00009.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00010.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00010.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00010.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00010.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00011.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00011.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00011.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00011.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00012.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00012.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00012.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00012.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00013.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00013.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/light_00013.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/light_00013.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/roma_taxi_p_bg_selector.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/roma_taxi_p_bg_selector.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/roma_taxi_p_bg_selector.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/roma_taxi_p_bg_selector.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/starting_anmi_flow.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/starting_anmi_flow.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/starting_anmi_flow.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/starting_anmi_flow.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0000.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0000.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0000.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0000.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0090.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0090.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0090.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/tail_ani_0090.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_bg_selector.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_bg_selector.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_bg_selector.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_bg_selector.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg_check.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg_check.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg_check.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg_check.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg_nor.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg_nor.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg_nor.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_autopilot_status_bg_nor.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_base_autopilot_status_icon_selector.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_base_autopilot_status_icon_selector.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_base_autopilot_status_icon_selector.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_base_autopilot_status_icon_selector.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_arrow_arrived.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_arrow_arrived.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_arrow_arrived.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_arrow_arrived.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_arrow_un_arrive.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_arrow_un_arrive.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_arrow_un_arrive.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_arrow_un_arrive.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_car.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_car.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_car.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_car.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_view_dir_end.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_view_dir_end.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_view_dir_end.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_view_dir_end.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_view_dir_start.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_view_dir_start.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_view_dir_start.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_map_view_dir_start.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_operation_status_bg.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_operation_status_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_operation_status_bg.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_operation_status_bg.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_blue_circle_bg.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_blue_circle_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_blue_circle_bg.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_blue_circle_bg.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_select.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_select.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_select.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_select.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_selected.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_selected.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_selected.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_selected.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_submit.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_submit.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_submit.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_comment_submit.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_function_voice_humb.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_function_voice_humb.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_function_voice_humb.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_function_voice_humb.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_function_voice_right_process_humb.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_function_voice_right_process_humb.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_function_voice_right_process_humb.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_function_voice_right_process_humb.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_light_bg.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_light_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_light_bg.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_light_bg.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_map_bottom_shape.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_map_bottom_shape.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_map_bottom_shape.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_map_bottom_shape.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_seekbar_calculator_layer.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_seekbar_calculator_layer.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_seekbar_calculator_layer.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_seekbar_calculator_layer.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_setting_selector.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_setting_selector.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_setting_selector.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_setting_selector.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_setting_view_bg.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_setting_view_bg.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_setting_view_bg.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_setting_view_bg.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_start_autopilot_bottom_bg.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_start_autopilot_bottom_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_start_autopilot_bottom_bg.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_start_autopilot_bottom_bg.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_start_autopilot_txt_btn_bg.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_start_autopilot_txt_btn_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_start_autopilot_txt_btn_bg.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_start_autopilot_txt_btn_bg.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xiaozhibelt_info.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xiaozhibelt_info.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xiaozhibelt_info.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xiaozhibelt_info.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xiaozhibelt_info_ball.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xiaozhibelt_info_ball.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xiaozhibelt_info_ball.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xiaozhibelt_info_ball.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xioazhi_normal.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xioazhi_normal.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xioazhi_normal.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_xioazhi_normal.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_yellow_circle_bg.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_yellow_circle_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_yellow_circle_bg.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_yellow_circle_bg.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_passenger_order_bg.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_passenger_order_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_passenger_order_bg.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_passenger_order_bg.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_speed_selector.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_speed_selector.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_speed_selector.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_speed_selector.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_order_process.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_order_process.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_order_process.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_order_process.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_000.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_000.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_000.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_000.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_001.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_001.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_001.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_001.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_002.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_002.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_002.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_002.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_003.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_003.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_003.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_003.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_004.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_004.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_004.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_004.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_005.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_005.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_005.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_005.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_006.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_006.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_006.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_006.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_007.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_007.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_007.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_007.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_008.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_008.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_008.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_008.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_009.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_009.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_009.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_009.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_010.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_010.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_010.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_010.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_011.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_011.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_011.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_011.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_012.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_012.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_012.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_012.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_013.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_013.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_013.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_013.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_014.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_014.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_014.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_014.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_015.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_015.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_015.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_015.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_016.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_016.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_016.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_016.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_017.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_017.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_017.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_017.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_018.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_018.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_018.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_018.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_019.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_019.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_019.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_019.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_020.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_020.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_020.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_020.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_021.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_021.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_021.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_021.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_022.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_022.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_022.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_022.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_023.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_023.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_023.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_023.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_024.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_024.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_024.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_024.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_025.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_025.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_025.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_025.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_026.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_026.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_026.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_026.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_027.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_027.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_027.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_027.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_028.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_028.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_028.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_028.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_029.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_029.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_029.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_029.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_030.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_030.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_030.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_030.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_031.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_031.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_031.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_031.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_032.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_032.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_032.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_032.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_033.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_033.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_033.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_033.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_034.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_034.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_034.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_034.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_035.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_035.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_035.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_035.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_036.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_036.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_036.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_036.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_037.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_037.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_037.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_037.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_038.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_038.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_038.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_038.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_039.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_039.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_039.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_039.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_040.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_040.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_040.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_040.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_041.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_041.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_041.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_041.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_042.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_042.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_042.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_042.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_043.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_043.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_043.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_043.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_044.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_044.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_044.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_044.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_045.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_045.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_045.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_045.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_046.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_046.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_046.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_046.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_047.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_047.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_047.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_047.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_048.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_048.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_048.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_048.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_049.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_049.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_049.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_049.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_050.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_050.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_050.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_050.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_051.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_051.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_051.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_051.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_052.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_052.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_052.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_052.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_053.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_053.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_053.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_053.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_054.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_054.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_054.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_054.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_055.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_055.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_055.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_055.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_056.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_056.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_056.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_056.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_057.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_057.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_057.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_057.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_058.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_058.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_058.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_058.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_059.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_059.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_059.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_belt_059.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_000.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_000.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_000.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_000.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_001.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_001.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_001.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_001.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_002.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_002.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_002.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_002.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_003.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_003.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_003.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_003.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_004.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_004.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_004.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_004.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_005.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_005.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_005.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_005.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_006.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_006.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_006.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_006.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_007.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_007.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_007.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_007.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_008.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_008.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_008.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_008.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_009.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_009.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_009.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_009.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_010.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_010.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_010.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_010.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_011.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_011.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_011.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_011.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_012.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_012.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_012.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_012.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_013.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_013.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_013.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_013.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_014.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_014.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_014.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_014.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_015.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_015.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_015.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_015.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_016.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_016.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_016.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_016.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_017.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_017.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_017.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_017.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_018.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_018.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_018.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_018.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_019.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_019.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_019.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_019.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_020.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_020.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_020.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_020.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_021.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_021.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_021.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_021.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_022.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_022.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_022.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_022.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_023.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_023.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_023.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_023.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_024.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_024.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_024.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_024.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_025.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_025.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_025.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_025.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_026.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_026.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_026.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_026.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_027.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_027.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_027.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_027.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_028.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_028.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_028.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_028.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_029.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_029.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_029.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_029.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_030.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_030.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_030.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_030.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_031.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_031.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_031.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_031.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_032.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_032.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_032.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_032.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_033.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_033.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_033.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_033.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_034.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_034.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_034.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_034.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_035.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_035.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_035.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_035.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_036.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_036.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_036.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_036.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_037.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_037.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_037.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_037.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_038.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_038.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_038.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_038.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_039.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_039.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_039.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_039.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_040.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_040.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_040.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_040.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_041.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_041.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_041.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_041.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_042.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_042.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_042.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_042.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_043.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_043.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_043.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_043.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_044.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_044.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_044.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_044.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_045.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_045.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_045.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_045.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_046.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_046.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_046.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_046.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_047.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_047.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_047.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_047.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_048.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_048.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_048.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_048.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_049.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_049.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_049.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_049.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_050.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_050.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_050.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_050.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_051.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_051.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_051.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_051.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_052.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_052.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_052.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_052.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_053.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_053.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_053.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_053.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_054.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_054.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_054.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_054.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_055.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_055.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_055.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_055.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_056.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_056.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_056.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_056.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_057.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_057.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_057.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_057.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_058.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_058.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_058.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_058.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_059.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_059.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_059.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_love_059.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal002.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal002.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal002.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal002.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal004.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal004.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal004.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal004.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal006.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal006.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal006.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal006.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal008.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal008.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal008.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal008.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal010.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal010.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal010.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal010.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal012.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal012.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal012.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal012.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal014.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal014.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal014.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal014.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal016.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal016.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal016.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal016.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal018.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal018.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal018.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal018.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal020.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal020.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal020.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal020.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal022.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal022.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal022.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal022.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal024.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal024.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal024.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal024.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal026.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal026.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal026.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal026.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal028.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal028.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal028.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal028.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal030.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal030.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal030.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal030.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal032.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal032.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal032.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal032.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal034.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal034.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal034.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal034.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal036.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal036.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal036.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal036.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal038.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal038.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal038.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal038.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal040.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal040.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal040.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal040.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal042.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal042.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal042.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal042.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal044.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal044.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal044.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal044.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal046.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal046.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal046.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal046.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal048.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal048.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal048.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal048.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal050.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal050.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal050.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal050.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal052.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal052.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal052.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal052.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal054.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal054.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal054.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal054.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal056.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal056.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal056.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal056.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal058.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal058.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal058.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal058.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal060.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal060.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal060.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal060.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal062.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal062.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal062.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal062.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal064.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal064.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal064.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal064.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal066.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal066.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal066.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal066.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal068.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal068.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal068.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal068.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal070.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal070.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal070.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal070.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal072.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal072.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal072.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal072.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal074.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal074.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal074.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal074.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal076.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal076.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal076.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal076.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal078.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal078.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal078.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal078.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal080.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal080.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal080.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal080.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal082.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal082.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal082.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal082.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal084.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal084.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal084.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal084.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal086.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal086.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal086.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal086.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal088.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal088.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal088.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal088.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal090.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal090.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal090.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal090.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal092.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal092.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal092.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal092.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal094.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal094.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal094.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal094.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal096.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal096.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal096.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal096.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal098.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal098.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal098.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal098.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal100.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal100.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal100.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal100.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal102.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal102.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal102.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal102.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal104.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal104.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal104.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal104.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal106.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal106.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal106.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal106.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal108.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal108.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal108.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal108.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal110.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal110.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal110.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal110.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal112.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal112.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal112.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal112.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal114.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal114.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal114.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal114.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal116.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal116.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal116.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal116.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal118.webp b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal118.webp similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal118.webp rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_normal118.webp diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_safety_belt.png b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_safety_belt.png similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_safety_belt.png rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable/xiaozhi_safety_belt.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/font/din.ttf b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/font/din.ttf similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/font/din.ttf rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/font/din.ttf diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_comment_item.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/list_comment_item.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/list_comment_item.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/list_comment_item.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_light.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_light.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_light.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_light.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/list_video_item_normal.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/m1_bottom_check.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/m1_bottom_check.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/m1_bottom_check.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/m1_bottom_check.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_blue_tooth.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_blue_tooth.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_blue_tooth.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_blue_tooth.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_debug.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_debug.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_debug.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_debug.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_map_view.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_map_view.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_map_view.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_map_view.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_movies.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_movies.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_movies.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_movies.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_video_layout.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_video_layout.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_video_layout.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_mogo_video_layout.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_navi_view.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_navi_view.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_navi_view.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_navi_view.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_overmap_fragment.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_overmap_fragment.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_overmap_fragment.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_overmap_fragment.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_right_rear_cam.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_right_rear_cam.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_right_rear_cam.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_right_rear_cam.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_setting_view.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_setting_view.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_setting_view.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_setting_view.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_statusview.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_statusview.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_statusview.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_statusview.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_traffic_light_view.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_traffic_light_view.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_traffic_light_view.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_traffic_light_view.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_v2x_notification_view.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_v2x_notification_view.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_v2x_notification_view.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_v2x_notification_view.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_distance_info.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_distance_info.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_distance_info.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_window_float_distance_info.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/raw/end_video.mp4 b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/raw/end_video.mp4 similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/raw/end_video.mp4 rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/raw/end_video.mp4 diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/raw/taxi_order.json b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/raw/taxi_order.json similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/raw/taxi_order.json rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/raw/taxi_order.json diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/raw/taxi_order_detail.json b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/raw/taxi_order_detail.json similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/raw/taxi_order_detail.json rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/raw/taxi_order_detail.json diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/raw/taxi_order_state_update.json b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/raw/taxi_order_state_update.json similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/raw/taxi_order_state_update.json rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/raw/taxi_order_state_update.json diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/arrays.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/values/arrays.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/values/arrays.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/values/arrays.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/attrs.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/values/attrs.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/values/attrs.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/values/attrs.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/values/colors.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/values/colors.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/values/dimens.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/values/dimens.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/ids.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/values/ids.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/values/ids.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/values/ids.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/values/strings.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml b/OCH/taxi/mogo-och-taxi-passenger/src/main/res/values/styles.xml similarity index 100% rename from OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml rename to OCH/taxi/mogo-och-taxi-passenger/src/main/res/values/styles.xml diff --git a/OCH/mogo-och-taxi-unmanned/.gitignore b/OCH/taxi/mogo-och-taxi-unmanned/.gitignore similarity index 100% rename from OCH/mogo-och-taxi-unmanned/.gitignore rename to OCH/taxi/mogo-och-taxi-unmanned/.gitignore diff --git a/OCH/mogo-och-taxi-unmanned/build.gradle b/OCH/taxi/mogo-och-taxi-unmanned/build.gradle similarity index 100% rename from OCH/mogo-och-taxi-unmanned/build.gradle rename to OCH/taxi/mogo-och-taxi-unmanned/build.gradle diff --git a/OCH/mogo-och-taxi-unmanned/consumer-rules.pro b/OCH/taxi/mogo-och-taxi-unmanned/consumer-rules.pro similarity index 100% rename from OCH/mogo-och-taxi-unmanned/consumer-rules.pro rename to OCH/taxi/mogo-och-taxi-unmanned/consumer-rules.pro diff --git a/OCH/mogo-och-taxi-unmanned/gradle.properties b/OCH/taxi/mogo-och-taxi-unmanned/gradle.properties similarity index 100% rename from OCH/mogo-och-taxi-unmanned/gradle.properties rename to OCH/taxi/mogo-och-taxi-unmanned/gradle.properties diff --git a/OCH/mogo-och-taxi-unmanned/proguard-rules.pro b/OCH/taxi/mogo-och-taxi-unmanned/proguard-rules.pro similarity index 100% rename from OCH/mogo-och-taxi-unmanned/proguard-rules.pro rename to OCH/taxi/mogo-och-taxi-unmanned/proguard-rules.pro diff --git a/OCH/mogo-och-taxi-unmanned/src/main/AndroidManifest.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/AndroidManifest.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/AndroidManifest.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/AndroidManifest.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/assets/map_style.data b/OCH/taxi/mogo-och-taxi-unmanned/src/main/assets/map_style.data similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/assets/map_style.data rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/assets/map_style.data diff --git a/OCH/mogo-och-taxi-unmanned/src/main/assets/map_style_extra.data b/OCH/taxi/mogo-och-taxi-unmanned/src/main/assets/map_style_extra.data similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/assets/map_style_extra.data rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/assets/map_style_extra.data diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/IMogoOCH.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/IMogoOCH.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/IMogoOCH.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/IMogoOCH.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/TaxiProvider.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/TaxiProvider.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/TaxiProvider.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/TaxiProvider.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/AvoidLeakDialog.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/AvoidLeakDialog.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/AvoidLeakDialog.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/AvoidLeakDialog.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/BaseTaxiTabFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/BaseTaxiTabFragment.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/BaseTaxiTabFragment.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/BaseTaxiTabFragment.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/BaseTaxiUIFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/BaseTaxiUIFragment.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/BaseTaxiUIFragment.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/BaseTaxiUIFragment.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/BaseUiFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/BaseUiFragment.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/BaseUiFragment.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/BaseUiFragment.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/BaseViewModel.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/BaseViewModel.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/BaseViewModel.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/BaseViewModel.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/MviInterface.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/MviInterface.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/MviInterface.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/base/MviInterface.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/CarHeartbeatReqBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/CarHeartbeatReqBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/CarHeartbeatReqBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/CarHeartbeatReqBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/DriverServiceDataRespBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/DriverServiceDataRespBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/DriverServiceDataRespBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/DriverServiceDataRespBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/DriverStatusUpdateReqBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/DriverStatusUpdateReqBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/DriverStatusUpdateReqBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/DriverStatusUpdateReqBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderCancelReqBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderCancelReqBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderCancelReqBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderCancelReqBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderDetail.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderDetail.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderDetail.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderDetail.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderGrabReqBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderGrabReqBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderGrabReqBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderGrabReqBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderGrabRespBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderGrabRespBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderGrabRespBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderGrabRespBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderGrabStatusQueryRespBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderGrabStatusQueryRespBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderGrabStatusQueryRespBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderGrabStatusQueryRespBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderQueryReqBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderQueryReqBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderQueryReqBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderQueryReqBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoReqBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoReqBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoReqBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoReqBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoRespBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoRespBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoRespBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoRespBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderRouteUpdateReqBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderRouteUpdateReqBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderRouteUpdateReqBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderRouteUpdateReqBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderStatusUpdateReqBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderStatusUpdateReqBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderStatusUpdateReqBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrderStatusUpdateReqBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrdersInServiceQueryRespBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrdersInServiceQueryRespBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrdersInServiceQueryRespBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrdersInServiceQueryRespBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrdersListQueryReqBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrdersListQueryReqBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrdersListQueryReqBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrdersListQueryReqBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrdersListQueryRespBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrdersListQueryRespBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrdersListQueryRespBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrdersListQueryRespBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrdersNewBookingQueryRespBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrdersNewBookingQueryRespBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrdersNewBookingQueryRespBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/OrdersNewBookingQueryRespBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/QueryOrderRouteResp.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/QueryOrderRouteResp.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/QueryOrderRouteResp.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/QueryOrderRouteResp.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/TaskDetail.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/TaskDetail.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/TaskDetail.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/TaskDetail.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/TaxiDataBaseRespBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/TaxiDataBaseRespBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/TaxiDataBaseRespBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/TaxiDataBaseRespBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/TaxiOrPassengerReadyReqBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/TaxiOrPassengerReadyReqBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/TaxiOrPassengerReadyReqBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/TaxiOrPassengerReadyReqBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UnmannedReqBean.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UnmannedReqBean.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UnmannedReqBean.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UnmannedReqBean.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UpdateOrderDisAndTimeReqBean.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UpdateOrderDisAndTimeReqBean.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UpdateOrderDisAndTimeReqBean.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UpdateOrderDisAndTimeReqBean.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiAutopilotPlanningCallback.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiAutopilotPlanningCallback.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiAutopilotPlanningCallback.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiAutopilotPlanningCallback.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiCarOperationalCallback.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiCarOperationalCallback.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiCarOperationalCallback.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiCarOperationalCallback.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiControllerStatusCallback.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiControllerStatusCallback.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiControllerStatusCallback.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiControllerStatusCallback.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiDriverRoleEnum.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiDriverRoleEnum.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiDriverRoleEnum.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiDriverRoleEnum.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiOpenOrderStatusEnum.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiOpenOrderStatusEnum.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiOpenOrderStatusEnum.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiOpenOrderStatusEnum.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiOrderCancelReasons.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiOrderCancelReasons.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiOrderCancelReasons.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiOrderCancelReasons.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiOrderStatusEnum.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiOrderStatusEnum.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiOrderStatusEnum.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiOrderStatusEnum.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiOrderTypeEnum.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiOrderTypeEnum.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiOrderTypeEnum.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiOrderTypeEnum.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxtServingStatusManager.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxtServingStatusManager.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxtServingStatusManager.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxtServingStatusManager.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java similarity index 98% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java index 1430748ea9..f6e02d78b4 100644 --- a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java @@ -50,7 +50,7 @@ public class TaxiModelLoopManager { .map((aLong -> aLong + 1)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(aLong -> TaxiModel.getInstance().queryInAndWaitOrders()); + .subscribe(aLong -> TaxiModel.INSTANCE.queryInAndWaitOrders()); } public void stopInAndWaitOrdersLoop() { diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/LoginBusImpl.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/LoginBusImpl.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/LoginBusImpl.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/LoginBusImpl.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/OchCommonServiceManager.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/OchCommonServiceManager.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/OchCommonServiceManager.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/OchCommonServiceManager.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/OchLoginServiceApi.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/OchLoginServiceApi.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/OchLoginServiceApi.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/OchLoginServiceApi.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/TaxiUnmannedServiceApi.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/TaxiUnmannedServiceApi.kt similarity index 96% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/TaxiUnmannedServiceApi.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/TaxiUnmannedServiceApi.kt index 60ff40aeef..63a0eaff6f 100644 --- a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/TaxiUnmannedServiceApi.kt +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/TaxiUnmannedServiceApi.kt @@ -32,7 +32,7 @@ interface TaxiUnmannedServiceApi { @Header("appId") appId: String?, @Header("ticket") ticket: String?, @Body data: DriverStatusUpdateReqBean? - ): Observable? + ): Observable /** * 暂停接单 @@ -45,7 +45,7 @@ interface TaxiUnmannedServiceApi { @Header("appId") appId: String?, @Header("ticket") ticket: String?, @Body data: DriverStatusUpdateReqBean? - ): Observable? + ): Observable //登陆成功后查询 开始接单/暂停接单的状态 diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/TaxiOperationalPresenter.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/TaxiOperationalPresenter.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/TaxiOperationalPresenter.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/TaxiOperationalPresenter.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java similarity index 98% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java index 0e178cbe45..f02486095c 100644 --- a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java @@ -174,6 +174,11 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS runOnUIThread( () -> mView.onNaviToEnd(isAmap,isShow)); } + @Override + public void onCurrentOrderDistToEndChanged(long meters, long timeInSecond) { + + } + @Override public void onVRModeChanged(boolean isVRMode) { runOnUIThread(() -> mView.switchVRFlatMode(isVRMode)); diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/ITaxiMapDirectionView.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/ITaxiMapDirectionView.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/ITaxiMapDirectionView.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/ITaxiMapDirectionView.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/ITaxiView.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/ITaxiView.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/ITaxiView.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/ITaxiView.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiAmapNaviFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiAmapNaviFragment.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiAmapNaviFragment.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiAmapNaviFragment.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt similarity index 99% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt index 2b94fed328..a1f846f550 100644 --- a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt @@ -94,7 +94,7 @@ public class TaxiFragment : BaseTaxiTabFragment(), serverOrdersFragmentWR = WeakReference(TaxiServerOrdersFragment.newInstance()) val transaction: FragmentTransaction = childFragmentManager.beginTransaction() //默认显示OCHTaxiServerOrdersFragment - transaction.add(R.id.fragment_container, serverOrdersFragmentWR!!.get()).show( + transaction.add(R.id.fragment_container, serverOrdersFragmentWR!!.get()!!).show( serverOrdersFragmentWR!!.get()!! ) transaction.commitAllowingStateLoss() diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiMapDirectionView.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiMapDirectionView.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiMapDirectionView.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiMapDirectionView.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiOperationDatasFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiOperationDatasFragment.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiOperationDatasFragment.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiOperationDatasFragment.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrderFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrderFragment.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrderFragment.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrderFragment.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiRottingNaviFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiRottingNaviFragment.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiRottingNaviFragment.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiRottingNaviFragment.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/unmanned/UnmannedIntent.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/unmanned/UnmannedIntent.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/unmanned/UnmannedIntent.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/unmanned/UnmannedIntent.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/unmanned/UnmannedState.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/unmanned/UnmannedState.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/unmanned/UnmannedState.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/unmanned/UnmannedState.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/DimenUtil.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/DimenUtil.kt similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/DimenUtil.kt rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/DimenUtil.kt diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/OrderUtil.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/OrderUtil.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/OrderUtil.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/OrderUtil.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/PermissionUtil.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/PermissionUtil.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/PermissionUtil.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/PermissionUtil.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TPRouteDataTestUtils.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TPRouteDataTestUtils.java similarity index 99% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TPRouteDataTestUtils.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TPRouteDataTestUtils.java index 5adc1a9531..9786aa8e0e 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TPRouteDataTestUtils.java +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TPRouteDataTestUtils.java @@ -38,7 +38,7 @@ public class TPRouteDataTestUtils { list.add(builder.build()); } // TaxiModel.getInstance().updateOrderRoute(list); - TaxiModel.getInstance().updateOrderRouteInfo(list); + TaxiModel.INSTANCE.updateOrderRouteInfo(list); } catch (JSONException e) { e.printStackTrace(); } diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TaxiMapAssetStyleUtil.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TaxiMapAssetStyleUtil.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TaxiMapAssetStyleUtil.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TaxiMapAssetStyleUtil.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/color/taxi_autopilot_text_color_selector.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/color/taxi_autopilot_text_color_selector.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/color/taxi_autopilot_text_color_selector.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/color/taxi_autopilot_text_color_selector.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/end_maker_icon.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/end_maker_icon.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/end_maker_icon.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/end_maker_icon.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/green_point.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/green_point.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/green_point.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/green_point.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_ai_normal_och.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_ai_normal_och.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_ai_normal_och.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_ai_normal_och.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_ai_select_och.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_ai_select_och.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_ai_select_och.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_ai_select_och.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_bad_case_normal_och.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_bad_case_normal_och.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_bad_case_normal_och.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_bad_case_normal_och.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_bad_case_select_och.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_bad_case_select_och.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_bad_case_select_och.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_bad_case_select_och.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_station_start_end.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_station_start_end.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_station_start_end.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/icon_station_start_end.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/img_taxi_operation_status_bg.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/img_taxi_operation_status_bg.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/img_taxi_operation_status_bg.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/img_taxi_operation_status_bg.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/no_order_data.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/no_order_data.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/no_order_data.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/no_order_data.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/order_drive_mode_bg.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/order_drive_mode_bg.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/order_drive_mode_bg.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/order_drive_mode_bg.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/start_maker_icon.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/start_maker_icon.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/start_maker_icon.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/start_maker_icon.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_autopilot_bg_selector.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_autopilot_bg_selector.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_autopilot_bg_selector.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_autopilot_bg_selector.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_autopilot_status_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_autopilot_status_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_autopilot_status_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_autopilot_status_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_back_btn.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_back_btn.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_back_btn.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_back_btn.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_base_icon_in_autopilot.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_base_icon_in_autopilot.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_base_icon_in_autopilot.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_base_icon_in_autopilot.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_base_notice_box_bg.9.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_base_notice_box_bg.9.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_base_notice_box_bg.9.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_base_notice_box_bg.9.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_base_slide_block.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_base_slide_block.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_base_slide_block.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_base_slide_block.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_close_navi_icon.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_close_navi_icon.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_close_navi_icon.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_close_navi_icon.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_dot_line.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_dot_line.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_dot_line.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_dot_line.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_big.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_big.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_big.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_big.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_small.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_small.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_small.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_small.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_green_big.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_green_big.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_green_big.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_green_big.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_green_small.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_green_small.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_green_small.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_green_small.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_grab_order_bt.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_grab_order_bt.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_grab_order_bt.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_grab_order_bt.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_image_circle_icon.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_image_circle_icon.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_image_circle_icon.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_image_circle_icon.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_operation_tab_line.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_operation_tab_line.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_operation_tab_line.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_operation_tab_line.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_tab_item_bg.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_tab_item_bg.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_tab_item_bg.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_tab_item_bg.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_grab_dot_line.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_grab_dot_line.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_grab_dot_line.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_grab_dot_line.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_grad_order_close_icon.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_grad_order_close_icon.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_grad_order_close_icon.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_grad_order_close_icon.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_disable.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_disable.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_disable.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_disable.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_failed.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_failed.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_failed.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_failed.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_loading.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_loading.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_loading.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_loading.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_success.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_success.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_success.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_ic_autopilot_success.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_icon_arrived_station.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_icon_arrived_station.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_icon_arrived_station.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_icon_arrived_station.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_icon_arriving_station.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_icon_arriving_station.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_icon_arriving_station.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_icon_arriving_station.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_light_green_nor.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_light_green_nor.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_light_green_nor.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_light_green_nor.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_light_red_nor.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_light_red_nor.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_light_red_nor.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_light_red_nor.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_lightyellow_nor.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_lightyellow_nor.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_lightyellow_nor.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_arrow_arrived.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_arrow_arrived.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_arrow_arrived.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_arrow_arrived.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_arrow_un_arrive.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_arrow_un_arrive.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_arrow_un_arrive.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_arrow_un_arrive.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_car.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_car.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_car.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_car.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_view_dir_end.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_view_dir_end.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_view_dir_end.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_view_dir_end.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_view_dir_start.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_view_dir_start.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_view_dir_start.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_map_view_dir_start.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_masking.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_masking.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_masking.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_masking.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_navi_arrow_icon.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_navi_arrow_icon.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_navi_arrow_icon.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_navi_arrow_icon.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_navi_direction_icon.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_navi_direction_icon.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_navi_direction_icon.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_navi_direction_icon.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_navi_icon.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_navi_icon.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_navi_icon.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_navi_icon.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_navi_line_icon.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_navi_line_icon.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_navi_line_icon.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_navi_line_icon.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_order_cancel_close.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_order_cancel_close.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_order_cancel_close.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_order_cancel_close.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_order_cancel_close1.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_order_cancel_close1.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_order_cancel_close1.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_order_cancel_close1.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_order_list_close_iv.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_order_list_close_iv.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_order_list_close_iv.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_order_list_close_iv.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_order_list_page.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_order_list_page.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_order_list_page.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_order_list_page.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_out_btn.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_out_btn.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_out_btn.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_out_btn.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_personal_btn.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_personal_btn.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_personal_btn.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_personal_btn.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_report_order_cancel_icon.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_report_order_cancel_icon.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_report_order_cancel_icon.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_report_order_cancel_icon.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_selected_btn.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_selected_btn.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_selected_btn.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_selected_btn.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_setting_btn_bg.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_setting_btn_bg.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_setting_btn_bg.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_setting_btn_bg.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_speed_bg.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_speed_bg.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_speed_bg.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_speed_bg.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_speed_selector.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_speed_selector.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_speed_selector.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_speed_selector.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_switch_map_long.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_switch_map_long.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_switch_map_long.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_switch_map_long.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_switch_map_medium.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_switch_map_medium.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_switch_map_medium.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_switch_map_medium.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_unselect_btn.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_unselect_btn.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_unselect_btn.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_unselect_btn.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/ai_collect_selector_och.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/ai_collect_selector_och.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/ai_collect_selector_och.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/ai_collect_selector_och.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00000.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00000.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00000.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00000.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00001.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00001.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00001.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00001.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00002.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00002.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00002.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00002.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00003.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00003.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00003.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00003.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00004.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00004.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00004.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00004.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00005.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00005.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00005.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00005.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00006.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00006.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00006.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00006.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00007.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00007.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00007.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00007.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00008.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00008.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00008.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00008.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00009.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00009.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00009.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00009.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00010.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00010.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00010.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00010.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00011.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00011.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00011.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00011.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00012.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00012.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00012.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00012.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00013.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00013.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00013.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00013.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00014.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00014.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00014.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00014.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00015.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00015.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00015.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00015.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00016.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00016.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00016.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00016.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00017.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00017.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00017.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00017.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00018.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00018.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00018.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00018.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00019.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00019.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00019.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00019.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00020.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00020.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00020.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00020.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00021.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00021.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00021.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00021.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00022.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00022.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00022.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00022.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00023.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00023.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00023.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00023.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00024.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00024.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00024.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00024.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00025.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00025.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00025.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00025.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00026.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00026.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00026.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00026.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00027.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00027.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00027.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00027.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00028.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00028.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00028.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00028.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00029.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00029.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00029.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00029.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00030.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00030.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00030.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00030.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00031.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00031.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00031.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00031.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00032.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00032.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00032.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00032.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00033.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00033.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00033.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00033.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00034.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00034.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00034.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00034.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00035.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00035.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00035.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00035.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00036.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00036.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00036.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00036.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00037.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00037.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00037.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00037.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00038.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00038.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00038.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00038.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00039.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00039.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00039.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00039.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00040.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00040.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00040.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00040.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00041.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00041.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00041.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00041.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00042.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00042.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00042.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00042.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00043.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00043.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00043.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00043.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00044.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00044.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00044.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00044.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00045.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00045.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00045.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00045.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00046.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00046.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00046.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00046.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00047.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00047.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00047.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00047.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00048.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00048.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00048.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00048.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00049.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00049.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00049.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00049.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00050.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00050.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00050.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00050.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00051.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00051.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00051.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00051.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00052.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00052.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00052.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00052.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00053.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00053.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00053.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00053.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00054.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00054.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00054.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00054.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00055.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00055.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00055.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00055.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00056.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00056.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00056.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00056.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00057.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00057.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00057.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00057.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00058.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00058.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00058.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00058.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00059.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00059.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00059.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_00059.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00000.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00000.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00000.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00000.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00001.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00001.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00001.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00001.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00002.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00002.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00002.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00002.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00003.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00003.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00003.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00003.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00004.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00004.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00004.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00004.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00005.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00005.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00005.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00005.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00006.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00006.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00006.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00006.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00007.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00007.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00007.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00007.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00008.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00008.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00008.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00008.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00009.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00009.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00009.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00009.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00010.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00010.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00010.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00010.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00011.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00011.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00011.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00011.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00012.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00012.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00012.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00012.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00013.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00013.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00013.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00013.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00014.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00014.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00014.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00014.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00015.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00015.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00015.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00015.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00016.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00016.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00016.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00016.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00017.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00017.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00017.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00017.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00018.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00018.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00018.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00018.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00019.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00019.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00019.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00019.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00020.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00020.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00020.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00020.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00021.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00021.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00021.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00021.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00022.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00022.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00022.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00022.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00023.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00023.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00023.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00023.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00024.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00024.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00024.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00024.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00025.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00025.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00025.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00025.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00026.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00026.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00026.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00026.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00027.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00027.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00027.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00027.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00028.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00028.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00028.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00028.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00029.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00029.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00029.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00029.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00030.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00030.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00030.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00030.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00031.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00031.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00031.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00031.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00032.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00032.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00032.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00032.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00033.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00033.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00033.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00033.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00034.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00034.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00034.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00034.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00035.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00035.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00035.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00035.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00036.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00036.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00036.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00036.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00037.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00037.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00037.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00037.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00038.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00038.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00038.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00038.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00039.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00039.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00039.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00039.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00040.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00040.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00040.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00040.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00041.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00041.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00041.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00041.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00042.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00042.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00042.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00042.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00043.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00043.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00043.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00043.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00044.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00044.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00044.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00044.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00045.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00045.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00045.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00045.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00046.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00046.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00046.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00046.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00047.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00047.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00047.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00047.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00048.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00048.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00048.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00048.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00049.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00049.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00049.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00049.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00050.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00050.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00050.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00050.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00051.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00051.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00051.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00051.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00052.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00052.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00052.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00052.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00053.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00053.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00053.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00053.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00054.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00054.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00054.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00054.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00055.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00055.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00055.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00055.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00056.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00056.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00056.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00056.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00057.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00057.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00057.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00057.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00058.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00058.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00058.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00058.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00059.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00059.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00059.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/anim_flow_man_co_00059.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/bad_case_selector_och.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/bad_case_selector_och.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/bad_case_selector_och.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/bad_case_selector_och.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/bg_taxi_traffic_light_background.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/bg_taxi_traffic_light_background.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/bg_taxi_traffic_light_background.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/bg_taxi_traffic_light_background.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/img_taxi_operation_status_bg.9.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/img_taxi_operation_status_bg.9.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/img_taxi_operation_status_bg.9.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/img_taxi_operation_status_bg.9.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_grab_order_bt.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_grab_order_bt.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_grab_order_bt.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_grab_order_bt.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_operation_back.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_operation_back.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_operation_back.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_operation_back.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_operation_out.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_operation_out.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_operation_out.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_operation_out.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_see_all_order.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_see_all_order.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_see_all_order.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_see_all_order.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_taxi_selected_btn.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_taxi_selected_btn.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_taxi_selected_btn.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_taxi_selected_btn.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_taxi_unselected_btn.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_taxi_unselected_btn.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_taxi_unselected_btn.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/shape_size_taxi_unselected_btn.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/task_click_btn_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/task_click_btn_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/task_click_btn_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/task_click_btn_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/task_order_type_btn_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/task_order_type_btn_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/task_order_type_btn_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/task_order_type_btn_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/task_unreal_type_btn_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/task_unreal_type_btn_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/task_unreal_type_btn_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/task_unreal_type_btn_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_autopilot_status_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_autopilot_status_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_autopilot_status_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_autopilot_status_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_autopilot_status_bg_check.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_autopilot_status_bg_check.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_autopilot_status_bg_check.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_autopilot_status_bg_check.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_autopilot_status_bg_nor.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_autopilot_status_bg_nor.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_autopilot_status_bg_nor.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_autopilot_status_bg_nor.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_base_autopilot_status_icon_selector.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_base_autopilot_status_icon_selector.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_base_autopilot_status_icon_selector.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_base_autopilot_status_icon_selector.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_cancel_button_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_cancel_button_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_cancel_button_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_cancel_button_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_checkbox_selector.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_checkbox_selector.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_checkbox_selector.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_checkbox_selector.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_grab_order_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_grab_order_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_grab_order_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_grab_order_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_grabing_order_btn_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_grabing_order_btn_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_grabing_order_btn_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_grabing_order_btn_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_line_bg1.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_line_bg1.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_line_bg1.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_line_bg1.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_line_bg2.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_line_bg2.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_line_bg2.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_line_bg2.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_arrow_arrived.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_arrow_arrived.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_arrow_arrived.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_arrow_arrived.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_arrow_un_arrive.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_arrow_un_arrive.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_arrow_un_arrive.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_arrow_un_arrive.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_car.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_car.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_car.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_car.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_view_dir_end.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_view_dir_end.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_view_dir_end.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_view_dir_end.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_view_dir_start.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_view_dir_start.png similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_view_dir_start.png rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_map_view_dir_start.png diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_operation_data_item_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_operation_data_item_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_operation_data_item_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_operation_data_item_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_operation_status_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_operation_status_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_operation_status_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_operation_status_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_operation_status_bg_selector.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_operation_status_bg_selector.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_operation_status_bg_selector.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_operation_status_bg_selector.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_operation_status_select_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_operation_status_select_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_operation_status_select_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_operation_status_select_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_button_status_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_button_status_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_button_status_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_button_status_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_button_status_canceled_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_button_status_canceled_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_button_status_canceled_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_button_status_canceled_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_button_type_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_button_type_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_button_type_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_button_type_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_button_type_reserver_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_button_type_reserver_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_button_type_reserver_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_button_type_reserver_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_cancel_dialog_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_cancel_dialog_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_cancel_dialog_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_cancel_dialog_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_viewpager_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_viewpager_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_viewpager_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_order_viewpager_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_panel_bkg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_panel_bkg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_panel_bkg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_panel_bkg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_panel_distance_bkg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_panel_distance_bkg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_panel_distance_bkg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_panel_distance_bkg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_setting_tip_red_cir_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_setting_tip_red_cir_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_setting_tip_red_cir_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_setting_tip_red_cir_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_show_orders_bg.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_show_orders_bg.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_show_orders_bg.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_show_orders_bg.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_speed_selector.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_speed_selector.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_speed_selector.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable/taxi_speed_selector.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_amap_navi_view.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_amap_navi_view.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_amap_navi_view.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_amap_navi_view.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_base_fragment.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_base_fragment.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_base_fragment.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_map_view.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_map_view.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_map_view.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_map_view.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_no_data_common_view.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_no_data_common_view.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_no_data_common_view.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_no_data_common_view.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_operation_data_item_view.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_operation_data_item_view.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_operation_data_item_view.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_operation_data_item_view.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_operation_data_view.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_operation_data_view.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_operation_data_view.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_operation_data_view.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_operation_tab_item_custom.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_operation_tab_item_custom.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_operation_tab_item_custom.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_operation_tab_item_custom.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_order_cancel_view.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_order_cancel_view.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_order_cancel_view.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_order_cancel_view.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_order_checkbox_item.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_order_checkbox_item.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_order_checkbox_item.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_order_checkbox_item.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_order_list_boot_no_data_view.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_order_list_boot_no_data_view.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_order_list_boot_no_data_view.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_order_list_boot_no_data_view.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_orders_list_day_item.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_orders_list_day_item.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_orders_list_day_item.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_orders_list_day_item.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_orders_list_item.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_orders_list_item.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_orders_list_item.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_orders_list_item.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_orders_list_view.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_orders_list_view.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_orders_list_view.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_orders_list_view.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_panel.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_panel.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_panel.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_panel.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_rotting_navi_view.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_rotting_navi_view.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_rotting_navi_view.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_rotting_navi_view.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_server_orders_panel.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_server_orders_panel.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_server_orders_panel.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_server_orders_panel.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_tab_item_custom.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_tab_item_custom.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_tab_item_custom.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_tab_item_custom.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_traffic_light_view.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_traffic_light_view.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/taxi_traffic_light_view.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_traffic_light_view.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/layout/unmanned_being_order.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/unmanned_being_order.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/layout/unmanned_being_order.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/unmanned_being_order.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/raw/end_marker.nt3d b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/raw/end_marker.nt3d similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/raw/end_marker.nt3d rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/raw/end_marker.nt3d diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/raw/star_marker.nt3d b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/raw/star_marker.nt3d similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/raw/star_marker.nt3d rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/raw/star_marker.nt3d diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/raw/taxi_order.json b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/raw/taxi_order.json similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/raw/taxi_order.json rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/raw/taxi_order.json diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/raw/taxi_order_detail.json b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/raw/taxi_order_detail.json similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/raw/taxi_order_detail.json rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/raw/taxi_order_detail.json diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/raw/taxi_order_state_update.json b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/raw/taxi_order_state_update.json similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/raw/taxi_order_state_update.json rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/raw/taxi_order_state_update.json diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/values/colors.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/values/colors.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/values/colors.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/values/colors.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/values/dimens.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/values/dimens.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/values/dimens.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/values/dimens.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/values/strings.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/values/strings.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/values/strings.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/values/styles.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/values/styles.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/values/styles.xml rename to OCH/taxi/mogo-och-taxi-unmanned/src/main/res/values/styles.xml diff --git a/OCH/mogo-och-taxi/.gitignore b/OCH/taxi/mogo-och-taxi/.gitignore similarity index 100% rename from OCH/mogo-och-taxi/.gitignore rename to OCH/taxi/mogo-och-taxi/.gitignore diff --git a/OCH/mogo-och-taxi/build.gradle b/OCH/taxi/mogo-och-taxi/build.gradle similarity index 100% rename from OCH/mogo-och-taxi/build.gradle rename to OCH/taxi/mogo-och-taxi/build.gradle diff --git a/OCH/mogo-och-taxi/consumer-rules.pro b/OCH/taxi/mogo-och-taxi/consumer-rules.pro similarity index 100% rename from OCH/mogo-och-taxi/consumer-rules.pro rename to OCH/taxi/mogo-och-taxi/consumer-rules.pro diff --git a/OCH/mogo-och-taxi/gradle.properties b/OCH/taxi/mogo-och-taxi/gradle.properties similarity index 100% rename from OCH/mogo-och-taxi/gradle.properties rename to OCH/taxi/mogo-och-taxi/gradle.properties diff --git a/OCH/mogo-och-taxi/proguard-rules.pro b/OCH/taxi/mogo-och-taxi/proguard-rules.pro similarity index 100% rename from OCH/mogo-och-taxi/proguard-rules.pro rename to OCH/taxi/mogo-och-taxi/proguard-rules.pro diff --git a/OCH/mogo-och-taxi/src/main/AndroidManifest.xml b/OCH/taxi/mogo-och-taxi/src/main/AndroidManifest.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/AndroidManifest.xml rename to OCH/taxi/mogo-och-taxi/src/main/AndroidManifest.xml diff --git a/OCH/mogo-och-taxi/src/main/assets/map_style.data b/OCH/taxi/mogo-och-taxi/src/main/assets/map_style.data similarity index 100% rename from OCH/mogo-och-taxi/src/main/assets/map_style.data rename to OCH/taxi/mogo-och-taxi/src/main/assets/map_style.data diff --git a/OCH/mogo-och-taxi/src/main/assets/map_style_extra.data b/OCH/taxi/mogo-och-taxi/src/main/assets/map_style_extra.data similarity index 100% rename from OCH/mogo-och-taxi/src/main/assets/map_style_extra.data rename to OCH/taxi/mogo-och-taxi/src/main/assets/map_style_extra.data diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/IMogoOCH.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/IMogoOCH.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/IMogoOCH.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/IMogoOCH.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/CarHeartbeatReqBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/CarHeartbeatReqBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/CarHeartbeatReqBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/CarHeartbeatReqBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/DriverServiceDataRespBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/DriverServiceDataRespBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/DriverServiceDataRespBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/DriverServiceDataRespBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/DriverStatusUpdateReqBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/DriverStatusUpdateReqBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/DriverStatusUpdateReqBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/DriverStatusUpdateReqBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderCancelReqBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderCancelReqBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderCancelReqBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderCancelReqBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderGrabReqBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderGrabReqBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderGrabReqBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderGrabReqBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderGrabRespBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderGrabRespBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderGrabRespBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderGrabRespBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderGrabStatusQueryRespBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderGrabStatusQueryRespBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderGrabStatusQueryRespBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderGrabStatusQueryRespBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryReqBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryReqBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryReqBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryReqBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoReqBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoReqBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoReqBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoReqBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoRespBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoRespBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoRespBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRouteInfoRespBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderRouteUpdateReqBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderRouteUpdateReqBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderRouteUpdateReqBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderRouteUpdateReqBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderStatusUpdateReqBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderStatusUpdateReqBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderStatusUpdateReqBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderStatusUpdateReqBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrdersInServiceQueryRespBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrdersInServiceQueryRespBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrdersInServiceQueryRespBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrdersInServiceQueryRespBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrdersListQueryReqBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrdersListQueryReqBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrdersListQueryReqBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrdersListQueryReqBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrdersListQueryRespBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrdersListQueryRespBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrdersListQueryRespBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrdersListQueryRespBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrdersNewBookingQueryRespBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrdersNewBookingQueryRespBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrdersNewBookingQueryRespBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrdersNewBookingQueryRespBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/QueryOrderRouteResp.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/QueryOrderRouteResp.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/QueryOrderRouteResp.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/QueryOrderRouteResp.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/TaxiDataBaseRespBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/TaxiDataBaseRespBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/TaxiDataBaseRespBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/TaxiDataBaseRespBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/TaxiOrPassengerReadyReqBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/TaxiOrPassengerReadyReqBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/TaxiOrPassengerReadyReqBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/TaxiOrPassengerReadyReqBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/UpdateOrderDisAndTimeReqBean.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/UpdateOrderDisAndTimeReqBean.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/UpdateOrderDisAndTimeReqBean.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/UpdateOrderDisAndTimeReqBean.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiAutopilotPlanningCallback.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiAutopilotPlanningCallback.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiAutopilotPlanningCallback.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/IOCHTaxiAutopilotPlanningCallback.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiCarOperationalCallback.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiCarOperationalCallback.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiCarOperationalCallback.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiCarOperationalCallback.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiControllerStatusCallback.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiControllerStatusCallback.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiControllerStatusCallback.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiControllerStatusCallback.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiDriverRoleEnum.kt b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiDriverRoleEnum.kt similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiDriverRoleEnum.kt rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiDriverRoleEnum.kt diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOpenOrderStatusEnum.kt b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOpenOrderStatusEnum.kt similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOpenOrderStatusEnum.kt rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOpenOrderStatusEnum.kt diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderCancelReasons.kt b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderCancelReasons.kt similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderCancelReasons.kt rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderCancelReasons.kt diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderStatusEnum.kt b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderStatusEnum.kt similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderStatusEnum.kt rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderStatusEnum.kt diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderTypeEnum.kt b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderTypeEnum.kt similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderTypeEnum.kt rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiOrderTypeEnum.kt diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxtServingStatusManager.kt b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxtServingStatusManager.kt similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxtServingStatusManager.kt rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxtServingStatusManager.kt diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/LoginBusImpl.kt b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/LoginBusImpl.kt similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/LoginBusImpl.kt rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/LoginBusImpl.kt diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OchCommonServiceManager.kt b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OchCommonServiceManager.kt similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OchCommonServiceManager.kt rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OchCommonServiceManager.kt diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OchLoginServiceApi.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OchLoginServiceApi.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OchLoginServiceApi.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OchLoginServiceApi.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceApiNew.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceApiNew.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceApiNew.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceApiNew.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiOperationalPresenter.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiOperationalPresenter.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiOperationalPresenter.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiOperationalPresenter.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiUIFragment.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiUIFragment.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiUIFragment.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiUIFragment.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/ITaxiMapDirectionView.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/ITaxiMapDirectionView.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/ITaxiMapDirectionView.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/ITaxiMapDirectionView.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/ITaxiView.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/ITaxiView.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/ITaxiView.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/ITaxiView.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiAmapNaviFragment.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiAmapNaviFragment.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiAmapNaviFragment.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiAmapNaviFragment.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiGrabOrderFragment.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiGrabOrderFragment.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiGrabOrderFragment.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiGrabOrderFragment.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiMapDirectionView.kt b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiMapDirectionView.kt similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiMapDirectionView.kt rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiMapDirectionView.kt diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOperationDatasFragment.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOperationDatasFragment.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOperationDatasFragment.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOperationDatasFragment.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrdersFragment.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrdersFragment.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrdersFragment.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrdersFragment.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiRottingNaviFragment.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiRottingNaviFragment.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiRottingNaviFragment.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiRottingNaviFragment.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/base/AvoidLeakDialog.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/base/AvoidLeakDialog.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/base/AvoidLeakDialog.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/base/AvoidLeakDialog.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/DimenUtil.kt b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/DimenUtil.kt similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/DimenUtil.kt rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/DimenUtil.kt diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/OrderUtil.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/OrderUtil.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/OrderUtil.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/OrderUtil.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/PermissionUtil.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/PermissionUtil.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/PermissionUtil.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/PermissionUtil.java diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TPRouteDataTestUtils.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TPRouteDataTestUtils.java similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TPRouteDataTestUtils.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TPRouteDataTestUtils.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiMapAssetStyleUtil.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiMapAssetStyleUtil.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiMapAssetStyleUtil.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiMapAssetStyleUtil.java diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java similarity index 100% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java rename to OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java diff --git a/OCH/mogo-och-taxi/src/main/res/color/taxi_autopilot_text_color_selector.xml b/OCH/taxi/mogo-och-taxi/src/main/res/color/taxi_autopilot_text_color_selector.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/color/taxi_autopilot_text_color_selector.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/color/taxi_autopilot_text_color_selector.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/end_maker_icon.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/end_maker_icon.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/end_maker_icon.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/end_maker_icon.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00001.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00001.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00001.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00001.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00002.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00002.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00002.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00002.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00003.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00003.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00003.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00003.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00004.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00004.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00004.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00004.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00005.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00005.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00005.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00005.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00006.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00006.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00006.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00006.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00007.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00007.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00007.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00007.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00008.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00008.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00008.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00008.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00009.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00009.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00009.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00009.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00010.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00010.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00010.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00010.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00011.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00011.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00011.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00011.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00012.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00012.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00012.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00012.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00013.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00013.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00013.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00013.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00014.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00014.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00014.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00014.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00015.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00015.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00015.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00015.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00016.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00016.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00016.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00016.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00017.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00017.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00017.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00017.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00018.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00018.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00018.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00018.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00019.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00019.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00019.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00019.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00020.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00020.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00020.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00020.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00021.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00021.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00021.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00021.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00022.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00022.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00022.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00022.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00023.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00023.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00023.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00023.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00024.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00024.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00024.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00024.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00025.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00025.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00025.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00025.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00026.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00026.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00026.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00026.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00027.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00027.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00027.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00027.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00028.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00028.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00028.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00028.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00029.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00029.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00029.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00029.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00030.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00030.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00030.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00030.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00031.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00031.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00031.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00031.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00032.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00032.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00032.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00032.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00033.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00033.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00033.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00033.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00034.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00034.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00034.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00034.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00035.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00035.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00035.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00035.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00036.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00036.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00036.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00036.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00037.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00037.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00037.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00037.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00038.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00038.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00038.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00038.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00039.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00039.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00039.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00039.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00040.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00040.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00040.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00040.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00041.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00041.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00041.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00041.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00042.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00042.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00042.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00042.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00043.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00043.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00043.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00043.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00044.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00044.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00044.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00044.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00045.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00045.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00045.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/heart_00045.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_normal_och.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_normal_och.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_normal_och.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_normal_och.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_select_och.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_select_och.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_select_och.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_select_och.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_normal_och.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_normal_och.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_normal_och.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_normal_och.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_select_och.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_select_och.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_select_och.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_select_och.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_station_start_end.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_station_start_end.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_station_start_end.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_station_start_end.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/img_taxi_operation_status_bg.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/img_taxi_operation_status_bg.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/img_taxi_operation_status_bg.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/img_taxi_operation_status_bg.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/no_order_data.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/no_order_data.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/no_order_data.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/no_order_data.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/order_drive_mode_bg.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/order_drive_mode_bg.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/order_drive_mode_bg.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/order_drive_mode_bg.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/start_maker_icon.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/start_maker_icon.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/start_maker_icon.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/start_maker_icon.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00001.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00001.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00001.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00001.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00002.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00002.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00002.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00002.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00003.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00003.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00003.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00003.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00004.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00004.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00004.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00004.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00005.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00005.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00005.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00005.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00006.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00006.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00006.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00006.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00007.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00007.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00007.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00007.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00008.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00008.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00008.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00008.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00009.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00009.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00009.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00009.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00010.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00010.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00010.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00010.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00011.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00011.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00011.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00011.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00012.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00012.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00012.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00012.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00013.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00013.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00013.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00013.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00014.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00014.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00014.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00014.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00015.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00015.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00015.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00015.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00016.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00016.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00016.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00016.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00017.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00017.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00017.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00017.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00018.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00018.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00018.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00018.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00019.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00019.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00019.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00019.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00020.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00020.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00020.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00020.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00021.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00021.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00021.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00021.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00022.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00022.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00022.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00022.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00023.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00023.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00023.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00023.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00024.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00024.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00024.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00024.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00025.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00025.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00025.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00025.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00026.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00026.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00026.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00026.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00027.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00027.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00027.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00027.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00028.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00028.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00028.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00028.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00029.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00029.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00029.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00029.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00030.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00030.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00030.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00030.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00031.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00031.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00031.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00031.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00032.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00032.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00032.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00032.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00033.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00033.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00033.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00033.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00034.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00034.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00034.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00034.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00035.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00035.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00035.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00035.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00036.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00036.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00036.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00036.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00037.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00037.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00037.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00037.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00038.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00038.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00038.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00038.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00039.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00039.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00039.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00039.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00040.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00040.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00040.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00040.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00041.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00041.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00041.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00041.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00042.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00042.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00042.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00042.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00043.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00043.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00043.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00043.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00044.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00044.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00044.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00044.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00045.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00045.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00045.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/success_00045.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_autopilot_bg_selector.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_autopilot_bg_selector.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_autopilot_bg_selector.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_autopilot_bg_selector.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_autopilot_status_bg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_autopilot_status_bg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_autopilot_status_bg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_autopilot_status_bg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_back_btn.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_back_btn.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_back_btn.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_back_btn.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_base_icon_in_autopilot.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_base_icon_in_autopilot.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_base_icon_in_autopilot.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_base_icon_in_autopilot.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_base_icon_not_in_autopilot.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_base_notice_box_bg.9.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_base_notice_box_bg.9.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_base_notice_box_bg.9.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_base_notice_box_bg.9.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_base_slide_block.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_base_slide_block.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_base_slide_block.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_base_slide_block.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_close_navi_icon.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_close_navi_icon.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_close_navi_icon.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_close_navi_icon.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_dot_line.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_dot_line.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_dot_line.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_dot_line.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_big.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_big.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_big.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_big.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_small.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_small.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_small.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_small.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_circle_green_big.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_circle_green_big.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_circle_green_big.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_circle_green_big.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_circle_green_small.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_circle_green_small.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_circle_green_small.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_circle_green_small.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_grab_order_bt.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_grab_order_bt.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_grab_order_bt.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_grab_order_bt.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_image_circle_icon.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_image_circle_icon.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_image_circle_icon.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_image_circle_icon.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_operation_tab_line.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_operation_tab_line.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_operation_tab_line.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_operation_tab_line.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_tab_item_bg.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_tab_item_bg.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_tab_item_bg.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_driver_tab_item_bg.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_grab_dot_line.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_grab_dot_line.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_grab_dot_line.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_grab_dot_line.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_grad_order_close_icon.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_grad_order_close_icon.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_grad_order_close_icon.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_grad_order_close_icon.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_disable.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_disable.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_disable.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_disable.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_failed.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_failed.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_failed.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_failed.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_loading.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_loading.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_loading.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_loading.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_success.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_success.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_success.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_ic_autopilot_success.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_icon_arrived_station.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_icon_arrived_station.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_icon_arrived_station.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_icon_arrived_station.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_icon_arriving_station.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_icon_arriving_station.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_icon_arriving_station.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_icon_arriving_station.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_light_green_nor.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_light_green_nor.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_light_green_nor.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_light_green_nor.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_light_red_nor.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_light_red_nor.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_light_red_nor.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_light_red_nor.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_lightyellow_nor.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_lightyellow_nor.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_lightyellow_nor.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_arrow_arrived.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_arrow_arrived.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_arrow_arrived.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_arrow_arrived.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_arrow_un_arrive.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_arrow_un_arrive.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_arrow_un_arrive.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_arrow_un_arrive.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_car.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_car.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_car.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_car.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_view_dir_end.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_view_dir_end.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_view_dir_end.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_view_dir_end.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_view_dir_start.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_view_dir_start.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_view_dir_start.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_map_view_dir_start.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_masking.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_masking.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_masking.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_masking.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_navi_arrow_icon.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_navi_arrow_icon.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_navi_arrow_icon.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_navi_arrow_icon.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_navi_direction_icon.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_navi_direction_icon.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_navi_direction_icon.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_navi_direction_icon.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_navi_icon.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_navi_icon.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_navi_icon.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_navi_icon.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_navi_line_icon.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_navi_line_icon.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_navi_line_icon.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_navi_line_icon.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_order_cancel_close.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_order_cancel_close.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_order_cancel_close.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_order_cancel_close.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_order_cancel_close1.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_order_cancel_close1.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_order_cancel_close1.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_order_cancel_close1.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_order_list_close_iv.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_order_list_close_iv.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_order_list_close_iv.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_order_list_close_iv.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_order_list_page.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_order_list_page.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_order_list_page.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_order_list_page.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_out_btn.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_out_btn.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_out_btn.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_out_btn.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_personal_btn.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_personal_btn.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_personal_btn.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_personal_btn.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_report_order_cancel_icon.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_report_order_cancel_icon.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_report_order_cancel_icon.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_report_order_cancel_icon.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_selected_btn.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_selected_btn.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_selected_btn.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_selected_btn.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_setting_btn_bg.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_setting_btn_bg.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_setting_btn_bg.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_setting_btn_bg.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_speed_bg.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_speed_bg.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_speed_bg.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_speed_bg.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_speed_selector.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_speed_selector.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_speed_selector.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_speed_selector.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_switch_map_long.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_switch_map_long.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_switch_map_long.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_switch_map_long.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_switch_map_medium.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_switch_map_medium.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_switch_map_medium.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_switch_map_medium.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_unselect_btn.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_unselect_btn.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_unselect_btn.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_unselect_btn.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector_och.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/ai_collect_selector_och.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector_och.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/ai_collect_selector_och.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00000.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00000.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00000.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00000.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00001.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00001.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00001.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00001.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00002.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00002.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00002.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00002.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00003.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00003.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00003.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00003.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00004.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00004.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00004.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00004.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00005.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00005.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00005.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00005.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00006.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00006.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00006.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00006.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00007.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00007.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00007.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00007.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00008.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00008.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00008.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00008.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00009.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00009.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00009.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00009.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00010.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00010.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00010.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00010.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00011.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00011.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00011.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00011.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00012.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00012.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00012.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00012.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00013.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00013.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00013.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00013.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00014.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00014.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00014.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00014.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00015.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00015.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00015.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00015.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00016.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00016.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00016.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00016.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00017.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00017.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00017.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00017.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00018.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00018.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00018.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00018.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00019.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00019.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00019.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00019.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00020.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00020.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00020.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00020.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00021.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00021.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00021.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00021.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00022.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00022.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00022.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00022.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00023.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00023.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00023.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00023.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00024.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00024.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00024.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00024.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00025.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00025.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00025.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00025.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00026.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00026.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00026.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00026.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00027.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00027.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00027.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00027.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00028.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00028.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00028.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00028.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00029.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00029.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00029.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00029.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00030.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00030.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00030.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00030.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00031.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00031.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00031.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00031.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00032.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00032.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00032.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00032.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00033.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00033.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00033.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00033.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00034.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00034.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00034.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00034.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00035.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00035.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00035.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00035.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00036.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00036.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00036.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00036.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00037.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00037.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00037.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00037.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00038.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00038.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00038.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00038.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00039.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00039.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00039.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00039.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00040.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00040.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00040.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00040.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00041.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00041.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00041.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00041.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00042.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00042.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00042.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00042.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00043.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00043.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00043.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00043.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00044.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00044.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00044.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00044.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00045.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00045.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00045.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00045.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00046.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00046.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00046.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00046.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00047.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00047.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00047.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00047.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00048.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00048.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00048.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00048.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00049.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00049.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00049.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00049.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00050.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00050.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00050.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00050.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00051.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00051.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00051.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00051.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00052.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00052.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00052.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00052.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00053.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00053.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00053.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00053.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00054.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00054.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00054.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00054.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00055.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00055.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00055.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00055.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00056.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00056.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00056.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00056.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00057.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00057.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00057.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00057.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00058.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00058.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00058.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00058.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00059.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00059.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_00059.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_00059.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00000.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00000.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00000.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00000.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00001.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00001.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00001.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00001.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00002.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00002.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00002.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00002.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00003.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00003.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00003.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00003.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00004.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00004.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00004.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00004.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00005.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00005.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00005.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00005.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00006.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00006.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00006.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00006.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00007.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00007.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00007.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00007.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00008.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00008.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00008.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00008.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00009.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00009.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00009.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00009.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00010.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00010.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00010.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00010.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00011.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00011.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00011.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00011.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00012.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00012.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00012.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00012.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00013.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00013.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00013.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00013.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00014.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00014.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00014.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00014.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00015.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00015.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00015.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00015.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00016.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00016.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00016.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00016.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00017.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00017.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00017.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00017.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00018.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00018.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00018.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00018.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00019.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00019.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00019.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00019.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00020.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00020.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00020.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00020.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00021.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00021.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00021.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00021.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00022.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00022.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00022.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00022.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00023.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00023.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00023.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00023.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00024.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00024.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00024.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00024.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00025.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00025.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00025.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00025.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00026.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00026.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00026.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00026.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00027.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00027.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00027.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00027.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00028.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00028.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00028.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00028.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00029.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00029.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00029.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00029.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00030.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00030.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00030.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00030.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00031.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00031.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00031.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00031.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00032.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00032.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00032.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00032.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00033.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00033.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00033.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00033.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00034.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00034.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00034.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00034.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00035.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00035.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00035.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00035.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00036.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00036.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00036.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00036.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00037.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00037.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00037.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00037.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00038.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00038.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00038.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00038.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00039.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00039.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00039.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00039.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00040.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00040.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00040.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00040.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00041.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00041.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00041.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00041.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00042.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00042.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00042.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00042.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00043.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00043.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00043.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00043.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00044.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00044.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00044.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00044.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00045.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00045.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00045.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00045.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00046.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00046.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00046.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00046.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00047.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00047.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00047.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00047.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00048.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00048.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00048.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00048.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00049.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00049.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00049.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00049.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00050.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00050.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00050.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00050.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00051.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00051.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00051.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00051.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00052.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00052.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00052.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00052.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00053.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00053.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00053.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00053.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00054.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00054.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00054.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00054.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00055.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00055.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00055.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00055.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00056.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00056.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00056.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00056.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00057.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00057.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00057.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00057.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00058.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00058.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00058.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00058.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00059.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00059.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00059.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/anim_flow_man_co_00059.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector_och.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/bad_case_selector_och.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector_och.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/bad_case_selector_och.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/bg_taxi_traffic_light_background.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/bg_taxi_traffic_light_background.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/bg_taxi_traffic_light_background.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/bg_taxi_traffic_light_background.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/grab_failure_anmi_flow.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/grab_failure_anmi_flow.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/grab_failure_anmi_flow.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/grab_failure_anmi_flow.xml diff --git a/OCH/mogo-och-taxi-unmanned/src/main/res/drawable/grab_success_anmi_flow.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/grab_success_anmi_flow.xml similarity index 100% rename from OCH/mogo-och-taxi-unmanned/src/main/res/drawable/grab_success_anmi_flow.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/grab_success_anmi_flow.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/img_taxi_operation_status_bg.9.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/img_taxi_operation_status_bg.9.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/img_taxi_operation_status_bg.9.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/img_taxi_operation_status_bg.9.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_grab_order_bt.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/shape_size_grab_order_bt.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/shape_size_grab_order_bt.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/shape_size_grab_order_bt.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_operation_back.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/shape_size_operation_back.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/shape_size_operation_back.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/shape_size_operation_back.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_operation_out.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/shape_size_operation_out.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/shape_size_operation_out.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/shape_size_operation_out.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_see_all_order.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/shape_size_see_all_order.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/shape_size_see_all_order.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/shape_size_see_all_order.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_taxi_selected_btn.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/shape_size_taxi_selected_btn.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/shape_size_taxi_selected_btn.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/shape_size_taxi_selected_btn.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/shape_size_taxi_unselected_btn.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/shape_size_taxi_unselected_btn.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/shape_size_taxi_unselected_btn.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/shape_size_taxi_unselected_btn.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_status_bg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_status_bg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_status_bg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_status_bg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_status_bg_check.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_status_bg_check.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_status_bg_check.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_status_bg_check.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_status_bg_nor.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_status_bg_nor.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_status_bg_nor.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_autopilot_status_bg_nor.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_base_autopilot_status_icon_selector.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_base_autopilot_status_icon_selector.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_base_autopilot_status_icon_selector.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_base_autopilot_status_icon_selector.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_cancel_button_bg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_cancel_button_bg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_cancel_button_bg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_cancel_button_bg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_checkbox_selector.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_checkbox_selector.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_checkbox_selector.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_checkbox_selector.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_grab_order_bg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_grab_order_bg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_grab_order_bg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_grab_order_bg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_grabing_order_btn_bg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_grabing_order_btn_bg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_grabing_order_btn_bg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_grabing_order_btn_bg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_line_bg1.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_line_bg1.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_line_bg1.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_line_bg1.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_line_bg2.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_line_bg2.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_line_bg2.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_line_bg2.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_map_arrow_arrived.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_map_arrow_arrived.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_map_arrow_arrived.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_map_arrow_arrived.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_map_arrow_un_arrive.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_map_arrow_un_arrive.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_map_arrow_un_arrive.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_map_arrow_un_arrive.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_map_car.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_map_car.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_map_car.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_map_car.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_map_view_dir_end.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_map_view_dir_end.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_map_view_dir_end.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_map_view_dir_end.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_map_view_dir_start.png b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_map_view_dir_start.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_map_view_dir_start.png rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_map_view_dir_start.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_operation_data_item_bg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_operation_data_item_bg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_operation_data_item_bg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_operation_data_item_bg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_operation_status_bg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_operation_status_bg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_operation_status_bg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_operation_status_bg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_operation_status_bg_selector.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_operation_status_bg_selector.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_operation_status_bg_selector.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_operation_status_bg_selector.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_operation_status_select_bg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_operation_status_select_bg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_operation_status_select_bg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_operation_status_select_bg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_bg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_order_bg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_bg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_order_bg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_status_bg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_order_button_status_bg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_status_bg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_order_button_status_bg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_status_canceled_bg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_order_button_status_canceled_bg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_status_canceled_bg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_order_button_status_canceled_bg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_type_bg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_order_button_type_bg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_type_bg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_order_button_type_bg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_type_reserver_bg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_order_button_type_reserver_bg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_button_type_reserver_bg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_order_button_type_reserver_bg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_cancel_dialog_bg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_order_cancel_dialog_bg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_cancel_dialog_bg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_order_cancel_dialog_bg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_viewpager_bg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_order_viewpager_bg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_order_viewpager_bg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_order_viewpager_bg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_panel_bkg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_panel_bkg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_panel_bkg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_panel_bkg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_panel_distance_bkg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_panel_distance_bkg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_panel_distance_bkg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_panel_distance_bkg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_setting_tip_red_cir_bg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_setting_tip_red_cir_bg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_setting_tip_red_cir_bg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_setting_tip_red_cir_bg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_show_orders_bg.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_show_orders_bg.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_show_orders_bg.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_show_orders_bg.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/taxi_speed_selector.xml b/OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_speed_selector.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable/taxi_speed_selector.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/drawable/taxi_speed_selector.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/auto_or_manual_btn_view.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/auto_or_manual_btn_view.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/auto_or_manual_btn_view.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/auto_or_manual_btn_view.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_amap_navi_view.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_amap_navi_view.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_amap_navi_view.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_amap_navi_view.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_map_view.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_map_view.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_map_view.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_map_view.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_no_data_common_view.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_no_data_common_view.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_no_data_common_view.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_no_data_common_view.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_data_item_view.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_operation_data_item_view.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_data_item_view.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_operation_data_item_view.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_data_view.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_operation_data_view.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_data_view.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_operation_data_view.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_tab_item_custom.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_operation_tab_item_custom.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_operation_tab_item_custom.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_operation_tab_item_custom.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_cancel_view.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_order_cancel_view.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_order_cancel_view.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_order_cancel_view.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_checkbox_item.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_order_checkbox_item.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_order_checkbox_item.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_order_checkbox_item.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_grab_view.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_order_grab_view.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_order_grab_view.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_order_grab_view.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_list_boot_no_data_view.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_order_list_boot_no_data_view.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_order_list_boot_no_data_view.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_order_list_boot_no_data_view.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_order_reserve_item.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_order_reserve_item.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_order_reserve_item.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_order_reserve_item.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_day_item.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_orders_list_day_item.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_day_item.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_orders_list_day_item.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_item.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_orders_list_item.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_item.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_orders_list_item.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_view.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_orders_list_view.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_orders_list_view.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_orders_list_view.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_panel.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_panel.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_reserve_orders.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_reserve_orders.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_reserve_orders.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_reserve_orders.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_rotting_navi_view.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_rotting_navi_view.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_rotting_navi_view.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_rotting_navi_view.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_server_orders_panel.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_server_orders_panel.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_server_orders_panel.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_server_orders_panel.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_tab_item_custom.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_tab_item_custom.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_tab_item_custom.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_tab_item_custom.xml diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_traffic_light_view.xml b/OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_traffic_light_view.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/layout/taxi_traffic_light_view.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/layout/taxi_traffic_light_view.xml diff --git a/OCH/mogo-och-taxi/src/main/res/raw/end_marker.nt3d b/OCH/taxi/mogo-och-taxi/src/main/res/raw/end_marker.nt3d similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/raw/end_marker.nt3d rename to OCH/taxi/mogo-och-taxi/src/main/res/raw/end_marker.nt3d diff --git a/OCH/mogo-och-taxi/src/main/res/raw/star_marker.nt3d b/OCH/taxi/mogo-och-taxi/src/main/res/raw/star_marker.nt3d similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/raw/star_marker.nt3d rename to OCH/taxi/mogo-och-taxi/src/main/res/raw/star_marker.nt3d diff --git a/OCH/mogo-och-taxi/src/main/res/raw/taxi_order.json b/OCH/taxi/mogo-och-taxi/src/main/res/raw/taxi_order.json similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/raw/taxi_order.json rename to OCH/taxi/mogo-och-taxi/src/main/res/raw/taxi_order.json diff --git a/OCH/mogo-och-taxi/src/main/res/raw/taxi_order_detail.json b/OCH/taxi/mogo-och-taxi/src/main/res/raw/taxi_order_detail.json similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/raw/taxi_order_detail.json rename to OCH/taxi/mogo-och-taxi/src/main/res/raw/taxi_order_detail.json diff --git a/OCH/mogo-och-taxi/src/main/res/raw/taxi_order_state_update.json b/OCH/taxi/mogo-och-taxi/src/main/res/raw/taxi_order_state_update.json similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/raw/taxi_order_state_update.json rename to OCH/taxi/mogo-och-taxi/src/main/res/raw/taxi_order_state_update.json diff --git a/OCH/mogo-och-taxi/src/main/res/values/colors.xml b/OCH/taxi/mogo-och-taxi/src/main/res/values/colors.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/values/colors.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/values/colors.xml diff --git a/OCH/mogo-och-taxi/src/main/res/values/dimens.xml b/OCH/taxi/mogo-och-taxi/src/main/res/values/dimens.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/values/dimens.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/values/dimens.xml diff --git a/OCH/mogo-och-taxi/src/main/res/values/strings.xml b/OCH/taxi/mogo-och-taxi/src/main/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/values/strings.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/values/strings.xml diff --git a/OCH/mogo-och-taxi/src/main/res/values/styles.xml b/OCH/taxi/mogo-och-taxi/src/main/res/values/styles.xml similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/values/styles.xml rename to OCH/taxi/mogo-och-taxi/src/main/res/values/styles.xml diff --git a/app/script/functions/och.gradle b/app/script/functions/och.gradle index af5890bff5..a46cbee658 100644 --- a/app/script/functions/och.gradle +++ b/app/script/functions/och.gradle @@ -34,12 +34,12 @@ project.dependencies { implementation project.project(':OCH:sweeper:sweeper-cloud') } else if (isCurrentDriver("sweeperOperate")) { implementation project.project(':OCH:sweeper:sweeper') - } else if (isCurrentDriver("taxi")) { - implementation project.project(':OCH:mogo-och-taxi') } else if (isCurrentDriver("taxiunmanned")) { - implementation project.project(':OCH:mogo-och-taxi-unmanned') + implementation project.project(':OCH:taxi:mogo-och-taxi-unmanned') + } else if (isCurrentDriver("taxi")) { + implementation project.project(':OCH:taxi:mogo-och-taxi') }else if (isCurrentPassenger("taxi")) { - implementation project.project(':OCH:mogo-och-taxi-passenger') + implementation project.project(':OCH:taxi:mogo-och-taxi-passenger') } else { noopImplementation(project(':OCH:mogo-och-noop')) implementation project.project(':OCH:mogo-och-bus') @@ -50,8 +50,9 @@ project.dependencies { implementation project.project(':OCH:mogo-och-shuttle-passenger') implementation project.project(':OCH:sweeper:sweeper-cloud') implementation project.project(':OCH:sweeper:sweeper') - implementation project.project(':OCH:mogo-och-taxi') - implementation project.project(':OCH:mogo-och-taxi-passenger') + implementation project.project(':OCH:taxi:mogo-och-taxi') + implementation project.project(':OCH:taxi:mogo-och-taxi-passenger') + implementation project.project(':OCH:taxi:mogo-och-taxi-unmanned') } if(isCurrentFlavors("sweeperCloud")){ diff --git a/settings.gradle b/settings.gradle index b27c2d7d54..865c818f1e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -58,9 +58,9 @@ include ':test:crashreport-apmbyte' //OCH 业务模块 include ':OCH:mogo-och-bus' include ':OCH:mogo-och-bus-passenger' -include ':OCH:mogo-och-taxi' -include ':OCH:mogo-och-taxi-unmanned' -include ':OCH:mogo-och-taxi-passenger' +include ':OCH:taxi:mogo-och-taxi' +include ':OCH:taxi:mogo-och-taxi-unmanned' +include ':OCH:taxi:mogo-och-taxi-passenger' include ':OCH:mogo-och-noop' include(':OCH:mogo-och-common-module') include ':OCH:sweeper:sweeper'