diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a222710..7ac24c7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,8 +8,7 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/mobile" />
-            <option value="$PROJECT_DIR$/wear" />
+            <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 816a809..fc3d511 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,11 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Espresso.iml" filepath="$PROJECT_DIR$/Espresso.iml" />
-      <module fileurl="file://$PROJECT_DIR$/Espresso.iml" filepath="$PROJECT_DIR$/Espresso.iml" />
-      <module fileurl="file://$PROJECT_DIR$/mobile/mobile.iml" filepath="$PROJECT_DIR$/mobile/mobile.iml" />
-      <module fileurl="file://$PROJECT_DIR$/mobile/mobile.iml" filepath="$PROJECT_DIR$/mobile/mobile.iml" />
-      <module fileurl="file://$PROJECT_DIR$/wear/wear.iml" filepath="$PROJECT_DIR$/wear/wear.iml" />
-      <module fileurl="file://$PROJECT_DIR$/wear/wear.iml" filepath="$PROJECT_DIR$/wear/wear.iml" />
+      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index cdec115..a6a483d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,13 +6,7 @@ android:
     - platform-tools
     - build-tools-25.0.2
     - android-25
-    - extra-google-google_play_services
     - extra-android-m2repository
-    - addon-google_apis-google-25
-  licenses:
-    - 'android-sdk-preview-license-.+'
-    - 'android-sdk-license-.+'
-    - 'google-gdk-license-.+'
 
 jdk:
   - oraclejdk8
@@ -20,4 +14,5 @@ jdk:
 notifications:
   email: false
 
-script: ./gradlew assemble check
+script:
+  - ./gradlew assemble check
diff --git a/README.md b/README.md
index e8420d2..12fa945 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,6 @@ This project is still in progress. Here are the some features that I will finish
 - [x] Day and night mode.
 - [x] Service to build notifications.
 - [x] Settings and about page.
-- [ ] Supporting Android Wear.
 - [ ] UI test and unit test.
 
 ### Help Me Improve This App
diff --git a/mobile/.gitignore b/app/.gitignore
similarity index 100%
rename from mobile/.gitignore
rename to app/.gitignore
diff --git a/mobile/build.gradle b/app/build.gradle
similarity index 50%
rename from mobile/build.gradle
rename to app/build.gradle
index aa6dbbd..e7750e9 100644
--- a/mobile/build.gradle
+++ b/app/build.gradle
@@ -31,33 +31,39 @@ android {
 
 }
 
+ext {
+    supportLibVersion = '25.3.1'
+    rxjavaVersion = '2.0.1'
+    retrofitVersion = '2.2.0'
+    zxingLibVersion = '3.3.0'
+    datetimePickerVersion = '3.1.3'
+    circleimageviewVersion = '2.1.0'
+}
+
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    wearApp project(':wear')
-    // Google Mobile Service
-    compile 'com.google.android.gms:play-services:10.2.1'
     // Support libraries
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:support-v4:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:cardview-v7:25.3.1'
-    compile 'com.android.support:preference-v14:25.3.1'
-    compile 'com.android.support:customtabs:25.3.1'
+    compile "com.android.support:appcompat-v7:${supportLibVersion}"
+    compile "com.android.support:support-v4:${supportLibVersion}"
+    compile "com.android.support:design:${supportLibVersion}"
+    compile "com.android.support:cardview-v7:${supportLibVersion}"
+    compile "com.android.support:preference-v14:${supportLibVersion}"
+    compile "com.android.support:customtabs:${supportLibVersion}"
     // ReactiveX series
-    compile 'io.reactivex.rxjava2:rxjava:2.0.1'
-    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    compile "io.reactivex.rxjava2:rxjava:${rxjavaVersion}"
+    compile "io.reactivex.rxjava2:rxandroid:${rxjavaVersion}"
     // Retrofit series
-    compile 'com.squareup.retrofit2:retrofit:2.2.0'
-    compile 'com.squareup.retrofit2:adapter-rxjava2:2.2.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.2.0'
+    compile "com.squareup.retrofit2:retrofit:${retrofitVersion}"
+    compile "com.squareup.retrofit2:adapter-rxjava2:${retrofitVersion}"
+    compile "com.squareup.retrofit2:converter-gson:${retrofitVersion}"
     // Zxing
-    compile 'com.google.zxing:core:3.3.0'
+    compile "com.google.zxing:core:${zxingLibVersion}"
     // Material date time picker
-    compile 'com.wdullaer:materialdatetimepicker:3.1.3'
+    compile "com.wdullaer:materialdatetimepicker:${datetimePickerVersion}"
     // CircleImageView
-    compile 'de.hdodenhof:circleimageview:2.1.0'
+    compile "de.hdodenhof:circleimageview:${circleimageviewVersion}"
     testCompile 'junit:junit:4.12'
 }
diff --git a/mobile/proguard-rules.pro b/app/proguard-rules.pro
similarity index 100%
rename from mobile/proguard-rules.pro
rename to app/proguard-rules.pro
diff --git a/mobile/src/androidTest/java/io/github/marktony/espresso/ExampleInstrumentedTest.java b/app/src/androidTest/java/io/github/marktony/espresso/ExampleInstrumentedTest.java
similarity index 100%
rename from mobile/src/androidTest/java/io/github/marktony/espresso/ExampleInstrumentedTest.java
rename to app/src/androidTest/java/io/github/marktony/espresso/ExampleInstrumentedTest.java
diff --git a/mobile/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
similarity index 95%
rename from mobile/src/main/AndroidManifest.xml
rename to app/src/main/AndroidManifest.xml
index 4b8bd78..c97a32d 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,10 +33,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
-            <!-- app shortcuts -->
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
         </activity>
         <activity
             android:name=".mvp.packages.MainActivity"
