diff --git a/OCH/mogo-och-charter-passenger/.gitignore b/OCH/mogo-och-charter-passenger/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/OCH/mogo-och-charter-passenger/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/OCH/mogo-och-charter-passenger/README.md b/OCH/mogo-och-charter-passenger/README.md
new file mode 100644
index 0000000000..6175119b78
--- /dev/null
+++ b/OCH/mogo-och-charter-passenger/README.md
@@ -0,0 +1,15 @@
+
+
+
+
+
+src
+    - androidTest Android 测试代码
+    - basecommon  金旅开沃、接驳车 公用代码部分
+    - jinlvvan    金旅开沃 独立代码部分  
+    - m1          金旅m1  独立代码部分
+    - m2          金旅m2  独立代码部分
+    - main        所有车型公用代码部分
+    - shuttle     接驳车独立代码       因为接驳车和金旅开沃代码耦合厉害暂时放入到mogo-och-bus-passenger里面
+                                     后期会创建独立module和mogo-och-bus-passenger平级
+    - test        普通代码测试
\ No newline at end of file
diff --git a/OCH/mogo-och-charter-passenger/build.gradle b/OCH/mogo-och-charter-passenger/build.gradle
new file mode 100644
index 0000000000..5df49d3b86
--- /dev/null
+++ b/OCH/mogo-och-charter-passenger/build.gradle
@@ -0,0 +1,73 @@
+apply plugin: 'com.android.library'
+apply plugin: 'com.alibaba.arouter'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+
+android {
+    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    // buildToolsVersion rootProject.ext.android.buildToolsVersion
+    defaultConfig {
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
+        versionCode Integer.valueOf(VERSION_CODE)
+        versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
+
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
+            }
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    flavorDimensions "vehicle"
+    productFlavors {
+        // 车型：金旅m1 包车业务
+        m1 {
+            dimension "vehicle"
+            buildConfigField 'int', 'NEW_TEST', '1'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.androidxappcompat
+    implementation rootProject.ext.dependencies.arouter
+    implementation rootProject.ext.dependencies.androidxrecyclerview
+    implementation rootProject.ext.dependencies.material
+    kapt rootProject.ext.dependencies.aroutercompiler
+    implementation rootProject.ext.dependencies.rxandroid
+    implementation rootProject.ext.dependencies.androidxconstraintlayout
+    implementation rootProject.ext.dependencies.amapnavi3dmap
+    implementation project(":OCH:mogo-och-common-module")
+    compileOnly project(":libraries:mogo-map")
+    compileOnly project(':libraries:mogo-adas')
+    implementation project(':core:mogo-core-res')
+    testImplementation 'junit:junit:4.12'
+
+}
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
\ No newline at end of file
diff --git a/OCH/mogo-och-charter-passenger/consumer-rules.pro b/OCH/mogo-och-charter-passenger/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/OCH/mogo-och-charter-passenger/gradle.properties b/OCH/mogo-och-charter-passenger/gradle.properties
new file mode 100644
index 0000000000..2ed1ed2f42
--- /dev/null
+++ b/OCH/mogo-och-charter-passenger/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=com.mogo.och
+POM_ARTIFACT_ID=och-bus-passenger
+VERSION_CODE=1
diff --git a/OCH/mogo-och-charter-passenger/proguard-rules.pro b/OCH/mogo-och-charter-passenger/proguard-rules.pro
new file mode 100644
index 0000000000..481bb43481
--- /dev/null
+++ b/OCH/mogo-och-charter-passenger/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/OCH/mogo-och-charter-passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java b/OCH/mogo-och-charter-passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java
new file mode 100644
index 0000000000..2685ade0a4
--- /dev/null
+++ b/OCH/mogo-och-charter-passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.mogo.och.bus.passenger;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("com.mogo.och.bus.passenger.test", appContext.getPackageName());
+    }
+}
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/m1/assets/m1_style.data b/OCH/mogo-och-charter-passenger/src/m1/assets/m1_style.data
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/assets/m1_style.data
rename to OCH/mogo-och-charter-passenger/src/m1/assets/m1_style.data
diff --git a/OCH/mogo-och-bus-passenger/src/m1/assets/m1_style_extra.data b/OCH/mogo-och-charter-passenger/src/m1/assets/m1_style_extra.data
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/assets/m1_style_extra.data
rename to OCH/mogo-och-charter-passenger/src/m1/assets/m1_style_extra.data
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/Temperature.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/Temperature.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/Temperature.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/Temperature.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusPassengerOperationStatusResponse.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusPassengerOperationStatusResponse.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusPassengerOperationStatusResponse.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusPassengerOperationStatusResponse.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusPassengerRoutesResponse.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusPassengerRoutesResponse.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusPassengerRoutesResponse.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusPassengerRoutesResponse.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusPassengerRoutesResult.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusPassengerRoutesResult.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusPassengerRoutesResult.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusPassengerRoutesResult.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusPassengerStation.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusPassengerStation.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusPassengerStation.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusPassengerStation.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionDeviceFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionDeviceFragment.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionDeviceFragment.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionDeviceFragment.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionFragment.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionFragment.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionFragment.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionVideoFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionVideoFragment.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionVideoFragment.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionVideoFragment.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerItemVideoHolder.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerItemVideoHolder.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerItemVideoHolder.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerItemVideoHolder.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselLayoutManager.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselLayoutManager.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselLayoutManager.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselLayoutManager.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselZoomPostLayoutListener.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselZoomPostLayoutListener.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselZoomPostLayoutListener.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselZoomPostLayoutListener.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CenterScrollListener.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CenterScrollListener.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CenterScrollListener.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CenterScrollListener.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/ItemTransformation.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/ItemTransformation.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/ItemTransformation.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/ItemTransformation.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/DrawBitmapView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/DrawBitmapView.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/DrawBitmapView.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/DrawBitmapView.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/DrawableCheckBox.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/DrawableCheckBox.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/DrawableCheckBox.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/DrawableCheckBox.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/PickerLayoutManager.java b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/PickerLayoutManager.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/PickerLayoutManager.java
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/PickerLayoutManager.java
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/drawable/MineGradientDrawable.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/drawable/MineGradientDrawable.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/drawable/MineGradientDrawable.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/drawable/MineGradientDrawable.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt
rename to OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/anim/alpha_hide_show.xml b/OCH/mogo-och-charter-passenger/src/m1/res/anim/alpha_hide_show.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/anim/alpha_hide_show.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/anim/alpha_hide_show.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/color/bus_p_aircondition_enable.xml b/OCH/mogo-och-charter-passenger/src/m1/res/color/bus_p_aircondition_enable.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/color/bus_p_aircondition_enable.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/color/bus_p_aircondition_enable.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml b/OCH/mogo-och-charter-passenger/src/m1/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_index.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_index.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_index.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_index.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bug_p_overmap_car_model.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bug_p_overmap_car_model.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bug_p_overmap_car_model.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bug_p_overmap_car_model.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_car_speed.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_car_speed.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_car_speed.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_car_speed.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_nor.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_nor.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_nor.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_nor.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_select.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_select.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_select.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_select.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_selected.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_selected.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_selected.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_selected.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_atmosphere_nor.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_atmosphere_nor.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_atmosphere_nor.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_atmosphere_nor.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_atmosphere_select.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_atmosphere_select.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_atmosphere_select.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_atmosphere_select.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_go_normal_src.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_go_normal_src.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_go_normal_src.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_go_normal_src.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_go_press_src.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_go_press_src.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_go_press_src.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_go_press_src.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_normal.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_normal.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_normal.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_normal.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_press.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_press.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_press.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_press.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_information_normal.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_information_normal.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_information_normal.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_information_normal.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_information_press.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_information_press.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_information_press.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_information_press.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_left_bg_selected.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_left_bg_selected.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_left_bg_selected.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_left_bg_selected.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_check_select.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_check_select.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_check_select.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_check_select.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_check_selected.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_check_selected.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_check_selected.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_check_selected.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_middle_selected.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_middle_selected.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_middle_selected.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_middle_selected.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_nor.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_nor.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_nor.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_nor.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select_left.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select_left.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select_left.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select_left.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select_right.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select_right.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select_right.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select_right.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_selected.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_selected.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_selected.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_selected.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_soft_normal.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_soft_normal.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_soft_normal.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_soft_normal.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_soft_press.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_soft_press.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_soft_press.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_soft_press.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_humb.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_humb.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_humb.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_humb.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_left_select_src.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_left_select_src.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_left_select_src.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_left_select_src.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_max.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_max.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_max.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_max.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_middle_select.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_middle_select.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_middle_select.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_middle_select.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_middle_selected.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_middle_selected.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_middle_selected.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_middle_selected.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_min.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_min.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_min.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_min.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_m1_status_bar_logo.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_m1_status_bar_logo.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_m1_status_bar_logo.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_m1_status_bar_logo.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_overmap_reset.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_overmap_reset.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_overmap_reset.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_overmap_reset.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_player_change_normal.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_player_change_normal.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_player_change_normal.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_player_change_normal.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_high.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_high.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_high.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_high.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_lod.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_lod.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_lod.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_lod.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_middle.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_middle.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_middle.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_middle.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_pause_big.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_pause_big.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_pause_big.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_pause_big.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_pause_small.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_pause_small.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_pause_small.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_pause_small.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_start_big.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_start_big.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_start_big.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_start_big.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_start_small.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_start_small.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/notice_video_start_small.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_start_small.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/taxi_p_change_full.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_change_full.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/taxi_p_change_full.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_change_full.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/taxi_p_mogo_video_play.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_mogo_video_play.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/taxi_p_mogo_video_play.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_mogo_video_play.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/taxi_p_video_bg_bottom.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_video_bg_bottom.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/taxi_p_video_bg_bottom.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_video_bg_bottom.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/taxi_p_video_bg_top.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_video_bg_top.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/taxi_p_video_bg_top.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_video_bg_top.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/taxi_p_video_holder.png b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_video_holder.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/taxi_p_video_holder.png
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_video_holder.png
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-v29/taxi_power_size_seekbar_style.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-v29/taxi_power_size_seekbar_style.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-v29/taxi_power_size_seekbar_style.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-v29/taxi_power_size_seekbar_style.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-v29/taxi_video_seekbar_style.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable-v29/taxi_video_seekbar_style.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-v29/taxi_video_seekbar_style.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable-v29/taxi_video_seekbar_style.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bg_taxi_p_video_bg.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bg_taxi_p_video_bg.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bg_taxi_p_video_bg.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bg_taxi_p_video_bg.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bg_taxi_p_video_bg_shape.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bg_taxi_p_video_bg_shape.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bg_taxi_p_video_bg_shape.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bg_taxi_p_video_bg_shape.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bg_taxi_p_video_bg_top.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bg_taxi_p_video_bg_top.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bg_taxi_p_video_bg_top.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bg_taxi_p_video_bg_top.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_distance_info_bg.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_distance_info_bg.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_distance_info_bg.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_distance_info_bg.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_common_bg.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_common_bg.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_common_bg.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_common_bg.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_common_bg_01.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_common_bg_01.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_common_bg_01.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_common_bg_01.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_left_select.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_left_select.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_left_select.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_left_select.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_left_selected.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_left_selected.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_left_selected.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_left_selected.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_select.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_select.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_select.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_select.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_select.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_select.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_select.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_select.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_selector.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_selector.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_selector.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_selector.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_airconditon_bg_selector.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_airconditon_bg_selector.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_airconditon_bg_selector.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_airconditon_bg_selector.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_airconditon_left_selector.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_airconditon_left_selector.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_airconditon_left_selector.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_airconditon_left_selector.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_airconditon_text_color_selector.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_airconditon_text_color_selector.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_airconditon_text_color_selector.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_airconditon_text_color_selector.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_bottom_device_bg_selector.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_device_bg_selector.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_bottom_device_bg_selector.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_device_bg_selector.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_bottom_information_bg_selector.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_information_bg_selector.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_bottom_information_bg_selector.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_information_bg_selector.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_bottom_soft_bg_selector.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_soft_bg_selector.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_bottom_soft_bg_selector.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_soft_bg_selector.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_normal.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_normal.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_normal.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_normal.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_press.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_press.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_press.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_press.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_press_selecor.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_press_selecor.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_press_selecor.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_press_selecor.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_go_normal.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_go_normal.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_go_normal.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_go_normal.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_go_press.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_go_press.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_go_press.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_go_press.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_go_press_selecor.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_go_press_selecor.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_go_press_selecor.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_go_press_selecor.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_normal.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_normal.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_normal.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_normal.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_press.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_press.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_press.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_press.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_press_selecor.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_press_selecor.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_press_selecor.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_press_selecor.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_stopside_normal.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_stopside_normal.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_stopside_normal.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_stopside_normal.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_stopside_press.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_stopside_press.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_stopside_press.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_stopside_press.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_stopside_press_selecor.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_stopside_press_selecor.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_device_stopside_press_selecor.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_stopside_press_selecor.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_distance_split_bg.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_distance_split_bg.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_distance_split_bg.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_distance_split_bg.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_left_bg_select.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_left_bg_select.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_left_bg_select.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_left_bg_select.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_light_left_select.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_left_select.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_light_left_select.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_left_select.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_light_left_selected.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_left_selected.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_light_left_selected.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_left_selected.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_light_left_selector.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_left_selector.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_light_left_selector.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_left_selector.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_light_switch_bg_select.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_switch_bg_select.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_light_switch_bg_select.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_switch_bg_select.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_light_switch_bg_selector.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_switch_bg_selector.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_light_switch_bg_selector.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_switch_bg_selector.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_setting_soft_b_shape.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_setting_soft_b_shape.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_setting_soft_b_shape.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_setting_soft_b_shape.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_switch_left_select.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_switch_left_select.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_switch_left_select.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_switch_left_select.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_switch_left_selected.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_switch_left_selected.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_switch_left_selected.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_switch_left_selected.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_switch_left_selector.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_switch_left_selector.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_switch_left_selector.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_switch_left_selector.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_full.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_change_full.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_full.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_change_full.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_normal.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_change_normal.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_normal.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_change_normal.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_big.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_big.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_big.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_big.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_small.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_small.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_small.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_small.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_start_big.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_start_big.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_start_big.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_start_big.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_start_small.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_start_small.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_start_small.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_start_small.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_big.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_big.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_big.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_big.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_samll.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_samll.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_samll.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_samll.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_voice_left_select.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_left_select.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_voice_left_select.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_left_select.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_voice_left_selected.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_left_selected.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_voice_left_selected.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_left_selected.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_voice_left_selector.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_left_selector.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_voice_left_selector.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_left_selector.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_voice_right_process_humb.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_right_process_humb.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_voice_right_process_humb.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_right_process_humb.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_overmap_reset_size.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_overmap_reset_size.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_overmap_reset_size.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_overmap_reset_size.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/taxi_power_size_seekbar_style.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/taxi_power_size_seekbar_style.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/taxi_power_size_seekbar_style.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/taxi_power_size_seekbar_style.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/taxi_video_seekbar_style.xml b/OCH/mogo-och-charter-passenger/src/m1/res/drawable/taxi_video_seekbar_style.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable/taxi_video_seekbar_style.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/drawable/taxi_video_seekbar_style.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_fragment.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_fragment.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_fragment.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_function_fragment.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_fragment.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_function_fragment.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_devices_fragment.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_function_setting_devices_fragment.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_devices_fragment.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_function_setting_devices_fragment.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_video_fragment.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_function_video_fragment.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_video_fragment.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_function_video_fragment.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_m1_view_blue_tooth.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_m1_view_blue_tooth.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_m1_view_blue_tooth.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_m1_view_blue_tooth.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_m1_view_status_bar.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_m1_view_status_bar.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_m1_view_status_bar.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_m1_view_status_bar.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_temperature_item.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_temperature_item.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_temperature_item.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/bus_p_temperature_item.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/list_video_item_normal.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/list_video_item_normal.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/layout/list_video_item_normal.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/list_video_item_normal.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/taxi_p_video_show.xml b/OCH/mogo-och-charter-passenger/src/m1/res/layout/taxi_p_video_show.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/layout/taxi_p_video_show.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/layout/taxi_p_video_show.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/raw/aiqinghao.nt3d b/OCH/mogo-och-charter-passenger/src/m1/res/raw/aiqinghao.nt3d
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/raw/aiqinghao.nt3d
rename to OCH/mogo-och-charter-passenger/src/m1/res/raw/aiqinghao.nt3d
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/raw/jiatinghao.nt3d b/OCH/mogo-och-charter-passenger/src/m1/res/raw/jiatinghao.nt3d
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/raw/jiatinghao.nt3d
rename to OCH/mogo-och-charter-passenger/src/m1/res/raw/jiatinghao.nt3d
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/raw/pengyouhao.nt3d b/OCH/mogo-och-charter-passenger/src/m1/res/raw/pengyouhao.nt3d
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/raw/pengyouhao.nt3d
rename to OCH/mogo-och-charter-passenger/src/m1/res/raw/pengyouhao.nt3d
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/values/attrs.xml b/OCH/mogo-och-charter-passenger/src/m1/res/values/attrs.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/values/attrs.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/values/attrs.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/values/color.xml b/OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/values/color.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/values/strings.xml b/OCH/mogo-och-charter-passenger/src/m1/res/values/strings.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/values/strings.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/values/strings.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/values/styles.xml b/OCH/mogo-och-charter-passenger/src/m1/res/values/styles.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m1/res/values/styles.xml
rename to OCH/mogo-och-charter-passenger/src/m1/res/values/styles.xml
diff --git a/OCH/mogo-och-charter-passenger/src/main/AndroidManifest.xml b/OCH/mogo-och-charter-passenger/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..e0687231c1
--- /dev/null
+++ b/OCH/mogo-och-charter-passenger/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mogo.och.bus.passenger">
+
+</manifest>
\ No newline at end of file
diff --git a/OCH/mogo-och-charter-passenger/src/main/assets/map_style.data b/OCH/mogo-och-charter-passenger/src/main/assets/map_style.data
new file mode 100644
index 0000000000..ab077f9849
Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/assets/map_style.data differ
diff --git a/OCH/mogo-och-charter-passenger/src/main/assets/map_style_extra.data b/OCH/mogo-och-charter-passenger/src/main/assets/map_style_extra.data
new file mode 100644
index 0000000000..01f7f2116e
Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/assets/map_style_extra.data differ
diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java
new file mode 100644
index 0000000000..fb146e17c3
--- /dev/null
+++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java
@@ -0,0 +1,22 @@
+package com.mogo.och.bus.passenger;
+
+import androidx.annotation.IdRes;
+import androidx.fragment.app.FragmentActivity;
+
+import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider;
+
+/**
+ * 网约车抽象接口
+ *
+ * Created on 2022/3/29
+ */
+interface IMogoOCH extends IMoGoFunctionProvider {
+
+    /**
+     * 初始化网约车容器
+     *
+     * @param activity
+     * @param containerId 容器ID
+     */
+    void createCoverage(FragmentActivity activity, @IdRes int containerId);
+}
diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt
new file mode 100644
index 0000000000..f2f8552625
--- /dev/null
+++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt
@@ -0,0 +1,36 @@
+package com.mogo.och.bus.passenger.constant
+
+import com.mogo.commons.debug.DebugConfig
+
+/**
+ * Created on 2021/12/6
+ */
+class BusPassengerConst {
+    companion object {
+
+        // OCH arouter 路由path
+        const val PATH = "/passenger/api"
+
+        // 轮询line
+        const val LOOP_LINE_2S = 2 * 1000L
+        const val LOOP_LINE_1S = 1 * 1000L
+        const val LOOP_DELAY = 100L
+
+        // 无状态
+        const val STATION_STATUS_IDLE = 0
+        // 已过站(历史站)
+        const val STATION_STATUS_LEAVING = 1
+        // 到站(当前站)
+        const val STATION_STATUS_STOPPED = 2
+        // 未到站(未到站)
+        const val STATION_STATUS_ARRIVING = 3
+
+        //bus平均速度 bus的平均里程：25km/h
+        const val BUS_AVERAGE_SPEED = 25
+
+        // 订单总里程
+        const val BUS_SP_KEY_ORDER_SUM_DIS = "BUS_SP_KEY_ORDER_SUM_DIS"
+
+        const val QUERY_BUS_P_STATION_DELAY = 3 * 1000L
+    }
+}
\ No newline at end of file
diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java
new file mode 100644
index 0000000000..edab28cb78
--- /dev/null
+++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java
@@ -0,0 +1,61 @@
+package com.mogo.och.bus.passenger.utils;
+
+
+import android.content.Context;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author donghongyu
+ * @date 12/18/20 5:37 PM
+ */
+public class BusPassengerMapAssetStyleUtil {
+
+    public static byte[] getAssetsStyle(Context context,String fileName) {
+        byte[] buffer1 = null;
+        InputStream is1 = null;
+        try {
+            is1 = context.getResources().getAssets().open(fileName); //eg. over_view_style.data
+            int lenght1 = is1.available();
+            buffer1 = new byte[lenght1];
+            is1.read(buffer1);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (is1 != null) {
+                    is1.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return buffer1;
+    }
+
+
+    public static byte[] getAssetsExtraStyle(Context context, String fileName) {
+        byte[] buffer1 = null;
+        InputStream is1 = null;
+        try {
+            is1 = context.getResources().getAssets().open(fileName); //eg. over_view_style_extra.data
+            int lenght1 = is1.available();
+            buffer1 = new byte[lenght1];
+            is1.read(buffer1);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (is1 != null) {
+                    is1.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return buffer1;
+    }
+
+
+}
diff --git a/OCH/mogo-och-charter-passenger/src/main/res/raw/bus_di.mp3 b/OCH/mogo-och-charter-passenger/src/main/res/raw/bus_di.mp3
new file mode 100644
index 0000000000..15b31ed247
Binary files /dev/null and b/OCH/mogo-och-charter-passenger/src/main/res/raw/bus_di.mp3 differ
diff --git a/OCH/mogo-och-charter-passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java b/OCH/mogo-och-charter-passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java
new file mode 100644
index 0000000000..d940b2948f
--- /dev/null
+++ b/OCH/mogo-och-charter-passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java
@@ -0,0 +1,15 @@
+package com.mogo.och.bus.passenger;
+
+import org.junit.Test;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/functions/och.gradle b/app/functions/och.gradle
index 23ade13fea..88776f90d2 100644
--- a/app/functions/och.gradle
+++ b/app/functions/och.gradle
@@ -43,7 +43,7 @@ project.dependencies {
 
         // 包车
         ochDriverM1Implementation (project(':OCH:mogo-och-charter'))
-        ochPassengerM1Implementation (project(':OCH:mogo-och-bus-passenger'))
+        ochPassengerM1Implementation (project(':OCH:mogo-och-charter-passenger'))
 
         // taxi司机端
         fOchTaxiImplementation (project(':OCH:mogo-och-taxi'))
diff --git a/settings.gradle b/settings.gradle
index 22999d6b33..46db6b0ea0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -65,3 +65,4 @@ include ':OCH:mogo-och-noop'
 include(':OCH:mogo-och-common-module')
 include ':OCH:mogo-och-sweeper'
 include ':OCH:mogo-och-charter'
+include ':OCH:mogo-och-charter-passenger'