diff --git a/mobile/src/main/assets/license.html b/app/src/main/assets/license.html
similarity index 100%
rename from mobile/src/main/assets/license.html
rename to app/src/main/assets/license.html
diff --git a/mobile/src/main/java/io/github/marktony/espresso/app/App.java b/app/src/main/java/io/github/marktony/espresso/app/App.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/app/App.java
rename to app/src/main/java/io/github/marktony/espresso/app/App.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/appwidget/AppWidgetProvider.java b/app/src/main/java/io/github/marktony/espresso/appwidget/AppWidgetProvider.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/appwidget/AppWidgetProvider.java
rename to app/src/main/java/io/github/marktony/espresso/appwidget/AppWidgetProvider.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/appwidget/AppWidgetService.java b/app/src/main/java/io/github/marktony/espresso/appwidget/AppWidgetService.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/appwidget/AppWidgetService.java
rename to app/src/main/java/io/github/marktony/espresso/appwidget/AppWidgetService.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/appwidget/WidgetListFactory.java b/app/src/main/java/io/github/marktony/espresso/appwidget/WidgetListFactory.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/appwidget/WidgetListFactory.java
rename to app/src/main/java/io/github/marktony/espresso/appwidget/WidgetListFactory.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/component/FastScrollPopup.java b/app/src/main/java/io/github/marktony/espresso/component/FastScrollPopup.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/component/FastScrollPopup.java
rename to app/src/main/java/io/github/marktony/espresso/component/FastScrollPopup.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/component/FastScrollRecyclerView.java b/app/src/main/java/io/github/marktony/espresso/component/FastScrollRecyclerView.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/component/FastScrollRecyclerView.java
rename to app/src/main/java/io/github/marktony/espresso/component/FastScrollRecyclerView.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/component/FastScroller.java b/app/src/main/java/io/github/marktony/espresso/component/FastScroller.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/component/FastScroller.java
rename to app/src/main/java/io/github/marktony/espresso/component/FastScroller.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/component/Timeline.java b/app/src/main/java/io/github/marktony/espresso/component/Timeline.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/component/Timeline.java
rename to app/src/main/java/io/github/marktony/espresso/component/Timeline.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/customtabs/CustomTabsHelper.java b/app/src/main/java/io/github/marktony/espresso/customtabs/CustomTabsHelper.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/customtabs/CustomTabsHelper.java
rename to app/src/main/java/io/github/marktony/espresso/customtabs/CustomTabsHelper.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/data/Company.java b/app/src/main/java/io/github/marktony/espresso/data/Company.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/data/Company.java
rename to app/src/main/java/io/github/marktony/espresso/data/Company.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/data/CompanyRecognition.java b/app/src/main/java/io/github/marktony/espresso/data/CompanyRecognition.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/data/CompanyRecognition.java
rename to app/src/main/java/io/github/marktony/espresso/data/CompanyRecognition.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/data/Package.java b/app/src/main/java/io/github/marktony/espresso/data/Package.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/data/Package.java
rename to app/src/main/java/io/github/marktony/espresso/data/Package.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/data/PackageAndCompanyPairs.java b/app/src/main/java/io/github/marktony/espresso/data/PackageAndCompanyPairs.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/data/PackageAndCompanyPairs.java
rename to app/src/main/java/io/github/marktony/espresso/data/PackageAndCompanyPairs.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/data/PackageStatus.java b/app/src/main/java/io/github/marktony/espresso/data/PackageStatus.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/data/PackageStatus.java
rename to app/src/main/java/io/github/marktony/espresso/data/PackageStatus.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/data/PackageWithCompany.java b/app/src/main/java/io/github/marktony/espresso/data/PackageWithCompany.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/data/PackageWithCompany.java
rename to app/src/main/java/io/github/marktony/espresso/data/PackageWithCompany.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/data/source/CompaniesDataSource.java b/app/src/main/java/io/github/marktony/espresso/data/source/CompaniesDataSource.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/data/source/CompaniesDataSource.java
rename to app/src/main/java/io/github/marktony/espresso/data/source/CompaniesDataSource.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/data/source/CompaniesRepository.java b/app/src/main/java/io/github/marktony/espresso/data/source/CompaniesRepository.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/data/source/CompaniesRepository.java
rename to app/src/main/java/io/github/marktony/espresso/data/source/CompaniesRepository.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/data/source/PackagesDataSource.java b/app/src/main/java/io/github/marktony/espresso/data/source/PackagesDataSource.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/data/source/PackagesDataSource.java
rename to app/src/main/java/io/github/marktony/espresso/data/source/PackagesDataSource.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/data/source/PackagesRepository.java b/app/src/main/java/io/github/marktony/espresso/data/source/PackagesRepository.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/data/source/PackagesRepository.java
rename to app/src/main/java/io/github/marktony/espresso/data/source/PackagesRepository.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/data/source/local/CompaniesLocalDataSource.java b/app/src/main/java/io/github/marktony/espresso/data/source/local/CompaniesLocalDataSource.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/data/source/local/CompaniesLocalDataSource.java
rename to app/src/main/java/io/github/marktony/espresso/data/source/local/CompaniesLocalDataSource.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/data/source/local/PackagesLocalDataSource.java b/app/src/main/java/io/github/marktony/espresso/data/source/local/PackagesLocalDataSource.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/data/source/local/PackagesLocalDataSource.java
rename to app/src/main/java/io/github/marktony/espresso/data/source/local/PackagesLocalDataSource.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/data/source/remote/PackagesRemoteDataSource.java b/app/src/main/java/io/github/marktony/espresso/data/source/remote/PackagesRemoteDataSource.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/data/source/remote/PackagesRemoteDataSource.java
rename to app/src/main/java/io/github/marktony/espresso/data/source/remote/PackagesRemoteDataSource.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/interfaze/OnFastScrollStateChangeListener.java b/app/src/main/java/io/github/marktony/espresso/interfaze/OnFastScrollStateChangeListener.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/interfaze/OnFastScrollStateChangeListener.java
rename to app/src/main/java/io/github/marktony/espresso/interfaze/OnFastScrollStateChangeListener.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/interfaze/OnRecyclerViewItemClickListener.java b/app/src/main/java/io/github/marktony/espresso/interfaze/OnRecyclerViewItemClickListener.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/interfaze/OnRecyclerViewItemClickListener.java
rename to app/src/main/java/io/github/marktony/espresso/interfaze/OnRecyclerViewItemClickListener.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/BasePresenter.java b/app/src/main/java/io/github/marktony/espresso/mvp/BasePresenter.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/BasePresenter.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/BasePresenter.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/BaseView.java b/app/src/main/java/io/github/marktony/espresso/mvp/BaseView.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/BaseView.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/BaseView.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/addpackage/AddPackageActivity.java b/app/src/main/java/io/github/marktony/espresso/mvp/addpackage/AddPackageActivity.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/addpackage/AddPackageActivity.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/addpackage/AddPackageActivity.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/addpackage/AddPackageContract.java b/app/src/main/java/io/github/marktony/espresso/mvp/addpackage/AddPackageContract.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/addpackage/AddPackageContract.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/addpackage/AddPackageContract.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/addpackage/AddPackageFragment.java b/app/src/main/java/io/github/marktony/espresso/mvp/addpackage/AddPackageFragment.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/addpackage/AddPackageFragment.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/addpackage/AddPackageFragment.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/addpackage/AddPackagePresenter.java b/app/src/main/java/io/github/marktony/espresso/mvp/addpackage/AddPackagePresenter.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/addpackage/AddPackagePresenter.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/addpackage/AddPackagePresenter.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/companies/CompaniesAdapter.java b/app/src/main/java/io/github/marktony/espresso/mvp/companies/CompaniesAdapter.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/companies/CompaniesAdapter.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/companies/CompaniesAdapter.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/companies/CompaniesContract.java b/app/src/main/java/io/github/marktony/espresso/mvp/companies/CompaniesContract.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/companies/CompaniesContract.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/companies/CompaniesContract.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/companies/CompaniesFragment.java b/app/src/main/java/io/github/marktony/espresso/mvp/companies/CompaniesFragment.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/companies/CompaniesFragment.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/companies/CompaniesFragment.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/companies/CompaniesPresenter.java b/app/src/main/java/io/github/marktony/espresso/mvp/companies/CompaniesPresenter.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/companies/CompaniesPresenter.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/companies/CompaniesPresenter.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/companydetails/CompanyDetailActivity.java b/app/src/main/java/io/github/marktony/espresso/mvp/companydetails/CompanyDetailActivity.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/companydetails/CompanyDetailActivity.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/companydetails/CompanyDetailActivity.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/companydetails/CompanyDetailContract.java b/app/src/main/java/io/github/marktony/espresso/mvp/companydetails/CompanyDetailContract.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/companydetails/CompanyDetailContract.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/companydetails/CompanyDetailContract.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/companydetails/CompanyDetailFragment.java b/app/src/main/java/io/github/marktony/espresso/mvp/companydetails/CompanyDetailFragment.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/companydetails/CompanyDetailFragment.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/companydetails/CompanyDetailFragment.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/companydetails/CompanyDetailPresenter.java b/app/src/main/java/io/github/marktony/espresso/mvp/companydetails/CompanyDetailPresenter.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/companydetails/CompanyDetailPresenter.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/companydetails/CompanyDetailPresenter.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsActivity.java b/app/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsActivity.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsActivity.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsActivity.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsAdapter.java b/app/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsAdapter.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsAdapter.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsAdapter.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsContract.java b/app/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsContract.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsContract.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsContract.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsFragment.java b/app/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsFragment.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsFragment.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsFragment.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsPresenter.java b/app/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsPresenter.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsPresenter.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/packagedetails/PackageDetailsPresenter.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/packages/MainActivity.java b/app/src/main/java/io/github/marktony/espresso/mvp/packages/MainActivity.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/packages/MainActivity.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/packages/MainActivity.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/packages/PackageFilterType.java b/app/src/main/java/io/github/marktony/espresso/mvp/packages/PackageFilterType.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/packages/PackageFilterType.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/packages/PackageFilterType.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/packages/PackagesAdapter.java b/app/src/main/java/io/github/marktony/espresso/mvp/packages/PackagesAdapter.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/packages/PackagesAdapter.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/packages/PackagesAdapter.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/packages/PackagesContract.java b/app/src/main/java/io/github/marktony/espresso/mvp/packages/PackagesContract.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/packages/PackagesContract.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/packages/PackagesContract.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/packages/PackagesFragment.java b/app/src/main/java/io/github/marktony/espresso/mvp/packages/PackagesFragment.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/packages/PackagesFragment.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/packages/PackagesFragment.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/packages/PackagesPresenter.java b/app/src/main/java/io/github/marktony/espresso/mvp/packages/PackagesPresenter.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/packages/PackagesPresenter.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/packages/PackagesPresenter.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/search/SearchActivity.java b/app/src/main/java/io/github/marktony/espresso/mvp/search/SearchActivity.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/search/SearchActivity.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/search/SearchActivity.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/search/SearchContract.java b/app/src/main/java/io/github/marktony/espresso/mvp/search/SearchContract.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/search/SearchContract.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/search/SearchContract.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/search/SearchFragment.java b/app/src/main/java/io/github/marktony/espresso/mvp/search/SearchFragment.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/search/SearchFragment.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/search/SearchFragment.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/search/SearchPresenter.java b/app/src/main/java/io/github/marktony/espresso/mvp/search/SearchPresenter.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/search/SearchPresenter.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/search/SearchPresenter.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/search/SearchResultsAdapter.java b/app/src/main/java/io/github/marktony/espresso/mvp/search/SearchResultsAdapter.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/mvp/search/SearchResultsAdapter.java
rename to app/src/main/java/io/github/marktony/espresso/mvp/search/SearchResultsAdapter.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/realm/RealmHelper.java b/app/src/main/java/io/github/marktony/espresso/realm/RealmHelper.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/realm/RealmHelper.java
rename to app/src/main/java/io/github/marktony/espresso/realm/RealmHelper.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/retrofit/Api.java b/app/src/main/java/io/github/marktony/espresso/retrofit/Api.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/retrofit/Api.java
rename to app/src/main/java/io/github/marktony/espresso/retrofit/Api.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/retrofit/RetrofitClient.java b/app/src/main/java/io/github/marktony/espresso/retrofit/RetrofitClient.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/retrofit/RetrofitClient.java
rename to app/src/main/java/io/github/marktony/espresso/retrofit/RetrofitClient.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/retrofit/RetrofitService.java b/app/src/main/java/io/github/marktony/espresso/retrofit/RetrofitService.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/retrofit/RetrofitService.java
rename to app/src/main/java/io/github/marktony/espresso/retrofit/RetrofitService.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/service/ReminderService.java b/app/src/main/java/io/github/marktony/espresso/service/ReminderService.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/service/ReminderService.java
rename to app/src/main/java/io/github/marktony/espresso/service/ReminderService.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/ui/AboutFragment.java b/app/src/main/java/io/github/marktony/espresso/ui/AboutFragment.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/ui/AboutFragment.java
rename to app/src/main/java/io/github/marktony/espresso/ui/AboutFragment.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/ui/LicensesFragment.java b/app/src/main/java/io/github/marktony/espresso/ui/LicensesFragment.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/ui/LicensesFragment.java
rename to app/src/main/java/io/github/marktony/espresso/ui/LicensesFragment.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/ui/PrefsActivity.java b/app/src/main/java/io/github/marktony/espresso/ui/PrefsActivity.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/ui/PrefsActivity.java
rename to app/src/main/java/io/github/marktony/espresso/ui/PrefsActivity.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/ui/SettingsFragment.java b/app/src/main/java/io/github/marktony/espresso/ui/SettingsFragment.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/ui/SettingsFragment.java
rename to app/src/main/java/io/github/marktony/espresso/ui/SettingsFragment.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingActivity.java b/app/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingActivity.java
similarity index 72%
rename from mobile/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingActivity.java
rename to app/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingActivity.java
index f3a09da..20868ea 100644
--- a/mobile/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingActivity.java
+++ b/app/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingActivity.java
@@ -19,7 +19,11 @@
 import android.animation.ArgbEvaluator;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
+import android.graphics.drawable.Icon;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
 import android.preference.PreferenceManager;
@@ -33,10 +37,14 @@
 import android.widget.ImageButton;
 import android.widget.ImageView;
 
+import java.util.Arrays;
+
 import io.github.marktony.espresso.R;
 import io.github.marktony.espresso.data.source.CompaniesRepository;
 import io.github.marktony.espresso.data.source.local.CompaniesLocalDataSource;
+import io.github.marktony.espresso.mvp.addpackage.AddPackageActivity;
 import io.github.marktony.espresso.mvp.packages.MainActivity;
+import io.github.marktony.espresso.mvp.search.SearchActivity;
 import io.github.marktony.espresso.util.SettingsUtil;
 
 public class OnboardingActivity extends AppCompatActivity {
@@ -99,6 +107,7 @@ public void onClick(View v) {
                     ed.putBoolean(SettingsUtil.KEY_FIRST_LAUNCH, false);
                     ed.apply();
                     navigateToMainActivity();
+                    enableShortcuts();
                 }
             });
 
@@ -188,6 +197,44 @@ protected void onProgressUpdate(Void... values) {
         }
     }
 
+    private void enableShortcuts() {
+        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+            ShortcutManager manager =  getSystemService(ShortcutManager.class);
+            ShortcutInfo addPkg = new ShortcutInfo.Builder(this, "shortcut_add_package")
+                    .setLongLabel(getString(R.string.shortcut_label_add_package))
+                    .setShortLabel(getString(R.string.shortcut_label_add_package))
+                    .setIcon(Icon.createWithResource(this, R.drawable.ic_shortcut_add))
+                    .setIntent(
+                            new Intent(OnboardingActivity.this, AddPackageActivity.class)
+                                    .setAction(Intent.ACTION_VIEW)
+                                    .addCategory(ShortcutInfo.SHORTCUT_CATEGORY_CONVERSATION)
+                    )
+                    .build();
+            ShortcutInfo scanCode = new ShortcutInfo.Builder(this, "shortcut_scan_code")
+                    .setIcon(Icon.createWithResource(this, R.drawable.ic_shortcut_filter_center_focus))
+                    .setLongLabel(getString(R.string.shortcut_label_scan_code))
+                    .setShortLabel(getString(R.string.shortcut_label_scan_code))
+                    .setIntent(
+                            new Intent(OnboardingActivity.this, AddPackageActivity.class)
+                                    .setAction("io.github.marktony.espresso.mvp.addpackage.AddPackageActivity")
+                                    .addCategory(ShortcutInfo.SHORTCUT_CATEGORY_CONVERSATION)
+                    )
+                    .build();
+            ShortcutInfo search = new ShortcutInfo.Builder(this, "shortcut_search")
+                    .setIcon(Icon.createWithResource(this, R.drawable.ic_shortcut_search))
+                    .setLongLabel(getString(R.string.shortcut_label_search))
+                    .setShortLabel(getString(R.string.shortcut_label_search))
+                    .setIntent(
+                            new Intent(OnboardingActivity.this, SearchActivity.class)
+                                    .setAction(Intent.ACTION_VIEW)
+                                    .addCategory(ShortcutInfo.SHORTCUT_CATEGORY_CONVERSATION)
+                    )
+                    .build();
+            manager.setDynamicShortcuts(Arrays.asList(addPkg, scanCode, search));
+        }
+
+    }
+
     private void navigateToMainActivity() {
         Intent i = new Intent(this, MainActivity.class);
         i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
diff --git a/mobile/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingFragment.java b/app/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingFragment.java
similarity index 97%
rename from mobile/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingFragment.java
rename to app/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingFragment.java
index 599ac4b..8bb1ea0 100644
--- a/mobile/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingFragment.java
+++ b/app/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingFragment.java
@@ -72,12 +72,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
                 sectionIntro.setText(R.string.onboarding_intro_1);
                 break;
             case 1:
-                sectionImg.setBackgroundResource(R.drawable.ic_notifications_black_24dp);
+                sectionImg.setBackgroundResource(R.drawable.ic_camera_black_24dp);
                 sectionLabel.setText(R.string.onboarding_section_2);
                 sectionIntro.setText(R.string.onboarding_intro_2);
                 break;
             case 2:
-                sectionImg.setBackgroundResource(R.drawable.ic_watch_black_24dp);
+                sectionImg.setBackgroundResource(R.drawable.ic_notifications_black_24dp);
                 sectionLabel.setText(R.string.onboarding_section_3);
                 sectionIntro.setText(R.string.onboarding_intro_3);
                 break;
diff --git a/mobile/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingPagerAdapter.java b/app/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingPagerAdapter.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingPagerAdapter.java
rename to app/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingPagerAdapter.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/util/DensityUtil.java b/app/src/main/java/io/github/marktony/espresso/util/DensityUtil.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/util/DensityUtil.java
rename to app/src/main/java/io/github/marktony/espresso/util/DensityUtil.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/util/NetworkUtil.java b/app/src/main/java/io/github/marktony/espresso/util/NetworkUtil.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/util/NetworkUtil.java
rename to app/src/main/java/io/github/marktony/espresso/util/NetworkUtil.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/util/PushUtil.java b/app/src/main/java/io/github/marktony/espresso/util/PushUtil.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/util/PushUtil.java
rename to app/src/main/java/io/github/marktony/espresso/util/PushUtil.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/util/SettingsUtil.java b/app/src/main/java/io/github/marktony/espresso/util/SettingsUtil.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/util/SettingsUtil.java
rename to app/src/main/java/io/github/marktony/espresso/util/SettingsUtil.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/util/TimeFormatUtil.java b/app/src/main/java/io/github/marktony/espresso/util/TimeFormatUtil.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/util/TimeFormatUtil.java
rename to app/src/main/java/io/github/marktony/espresso/util/TimeFormatUtil.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/zxing/CaptureActivity.java b/app/src/main/java/io/github/marktony/espresso/zxing/CaptureActivity.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/zxing/CaptureActivity.java
rename to app/src/main/java/io/github/marktony/espresso/zxing/CaptureActivity.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/zxing/camera/AutoFocusManager.java b/app/src/main/java/io/github/marktony/espresso/zxing/camera/AutoFocusManager.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/zxing/camera/AutoFocusManager.java
rename to app/src/main/java/io/github/marktony/espresso/zxing/camera/AutoFocusManager.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/zxing/camera/CameraConfigurationManager.java b/app/src/main/java/io/github/marktony/espresso/zxing/camera/CameraConfigurationManager.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/zxing/camera/CameraConfigurationManager.java
rename to app/src/main/java/io/github/marktony/espresso/zxing/camera/CameraConfigurationManager.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/zxing/camera/CameraManager.java b/app/src/main/java/io/github/marktony/espresso/zxing/camera/CameraManager.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/zxing/camera/CameraManager.java
rename to app/src/main/java/io/github/marktony/espresso/zxing/camera/CameraManager.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/zxing/camera/PreviewCallback.java b/app/src/main/java/io/github/marktony/espresso/zxing/camera/PreviewCallback.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/zxing/camera/PreviewCallback.java
rename to app/src/main/java/io/github/marktony/espresso/zxing/camera/PreviewCallback.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/zxing/camera/open/OpenCameraInterface.java b/app/src/main/java/io/github/marktony/espresso/zxing/camera/open/OpenCameraInterface.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/zxing/camera/open/OpenCameraInterface.java
rename to app/src/main/java/io/github/marktony/espresso/zxing/camera/open/OpenCameraInterface.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/zxing/decode/DecodeFormatManager.java b/app/src/main/java/io/github/marktony/espresso/zxing/decode/DecodeFormatManager.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/zxing/decode/DecodeFormatManager.java
rename to app/src/main/java/io/github/marktony/espresso/zxing/decode/DecodeFormatManager.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/zxing/decode/DecodeHandler.java b/app/src/main/java/io/github/marktony/espresso/zxing/decode/DecodeHandler.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/zxing/decode/DecodeHandler.java
rename to app/src/main/java/io/github/marktony/espresso/zxing/decode/DecodeHandler.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/zxing/decode/DecodeThread.java b/app/src/main/java/io/github/marktony/espresso/zxing/decode/DecodeThread.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/zxing/decode/DecodeThread.java
rename to app/src/main/java/io/github/marktony/espresso/zxing/decode/DecodeThread.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/zxing/utils/BeepManager.java b/app/src/main/java/io/github/marktony/espresso/zxing/utils/BeepManager.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/zxing/utils/BeepManager.java
rename to app/src/main/java/io/github/marktony/espresso/zxing/utils/BeepManager.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/zxing/utils/CaptureActivityHandler.java b/app/src/main/java/io/github/marktony/espresso/zxing/utils/CaptureActivityHandler.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/zxing/utils/CaptureActivityHandler.java
rename to app/src/main/java/io/github/marktony/espresso/zxing/utils/CaptureActivityHandler.java
diff --git a/mobile/src/main/java/io/github/marktony/espresso/zxing/utils/InactivityTimer.java b/app/src/main/java/io/github/marktony/espresso/zxing/utils/InactivityTimer.java
similarity index 100%
rename from mobile/src/main/java/io/github/marktony/espresso/zxing/utils/InactivityTimer.java
rename to app/src/main/java/io/github/marktony/espresso/zxing/utils/InactivityTimer.java
diff --git a/mobile/src/main/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml
similarity index 100%
rename from mobile/src/main/res/anim/fade_in.xml
rename to app/src/main/res/anim/fade_in.xml
diff --git a/mobile/src/main/res/anim/fade_out.xml b/app/src/main/res/anim/fade_out.xml
similarity index 100%
rename from mobile/src/main/res/anim/fade_out.xml
rename to app/src/main/res/anim/fade_out.xml
diff --git a/mobile/src/main/res/animator/lift_on_touch.xml b/app/src/main/res/animator/lift_on_touch.xml
similarity index 100%
rename from mobile/src/main/res/animator/lift_on_touch.xml
rename to app/src/main/res/animator/lift_on_touch.xml
diff --git a/mobile/src/main/res/drawable-hdpi/ic_deliver_man.png b/app/src/main/res/drawable-hdpi/ic_deliver_man.png
similarity index 100%
rename from mobile/src/main/res/drawable-hdpi/ic_deliver_man.png
rename to app/src/main/res/drawable-hdpi/ic_deliver_man.png
diff --git a/mobile/src/main/res/drawable-hdpi/ic_shortcut_add.png b/app/src/main/res/drawable-hdpi/ic_shortcut_add.png
similarity index 100%
rename from mobile/src/main/res/drawable-hdpi/ic_shortcut_add.png
rename to app/src/main/res/drawable-hdpi/ic_shortcut_add.png
diff --git a/mobile/src/main/res/drawable-hdpi/ic_shortcut_filter_center_focus.png b/app/src/main/res/drawable-hdpi/ic_shortcut_filter_center_focus.png
similarity index 100%
rename from mobile/src/main/res/drawable-hdpi/ic_shortcut_filter_center_focus.png
rename to app/src/main/res/drawable-hdpi/ic_shortcut_filter_center_focus.png
diff --git a/mobile/src/main/res/drawable-hdpi/ic_shortcut_search.png b/app/src/main/res/drawable-hdpi/ic_shortcut_search.png
similarity index 100%
rename from mobile/src/main/res/drawable-hdpi/ic_shortcut_search.png
rename to app/src/main/res/drawable-hdpi/ic_shortcut_search.png
diff --git a/mobile/src/main/res/drawable-hdpi/nav_header.png b/app/src/main/res/drawable-hdpi/nav_header.png
similarity index 100%
rename from mobile/src/main/res/drawable-hdpi/nav_header.png
rename to app/src/main/res/drawable-hdpi/nav_header.png
diff --git a/mobile/src/main/res/drawable-mdpi/ic_deliver_man.png b/app/src/main/res/drawable-mdpi/ic_deliver_man.png
similarity index 100%
rename from mobile/src/main/res/drawable-mdpi/ic_deliver_man.png
rename to app/src/main/res/drawable-mdpi/ic_deliver_man.png
diff --git a/mobile/src/main/res/drawable-mdpi/ic_shortcut_add.png b/app/src/main/res/drawable-mdpi/ic_shortcut_add.png
similarity index 100%
rename from mobile/src/main/res/drawable-mdpi/ic_shortcut_add.png
rename to app/src/main/res/drawable-mdpi/ic_shortcut_add.png
diff --git a/mobile/src/main/res/drawable-mdpi/ic_shortcut_filter_center_focus.png b/app/src/main/res/drawable-mdpi/ic_shortcut_filter_center_focus.png
similarity index 100%
rename from mobile/src/main/res/drawable-mdpi/ic_shortcut_filter_center_focus.png
rename to app/src/main/res/drawable-mdpi/ic_shortcut_filter_center_focus.png
diff --git a/mobile/src/main/res/drawable-mdpi/ic_shortcut_search.png b/app/src/main/res/drawable-mdpi/ic_shortcut_search.png
similarity index 100%
rename from mobile/src/main/res/drawable-mdpi/ic_shortcut_search.png
rename to app/src/main/res/drawable-mdpi/ic_shortcut_search.png
diff --git a/mobile/src/main/res/drawable-xhdpi/ic_deliver_man.png b/app/src/main/res/drawable-xhdpi/ic_deliver_man.png
similarity index 100%
rename from mobile/src/main/res/drawable-xhdpi/ic_deliver_man.png
rename to app/src/main/res/drawable-xhdpi/ic_deliver_man.png
diff --git a/mobile/src/main/res/drawable-xhdpi/ic_shortcut_add.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_add.png
similarity index 100%
rename from mobile/src/main/res/drawable-xhdpi/ic_shortcut_add.png
rename to app/src/main/res/drawable-xhdpi/ic_shortcut_add.png
diff --git a/mobile/src/main/res/drawable-xhdpi/ic_shortcut_filter_center_focus.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_filter_center_focus.png
similarity index 100%
rename from mobile/src/main/res/drawable-xhdpi/ic_shortcut_filter_center_focus.png
rename to app/src/main/res/drawable-xhdpi/ic_shortcut_filter_center_focus.png
diff --git a/mobile/src/main/res/drawable-xhdpi/ic_shortcut_search.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_search.png
similarity index 100%
rename from mobile/src/main/res/drawable-xhdpi/ic_shortcut_search.png
rename to app/src/main/res/drawable-xhdpi/ic_shortcut_search.png
diff --git a/mobile/src/main/res/drawable-xxhdpi/ic_deliver_man.png b/app/src/main/res/drawable-xxhdpi/ic_deliver_man.png
similarity index 100%
rename from mobile/src/main/res/drawable-xxhdpi/ic_deliver_man.png
rename to app/src/main/res/drawable-xxhdpi/ic_deliver_man.png
diff --git a/mobile/src/main/res/drawable-xxhdpi/ic_shortcut_add.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_add.png
similarity index 100%
rename from mobile/src/main/res/drawable-xxhdpi/ic_shortcut_add.png
rename to app/src/main/res/drawable-xxhdpi/ic_shortcut_add.png
diff --git a/mobile/src/main/res/drawable-xxhdpi/ic_shortcut_filter_center_focus.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_filter_center_focus.png
similarity index 100%
rename from mobile/src/main/res/drawable-xxhdpi/ic_shortcut_filter_center_focus.png
rename to app/src/main/res/drawable-xxhdpi/ic_shortcut_filter_center_focus.png
diff --git a/mobile/src/main/res/drawable-xxhdpi/ic_shortcut_search.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_search.png
similarity index 100%
rename from mobile/src/main/res/drawable-xxhdpi/ic_shortcut_search.png
rename to app/src/main/res/drawable-xxhdpi/ic_shortcut_search.png
diff --git a/mobile/src/main/res/drawable-xxxhdpi/ic_deliver_man.png b/app/src/main/res/drawable-xxxhdpi/ic_deliver_man.png
similarity index 100%
rename from mobile/src/main/res/drawable-xxxhdpi/ic_deliver_man.png
rename to app/src/main/res/drawable-xxxhdpi/ic_deliver_man.png
diff --git a/mobile/src/main/res/drawable-xxxhdpi/ic_shortcut_add.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_add.png
similarity index 100%
rename from mobile/src/main/res/drawable-xxxhdpi/ic_shortcut_add.png
rename to app/src/main/res/drawable-xxxhdpi/ic_shortcut_add.png
diff --git a/mobile/src/main/res/drawable-xxxhdpi/ic_shortcut_filter_center_focus.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_filter_center_focus.png
similarity index 100%
rename from mobile/src/main/res/drawable-xxxhdpi/ic_shortcut_filter_center_focus.png
rename to app/src/main/res/drawable-xxxhdpi/ic_shortcut_filter_center_focus.png
diff --git a/mobile/src/main/res/drawable-xxxhdpi/ic_shortcut_search.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_search.png
similarity index 100%
rename from mobile/src/main/res/drawable-xxxhdpi/ic_shortcut_search.png
rename to app/src/main/res/drawable-xxxhdpi/ic_shortcut_search.png
diff --git a/mobile/src/main/res/drawable/banner_background_add.png b/app/src/main/res/drawable/banner_background_add.png
similarity index 100%
rename from mobile/src/main/res/drawable/banner_background_add.png
rename to app/src/main/res/drawable/banner_background_add.png
diff --git a/mobile/src/main/res/drawable/banner_background_delivered.png b/app/src/main/res/drawable/banner_background_delivered.png
similarity index 100%
rename from mobile/src/main/res/drawable/banner_background_delivered.png
rename to app/src/main/res/drawable/banner_background_delivered.png
diff --git a/mobile/src/main/res/drawable/banner_background_error.png b/app/src/main/res/drawable/banner_background_error.png
similarity index 100%
rename from mobile/src/main/res/drawable/banner_background_error.png
rename to app/src/main/res/drawable/banner_background_error.png
diff --git a/mobile/src/main/res/drawable/banner_background_on_the_way.png b/app/src/main/res/drawable/banner_background_on_the_way.png
similarity index 100%
rename from mobile/src/main/res/drawable/banner_background_on_the_way.png
rename to app/src/main/res/drawable/banner_background_on_the_way.png
diff --git a/mobile/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_add_white_24dp.xml
rename to app/src/main/res/drawable/ic_add_white_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_assignment_black_24dp.xml b/app/src/main/res/drawable/ic_assignment_black_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_assignment_black_24dp.xml
rename to app/src/main/res/drawable/ic_assignment_black_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_assignment_turned_in_black_24dp.xml b/app/src/main/res/drawable/ic_assignment_turned_in_black_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_assignment_turned_in_black_24dp.xml
rename to app/src/main/res/drawable/ic_assignment_turned_in_black_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_assignment_turned_in_teal_24dp.xml b/app/src/main/res/drawable/ic_assignment_turned_in_teal_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_assignment_turned_in_teal_24dp.xml
rename to app/src/main/res/drawable/ic_assignment_turned_in_teal_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_beenhere_black_24dp.xml b/app/src/main/res/drawable/ic_beenhere_black_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_beenhere_black_24dp.xml
rename to app/src/main/res/drawable/ic_beenhere_black_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_brightness_6_black_24dp.xml b/app/src/main/res/drawable/ic_brightness_6_black_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_brightness_6_black_24dp.xml
rename to app/src/main/res/drawable/ic_brightness_6_black_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_watch_black_24dp.xml b/app/src/main/res/drawable/ic_camera_black_24dp.xml
similarity index 64%
rename from mobile/src/main/res/drawable/ic_watch_black_24dp.xml
rename to app/src/main/res/drawable/ic_camera_black_24dp.xml
index 5a5a9f7..5053119 100644
--- a/mobile/src/main/res/drawable/ic_watch_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_camera_black_24dp.xml
@@ -21,5 +21,5 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M20,12c0,-2.54 -1.19,-4.81 -3.04,-6.27L16,0H8l-0.95,5.73C5.19,7.19 4,9.45 4,12s1.19,4.81 3.05,6.27L8,24h8l0.96,-5.73C18.81,16.81 20,14.54 20,12zM6,12c0,-3.31 2.69,-6 6,-6s6,2.69 6,6 -2.69,6 -6,6 -6,-2.69 -6,-6z"/>
+        android:pathData="M9.4,10.5l4.77,-8.26C13.47,2.09 12.75,2 12,2c-2.4,0 -4.6,0.85 -6.32,2.25l3.66,6.35 0.06,-0.1zM21.54,9c-0.92,-2.92 -3.15,-5.26 -6,-6.34L11.88,9h9.66zM21.8,10h-7.49l0.29,0.5 4.76,8.25C21,16.97 22,14.61 22,12c0,-0.69 -0.07,-1.35 -0.2,-2zM8.54,12l-3.9,-6.75C3.01,7.03 2,9.39 2,12c0,0.69 0.07,1.35 0.2,2h7.49l-1.15,-2zM2.46,15c0.92,2.92 3.15,5.26 6,6.34L12.12,15L2.46,15zM13.73,15l-3.9,6.76c0.7,0.15 1.42,0.24 2.17,0.24 2.4,0 4.6,-0.85 6.32,-2.25l-3.66,-6.35 -0.93,1.6z"/>
 </vector>
diff --git a/mobile/src/main/res/drawable/ic_chevron_left_white_24dp.xml b/app/src/main/res/drawable/ic_chevron_left_white_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_chevron_left_white_24dp.xml
rename to app/src/main/res/drawable/ic_chevron_left_white_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_chevron_right_white_24dp.xml b/app/src/main/res/drawable/ic_chevron_right_white_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_chevron_right_white_24dp.xml
rename to app/src/main/res/drawable/ic_chevron_right_white_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable/ic_delete_white_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_delete_white_24dp.xml
rename to app/src/main/res/drawable/ic_delete_white_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_dialpad_black_24dp.xml b/app/src/main/res/drawable/ic_dialpad_black_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_dialpad_black_24dp.xml
rename to app/src/main/res/drawable/ic_dialpad_black_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_done_white_24dp.xml b/app/src/main/res/drawable/ic_done_white_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_done_white_24dp.xml
rename to app/src/main/res/drawable/ic_done_white_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_explore_black_24dp.xml b/app/src/main/res/drawable/ic_explore_black_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_explore_black_24dp.xml
rename to app/src/main/res/drawable/ic_explore_black_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_favorite_border_cyan_48dp.xml b/app/src/main/res/drawable/ic_favorite_border_cyan_48dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_favorite_border_cyan_48dp.xml
rename to app/src/main/res/drawable/ic_favorite_border_cyan_48dp.xml
diff --git a/mobile/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_home_black_24dp.xml
rename to app/src/main/res/drawable/ic_home_black_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_info_black_24dp.xml b/app/src/main/res/drawable/ic_info_black_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_info_black_24dp.xml
rename to app/src/main/res/drawable/ic_info_black_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_link_black_24dp.xml b/app/src/main/res/drawable/ic_link_black_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_link_black_24dp.xml
rename to app/src/main/res/drawable/ic_link_black_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_list_black_24dp.xml b/app/src/main/res/drawable/ic_list_black_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_list_black_24dp.xml
rename to app/src/main/res/drawable/ic_list_black_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_local_shipping_black_24dp.xml b/app/src/main/res/drawable/ic_local_shipping_black_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_local_shipping_black_24dp.xml
rename to app/src/main/res/drawable/ic_local_shipping_black_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_local_shipping_teal_24dp.xml b/app/src/main/res/drawable/ic_local_shipping_teal_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_local_shipping_teal_24dp.xml
rename to app/src/main/res/drawable/ic_local_shipping_teal_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_location_city_black_24dp.xml b/app/src/main/res/drawable/ic_location_city_black_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_location_city_black_24dp.xml
rename to app/src/main/res/drawable/ic_location_city_black_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_mode_edit_white_24dp.xml b/app/src/main/res/drawable/ic_mode_edit_white_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_mode_edit_white_24dp.xml
rename to app/src/main/res/drawable/ic_mode_edit_white_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_notifications_black_24dp.xml
rename to app/src/main/res/drawable/ic_notifications_black_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_phone_black_24dp.xml b/app/src/main/res/drawable/ic_phone_black_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_phone_black_24dp.xml
rename to app/src/main/res/drawable/ic_phone_black_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_search_white_24dp.xml b/app/src/main/res/drawable/ic_search_white_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_search_white_24dp.xml
rename to app/src/main/res/drawable/ic_search_white_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings_black_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_settings_black_24dp.xml
rename to app/src/main/res/drawable/ic_settings_black_24dp.xml
diff --git a/mobile/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable/ic_share_white_24dp.xml
similarity index 100%
rename from mobile/src/main/res/drawable/ic_share_white_24dp.xml
rename to app/src/main/res/drawable/ic_share_white_24dp.xml
diff --git a/mobile/src/main/res/drawable/nav_item_color.xml b/app/src/main/res/drawable/nav_item_color.xml
similarity index 100%
rename from mobile/src/main/res/drawable/nav_item_color.xml
rename to app/src/main/res/drawable/nav_item_color.xml
diff --git a/mobile/src/main/res/drawable/onboarding_indicator_selected.xml b/app/src/main/res/drawable/onboarding_indicator_selected.xml
similarity index 100%
rename from mobile/src/main/res/drawable/onboarding_indicator_selected.xml
rename to app/src/main/res/drawable/onboarding_indicator_selected.xml
diff --git a/mobile/src/main/res/drawable/onboarding_indicator_unselected.xml b/app/src/main/res/drawable/onboarding_indicator_unselected.xml
similarity index 100%
rename from mobile/src/main/res/drawable/onboarding_indicator_unselected.xml
rename to app/src/main/res/drawable/onboarding_indicator_unselected.xml
diff --git a/mobile/src/main/res/drawable/qr_code_bg.9.png b/app/src/main/res/drawable/qr_code_bg.9.png
similarity index 100%
rename from mobile/src/main/res/drawable/qr_code_bg.9.png
rename to app/src/main/res/drawable/qr_code_bg.9.png
diff --git a/mobile/src/main/res/drawable/scan_line.png b/app/src/main/res/drawable/scan_line.png
similarity index 100%
rename from mobile/src/main/res/drawable/scan_line.png
rename to app/src/main/res/drawable/scan_line.png
diff --git a/mobile/src/main/res/drawable/shadow.png b/app/src/main/res/drawable/shadow.png
similarity index 100%
rename from mobile/src/main/res/drawable/shadow.png
rename to app/src/main/res/drawable/shadow.png
diff --git a/mobile/src/main/res/drawable/solid_circle.xml b/app/src/main/res/drawable/solid_circle.xml
similarity index 100%
rename from mobile/src/main/res/drawable/solid_circle.xml
rename to app/src/main/res/drawable/solid_circle.xml
diff --git a/mobile/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
similarity index 100%
rename from mobile/src/main/res/layout/activity_main.xml
rename to app/src/main/res/layout/activity_main.xml
diff --git a/mobile/src/main/res/layout/activity_onboarding.xml b/app/src/main/res/layout/activity_onboarding.xml
similarity index 100%
rename from mobile/src/main/res/layout/activity_onboarding.xml
rename to app/src/main/res/layout/activity_onboarding.xml
diff --git a/mobile/src/main/res/layout/activity_prefs.xml b/app/src/main/res/layout/activity_prefs.xml
similarity index 100%
rename from mobile/src/main/res/layout/activity_prefs.xml
rename to app/src/main/res/layout/activity_prefs.xml
diff --git a/mobile/src/main/res/layout/activity_scan.xml b/app/src/main/res/layout/activity_scan.xml
similarity index 100%
rename from mobile/src/main/res/layout/activity_scan.xml
rename to app/src/main/res/layout/activity_scan.xml
diff --git a/mobile/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
similarity index 100%
rename from mobile/src/main/res/layout/app_bar_main.xml
rename to app/src/main/res/layout/app_bar_main.xml
diff --git a/mobile/src/main/res/layout/container.xml b/app/src/main/res/layout/container.xml
similarity index 100%
rename from mobile/src/main/res/layout/container.xml
rename to app/src/main/res/layout/container.xml
diff --git a/mobile/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
similarity index 100%
rename from mobile/src/main/res/layout/content_main.xml
rename to app/src/main/res/layout/content_main.xml
diff --git a/mobile/src/main/res/layout/dialog_edit_package_name.xml b/app/src/main/res/layout/dialog_edit_package_name.xml
similarity index 100%
rename from mobile/src/main/res/layout/dialog_edit_package_name.xml
rename to app/src/main/res/layout/dialog_edit_package_name.xml
diff --git a/mobile/src/main/res/layout/fragment_add_package.xml b/app/src/main/res/layout/fragment_add_package.xml
similarity index 100%
rename from mobile/src/main/res/layout/fragment_add_package.xml
rename to app/src/main/res/layout/fragment_add_package.xml
diff --git a/mobile/src/main/res/layout/fragment_companies_list.xml b/app/src/main/res/layout/fragment_companies_list.xml
similarity index 100%
rename from mobile/src/main/res/layout/fragment_companies_list.xml
rename to app/src/main/res/layout/fragment_companies_list.xml
diff --git a/mobile/src/main/res/layout/fragment_company_details.xml b/app/src/main/res/layout/fragment_company_details.xml
similarity index 100%
rename from mobile/src/main/res/layout/fragment_company_details.xml
rename to app/src/main/res/layout/fragment_company_details.xml
diff --git a/mobile/src/main/res/layout/fragment_licenses.xml b/app/src/main/res/layout/fragment_licenses.xml
similarity index 100%
rename from mobile/src/main/res/layout/fragment_licenses.xml
rename to app/src/main/res/layout/fragment_licenses.xml
diff --git a/mobile/src/main/res/layout/fragment_onboarding.xml b/app/src/main/res/layout/fragment_onboarding.xml
similarity index 100%
rename from mobile/src/main/res/layout/fragment_onboarding.xml
rename to app/src/main/res/layout/fragment_onboarding.xml
diff --git a/mobile/src/main/res/layout/fragment_package_details.xml b/app/src/main/res/layout/fragment_package_details.xml
similarity index 100%
rename from mobile/src/main/res/layout/fragment_package_details.xml
rename to app/src/main/res/layout/fragment_package_details.xml
diff --git a/mobile/src/main/res/layout/fragment_packages.xml b/app/src/main/res/layout/fragment_packages.xml
similarity index 100%
rename from mobile/src/main/res/layout/fragment_packages.xml
rename to app/src/main/res/layout/fragment_packages.xml
diff --git a/mobile/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
similarity index 100%
rename from mobile/src/main/res/layout/fragment_search.xml
rename to app/src/main/res/layout/fragment_search.xml
diff --git a/mobile/src/main/res/layout/item_company.xml b/app/src/main/res/layout/item_company.xml
similarity index 100%
rename from mobile/src/main/res/layout/item_company.xml
rename to app/src/main/res/layout/item_company.xml
diff --git a/mobile/src/main/res/layout/item_company_with_header.xml b/app/src/main/res/layout/item_company_with_header.xml
similarity index 100%
rename from mobile/src/main/res/layout/item_company_with_header.xml
rename to app/src/main/res/layout/item_company_with_header.xml
diff --git a/mobile/src/main/res/layout/item_details_header.xml b/app/src/main/res/layout/item_details_header.xml
similarity index 100%
rename from mobile/src/main/res/layout/item_details_header.xml
rename to app/src/main/res/layout/item_details_header.xml
diff --git a/mobile/src/main/res/layout/item_package.xml b/app/src/main/res/layout/item_package.xml
similarity index 100%
rename from mobile/src/main/res/layout/item_package.xml
rename to app/src/main/res/layout/item_package.xml
diff --git a/mobile/src/main/res/layout/item_package_for_widget.xml b/app/src/main/res/layout/item_package_for_widget.xml
similarity index 100%
rename from mobile/src/main/res/layout/item_package_for_widget.xml
rename to app/src/main/res/layout/item_package_for_widget.xml
diff --git a/mobile/src/main/res/layout/item_package_status.xml b/app/src/main/res/layout/item_package_status.xml
similarity index 100%
rename from mobile/src/main/res/layout/item_package_status.xml
rename to app/src/main/res/layout/item_package_status.xml
diff --git a/mobile/src/main/res/layout/item_search_result_category.xml b/app/src/main/res/layout/item_search_result_category.xml
similarity index 100%
rename from mobile/src/main/res/layout/item_search_result_category.xml
rename to app/src/main/res/layout/item_search_result_category.xml
diff --git a/mobile/src/main/res/layout/item_search_result_empty.xml b/app/src/main/res/layout/item_search_result_empty.xml
similarity index 100%
rename from mobile/src/main/res/layout/item_search_result_empty.xml
rename to app/src/main/res/layout/item_search_result_empty.xml
diff --git a/mobile/src/main/res/layout/launcher_list_widget.xml b/app/src/main/res/layout/launcher_list_widget.xml
similarity index 100%
rename from mobile/src/main/res/layout/launcher_list_widget.xml
rename to app/src/main/res/layout/launcher_list_widget.xml
diff --git a/mobile/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
similarity index 100%
rename from mobile/src/main/res/layout/nav_header_main.xml
rename to app/src/main/res/layout/nav_header_main.xml
diff --git a/mobile/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
similarity index 100%
rename from mobile/src/main/res/menu/activity_main_drawer.xml
rename to app/src/main/res/menu/activity_main_drawer.xml
diff --git a/mobile/src/main/res/menu/bottom_navigation.xml b/app/src/main/res/menu/bottom_navigation.xml
similarity index 100%
rename from mobile/src/main/res/menu/bottom_navigation.xml
rename to app/src/main/res/menu/bottom_navigation.xml
diff --git a/mobile/src/main/res/menu/companies_list.xml b/app/src/main/res/menu/companies_list.xml
similarity index 100%
rename from mobile/src/main/res/menu/companies_list.xml
rename to app/src/main/res/menu/companies_list.xml
diff --git a/mobile/src/main/res/menu/package_details.xml b/app/src/main/res/menu/package_details.xml
similarity index 100%
rename from mobile/src/main/res/menu/package_details.xml
rename to app/src/main/res/menu/package_details.xml
diff --git a/mobile/src/main/res/menu/packages_list.xml b/app/src/main/res/menu/packages_list.xml
similarity index 100%
rename from mobile/src/main/res/menu/packages_list.xml
rename to app/src/main/res/menu/packages_list.xml
diff --git a/mobile/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from mobile/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from mobile/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/mobile/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from mobile/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from mobile/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from mobile/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/mobile/src/main/res/raw/beep.ogg b/app/src/main/res/raw/beep.ogg
similarity index 100%
rename from mobile/src/main/res/raw/beep.ogg
rename to app/src/main/res/raw/beep.ogg
diff --git a/mobile/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
similarity index 100%
rename from mobile/src/main/res/values-night/colors.xml
rename to app/src/main/res/values-night/colors.xml
diff --git a/mobile/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
similarity index 100%
rename from mobile/src/main/res/values-w820dp/dimens.xml
rename to app/src/main/res/values-w820dp/dimens.xml
diff --git a/mobile/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
similarity index 94%
rename from mobile/src/main/res/values-zh-rCN/strings.xml
rename to app/src/main/res/values-zh-rCN/strings.xml
index 0c299f8..0e210e6 100644
--- a/mobile/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -174,11 +174,11 @@
     <string name="onboarding_finish_button_description">完成</string>
     <string name="onboarding_pre_button_description">上一步</string>
     <string name="onboarding_section_1">简单快速地添加包裹</string>
-    <string name="onboarding_intro_1">支持全球640余家快递公司, 但当你添加包裹时, 快递公司的识别将被自动完成。</string>
-    <string name="onboarding_section_2">保持你的物流信息为最新状态</string>
-    <string name="onboarding_intro_2">当物流信息更新后, 你将收到通知提醒, 所以你的信息将保持最新。</string>
-    <string name="onboarding_section_3">和你的Android Wear设备保持同步</string>
-    <string name="onboarding_intro_3">你可以在Android Wear设备上完成一切操作。</string>
+    <string name="onboarding_intro_1">支持全球640余家快递公司</string>
+    <string name="onboarding_section_2">一次点击就可以完成输入单号的操作</string>
+    <string name="onboarding_intro_2">对准单号扫描，然后单号就会被自动识别</string>
+    <string name="onboarding_section_3">保持你的物流信息为最新状态</string>
+    <string name="onboarding_intro_3">当物流信息更新后, 你将收到通知提醒, 所以你的信息将保持最新</string>
     <string name="onboarding_finish_button_description_wait">准备中, 请稍后…</string>
     <!--onboarding end-->
 
diff --git a/mobile/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
similarity index 95%
rename from mobile/src/main/res/values-zh-rHK/strings.xml
rename to app/src/main/res/values-zh-rHK/strings.xml
index 70a279d..b643f89 100644
--- a/mobile/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -174,11 +174,11 @@
     <string name="onboarding_finish_button_description">完成</string>
     <string name="onboarding_pre_button_description">上一步</string>
     <string name="onboarding_section_1">簡單快速地添加包裹</string>
-    <string name="onboarding_intro_1">支持全球640餘家快遞公司, 但當你添加包裹時, 快遞公司的識別將被自動完成。</string>
-    <string name="onboarding_section_2">保持你的物流信息為最新狀態</string>
-    <string name="onboarding_intro_2">當物流信息更新後, 你將收到通知提醒, 所以你的信息將保持最新。</string>
-    <string name="onboarding_section_3">和你的Android Wear設備保持同步</string>
-    <string name="onboarding_intro_3">你可以在Android Wear設備上完成一切操作。</string>
+    <string name="onboarding_intro_1">支持全球640餘家快遞公司</string>
+    <string name="onboarding_section_2">一次點擊就可以完成輸入單號的操作</string>
+    <string name="onboarding_intro_2">對準單號掃描，然後單號就會被自動識別</string>
+    <string name="onboarding_section_3">保持你的物流信息為最新狀態</string>
+    <string name="onboarding_intro_3">當物流信息更新後, 你將收到通知提醒, 所以你的信息將保持最新。</string>
     <string name="onboarding_finish_button_description_wait">準備中, 請稍後…</string>
     <!--onboarding end-->
 
diff --git a/mobile/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
similarity index 94%
rename from mobile/src/main/res/values-zh-rTW/strings.xml
rename to app/src/main/res/values-zh-rTW/strings.xml
index abaad70..287bcdf 100644
--- a/mobile/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -174,11 +174,11 @@
     <string name="onboarding_finish_button_description">完成</string>
     <string name="onboarding_pre_button_description">上一步</string>
     <string name="onboarding_section_1">簡單快速地添加包裹</string>
-    <string name="onboarding_intro_1">支持全球640餘家快遞公司, 但當你添加包裹時, 快遞公司的識別將被自動完成。</string>
-    <string name="onboarding_section_2">保持你的物流信息為最新狀態</string>
-    <string name="onboarding_intro_2">當物流信息更新後, 你將收到通知提醒, 所以你的信息將保持最新。</string>
-    <string name="onboarding_section_3">和你的Android Wear設備保持同步</string>
-    <string name="onboarding_intro_3">你可以在Android Wear設備上完成一切操作。</string>
+    <string name="onboarding_intro_1">支持全球640餘家快遞公司</string>
+    <string name="onboarding_section_2">一次點擊就可以完成輸入單號的操作</string>
+    <string name="onboarding_intro_2">對準單號掃描，然後單號就會被自動識別</string>
+    <string name="onboarding_section_3">保持你的物流信息為最新狀態</string>
+    <string name="onboarding_intro_3">當物流信息更新後, 你將收到通知提醒, 所以你的信息將保持最新</string>
     <string name="onboarding_finish_button_description_wait">準備中, 請稍後…</string>
     <!--onboarding end-->
 
diff --git a/mobile/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
similarity index 100%
rename from mobile/src/main/res/values/attr.xml
rename to app/src/main/res/values/attr.xml
diff --git a/mobile/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
similarity index 100%
rename from mobile/src/main/res/values/colors.xml
rename to app/src/main/res/values/colors.xml
diff --git a/mobile/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
similarity index 100%
rename from mobile/src/main/res/values/dimens.xml
rename to app/src/main/res/values/dimens.xml
diff --git a/mobile/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
similarity index 95%
rename from mobile/src/main/res/values/strings.xml
rename to app/src/main/res/values/strings.xml
index a01b221..d53bbb9 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -174,11 +174,11 @@
     <string name="onboarding_finish_button_description">Finish</string>
     <string name="onboarding_pre_button_description">Pre</string>
     <string name="onboarding_section_1">Add your packages quickly and easily</string>
-    <string name="onboarding_intro_1">Support 640+ express companies all over the world, but when you add packages, the companies will be recognized automatically.</string>
-    <string name="onboarding_section_2">Keep the delivery status updated</string>
-    <string name="onboarding_intro_2">Push notification when the delivery status is refreshed, so you can get the latest information.</string>
-    <string name="onboarding_section_3">Sync with your Android Wear devices</string>
-    <string name="onboarding_intro_3">You can make everything done on your watches.</string>
+    <string name="onboarding_intro_1">Support 640+ express companies all over the world.</string>
+    <string name="onboarding_section_2">Input numbers by just one touch</string>
+    <string name="onboarding_intro_2">Scan the number and then, they are recognized.</string>
+    <string name="onboarding_section_3">Keep the delivery status updated</string>
+    <string name="onboarding_intro_3">Push notification when the delivery status is refreshed, so you can get the latest information.</string>
     <string name="onboarding_finish_button_description_wait">Preparing, please wait…</string>
     <!--onboarding end-->
 
diff --git a/mobile/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
similarity index 100%
rename from mobile/src/main/res/values/styles.xml
rename to app/src/main/res/values/styles.xml
diff --git a/mobile/src/main/res/values/zxing_ids.xml b/app/src/main/res/values/zxing_ids.xml
similarity index 100%
rename from mobile/src/main/res/values/zxing_ids.xml
rename to app/src/main/res/values/zxing_ids.xml
diff --git a/mobile/src/main/res/xml/about_prefs.xml b/app/src/main/res/xml/about_prefs.xml
similarity index 100%
rename from mobile/src/main/res/xml/about_prefs.xml
rename to app/src/main/res/xml/about_prefs.xml
diff --git a/mobile/src/main/res/xml/settings_prefs.xml b/app/src/main/res/xml/settings_prefs.xml
similarity index 100%
rename from mobile/src/main/res/xml/settings_prefs.xml
rename to app/src/main/res/xml/settings_prefs.xml
diff --git a/mobile/src/main/res/xml/widget_provider.xml b/app/src/main/res/xml/widget_provider.xml
similarity index 100%
rename from mobile/src/main/res/xml/widget_provider.xml
rename to app/src/main/res/xml/widget_provider.xml
diff --git a/mobile/src/test/java/io/github/marktony/espresso/ExampleUnitTest.java b/app/src/test/java/io/github/marktony/espresso/ExampleUnitTest.java
similarity index 100%
rename from mobile/src/test/java/io/github/marktony/espresso/ExampleUnitTest.java
rename to app/src/test/java/io/github/marktony/espresso/ExampleUnitTest.java
diff --git a/mobile/src/main/res/xml/shortcuts.xml b/mobile/src/main/res/xml/shortcuts.xml
deleted file mode 100644
index fd5dcce..0000000
--- a/mobile/src/main/res/xml/shortcuts.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~  Copyright(c) 2017 lizhaotailang
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<Shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <shortcut
-        android:enabled="true"
-        android:icon="@drawable/ic_shortcut_add"
-        android:shortcutId="shortcut_add_package"
-        android:shortcutShortLabel="@string/shortcut_label_add_package"
-        android:shortcutLongLabel="@string/shortcut_label_add_package">
-
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:targetPackage="io.github.marktony.espresso"
-            android:targetClass="io.github.marktony.espresso.mvp.addpackage.AddPackageActivity" />
-
-        <categories android:name="android.shortcut.conversation" />
-
-    </shortcut>
-
-    <shortcut
-        android:enabled="true"
-        android:icon="@drawable/ic_shortcut_filter_center_focus"
-        android:shortcutId="shortcut_scan_code"
-        android:shortcutShortLabel="@string/shortcut_label_scan_code"
-        android:shortcutLongLabel="@string/shortcut_label_scan_code">
-
-        <intent
-            android:action="io.github.marktony.espresso.mvp.addpackage.AddPackageActivity"
-            android:targetPackage="io.github.marktony.espresso"
-            android:targetClass="io.github.marktony.espresso.mvp.addpackage.AddPackageActivity" />
-
-        <categories android:name="android.shortcut.conversation" />
-
-    </shortcut>
-
-    <shortcut
-        android:enabled="true"
-        android:icon="@drawable/ic_shortcut_search"
-        android:shortcutId="shortcut_search"
-        android:shortcutShortLabel="@string/shortcut_label_search"
-        android:shortcutLongLabel="@string/shortcut_label_search">
-
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:targetPackage="io.github.marktony.espresso"
-            android:targetClass="io.github.marktony.espresso.mvp.search.SearchActivity" />
-
-        <categories android:name="android.shortcut.conversation" />
-
-    </shortcut>
-
-</Shortcuts>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 6a4e79f..e7b4def 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':mobile', ':wear'
+include ':app'