diff --git a/.gradle/5.4.1/executionHistory/executionHistory.bin b/.gradle/5.4.1/executionHistory/executionHistory.bin
index 6828989..5533df8 100644
Binary files a/.gradle/5.4.1/executionHistory/executionHistory.bin and b/.gradle/5.4.1/executionHistory/executionHistory.bin differ
diff --git a/.gradle/5.4.1/executionHistory/executionHistory.lock b/.gradle/5.4.1/executionHistory/executionHistory.lock
index 92e3332..f2eca88 100644
Binary files a/.gradle/5.4.1/executionHistory/executionHistory.lock and b/.gradle/5.4.1/executionHistory/executionHistory.lock differ
diff --git a/.gradle/5.4.1/fileHashes/fileHashes.bin b/.gradle/5.4.1/fileHashes/fileHashes.bin
index 1299ffe..787d0f3 100644
Binary files a/.gradle/5.4.1/fileHashes/fileHashes.bin and b/.gradle/5.4.1/fileHashes/fileHashes.bin differ
diff --git a/.gradle/5.4.1/fileHashes/fileHashes.lock b/.gradle/5.4.1/fileHashes/fileHashes.lock
index d7f5188..48bfc03 100644
Binary files a/.gradle/5.4.1/fileHashes/fileHashes.lock and b/.gradle/5.4.1/fileHashes/fileHashes.lock differ
diff --git a/.gradle/5.4.1/fileHashes/resourceHashesCache.bin b/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
index ac5377a..1c60897 100644
Binary files a/.gradle/5.4.1/fileHashes/resourceHashesCache.bin and b/.gradle/5.4.1/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/5.4.1/javaCompile/classAnalysis.bin b/.gradle/5.4.1/javaCompile/classAnalysis.bin
index be20110..87d2437 100644
Binary files a/.gradle/5.4.1/javaCompile/classAnalysis.bin and b/.gradle/5.4.1/javaCompile/classAnalysis.bin differ
diff --git a/.gradle/5.4.1/javaCompile/jarAnalysis.bin b/.gradle/5.4.1/javaCompile/jarAnalysis.bin
index c02118d..7ad9d85 100644
Binary files a/.gradle/5.4.1/javaCompile/jarAnalysis.bin and b/.gradle/5.4.1/javaCompile/jarAnalysis.bin differ
diff --git a/.gradle/5.4.1/javaCompile/javaCompile.lock b/.gradle/5.4.1/javaCompile/javaCompile.lock
index 049946e..e6d630d 100644
Binary files a/.gradle/5.4.1/javaCompile/javaCompile.lock and b/.gradle/5.4.1/javaCompile/javaCompile.lock differ
diff --git a/.gradle/5.4.1/javaCompile/taskHistory.bin b/.gradle/5.4.1/javaCompile/taskHistory.bin
index e126ac6..d053107 100644
Binary files a/.gradle/5.4.1/javaCompile/taskHistory.bin and b/.gradle/5.4.1/javaCompile/taskHistory.bin differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3fc4992..bd2b064 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,9 +6,14 @@
     </shared>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="713ef07d-bb6d-4386-95df-92f7f9fff5f1" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/BaseRepository.kt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/UserRepository.kt" afterDir="false" />
+    <list default="true" id="ebd2cf14-6a1f-4718-a07e-0a5968921822" name="Default Changelist" comment="ddWorking on implementing the Toggle controls like Repeat and Shuffle. Having a little issues with Repeat, haven't started with Shuffle">
+      <change afterPath="$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/src/main/cpp/types/ConnType.h" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/src/main/cpp/utility/GeneralUtility.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileChanges/last-build.bin" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.bin" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.lock" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/gc.properties" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" afterDir="false" />
@@ -22,17 +27,89 @@
       <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dictionaries/phoenix.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules/mear.iml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/render.experimental.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_ealva_ealvalog_android_0_5_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_ealva_ealvalog_android_0_5_0_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_github_XuDeveloper_XPopupWindow_1_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_github_XuDeveloper_XPopupWindow_1_0_1_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_coroutines_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_coroutines_0_10_8_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_commons_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_commons_0_10_8_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_coroutines_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_coroutines_0_10_8_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_0_10_8_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_coroutines_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_coroutines_0_10_8_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_10_8_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_0_10_8_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_commons_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_commons_0_10_8_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_appcompatV7_base_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_appcompatV7_base_0_10_8_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_commons_base_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_commons_base_0_10_8_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/APIRepository.cpp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/APIRepository.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/repository/APIRepository.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/BaseRepository.cpp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/BaseRepository.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/repository/BaseRepository.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/CoverArtRepository.cpp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/CoverArtRepository.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/repository/CoverArtRepository.h" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/cpp/Demo.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/Demo.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/LoginActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/LoginActivity.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/RepeatRepository.cpp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/RepeatRepository.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/repository/RepeatRepository.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/RepeatTypes.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/types/RepeatTypes.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/ShuffleRepository.cpp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/ShuffleRepository.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/repository/ShuffleRepository.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/ShuffleTypes.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/types/ShuffleTypes.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/SongRepository.cpp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/SongRepository.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/repository/SongRepository.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/Tok.cpp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/Tok.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/manager/Tok.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/TokenRepository.cpp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/TokenRepository.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/repository/TokenRepository.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/UserRepository.cpp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/UserRepository.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/repository/UserRepository.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/model/Song.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/model/Song.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/mear.iml" beforeDir="false" afterPath="$PROJECT_DIR$/mear.iml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -44,7 +121,7 @@
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="ZY2248HP8X" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="Nexus_5X_API_29_x86" />
   <component name="ExternalProjectsData">
     <projectState path="$PROJECT_DIR$">
       <ProjectState />
@@ -58,112 +135,117 @@
     </system>
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.5">
+    <splitter split-orientation="horizontal" split-proportion="0.49960223">
       <split-first>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/app/src/main/cpp/Demo.cpp">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="292">
+                  <caret line="230" column="31" selection-start-line="230" selection-start-column="31" selection-end-line="230" selection-end-column="31" />
+                  <folding>
+                    <element signature="e#40#57#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/MainActivity.kt">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="886">
+                  <caret line="380" selection-start-line="380" selection-end-line="380" />
+                  <folding>
+                    <element signature="e#37#1331#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/playback/service/MusicService.kt">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="2336">
+                  <caret line="162" column="40" selection-start-line="162" selection-start-column="40" selection-end-line="162" selection-end-column="40" />
+                  <folding>
+                    <element signature="e#43#596#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
           <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
-              <provider selected="true" editor-type-id="text-editor" />
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/LoginActivity.kt">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="209">
-                  <caret line="88" column="9" selection-start-line="88" selection-start-column="9" selection-end-line="88" selection-end-column="9" />
-                  <folding>
-                    <element signature="e#37#460#0" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/models/Token.kt">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="34">
-                  <caret line="2" column="6" selection-start-line="2" selection-start-column="6" selection-end-line="2" selection-end-column="6" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/BaseRepository.kt">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="221">
-                  <caret line="13" column="11" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="11" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/UserRepository.kt">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="289">
-                  <caret line="17" selection-start-line="17" selection-end-line="17" />
-                  <folding>
-                    <element signature="e#39#111#0" expanded="true" />
-                  </folding>
+                <state relative-caret-position="464">
+                  <caret line="29" column="8" selection-start-line="29" selection-start-column="8" selection-end-line="29" selection-end-column="8" />
                 </state>
               </provider>
             </entry>
           </file>
           <file pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/app/src/main/cpp/Demo.cpp">
+            <entry file="file://$PROJECT_DIR$/app/src/main/cpp/model/Song.h">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="115">
-                  <caret line="281" column="19" selection-start-line="281" selection-start-column="19" selection-end-line="281" selection-end-column="19" />
+                <state relative-caret-position="448">
+                  <caret line="28" selection-start-line="28" selection-end-line="28" />
                   <folding>
-                    <element signature="e#5952#7882#0" />
-                    <element signature="e#7904#8870#0" />
-                    <element signature="e#8896#9391#0" />
-                    <element signature="e#9411#9730#0" />
-                    <element signature="e#9752#10070#0" />
-                    <element signature="e#10093#10352#0" />
-                    <element signature="e#10375#10919#0" />
+                    <element signature="e#82#99#0" expanded="true" />
                   </folding>
                 </state>
               </provider>
             </entry>
           </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/include/jni.h">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="183">
-                  <caret line="696" selection-start-line="696" selection-end-line="696" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/models/User.kt">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="34">
-                  <caret line="2" column="62" selection-start-line="2" selection-start-column="62" selection-end-line="2" selection-end-column="62" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/models/Song.kt">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="34">
-                  <caret line="2" column="37" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
-                </state>
-              </provider>
-            </entry>
-          </file>
         </leaf>
       </split-first>
       <split-second>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
           <file pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/UserRepository.kt">
+            <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/TrackRepository.kt">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="119">
-                  <caret line="7" selection-start-line="7" selection-end-line="7" />
+                <state relative-caret-position="432">
+                  <caret line="34" selection-start-line="34" selection-end-line="34" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="736">
+                  <caret line="46" column="31" selection-start-line="46" selection-start-column="31" selection-end-line="46" selection-end-column="31" />
                   <folding>
-                    <element signature="e#39#85#0" expanded="true" />
+                    <element signature="e#220#274#0" expanded="true" />
+                    <element signature="e#419#473#0" expanded="true" />
+                    <element signature="e#602#656#0" expanded="true" />
+                    <element signature="e#783#837#0" expanded="true" />
+                    <element signature="e#956#1010#0" expanded="true" />
+                    <element signature="e#1126#1180#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/TokenRepository.h">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="646">
+                  <caret line="66" column="56" selection-start-line="66" selection-start-column="56" selection-end-line="66" selection-end-column="56" />
+                  <folding>
+                    <element signature="e#104#121#0" expanded="true" />
+                    <element signature="e#233#261#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/UserRepository.h">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="1280">
+                  <caret line="80" column="70" selection-start-line="80" selection-start-column="70" selection-end-line="80" selection-end-column="70" />
+                  <folding>
+                    <element signature="e#102#119#0" expanded="true" />
+                    <element signature="e#231#257#0" expanded="true" />
                   </folding>
                 </state>
               </provider>
@@ -176,104 +258,237 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
+        <option value="Kotlin Object" />
         <option value="Kotlin Class" />
       </list>
     </option>
   </component>
   <component name="Git.Settings">
+    <option name="PREVIOUS_COMMIT_AUTHORS">
+      <list>
+        <option value="kdeng00 &lt;kundeng94@gmail.com&gt;" />
+      </list>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/ShuffleRepository.kt" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/BaseRepository.kt" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/models/User.kt" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/UserRepository.kt" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/RepeatRepository.kt" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/model/CoverArt.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/Demo.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/CoverArtRepository.cpp" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/models/Song.kt" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/IcarusSongActivity.kt" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/adapters/SongAdapter.kt" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/model/Token.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/TokenRepository.cpp" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/Tok.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/Tok.cpp" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/CoverArtRepository.kt" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/util/ConvertByteArray.kt" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/LoginActivity.kt" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/SongRepository.cpp" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/GeneralUtility.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/SongRepository.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/CoverArtRepository.h" />
+        <option value="$PROJECT_DIR$/app/src/main/res/menu/popup_menu.xml" />
+        <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/TrackRepository.kt" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/playback/service/MusicService.kt" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/MainActivity.kt" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/APIRepository.cpp" />
+        <option value="$PROJECT_DIR$/app/build.gradle" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/types/ConnType.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/BaseRepository.cpp" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/BaseRepository.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/APIRepository.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/APIRepository.cpp" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/CoverArtRepository.cpp" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/RepeatRepository.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/RepeatRepository.cpp" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/SongRepository.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/CoverArtRepository.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/ShuffleRepository.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/ShuffleRepository.cpp" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/manager/Tok.cpp" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/manager/Tok.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/SongRepository.cpp" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/TokenRepository.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/TokenRepository.cpp" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/UserRepository.cpp" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/UserRepository.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/utility/GeneralUtility.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" />
         <option value="$PROJECT_DIR$/app/src/main/cpp/Demo.cpp" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/model/Song.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h" />
       </list>
     </option>
   </component>
+  <component name="OCFindUsagesOptions" text="true" ivars="false" properties="true" derivedClasses="false" />
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="154" />
-    <option name="y" value="35" />
-    <option name="width" value="1400" />
-    <option name="height" value="1000" />
+    <option name="y" value="-16" />
+    <option name="width" value="640" />
+    <option name="height" value="1079" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
-    <navigator proportions="" version="1">
+    <navigator currentView="ProjectPane" proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="AndroidView">
+      <pane id="Scope" />
+      <pane id="AndroidView" />
+      <pane id="ProjectPane">
         <subPane>
           <expand>
             <path>
-              <item name="mear" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
             </path>
             <path>
-              <item name="mear" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
-              <item name="java" type="edd41e36:AndroidSourceTypeNode" />
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
             </path>
             <path>
-              <item name="mear" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
-              <item name="java" type="edd41e36:AndroidSourceTypeNode" />
-              <item name="mear" type="cbb59c9e:AndroidPsiDirectoryNode" />
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="mear" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
-              <item name="java" type="edd41e36:AndroidSourceTypeNode" />
-              <item name="mear" type="cbb59c9e:AndroidPsiDirectoryNode" />
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="cpp" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="cpp" type="462c0819:PsiDirectoryNode" />
+              <item name="manager" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="cpp" type="462c0819:PsiDirectoryNode" />
+              <item name="model" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="cpp" type="462c0819:PsiDirectoryNode" />
+              <item name="types" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="mear" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="mear" type="462c0819:PsiDirectoryNode" />
               <item name="activities" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="mear" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
-              <item name="java" type="edd41e36:AndroidSourceTypeNode" />
-              <item name="mear" type="cbb59c9e:AndroidPsiDirectoryNode" />
-              <item name="models" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="mear" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
-              <item name="java" type="edd41e36:AndroidSourceTypeNode" />
-              <item name="mear" type="cbb59c9e:AndroidPsiDirectoryNode" />
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="mear" type="462c0819:PsiDirectoryNode" />
               <item name="repositories" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="mear" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
-              <item name="cpp" type="9a30073f:AndroidJniFolderNode" />
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="res" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="mear" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
-              <item name="cpp" type="9a30073f:AndroidJniFolderNode" />
-              <item name="" type="557542c:NdkLibraryEnhancedHeadersNode" />
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="res" type="462c0819:PsiDirectoryNode" />
+              <item name="menu" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="res" type="462c0819:PsiDirectoryNode" />
+              <item name="values" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="ProjectPane" />
-      <pane id="Scope" />
       <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
+    <property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="ZY326HNM46" />
+    <property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2019-11-20T03:44:38.344Z" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
+    <property name="android.sdk.path" value="$USER_HOME$/Android/Sdk" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/app/src/main/cpp/types" />
     <property name="not.eligible.for.single.variant.sync" value="true" />
-    <property name="project.structure.last.edited" value="SDK Location" />
-    <property name="project.structure.proportion" value="0.17" />
-    <property name="project.structure.side.proportion" value="0.0" />
     <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
   </component>
+  <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/app/src/main/cpp/types" />
+      <recent name="$PROJECT_DIR$/app/src/main/cpp/manager" />
+      <recent name="$PROJECT_DIR$/app/src/main/cpp/repository" />
+      <recent name="$PROJECT_DIR$/app/src/main/cpp/utility" />
+    </key>
+  </component>
   <component name="RunDashboard">
     <option name="ruleStates">
       <list>
@@ -353,17 +568,66 @@
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="713ef07d-bb6d-4386-95df-92f7f9fff5f1" name="Default Changelist" comment="" />
-      <created>1570724397030</created>
+      <changelist id="ebd2cf14-6a1f-4718-a07e-0a5968921822" name="Default Changelist" comment="" />
+      <created>1570986832038</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1570724397030</updated>
+      <updated>1570986832038</updated>
     </task>
+    <task id="LOCAL-00001" summary="Able to play songs from icarus and use a partial set of controls. Next up is the cover art.">
+      <created>1570991362728</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1570991362728</updated>
+    </task>
+    <task id="LOCAL-00002" summary="Working on implementing the Toggle controls like Repeat and Shuffle. Having a little issues with Repeat, haven't started with Shuffle">
+      <created>1572313624917</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1572313624917</updated>
+    </task>
+    <task id="LOCAL-00003" summary="Having issue with repeat a song when pressing the next button or if the song ends (which proceeds to the next song). Need to work on shuffling">
+      <created>1572398031636</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1572398031636</updated>
+    </task>
+    <task id="LOCAL-00004" summary="Implemented shuffle functionality. Not able to reproduce the bug with repeating the song.">
+      <created>1573009363416</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1573009363417</updated>
+    </task>
+    <task id="LOCAL-00005" summary="Added functionality to retrieve the song cover's art from Icarus">
+      <created>1573270576941</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1573270576941</updated>
+    </task>
+    <task id="LOCAL-00006" summary="jni memory leak fix">
+      <created>1574019936077</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1574019936077</updated>
+    </task>
+    <task id="LOCAL-00007" summary="Adding downloading functionality, left TODO's on where to pick up from">
+      <created>1574733783595</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1574733783595</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
-    <editor active="true" />
+    <frame x="0" y="-16" width="1920" height="1079" extended-state="6" />
     <layout>
       <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
       <window_info id="Structure" order="1" side_tool="true" />
@@ -371,143 +635,607 @@
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Image Layers" order="4" />
       <window_info id="Designer" order="5" />
-      <window_info content_ui="combo" id="Project" order="6" weight="0.32889125" />
-      <window_info id="Resources Explorer" order="7" weight="0.32985073" />
+      <window_info content_ui="combo" id="Project" order="6" weight="0.36567163" />
+      <window_info id="Resources Explorer" order="7" weight="0.32995737" />
       <window_info id="Capture Tool" order="8" />
+      <window_info active="true" anchor="bottom" id="Messages" visible="true" weight="0.32954547" />
       <window_info anchor="bottom" id="Run" order="0" />
       <window_info anchor="bottom" id="Logcat" order="1" />
       <window_info anchor="bottom" id="TODO" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.4989339" weight="0.3290461" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.33264464" />
       <window_info anchor="bottom" id="Terminal" order="4" />
-      <window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.5010661" side_tool="true" weight="0.3290461" />
+      <window_info anchor="bottom" id="Event Log" order="5" side_tool="true" />
       <window_info anchor="bottom" id="Version Control" order="6" />
-      <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49925372" weight="0.30653805" />
-      <window_info anchor="bottom" id="Android Profiler" order="8" />
-      <window_info anchor="right" id="Device File Explorer" order="0" side_tool="true" />
-      <window_info anchor="right" id="Capture Analysis" order="1" />
-      <window_info anchor="right" id="Gradle" order="2" />
-      <window_info anchor="right" id="Theme Preview" order="3" />
-      <window_info anchor="right" id="Palette&#9;" order="4" />
-      <window_info anchor="right" id="Assistant" order="5" weight="0.32985073" />
+      <window_info anchor="bottom" id="Find" order="7" weight="0.3285124" />
+      <window_info anchor="bottom" id="Build" order="8" weight="0.3285124" />
+      <window_info anchor="bottom" id="Android Profiler" order="9" />
+      <window_info anchor="right" id="Capture Analysis" order="0" />
+      <window_info anchor="right" id="Gradle" order="1" />
+      <window_info anchor="right" id="Theme Preview" order="2" />
+      <window_info anchor="right" id="Palette&#9;" order="3" />
+      <window_info anchor="right" id="Device File Explorer" order="4" sideWeight="0.50153846" side_tool="true" weight="0.32995737" />
+      <window_info anchor="right" id="Preview" order="5" />
+      <window_info anchor="right" id="Assistant" order="6" sideWeight="0.49846154" weight="0.32995737" />
     </layout>
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="Able to play songs from icarus and use a partial set of controls. Next up is the cover art." />
+    <MESSAGE value="Working on implementing the Toggle controls like Repeat and Shuffle. Having a little issues with Repeat, haven't started with Shuffle" />
+    <MESSAGE value="Having issue with repeat a song when pressing the next button or if the song ends (which proceeds to the next song). Need to work on shuffling" />
+    <MESSAGE value="Implemented shuffle functionality. Not able to reproduce the bug with repeating the song." />
+    <MESSAGE value="Added functionality to retrieve the song cover's art from Icarus" />
+    <MESSAGE value="jni memory leak fix" />
+    <MESSAGE value="Adding downloading functionality, left TODO's on where to pick up from" />
+    <MESSAGE value="ddWorking on implementing the Toggle controls like Repeat and Shuffle. Having a little issues with Repeat, haven't started with Shuffle" />
+    <option name="LAST_COMMIT_MESSAGE" value="ddWorking on implementing the Toggle controls like Repeat and Shuffle. Having a little issues with Repeat, haven't started with Shuffle" />
+  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="kotlin-line">
-          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/LoginActivity.kt</url>
-          <line>91</line>
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/MainActivity.kt</url>
+          <line>394</line>
           <properties />
-          <option name="timeStamp" value="2" />
+          <option name="timeStamp" value="20" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/MainActivity.kt</url>
+          <line>287</line>
+          <properties />
+          <option name="timeStamp" value="21" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/MainActivity.kt</url>
+          <line>246</line>
+          <properties />
+          <option name="timeStamp" value="22" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/MainActivity.kt</url>
+          <line>62</line>
+          <properties />
+          <option name="timeStamp" value="25" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/MainActivity.kt</url>
+          <line>92</line>
+          <properties />
+          <option name="timeStamp" value="31" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/MainActivity.kt</url>
+          <line>110</line>
+          <properties />
+          <option name="timeStamp" value="32" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/MainActivity.kt</url>
+          <line>74</line>
+          <properties />
+          <option name="timeStamp" value="33" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/MainActivity.kt</url>
+          <line>86</line>
+          <properties />
+          <option name="timeStamp" value="35" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/mear/playback/service/MusicService.kt</url>
+          <line>239</line>
+          <properties />
+          <option name="timeStamp" value="41" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/mear/playback/service/MusicService.kt</url>
+          <line>127</line>
+          <properties />
+          <option name="timeStamp" value="92" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/mear/playback/service/MusicService.kt</url>
+          <line>190</line>
+          <properties />
+          <option name="timeStamp" value="100" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="kotlin-line">
           <url>file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/LoginActivity.kt</url>
-          <line>87</line>
+          <line>62</line>
           <properties />
-          <option name="timeStamp" value="5" />
+          <option name="timeStamp" value="162" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/mear/util/ConvertByteArray.kt</url>
+          <line>8</line>
+          <properties />
+          <option name="timeStamp" value="171" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/TrackRepository.kt</url>
+          <line>36</line>
+          <properties />
+          <option name="timeStamp" value="187" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/repository/RepeatRepository.cpp</url>
+          <line>88</line>
+          <option name="timeStamp" value="43" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/repository/RepeatRepository.cpp</url>
+          <line>49</line>
+          <option name="timeStamp" value="44" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/repository/RepeatRepository.cpp</url>
+          <line>27</line>
+          <option name="timeStamp" value="45" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/repository/BaseRepository.cpp</url>
+          <line>34</line>
+          <option name="timeStamp" value="59" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/repository/BaseRepository.cpp</url>
+          <line>54</line>
+          <option name="timeStamp" value="67" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/repository/ShuffleRepository.cpp</url>
+          <line>28</line>
+          <option name="timeStamp" value="106" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/repository/ShuffleRepository.cpp</url>
+          <line>51</line>
+          <option name="timeStamp" value="107" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/repository/ShuffleRepository.cpp</url>
+          <line>91</line>
+          <option name="timeStamp" value="108" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/repository/CoverArtRepository.cpp</url>
+          <line>85</line>
+          <option name="timeStamp" value="116" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/repository/TokenRepository.cpp</url>
+          <line>51</line>
+          <option name="timeStamp" value="144" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/repository/TokenRepository.cpp</url>
+          <line>69</line>
+          <option name="timeStamp" value="145" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/repository/TokenRepository.cpp</url>
+          <line>33</line>
+          <option name="timeStamp" value="146" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/repository/BaseRepository.cpp</url>
+          <line>82</line>
+          <option name="timeStamp" value="150" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/repository/BaseRepository.cpp</url>
+          <line>64</line>
+          <option name="timeStamp" value="151" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/repository/BaseRepository.cpp</url>
+          <line>68</line>
+          <option name="timeStamp" value="152" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/repository/BaseRepository.cpp</url>
+          <line>19</line>
+          <option name="timeStamp" value="153" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
           <url>file://$PROJECT_DIR$/app/src/main/cpp/Demo.cpp</url>
-          <line>285</line>
-          <option name="timeStamp" value="12" />
+          <line>302</line>
+          <option name="timeStamp" value="182" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/local.properties">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gradle.properties">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/BaseServiceActivity.kt">
+    <entry file="file://$USER_HOME$/AndroidStudio/DeviceExplorer/motorola-moto_e__4__plus-ZY2248HP8X/data/data/com.example.mear/mear.db3" />
+    <entry file="file://$USER_HOME$/AndroidStudio/DeviceExplorer/motorola-moto_e__4__plus-ZY2248HP8X/data/data/com.example.mear/databases/Mear" />
+    <entry file="file://$USER_HOME$/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1/string">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="16" column="11" selection-start-line="16" selection-start-column="11" selection-end-line="16" selection-end-column="11" />
+        <state relative-caret-position="112">
+          <caret line="825" selection-start-line="825" selection-end-line="825" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/BaseRepository.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="13" column="11" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/models/Token.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="6" selection-start-line="2" selection-start-column="6" selection-end-line="2" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/cpp/3rdparty/json/single_include/nlohmann/json.hpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="455">
-          <caret line="4459" selection-start-line="4459" selection-end-line="4459" />
+        <state relative-caret-position="208">
+          <caret line="2848" column="32" selection-start-line="2848" selection-start-column="32" selection-end-line="2848" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/models/Song.kt">
+    <entry file="file://$USER_HOME$/AndroidStudio/DeviceExplorer/motorola-moto_e__4__plus-ZY2248HP8X/data/data/com.example.mear/image.png" />
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/adapters/SongAdapter.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="37" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/models/User.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="62" selection-start-line="2" selection-start-column="62" selection-end-line="2" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/UserRepository.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="17" selection-start-line="17" selection-end-line="17" />
-          <folding>
-            <element signature="e#39#111#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/include/jni.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="183">
-          <caret line="696" selection-start-line="696" selection-end-line="696" />
+        <state relative-caret-position="992">
+          <caret line="82" selection-start-line="82" selection-end-line="82" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/LoginActivity.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="88" column="9" selection-start-line="88" selection-start-column="9" selection-end-line="88" selection-end-column="9" />
+        <state relative-caret-position="128">
+          <caret line="8" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1/vector">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="16">
+          <caret line="1543" selection-start-line="1543" selection-end-line="1543" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/jni.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="840" selection-start-line="840" selection-end-line="840" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/UserRepository.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="256">
+          <caret line="17" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/models/Token.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/models/APIInfo.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="32">
+          <caret line="2" column="18" selection-start-line="2" selection-start-column="18" selection-end-line="2" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/util/ConvertByteArray.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="224">
+          <caret line="14" selection-start-line="14" selection-end-line="14" />
           <folding>
-            <element signature="e#37#460#0" expanded="true" />
+            <element signature="e#31#99#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/model/Token.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="16">
+          <caret line="1" column="32" selection-start-line="1" selection-start-column="32" selection-end-line="1" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/CoverArtRepository.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="12" selection-start-line="12" selection-end-line="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/TokenRepository.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="288">
+          <caret line="18" column="57" selection-start-line="18" selection-start-column="57" selection-end-line="18" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/popup_layout.xml">
+      <provider editor-type-id="text-editor" />
+      <provider selected="true" editor-type-id="android-designer2" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/main.xml">
+      <provider editor-type-id="text-editor" />
+      <provider selected="true" editor-type-id="android-designer2" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/activity_main_drawer.xml">
+      <provider editor-type-id="text-editor" />
+      <provider selected="true" editor-type-id="android-designer2" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/menu_song_view.xml">
+      <provider editor-type-id="text-editor" />
+      <provider selected="true" editor-type-id="android-designer2" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/IcarusSongActivity.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="10" column="37" selection-start-line="10" selection-start-column="37" selection-end-line="10" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/build.gradle">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="24" column="36" selection-start-line="24" selection-start-column="36" selection-end-line="24" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/popup_menu.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="10" column="40" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="40" />
+        </state>
+      </provider>
+      <provider editor-type-id="android-designer2" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/playback/service/MusicService.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2336">
+          <caret line="162" column="40" selection-start-line="162" selection-start-column="40" selection-end-line="162" selection-end-column="40" />
+          <folding>
+            <element signature="e#43#596#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/BaseRepository.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="32">
+          <caret line="2" column="2" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/APIRepository.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="32">
+          <caret line="2" column="2" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/CoverArtRepository.cpp">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="624">
+          <caret line="39" column="4" selection-start-line="39" selection-start-column="4" selection-end-line="39" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/MainActivity.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="886">
+          <caret line="380" selection-start-line="380" selection-end-line="380" />
+          <folding>
+            <element signature="e#37#1331#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/APIRepository.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="774">
+          <caret line="109" lean-forward="true" selection-start-line="109" selection-end-line="109" />
+          <folding>
+            <element signature="e#101#118#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/BaseRepository.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="452">
+          <caret line="99" column="11" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="11" />
+          <folding>
+            <element signature="e#102#119#0" expanded="true" />
+            <element signature="e#2722#2750#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/SongRepository.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="8" column="16" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="16" />
+          <folding>
+            <element signature="e#701#732#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/RepeatRepository.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="736">
+          <caret line="99" column="26" selection-start-line="99" selection-start-column="26" selection-end-line="99" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/RepeatRepository.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="32">
+          <caret line="2" column="2" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/ShuffleRepository.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="606">
+          <caret line="41" selection-start-line="41" selection-end-line="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/CoverArtRepository.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
+          <folding>
+            <element signature="e#110#245#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/types/ConnType.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/manager/Tok.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="1" selection-start-column="1" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/ShuffleRepository.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/SongRepository.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="64">
+          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/TokenRepository.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="32">
+          <caret line="2" column="2" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/manager/Tok.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="19" selection-start-line="19" selection-end-line="19" />
+          <folding>
+            <element signature="e#80#100#0" expanded="true" />
+            <element signature="e#299#327#0" expanded="true" />
+            <element signature="e#331#357#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/TokenRepository.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="646">
+          <caret line="66" column="56" selection-start-line="66" selection-start-column="56" selection-end-line="66" selection-end-column="56" />
+          <folding>
+            <element signature="e#104#121#0" expanded="true" />
+            <element signature="e#233#261#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/UserRepository.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="32">
+          <caret line="2" column="1" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/UserRepository.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1280">
+          <caret line="80" column="70" selection-start-line="80" selection-start-column="70" selection-end-line="80" selection-end-column="70" />
+          <folding>
+            <element signature="e#102#119#0" expanded="true" />
+            <element signature="e#231#257#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/utility/GeneralUtility.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
+          <folding>
+            <element signature="e#103#238#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="464">
+          <caret line="29" column="8" selection-start-line="29" selection-start-column="8" selection-end-line="29" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/cpp/Demo.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="281" column="19" selection-start-line="281" selection-start-column="19" selection-end-line="281" selection-end-column="19" />
+        <state relative-caret-position="292">
+          <caret line="230" column="31" selection-start-line="230" selection-start-column="31" selection-end-line="230" selection-end-column="31" />
           <folding>
-            <element signature="e#5952#7882#0" />
-            <element signature="e#7904#8870#0" />
-            <element signature="e#8896#9391#0" />
-            <element signature="e#9411#9730#0" />
-            <element signature="e#9752#10070#0" />
-            <element signature="e#10093#10352#0" />
-            <element signature="e#10375#10919#0" />
+            <element signature="e#40#57#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/model/Song.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="448">
+          <caret line="28" selection-start-line="28" selection-end-line="28" />
+          <folding>
+            <element signature="e#82#99#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="736">
+          <caret line="46" column="31" selection-start-line="46" selection-start-column="31" selection-end-line="46" selection-end-column="31" />
+          <folding>
+            <element signature="e#220#274#0" expanded="true" />
+            <element signature="e#419#473#0" expanded="true" />
+            <element signature="e#602#656#0" expanded="true" />
+            <element signature="e#783#837#0" expanded="true" />
+            <element signature="e#956#1010#0" expanded="true" />
+            <element signature="e#1126#1180#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/TrackRepository.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="432">
+          <caret line="34" selection-start-line="34" selection-end-line="34" />
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index fdcb195..dac30dd 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -4,8 +4,8 @@
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":app" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.1" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.1" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.2" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.2" />
       </configuration>
     </facet>
     <facet type="native-android-gradle" name="Native-Android-Gradle">
@@ -34,7 +34,7 @@
         <compilerSettings />
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
-          <option name="classpath" value="$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bb8488788503b8cd5695ca9b42c24cb4/ealvalog-android-0.5.0/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.50/50ad05ea1c2595fb31b800e76db464d08d599af3/kotlin-stdlib-jdk7-1.3.50.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/746373d9bb5d2847c635f69f30e8e6c8/anko-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvatag/0.4.3/3c93057202a128c3dfde894b9050d043eb49d908/ealvatag-0.4.3.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/801d86a3f9a129323d8c786c4d6ba346/picasso-2.71828/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.10.0/7ef0f1d95bf4c0b3ba30bbae25e0e562b05cf75e/okhttp-3.10.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.0/7e006aaf475d67f9521f04dcbe8865361300f4f1/okio-jvm-2.4.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f3526847558421d7be29069614a95f06/anko-sqlite-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/5a6fb5ec6de7ecb19f5d15c8e34e0ff1/anko-sdk27-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/383973069d3f0771c8544b869eb46e65/anko-sdk27-coroutines-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/ef280b3f04d336c753ffb84d9680e18c/anko-appcompat-v7-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9d333341a07697ba76dce31b50371a33/anko-support-v4-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/7855097bc6583aaed9a1ab6b197b79d1/anko-appcompat-v7-coroutines-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/377850cc684b95d7d96577c55078b42a/anko-appcompat-v7-commons-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/bb6c0c160da72f3f25e56facfec807f2/anko-support-v4-commons-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/e8dfe65d4d95a32181950bb16eba586d/anko-commons-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/87f134ca51f8986f93e20480c978a028/anko-coroutines-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/3e0df6c358bae9e624b349ff485418f9/sqlite-base-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/6a0be88e1b0bfbd66f2cb1bc87c2d867/platform-base-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/39ac3dfb7e32b3fe44c157c742509500/appcompatV7-base-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4053d6dbc908f798d8e2441414147a36/supportV4-base-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/66ebfec852bd365d06cf30471d7c6895/commons-base-0.10.8/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.0.0/2102040565a29061ab7aaea6ea548ad51eafb11d/kotlinx-coroutines-android-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.0/a33c4bf7581f71f01d4ed660b09ca199abbb44da/kotlinx-coroutines-core-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.50/b529d1738c7e98bbfa36a4134039528f2ce78ebf/kotlin-stdlib-1.3.50.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-common/1.0.0/5f7551ec1edc068deaa0397100a1f14f32270274/kotlinx-coroutines-core-common-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.50/3d9cd3e1bc7b92e95f43d45be3bfbcf38e36ab87/kotlin-stdlib-common-1.3.50.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/16.0.2/dab5655eb9abe23f2245c34e66c9813c7daf4563/annotations-16.0.2.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/2cceb2ce8c89f797eb3732ae151c5eed/design-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/40c172b322ab2cbaa5b264bd61fb1fe7/appcompat-v7-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/bbceac5ea10b377f4a1bfe0ef27e24c2/cardview-v7-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/8cb7bcedb8e3dca36a0b3cbbb9ea9648/support-v4-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/1b2cfac5df8473d8ba6bf25b647ece81/support-fragment-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/02c7c6846dca5de6916e784b3b4c645f/animated-vector-drawable-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/420bf1ba9060f87a0d755513f44eccff/recyclerview-v7-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/95e05009c6f4970c7674399faa6801cb/support-core-ui-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/21da103b05e0da3ef0c3912db0f543eb/support-core-utils-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a9ef90871aedc840ef5b19c648c5ae85/support-vector-drawable-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/85bd6d9bdc03a21f96f63442247904c6/support-media-compat-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/6cba45a7aa40d0da266b0bba795099f0/transition-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/45258a756e6ebd4ac509787eddeba4a0/loader-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4058136cb75c11e77fd3f407a6252dc5/viewpager-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/b7b90df0ea12b43edfeb748d473f59b0/coordinatorlayout-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f64e093468ab77842c0a17619bdda714/drawerlayout-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f6bf15b8ac7305beb683644a8b84171b/slidingpanelayout-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/1e72ebf55c3ee4943e8d88d925c3a67c/customview-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/bb36339521ed6409a2d50bed502cff2a/swiperefreshlayout-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/6bbb494af45561416a0fd17eba96f4cd/asynclayoutinflater-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/55bb126aa8799a19185c1769b3802de6/support-compat-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9b9c4c649b4547a1a2a29a66e60463ed/versionedparcelable-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/fa3e9f44740e16b967ad338590f640f9/cursoradapter-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/753644a8a421231bd03dae601286f889/exifinterface-27.1.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f304d26e81c2ac674c8d718020f44ce2/runtime-1.1.1/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/b1f429bc867e6bef343718a928b27bcf/documentfile-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/c9a4cff7d801afcde38a15c849aba7d3/localbroadcastmanager-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/1d60f7a1f34b86e30b27d981246805b0/print-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/e8486cfa145a085ddb7749e90b86cd7a/viewmodel-1.1.1/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a7cc930c6c85553baec9442768e9910e/interpolator-28.0.0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/620dcdd05acbf60c6f21b269ddbcc44d/livedata-1.1.1/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/d9480822a420f8b71d4809310057ac98/livedata-core-1.1.1/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/6ed36e64d19fbb140eab41e81e83fb81/runtime-1.1.1/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/01a8c0061e5c8e400c59b1da7fe6af7f/constraint-layout-1.1.3/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.3/bde0667d7414c16ed62d3cfe993cff7f9d732373/constraint-layout-solver-1.1.3.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/23.0/c947004bb13d18182be60077ade044099e4f26f1/guava-23.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/1.3.9/40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf/jsr305-1.3.9.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.0.18/5f65affce1684999e2f4024983835efc3504012e/error_prone_annotations-2.0.18.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog/0.5.0/9ac5b435edc23482abd2815884805352820e4038/ealvalog-0.5.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog-core/0.5.0/b218daf48ae873b529c4e865562e6ba1d319be2f/ealvalog-core-0.5.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/e18d3506cbad107043af39fb3ff623f0/XPopupWindow-1.0.1/jars/classes.jar:/home/brahmix/Android/Sdk/platforms/android-29/android.jar:/home/brahmix/Android/Sdk/build-tools/28.0.3/core-lambda-stubs.jar" />
+          <option name="classpath" value="$USER_HOME$/.gradle/caches/transforms-2/files-2.1/271d6925984ff7b9602a1eb73e49001f/ealvalog-android-0.5.0-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.50/50ad05ea1c2595fb31b800e76db464d08d599af3/kotlin-stdlib-jdk7-1.3.50.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/dfab7af05bbfe12f5824cc6f5232821d/anko-0.10.8-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvatag/0.4.3/3c93057202a128c3dfde894b9050d043eb49d908/ealvatag-0.4.3.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/26dc1b639e7fc0a30a965e231590a69e/picasso-2.71828-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.10.0/7ef0f1d95bf4c0b3ba30bbae25e0e562b05cf75e/okhttp-3.10.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.0/7e006aaf475d67f9521f04dcbe8865361300f4f1/okio-jvm-2.4.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/2861b2f30b27584d44188d9179f96df7/anko-sqlite-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4c385883d77baa2291ca93003945a938/anko-sdk27-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/8a8db17fa2d6bfa1cc2fce8404e4a56f/anko-sdk27-coroutines-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/5805ef6f5579d5b583db72ac1701ed6d/anko-appcompat-v7-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/42db35e9dbef9e97798dddf5f7610ccf/anko-support-v4-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/92c984a87cca2d4d0b09329d02b2f12c/anko-appcompat-v7-coroutines-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4b3655bcefc6566df82516d7045b0b1e/anko-appcompat-v7-commons-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/0ef4dff7ecd7e6935805b52a9d091a31/anko-support-v4-commons-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/857a8ee5a26b0022cbd52317b41a9b20/anko-commons-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/88e5b591e82443eb7723dbf0b28a0f3b/anko-coroutines-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/d827ea25c9883ce7319b6784a09b511f/sqlite-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/af34a4220d8cc456f9b4fcbd39bd9caf/platform-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/088f0f447b747aebb7413ba4310fcf6f/appcompatV7-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9e91d7d165d6c5efa9f3be07555538b1/supportV4-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/87308e003b68d096c43dca2028f7c160/commons-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.0.0/2102040565a29061ab7aaea6ea548ad51eafb11d/kotlinx-coroutines-android-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.0/a33c4bf7581f71f01d4ed660b09ca199abbb44da/kotlinx-coroutines-core-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.50/b529d1738c7e98bbfa36a4134039528f2ce78ebf/kotlin-stdlib-1.3.50.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-common/1.0.0/5f7551ec1edc068deaa0397100a1f14f32270274/kotlinx-coroutines-core-common-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.50/3d9cd3e1bc7b92e95f43d45be3bfbcf38e36ab87/kotlin-stdlib-common-1.3.50.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/16.0.2/dab5655eb9abe23f2245c34e66c9813c7daf4563/annotations-16.0.2.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/b5fb1710cef00ad16e437bb9e3ca88d6/design-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/8cb4ece18c428eee2b2d2f816e1765ce/appcompat-v7-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/afeedcf4daf261fdaf96737d77a34927/cardview-v7-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/35dccd0aced25481287ee2555b049a1f/support-v4-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4bf174fa149f5a07417d46721d57d4ca/support-fragment-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9fb0db39c3a86bc0cf1f565867f332b8/animated-vector-drawable-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/44c33949c0e9e6dd708260cd8308594a/recyclerview-v7-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a99e84cffddca52b0fee4289e089ed61/support-core-ui-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/1e829ced447316a53103caa5aaf8b597/support-core-utils-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/bb83ef7a230e8de67545c9b22fb3a41d/support-vector-drawable-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/af69f834453339f26013f22add42d8ff/support-media-compat-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/610dccbd018999b294982ac65792b123/transition-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/327b41a2ca4c117cfeb16798bcc3f4d9/loader-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/ddde2ebc4ed311a8b54356605c6c7f6c/viewpager-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/8c4654165c8d458da0813644293f11c5/coordinatorlayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/344b88a0eccf8c1c8d0d993348ba92ba/drawerlayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/37654f73464414bf65dd7e950c798518/slidingpanelayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/8979616f7b752abef751da7fb2f650af/customview-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a359656a7bee87a41a0b4d8ea11165c2/swiperefreshlayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/2b9e2577e9491fc82a9be8665477dc23/asynclayoutinflater-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/7b11524d69766eb26f054cf5eb8d3381/support-compat-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a59b6eb9af4a08f3dc8d4b9220e15962/versionedparcelable-28.0.0-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/27b91aa254349536320daaae4c74d5e3/cursoradapter-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/7f8f5e9e5fa3a961b845c6044177b98d/exifinterface-27.1.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/dc05c35ce9985f7896b73845a95da368/runtime-1.1.1-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/35e98f176c7337654e1353ab91dbbc1f/documentfile-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/e69a5f13345bd2ce943b9fd6f695d932/localbroadcastmanager-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/077d2af1d05a4c177a5d01ece05f30b2/print-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/445d10e381f635c467b9c5cfca91a87e/viewmodel-1.1.1-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/e266d55146406fe63185265acf1b8526/interpolator-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/778cee53273e330a2bf84b420363970b/livedata-1.1.1-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/98757048d3de64ee204f81b184d81479/livedata-core-1.1.1-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/ea1f6890b856070cd3e0145ffc71a465/runtime-1.1.1-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/401b8779db25a906a2f3dd86ab05b615/constraint-layout-1.1.3-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.3/bde0667d7414c16ed62d3cfe993cff7f9d732373/constraint-layout-solver-1.1.3.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/23.0/c947004bb13d18182be60077ade044099e4f26f1/guava-23.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/1.3.9/40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf/jsr305-1.3.9.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.0.18/5f65affce1684999e2f4024983835efc3504012e/error_prone_annotations-2.0.18.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog/0.5.0/9ac5b435edc23482abd2815884805352820e4038/ealvalog-0.5.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog-core/0.5.0/b218daf48ae873b529c4e865562e6ba1d319be2f/ealvalog-core-0.5.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9b20ca310a187f541cc98de32b1f0f11/XPopupWindow-1.0.1-api.jar:/home/brahmix/Android/Sdk/platforms/android-29/android.jar:/home/brahmix/Android/Sdk/build-tools/28.0.3/core-lambda-stubs.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="app_debug" />
diff --git a/app/src/main/cpp/APIRepository.cpp b/app/src/main/cpp/APIRepository.cpp
deleted file mode 100644
index 213f08c..0000000
--- a/app/src/main/cpp/APIRepository.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Created by brahmix on 10/12/19.
-//
-
-#include "APIRepository.h"
-
-#include <SQLiteCpp/Database.h>
-
-namespace repository { namespace local {
-    APIRepository::APIRepository()
-    {
-        m_tableName = apiInfoTable();
-    }
-
-
-    model::APIInfo APIRepository::retrieveAPIInfo(const std::string& path)
-    {
-        model::APIInfo apiInfo;
-        try {
-            const auto dbPath = pathOfDatabase(path);
-            SQLite::Database db(dbPath, SQLite::OPEN_READONLY);
-
-            std::string queryString("SELECT * FROM ");
-            queryString.append(m_tableName);
-            queryString.append(" LIMIT 1");
-
-            SQLite::Statement query(db, queryString);
-
-            auto result = query.executeStep();
-            apiInfo.uri = query.getColumn(1).getString();
-            apiInfo.version = query.getColumn(2).getInt();
-
-            return apiInfo;
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-
-        return apiInfo;
-    }
-
-
-    bool APIRepository::doesAPIInfoTableExist(const std::string& path)
-    {
-        try {
-            const auto dbPath = pathOfDatabase(path);
-            SQLite::Database db(dbPath, SQLite::OPEN_READONLY);
-
-            return db.tableExists(m_tableName);
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-    }
-
-
-    void APIRepository::createAPiInfoTable(const std::string& path)
-    {
-        try {
-            const auto dbPath = pathOfDatabase(path);
-            SQLite::Database db(dbPath, SQLite::OPEN_READWRITE);
-
-            std::string queryString("CREATE TABLE ");
-            queryString.append(m_tableName);
-            queryString.append(" (Id INTEGER PRIMARY KEY, Uri TEXT, Version INT)");
-            db.exec(queryString);
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-    }
-
-    void APIRepository::deleteAPIInfo(const model::APIInfo& apiInfo, const std::string& path)
-    {
-        try {
-            const auto dbPath = pathOfDatabase(path);
-            SQLite::Database db(dbPath, SQLite::OPEN_READWRITE);
-
-            std::string queryString("DELETE FROM ");
-            queryString.append(m_tableName);
-
-            db.exec(queryString);
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-    }
-
-    void APIRepository::saveAPIInfo(const model::APIInfo& apiInfo, const std::string& path)
-    {
-        try {
-            const auto dbPath = pathOfDatabase(path);
-            SQLite::Database db(dbPath, SQLite::OPEN_READWRITE);
-            std::string queryString("INSERT INTO ");
-            queryString.append(m_tableName);
-            queryString.append(" (Uri, Version) VALUES (?, ?)");
-
-            SQLite::Statement query(db, queryString);
-            query.bind(1, apiInfo.uri);
-            query.bind(2, apiInfo.version);
-
-            query.exec();
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-    }
-
-
-    std::string APIRepository::apiInfoTable() noexcept { return "APIInfo"; }
-}}
diff --git a/app/src/main/cpp/APIRepository.h b/app/src/main/cpp/APIRepository.h
deleted file mode 100644
index 2969a0b..0000000
--- a/app/src/main/cpp/APIRepository.h
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// Created by brahmix on 10/12/19.
-//
-
-#ifndef MEAR_APIREPOSITORY_H
-#define MEAR_APIREPOSITORY_H
-
-#include <string>
-
-#include "BaseRepository.h"
-#include "model/APIInfo.h"
-
-namespace repository { namespace local {
-    class APIRepository: public BaseRepository {
-    public:
-        APIRepository();
-
-        model::APIInfo retrieveAPIInfo(const std::string&);
-
-        [[deprecated("use the base class function")]]
-        bool doesAPIInfoTableExist(const std::string&);
-
-        void createAPiInfoTable(const std::string&);
-        void deleteAPIInfo(const model::APIInfo&, const std::string&);
-        void saveAPIInfo(const model::APIInfo&, const std::string&);
-    private:
-        std::string apiInfoTable() noexcept;
-    };
-}}
-
-
-#endif //MEAR_APIREPOSITORY_H
diff --git a/app/src/main/cpp/BaseRepository.cpp b/app/src/main/cpp/BaseRepository.cpp
deleted file mode 100644
index a36ef08..0000000
--- a/app/src/main/cpp/BaseRepository.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Created by brahmix on 10/6/19.
-//
-
-#include "BaseRepository.h"
-
-#include <fstream>
-
-#include <SQLiteCpp/SQLiteCpp.h>
-
-namespace repository { namespace local {
-    bool BaseRepository::databaseExist(const std::string& appPath)
-    {
-        try {
-            const auto dbPath = pathOfDatabase(appPath);
-
-            SQLite::Database db(dbPath, SQLite::OPEN_READONLY);
-            return true;
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-
-        return false;
-    }
-
-    bool BaseRepository::doesTableExist(const std::string& appPath)
-    {
-        try {
-            const auto dbPath = pathOfDatabase(appPath);
-            SQLite::Database db(dbPath, SQLite::OPEN_READONLY);
-
-            auto result = db.tableExists(m_tableName);
-            return result;
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-
-        return false;
-    }
-
-    bool BaseRepository::isTableEmpty(const std::string& appPath)
-    {
-        try {
-            const auto dbPath = pathOfDatabase(appPath);
-            SQLite::Database db(dbPath, SQLite::OPEN_READONLY);
-            std::string queryStr("SELECT * FROM ");
-            queryStr.append(m_tableName);
-
-            SQLite::Statement query(db, queryStr);
-
-            const auto result = query.hasRow();
-
-            return result;
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-
-        return true;
-    }
-
-
-    void BaseRepository::initializedDatabase(const std::string& appPath)
-    {
-        try {
-            const auto dbPath = pathOfDatabase(appPath);
-
-            SQLite::Database db(dbPath, SQLite::OPEN_CREATE | SQLite::OPEN_READWRITE);
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-    }
-
-    void BaseRepository::deleteRecord(const std::string& appPath)
-    {
-        try {
-            auto db = getDbConn(appPath, ConnType::ReadWrite);
-
-            std::string queryString("DELETE FROM ");
-            queryString.append(m_tableName);
-
-            db.exec(queryString);
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-    }
-
-
-    std::string BaseRepository::pathOfDatabase(const std::string& appPath)
-    {
-        std::string dbPath(appPath);
-        auto lastChar = dbPath.at(dbPath.size()-1);
-        if (lastChar != '/') {
-            dbPath.append("/");
-        }
-
-        dbPath.append(m_databaseName);
-
-        return dbPath;
-    }
-
-    SQLite::Database BaseRepository::getDbConn(const std::string& path, ConnType dbType)
-    {
-        auto dbPath = pathOfDatabase(path);
-        switch (dbType) {
-            case ConnType::ReadOnly:
-                return SQLite::Database(dbPath, SQLite::OPEN_READONLY);
-            case ConnType::ReadWrite:
-                return SQLite::Database(dbPath, SQLite::OPEN_READWRITE);
-            case ConnType::Create:
-                return SQLite::Database(dbPath, SQLite::OPEN_CREATE);
-            default:
-                break;
-        }
-
-        return SQLite::Database(dbPath);
-    }
-}}
\ No newline at end of file
diff --git a/app/src/main/cpp/BaseRepository.h b/app/src/main/cpp/BaseRepository.h
deleted file mode 100644
index d5a2072..0000000
--- a/app/src/main/cpp/BaseRepository.h
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Created by brahmix on 10/6/19.
-//
-
-#ifndef MEAR_BASEREPOSITORY_H
-#define MEAR_BASEREPOSITORY_H
-
-#include <string>
-#include <exception>
-
-#include <SQLiteCpp/Database.h>
-
-namespace repository { namespace local {
-    class BaseRepository {
-    public:
-        bool databaseExist(const std::string&);
-        bool doesTableExist(const std::string&);
-        bool isTableEmpty(const std::string&);
-
-        void initializedDatabase(const std::string&);
-        void deleteRecord(const std::string&);
-    protected:
-        enum class ConnType;
-        std::string pathOfDatabase(const std::string&);
-
-        SQLite::Database getDbConn(const std::string&, ConnType);
-
-        const std::string m_databaseName = "mear.db3";
-        std::string m_tableName;
-
-        enum class ConnType {
-            ReadOnly = 0,
-            ReadWrite,
-            Create
-        };
-    private:
-    };
-} }
-
-
-#endif //MEAR_BASEREPOSITORY_H
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index c72d3f3..8241e50 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 # Sets the minimum version of CMake required to build the native library.
 
-cmake_minimum_required(VERSION 3.6.0)
+cmake_minimum_required(VERSION 3.10)
 
 # Creates and names a library, sets it as either STATIC
 # or SHARED, and provides the relative paths to its source code.
@@ -13,41 +13,39 @@ cmake_minimum_required(VERSION 3.6.0)
 
 # set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
 
-set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=c++17")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -g -O0 -std=c++17")
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3 -std=c++17 -DNDEBUG")
+
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_STANDARD 17)
+# set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=c++17")
+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+# set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -g -O0 -std=c++17")
+# set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3 -std=c++17 -DNDEBUG")
 
 set (SOURCES
-        APIRepository.cpp
-        BaseRepository.cpp
         Demo.cpp
-        RepeatRepository.cpp
-        ShuffleRepository.cpp
-        Tok.cpp
-        TokenRepository.cpp
-        UserRepository.cpp
 )
 
 set (HEADERS
-        APIRepository.h
-        BaseRepository.h
-        model/CoverArt.h
-        CoverArtRepository.h
         Demo.h
+        manager/DirectoryManager.h
+        manager/Tok.h
         model/APIInfo.h
+        model/CoverArt.h
         model/Song.h
         model/Token.h
         model/User.h
-        RepeatRepository.h
-        RepeatTypes.h
-        ShuffleRepository.h
-        ShuffleTypes.h
-        SongRepository.h
-        Tok.h
-        TokenRepository.h
-        UserRepository.h
-        GeneralUtility.h
+        repository/APIRepository.h
+        repository/BaseRepository.h
+        repository/CoverArtRepository.h
+        repository/RepeatRepository.h
+        repository/ShuffleRepository.h
+        repository/SongRepository.h
+        repository/TokenRepository.h
+        repository/UserRepository.h
+        types/ConnType.h
+        types/RepeatTypes.h
+        types/ShuffleTypes.h
+        utility/GeneralUtility.h
 )
 
 set(JSON_BuildTests OFF CACHE INTERNAL "")
@@ -88,7 +86,7 @@ set_target_properties(boo PROPERTIES IMPORTED_LOCATION
         "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/android/${ANDROID_ABI}/libcurl.a"
 )
 
-include_directories(${CURL_INCLUDE_DIR} ${SQLITECPP_INCLUDE})
+include_directories(${CURL_INCLUDE_DIR} ${SQLITECPP_INCLUDE} ${HEADERS})
 
 target_link_libraries(native-lib PRIVATE
         nlohmann_json::nlohmann_json
diff --git a/app/src/main/cpp/CoverArtRepository.cpp b/app/src/main/cpp/CoverArtRepository.cpp
deleted file mode 100644
index e7b0346..0000000
--- a/app/src/main/cpp/CoverArtRepository.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Created by brahmix on 11/8/19.
-//
-
-#include "CoverArtRepository.h"
-
-#include <curl/curl.h>
-
-namespace repository {
-
-    /**
-    template<typename C>
-    std::vector<C> CoverArtRepository<C>::retrieveCoverArtRecords(const model::Token& token,
-            const std::string& uri) {
-        std::vector<std::string> vals;
-
-        return vals;
-    }
-
-    template<typename C>
-    std::vector<data> CoverArtRepository<C>::retrieveCoverArtData(const model::Token& token,
-            const C& cover,
-            const std::string& uri) {
-        std::string fullUri(uri);
-        if (fullUri.at(fullUri.size() - 1) != '/') {
-            fullUri.append("/");
-        }
-        fullUri.append(downloadEndpoint());
-        fullUri.append(std::to_string(cover.id));
-
-        CURL *curl;
-        CURLcode res;
-        struct curl_slist *chunk = nullptr;
-        curl = curl_easy_init();
-
-        std::vector<data> vals;
-
-        if (!curl) {
-            return vals;
-        }
-
-        std::string data;
-        std::string authHeader("Authorization: Bearer ");
-        authHeader.append(token.accessToken);
-        constexpr auto keepAliveHeader = "Content-type: Keep-alive";
-        chunk = curl_slist_append(chunk, authHeader.c_str());
-        chunk = curl_slist_append(chunk, keepAliveHeader);
-
-        curl_easy_setopt(curl, CURLOPT_URL, fullUri.c_str());
-        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, chunk);
-        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, respBodyRetriever);
-        curl_easy_setopt(curl, CURLOPT_WRITEDATA, &data);
-        curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
-
-        std::copy(data.begin(), data.end(), vals);
-
-        return vals;
-    }
-
-    template<typename C>
-    C CoverArtRepository<C>::retrieveCoverArtRecord(const model::Token& token,
-            const C& cover,
-            const std::string& uri) {
-        model::CoverArt cov;
-
-        return cov;
-    }
-
-
-    template<typename C>
-    constexpr auto CoverArtRepository<C>::downloadEndpoint() noexcept {
-        return "api/v1/coverart/download";
-    }
-    template<typename C>
-    constexpr auto CoverArtRepository<C>::recordsEndpoint() noexcept {
-        return "api/v1/coverart/";
-    }
-
-    template<typename C>
-    size_t CoverArtRepository<C>::respBodyRetriever(void *ptr, size_t size, size_t nmemb, char *e) {
-        ((std::string*)e)->append((char*)ptr, size * nmemb);
-
-        return size * nmemb;
-    }
-     */
-}
diff --git a/app/src/main/cpp/Demo.cpp b/app/src/main/cpp/Demo.cpp
index 402eb0d..6452d03 100644
--- a/app/src/main/cpp/Demo.cpp
+++ b/app/src/main/cpp/Demo.cpp
@@ -23,14 +23,14 @@
 #include <sqlite3.h>
 #include <sys/mman.h>
 
-#include "APIRepository.h"
-#include "CoverArtRepository.h"
-#include "RepeatRepository.h"
-#include "ShuffleRepository.h"
-#include "SongRepository.h"
-#include "Tok.h"
-#include "TokenRepository.h"
-#include "UserRepository.h"
+#include "repository/APIRepository.h"
+#include "repository/CoverArtRepository.h"
+#include "repository/RepeatRepository.h"
+#include "repository/ShuffleRepository.h"
+#include "repository/SongRepository.h"
+#include "manager/Tok.h"
+#include "repository/TokenRepository.h"
+#include "repository/UserRepository.h"
 
 
 
@@ -228,7 +228,7 @@ void saveCredentials(const model::User& user, const std::string& appDirectory)
     if (!userRepo.databaseExist(appDirectory)) {
         userRepo.initializedDatabase(appDirectory);
     }
-    if (!userRepo.doesUserTableExist(appDirectory)) {
+    if (!userRepo.doesTableExist(appDirectory)) {
         userRepo.createUserTable(appDirectory);
     }
 
@@ -304,6 +304,22 @@ Java_com_example_mear_repositories_TrackRepository_retrieveSongs(
         }
     }
 
+    auto curPath = "/data/data/com.example.mear/";
+    std::string filename;
+    std::string currPathStr(curPath);
+    std::fstream tmp;
+    if (currPathStr.at(currPathStr.size() - 1) == '/') {
+        filename.assign(currPathStr);
+    } else {
+        filename.assign(currPathStr);
+        filename.append("/");
+    }
+    filename.append("test.txt");
+    tmp.open(filename.c_str(), std::ios::out);
+    auto content = "hello fs";
+    tmp.write(content, std::strlen(content));
+    tmp.close();
+
     return songs;
 }
 
diff --git a/app/src/main/cpp/RepeatRepository.cpp b/app/src/main/cpp/RepeatRepository.cpp
deleted file mode 100644
index d46d539..0000000
--- a/app/src/main/cpp/RepeatRepository.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Created by brahmix on 10/21/19.
-//
-
-#include "RepeatRepository.h"
-
-namespace repository { namespace local {
-    RepeatRepository::RepeatRepository() {
-        m_tableName = repeatTable();
-    }
-
-
-    RepeatTypes RepeatRepository::retrieveRepeatMode(const std::string& path) {
-        try {
-            auto db = getDbConn(path, ConnType::ReadOnly);
-            std::string queryString("SELECT * FROM ");
-            queryString.append(m_tableName);
-            queryString.append(" LIMIT 1");
-
-            SQLite::Statement query(db, queryString);
-
-            const auto result = query.executeStep();
-
-            auto repeatType = query.getColumn(1).getInt();
-            auto val = static_cast<RepeatTypes>(repeatType);
-            return val;
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-
-        return RepeatTypes::RepeatOff;
-    }
-
-
-    void RepeatRepository::createRepeatTable(const std::string& path) {
-        try {
-            auto db = getDbConn(path, ConnType::ReadWrite);
-            std::string queryString("CREATE TABLE ");
-            queryString.append(m_tableName);
-            queryString.append(" (Id INTEGER PRIMARY KEY, RepeatMode INT)");
-
-            db.exec(queryString);
-
-            queryString = "INSERT INTO " + m_tableName + " (RepeatMode) VALUES(?)";
-            SQLite::Statement query(db, queryString);
-            query.bind(1, static_cast<int>(RepeatTypes::RepeatOff));
-            query.exec();
-
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-    }
-
-
-    void RepeatRepository::updateRepeat(const std::string& path) {
-        try {
-            auto db = getDbConn(path, ConnType::ReadWrite);
-
-            if (isTableEmpty(path)) {
-                std::string queryString("INSERT INTO ");
-                queryString.append(m_tableName);
-                queryString.append(" (RepeatMode) VALUES (?)");
-
-                SQLite::Statement query(db, queryString);
-                query.bind(1, static_cast<int>(RepeatTypes::RepeatOff));
-                query.exec();
-            } else {
-                std::string queryString("UPDATE ");
-                queryString.append(m_tableName);
-                queryString.append(" SET RepeatMode = ?");
-
-                auto repeatMode = retrieveRepeatMode(path);
-                SQLite::Statement query(db, queryString);
-
-                switch (repeatMode) {
-                    case RepeatTypes::RepeatOff:
-                        query.bind(1, static_cast<int>(RepeatTypes::RepeatSong));
-                        break;
-                    case RepeatTypes::RepeatSong:
-                        query.bind(1, static_cast<int>(RepeatTypes::RepeatOff));
-                        break;
-                    default:
-                        break;
-                }
-
-                query.exec();
-            }
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-    }
-
-
-    std::string RepeatRepository::repeatTable() noexcept { return "Repeat"; }
-}}
diff --git a/app/src/main/cpp/RepeatRepository.h b/app/src/main/cpp/RepeatRepository.h
deleted file mode 100644
index 9bf2e7f..0000000
--- a/app/src/main/cpp/RepeatRepository.h
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// Created by brahmix on 10/21/19.
-//
-
-#ifndef MEAR_REPEATREPOSITORY_H
-#define MEAR_REPEATREPOSITORY_H
-
-#include <string>
-
-#include "BaseRepository.h"
-#include "RepeatTypes.h"
-
-namespace repository { namespace local {
-    class RepeatRepository : public BaseRepository {
-    public:
-        RepeatRepository();
-
-        RepeatTypes retrieveRepeatMode(const std::string&);
-
-        void createRepeatTable(const std::string&);
-        void updateRepeat(const std::string&);
-    private:
-        std::string repeatTable() noexcept;
-    };
-}}
-
-
-#endif //MEAR_REPEATREPOSITORY_H
diff --git a/app/src/main/cpp/ShuffleRepository.cpp b/app/src/main/cpp/ShuffleRepository.cpp
deleted file mode 100644
index 5de129b..0000000
--- a/app/src/main/cpp/ShuffleRepository.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// Created by brahmix on 10/21/19.
-//
-
-#include "ShuffleRepository.h"
-
-namespace repository { namespace local {
-    ShuffleRepository::ShuffleRepository() {
-        m_tableName = shuffleTable();
-    }
-
-
-    ShuffleTypes ShuffleRepository::retrieveShuffleMode(const std::string& path) {
-        try {
-            auto db = getDbConn(path, ConnType::ReadOnly);
-            std::string queryString("SELECT * FROM ");
-            queryString.append(m_tableName);
-            queryString.append(" LIMIT 1");
-
-            SQLite::Statement query(db, queryString);
-
-            const auto result = query.executeStep();
-            auto shuffleType = query.getColumn(1).getInt();
-            auto val = static_cast<ShuffleTypes>(shuffleType);
-
-            return val;
-
-        } catch (std::exception &ex) {
-            auto msg = ex.what();
-        }
-
-        return ShuffleTypes::ShuffleOff;
-    }
-
-
-    void ShuffleRepository::createShuffleTable(const std::string& path) {
-        try {
-            auto db = getDbConn(path, ConnType::ReadWrite);
-            std::string queryString("CREATE TABLE ");
-            queryString.append(m_tableName);
-            queryString.append(" (Id INTEGER PRIMARY KEY, ShuffleMode INT)");
-
-            db.exec(queryString);
-
-            queryString = "INSERT INTO ";
-            queryString.append(m_tableName);
-            queryString.append(" (ShuffleMode) VALUES(?)");
-            SQLite::Statement query(db, queryString);
-            query.bind(1, static_cast<int>(ShuffleTypes::ShuffleOff));
-            query.exec();
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-    }
-
-    void ShuffleRepository::updateShuffle(const std::string& path) {
-        try {
-            auto db = getDbConn(path, ConnType::ReadWrite);
-
-            if (!doesTableExist(path)) {
-                createShuffleTable(path);
-            }
-
-            if (isTableEmpty(path)) {
-                constexpr auto queryString = "INSERT INTO ? (ShuffleMode) VALUES(?)";
-                SQLite::Statement query(db, queryString);
-                query.bind(1, m_tableName);
-                query.bind(2, static_cast<int>(ShuffleTypes::ShuffleOff));
-                query.exec();
-            } else {
-                std::string queryString("UPDATE ");
-                queryString.append(m_tableName);
-                queryString.append(" SET ShuffleMode = ?");
-
-                auto shuffleMode = retrieveShuffleMode(path);
-                SQLite::Statement query(db, queryString);
-
-                switch (shuffleMode) {
-                    case ShuffleTypes::ShuffleOff:
-                        query.bind(1, static_cast<int>(ShuffleTypes::ShuffleOn));
-                        break;
-                    case ShuffleTypes ::ShuffleOn:
-                        query.bind(1, static_cast<int>(ShuffleTypes::ShuffleOff));
-                        break;
-                    default:
-                        break;
-                }
-
-                query.exec();
-            }
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-    }
-
-
-    std::string ShuffleRepository::shuffleTable() noexcept { return "Shuffle"; }
-}}
\ No newline at end of file
diff --git a/app/src/main/cpp/ShuffleRepository.h b/app/src/main/cpp/ShuffleRepository.h
deleted file mode 100644
index 0f9a69e..0000000
--- a/app/src/main/cpp/ShuffleRepository.h
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// Created by brahmix on 10/21/19.
-//
-
-#ifndef MEAR_SHUFFLEREPOSITORY_H
-#define MEAR_SHUFFLEREPOSITORY_H
-
-#include <string>
-
-#include "BaseRepository.h"
-#include "ShuffleTypes.h"
-
-namespace repository { namespace local {
-    class ShuffleRepository : public BaseRepository {
-    public:
-        ShuffleRepository();
-
-        ShuffleTypes retrieveShuffleMode(const std::string&);
-
-        void createShuffleTable(const std::string&);
-        void updateShuffle(const std::string&);
-    private:
-        std::string shuffleTable() noexcept;
-    };
-}}
-
-
-#endif //MEAR_SHUFFLEREPOSITORY_H
diff --git a/app/src/main/cpp/SongRepository.cpp b/app/src/main/cpp/SongRepository.cpp
deleted file mode 100644
index 149bc72..0000000
--- a/app/src/main/cpp/SongRepository.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// Created by brahmix on 10/3/19.
-//
-
-#include "SongRepository.h"
-
-#include <curl/curl.h>
-#include <nlohmann/json.hpp>
-
-namespace repository {
-    /**
-    std::vector<model::Song> SongRepository::fetchSongs(const model::Token& token,
-        const std::string& uri)
-    {
-    }
-     */
-
-
-    /**
-    model::Song SongRepository::retrieveSong(const model::Token& token, const model::Song& sng,
-            const std::string& baseUri) {
-    }
-     */
-
-
-    /**
-    size_t SongRepository::respBodyRetriever(void* ptr, size_t size, size_t nmemb, char *e)
-    {
-        ((std::string*)e)->append((char*)ptr, size * nmemb);
-        return size * nmemb;
-    }
-     */
-}
diff --git a/app/src/main/cpp/Tok.cpp b/app/src/main/cpp/Tok.cpp
deleted file mode 100644
index 9346023..0000000
--- a/app/src/main/cpp/Tok.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Created by brahmix on 10/1/19.
-//
-
-#include "Tok.h"
-
-#include <algorithm>
-#include <memory>
-#include <cstring>
-
-#include <curl/curl.h>
-#include <nlohmann/json.hpp>
-
-namespace manager {
-    model::Token Tok::fetchTokenTrans(const model::User &user, const std::string& uri) {
-        CURL *curl;
-        struct curl_slist *chunk = nullptr;
-        CURLcode res;
-
-        curl = curl_easy_init();
-
-        if (!curl) {
-            return model::Token("none");
-        }
-
-        std::string resp;
-        const auto loginUri = fetchLoginUri(uri);
-        const auto obj = userJsonString(user);
-
-        constexpr auto contentType = "Content-type: Keep-alive";
-        chunk = curl_slist_append(chunk , contentType);
-
-        curl_easy_setopt(curl, CURLOPT_URL, loginUri.c_str());
-        curl_easy_setopt(curl, CURLOPT_POSTFIELDS, obj.c_str());
-        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, chunk);
-        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, respBodyRetriever);
-        curl_easy_setopt(curl, CURLOPT_WRITEDATA, &resp);
-        curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
-
-        res = curl_easy_perform(curl);
-        curl_easy_cleanup(curl);
-
-        if (res == CURLE_OK) {
-            auto s = nlohmann::json::parse(resp);
-            const auto tokenStr = std::move(s["token"].get<std::string>());
-
-            return model::Token(std::move(tokenStr));
-        }
-
-        return model::Token("failure");
-    }
-
-
-    constexpr auto Tok::loginEndpoint() noexcept
-    {
-        return "api/v1/login";
-    }
-
-    std::string Tok::fetchLoginUri(const std::string& uriBase) noexcept
-    {
-        std::string uri(uriBase);
-        if (uri.at(uri.size() - 1) != '/') {
-            uri.append("/");
-        }
-        uri.append(loginEndpoint());
-
-        return uri;
-    }
-    std::string Tok::userJsonString(const model::User& user)
-    {
-        nlohmann::json usr;
-        usr["username"] = user.username;
-        usr["password"] = user.password;
-
-        return usr.dump();
-    }
-
-
-    size_t Tok::respBodyRetriever(void* ptr, size_t size, size_t nmemb, char *e)
-    {
-        ((std::string*)e)->append((char*)ptr, size * nmemb);
-
-        return size * nmemb;
-    }
-}
diff --git a/app/src/main/cpp/Tok.h b/app/src/main/cpp/Tok.h
deleted file mode 100644
index 0d56fcd..0000000
--- a/app/src/main/cpp/Tok.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Created by brahmix on 10/1/19.
-//
-
-#ifndef MEAR_TOK_H
-#define MEAR_TOK_H
-
-#include <memory>
-#include <string>
-
-#include "model/Token.h"
-#include "model/User.h"
-
-namespace manager {
-
-    class Tok {
-    public:
-        model::Token fetchTokenTrans(const model::User&, const std::string&);
-    private:
-        std::string fetchLoginUri(const std::string&) noexcept;
-        constexpr auto loginEndpoint() noexcept;
-        std::string userJsonString(const model::User&);
-
-        static size_t respBodyRetriever(void*, size_t, size_t, char*);
-    };
-}
-
-
-#endif //MEAR_TOK_H
diff --git a/app/src/main/cpp/TokenRepository.cpp b/app/src/main/cpp/TokenRepository.cpp
deleted file mode 100644
index 6f42485..0000000
--- a/app/src/main/cpp/TokenRepository.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Created by brahmix on 10/6/19.
-//
-
-#include "TokenRepository.h"
-
-#include <SQLiteCpp/Database.h>
-
-namespace repository { namespace local {
-    TokenRepository::TokenRepository()
-    {
-        m_tableName = tokenTable();
-    }
-
-
-    model::Token TokenRepository::retrieveToken(const std::string& path)
-    {
-        model::Token token;
-
-        try {
-            auto db = getDbConn(path, ConnType::ReadOnly);
-            std::string queryString("SELECT * FROM ");
-            queryString.append(m_tableName);
-            queryString.append(" LIMIT 1");
-
-            SQLite::Statement query(db, queryString);
-
-            auto result = query.executeStep();
-            //const std::string t(query.getColumn(1).getString());
-            token.accessToken = std::move(query.getColumn(1).getString());
-
-            return token;
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-
-        return token;
-    }
-
-
-    void TokenRepository::createTokenTable(const std::string& path)
-    {
-        try {
-            auto db = getDbConn(path, ConnType::ReadWrite);
-
-            std::string queryString("CREATE TABLE ");
-            queryString.append(m_tableName);
-            queryString.append(" (Id INTEGER PRIMARY KEY, AccessToken TEXT)");
-
-            db.exec(queryString);
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-    }
-
-    void TokenRepository::saveToken(const model::Token& token, const std::string& path)
-    {
-        try {
-            auto db = getDbConn(path, ConnType::ReadWrite);
-
-            std::string queryString("INSERT INTO ");
-            queryString.append(m_tableName);
-            queryString.append(" (AccessToken) VALUES (?)");
-
-            SQLite::Statement query(db, queryString);
-            query.bind(1, token.accessToken);
-
-            query.exec();
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-    }
-
-
-    std::string TokenRepository::tokenTable() noexcept { return "Token"; }
-}}
diff --git a/app/src/main/cpp/TokenRepository.h b/app/src/main/cpp/TokenRepository.h
deleted file mode 100644
index 4a6e527..0000000
--- a/app/src/main/cpp/TokenRepository.h
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// Created by brahmix on 10/6/19.
-//
-
-#ifndef MEAR_TOKENREPOSITORY_H
-#define MEAR_TOKENREPOSITORY_H
-
-#include <string>
-
-#include "model/Token.h"
-#include "BaseRepository.h"
-
-namespace repository { namespace local {
-    class TokenRepository: public BaseRepository {
-    public:
-        TokenRepository();
-
-        model::Token retrieveToken(const std::string&);
-
-        void createTokenTable(const std::string&);
-        void saveToken(const model::Token&, const std::string&);
-    private:
-        std::string tokenTable() noexcept;
-    };
-}}
-
-
-#endif //MEAR_TOKENREPOSITORY_H
diff --git a/app/src/main/cpp/UserRepository.cpp b/app/src/main/cpp/UserRepository.cpp
deleted file mode 100644
index 2387cc5..0000000
--- a/app/src/main/cpp/UserRepository.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Created by brahmix on 10/6/19.
-//
-
-#include "UserRepository.h"
-
-#include <SQLiteCpp/SQLiteCpp.h>
-
-namespace repository { namespace local {
-   UserRepository::UserRepository()
-   {
-       m_tableName = userTable();
-   }
-
-
-   model::User UserRepository::retrieveUserCredentials(const std::string &appPath)
-   {
-       model::User user;
-       try {
-           const auto dbPath = pathOfDatabase(appPath);
-           SQLite::Database db(dbPath, SQLite::OPEN_READONLY);
-
-           std::string queryString("SELECT * FROM ");
-           queryString.append(m_tableName);
-           queryString.append(" LIMIT 1");
-
-           SQLite::Statement query(db, queryString);
-
-           auto result = query.executeStep();
-
-           auto valZero = query.getColumn(1);
-           auto valOne = query.getColumn(2);
-
-           user.username = valZero.getString();
-           user.password = valOne.getString();
-
-           return user;
-
-       } catch (std::exception& ex) {
-           auto msg = ex.what();
-       }
-
-       return user;
-   }
-
-
-   [[deprecated("use the base class doesTableExist() function")]]
-   bool UserRepository::doesUserTableExist(const std::string &appPath)
-   {
-       try {
-           const auto dbPath = pathOfDatabase(appPath);
-           SQLite::Database db(dbPath, SQLite::OPEN_READONLY);
-
-           return db.tableExists(m_tableName);
-       } catch (std::exception& ex) {
-           auto msg = ex.what();
-       }
-
-       return false;
-   }
-
-
-   void UserRepository::createUserTable(const std::string &appPath)
-   {
-       try {
-           const auto dbPath = pathOfDatabase(appPath);
-           SQLite::Database db(dbPath, SQLite::OPEN_READWRITE);
-
-           std::string queryString("CREATE TABLE ");
-           queryString.append(m_tableName);
-           queryString.append(" (Id INTEGER PRIMARY KEY, Username TEXT, Password TEXT)");
-           db.exec(queryString);
-       } catch (std::exception& ex) {
-           auto msg = ex.what();
-       }
-   }
-
-   void UserRepository::deleteUserTable(const std::string& appPath)
-   {
-       try {
-           const auto dbPath = pathOfDatabase(appPath);
-           SQLite::Database db(dbPath, SQLite::OPEN_READWRITE);
-
-           std::string queryStr("DELETE FROM ");
-           queryStr.append(m_tableName);
-
-           db.exec(queryStr);
-       } catch (std::exception& ex) {
-           auto msg = ex.what();
-       }
-   }
-
-   void UserRepository::saveUserCred(const model::User & user, const std::string& appPath)
-   {
-       try {
-           const auto dbPath = pathOfDatabase(appPath);
-           SQLite::Database db(dbPath, SQLite::OPEN_READWRITE);
-           std::string queryString("INSERT INTO ");
-           queryString.append(m_tableName);
-           queryString.append(" (Username, Password) VALUES (?, ?)");
-
-           SQLite::Statement query(db, queryString);
-           query.bind(1, user.username);
-           query.bind(2, user.password);
-
-           query.exec();
-       } catch (std::exception& ex) {
-           auto msg = ex.what();
-       }
-   }
-
-
-   std::string UserRepository::userTable()
-   {
-       constexpr auto table = "User";
-
-       return table;
-   }
-}}
diff --git a/app/src/main/cpp/UserRepository.h b/app/src/main/cpp/UserRepository.h
deleted file mode 100644
index 666ed16..0000000
--- a/app/src/main/cpp/UserRepository.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// Created by brahmix on 10/6/19.
-//
-
-#ifndef MEAR_USERREPOSITORY_H
-#define MEAR_USERREPOSITORY_H
-
-#include <string>
-
-#include "BaseRepository.h"
-#include "model/User.h"
-
-
-namespace repository { namespace local {
-
-    class UserRepository : public BaseRepository {
-    public:
-        UserRepository();
-
-        model::User retrieveUserCredentials(const std::string&);
-
-        bool doesUserTableExist(const std::string&);
-
-        void createUserTable(const std::string&);
-        void deleteUserTable(const std::string&);
-        void saveUserCred(const model::User&, const std::string&);
-    private:
-        std::string userTable();
-    };
-
-}}
-
-#endif //MEAR_USERREPOSITORY_H
diff --git a/app/src/main/cpp/manager/DirectoryManager.h b/app/src/main/cpp/manager/DirectoryManager.h
new file mode 100644
index 0000000..319d383
--- /dev/null
+++ b/app/src/main/cpp/manager/DirectoryManager.h
@@ -0,0 +1,54 @@
+//
+// Created by brahmix on 11/29/19.
+//
+
+#ifndef MEAR_DIRECTORYMANAGER_H
+#define MEAR_DIRECTORYMANAGER_H
+
+#include <string>
+
+#include "../model/Song.h"
+
+namespace manager {
+    class DirectoryManager {
+    public:
+        template<typename Str = std::string, class Song = model::Song>
+        Str fullSongPath(const Song& song, const Str& path) {
+            auto s = "";
+
+            return s;
+        }
+
+        template<typename Str = std::string, class Song = model::Song>
+        Str albumPath(const Song& song, const Str& path) {
+            auto ss = "";
+
+            return ss;
+        }
+
+        template<typename Str = std::string, class Song = model::Song>
+        Str artistPath(const Song& song, const Str& path) {
+            return "art";
+        }
+
+
+        template<typename Str = std::string, class Song = model::Song>
+        bool doesSongExist(const Song& song, const Str& path) {
+            return false;
+        }
+
+
+        template<typename Str = std::string, class Song = model::Song>
+        void createSongDirectory(const Song& song, const Str& path) {
+
+        }
+
+        template<typename Str = std::string, class Song = model::Song>
+        void deleteSongDirectory(const Song& song, const Str& path) {
+
+        }
+    private:
+    };
+}
+
+#endif //MEAR_DIRECTORYMANAGER_H
diff --git a/app/src/main/cpp/manager/Tok.h b/app/src/main/cpp/manager/Tok.h
new file mode 100644
index 0000000..5d5d002
--- /dev/null
+++ b/app/src/main/cpp/manager/Tok.h
@@ -0,0 +1,95 @@
+//
+// Created by brahmix on 10/1/19.
+//
+
+#ifndef MEAR_TOK_H
+#define MEAR_TOK_H
+
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <cstring>
+
+#include <curl/curl.h>
+#include <nlohmann/json.hpp>
+
+#include "../model/Token.h"
+#include "../model/User.h"
+
+namespace manager {
+    template<class Token = model::Token>
+    class Tok {
+    public:
+        template<class User = model::User>
+        Token fetchTokenTrans(const User& user, const std::string& uri) {
+            CURL *curl;
+            struct curl_slist *chunk = nullptr;
+            CURLcode res;
+
+            curl = curl_easy_init();
+
+            if (!curl) {
+                return model::Token("none");
+            }
+
+            std::string resp;
+            const auto loginUri = fetchLoginUri(uri);
+            const auto obj = userJsonString(user);
+
+            constexpr auto contentType = "Content-type: Keep-alive";
+            chunk = curl_slist_append(chunk, contentType);
+
+            curl_easy_setopt(curl, CURLOPT_URL, loginUri.c_str());
+            curl_easy_setopt(curl, CURLOPT_POSTFIELDS, obj.c_str());
+            curl_easy_setopt(curl, CURLOPT_HTTPHEADER, chunk);
+            curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, respBodyRetriever);
+            curl_easy_setopt(curl, CURLOPT_WRITEDATA, &resp);
+            curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
+
+            res = curl_easy_perform(curl);
+            curl_easy_cleanup(curl);
+
+            if (res == CURLE_OK) {
+                auto s = nlohmann::json::parse(resp);
+                const auto tokenStr = std::move(s["token"].get<std::string>());
+
+                return Token(std::move(tokenStr));
+            }
+
+            return Token("failure");
+        }
+    private:
+        std::string fetchLoginUri(const std::string& uriBase) noexcept {
+            std::string uri(uriBase);
+            if (uri.at(uri.size() - 1) != '/') {
+                uri.append("/");
+            }
+            uri.append(loginEndpoint());
+
+            return uri;
+        }
+
+        std::string userJsonString(const model::User& user) {
+            nlohmann::json usr;
+            usr["username"] = user.username;
+            usr["password"] = user.password;
+
+            return usr.dump();
+        }
+
+
+        constexpr auto loginEndpoint() noexcept {
+            return "api/v1/login";
+        }
+
+
+        static size_t respBodyRetriever(void* ptr, size_t size, size_t nmemb, char* e) {
+            ((std::string*)e)->append((char*)ptr, size * nmemb);
+
+            return size * nmemb;
+        }
+    };
+}
+
+
+#endif //MEAR_TOK_H
diff --git a/app/src/main/cpp/model/Song.h b/app/src/main/cpp/model/Song.h
index f17e58a..3b6cad7 100644
--- a/app/src/main/cpp/model/Song.h
+++ b/app/src/main/cpp/model/Song.h
@@ -26,14 +26,6 @@ public:
          const int duration, const int year, const int coverArtId) :
             id(id), title(title), artist(artist), album(album), albumArtist(albumArtist),
             genre(genre), duration(duration), year(year), coverArtId(coverArtId) { }
-    /**
-Song(const int id, const std::string&& title, const std::string&& artist,
- const std::string&& album, const std::string&& genre,
- const int duration, const int year) :
-    id(id), title(std::move(title)), artist(std::move(artist)),
-    album(std::move(album)), genre(std::move(genre)), duration(duration),
-    year(year) { }
-     */
 
     int id;
     std::string title;
@@ -45,6 +37,8 @@ Song(const int id, const std::string&& title, const std::string&& artist,
     int year;
     int coverArtId;
     std::vector<char> data;
+    bool downloaded;
+    std::string path;
 };
 }
 
diff --git a/app/src/main/cpp/repository/APIRepository.h b/app/src/main/cpp/repository/APIRepository.h
new file mode 100644
index 0000000..95a2a0b
--- /dev/null
+++ b/app/src/main/cpp/repository/APIRepository.h
@@ -0,0 +1,112 @@
+//
+// Created by brahmix on 10/12/19.
+//
+
+#ifndef MEAR_APIREPOSITORY_H
+#define MEAR_APIREPOSITORY_H
+
+#include <string>
+
+#include "BaseRepository.h"
+#include "../model/APIInfo.h"
+
+namespace repository { namespace local {
+    class APIRepository: public BaseRepository {
+    public:
+        APIRepository() {
+            m_tableName = apiInfoTable();
+        }
+
+
+        model::APIInfo retrieveAPIInfo(const std::string& path) {
+            model::APIInfo apiInfo;
+            try {
+                const auto dbPath = pathOfDatabase(path);
+                SQLite::Database db(dbPath, SQLite::OPEN_READONLY);
+
+                std::string queryString("SELECT * FROM ");
+                queryString.append(m_tableName);
+                queryString.append(" LIMIT 1");
+
+                SQLite::Statement query(db, queryString);
+
+                auto result = query.executeStep();
+                apiInfo.uri = query.getColumn(1).getString();
+                apiInfo.version = query.getColumn(2).getInt();
+
+                return apiInfo;
+            } catch (std::exception& ex) {
+                auto msg = ex.what();
+            }
+
+            return apiInfo;
+        }
+
+
+        [[deprecated("use the base class function")]]
+        bool doesAPIInfoTableExist(const std::string& path) {
+            try {
+                const auto dbPath = pathOfDatabase(path);
+                SQLite::Database db(dbPath, SQLite::OPEN_READONLY);
+
+                return db.tableExists(m_tableName);
+            } catch (std::exception& ex) {
+                auto msg = ex.what();
+            }
+
+            return false;
+        }
+
+
+        void createAPiInfoTable(const std::string& path) {
+            try {
+                const auto dbPath = pathOfDatabase(path);
+                SQLite::Database db(dbPath, SQLite::OPEN_READWRITE);
+
+                std::string queryString("CREATE TABLE ");
+                queryString.append(m_tableName);
+                queryString.append(" (Id INTEGER PRIMARY KEY, Uri TEXT, Version INT)");
+                db.exec(queryString);
+            } catch (std::exception& ex) {
+                auto msg = ex.what();
+            }
+        }
+
+        void deleteAPIInfo(const model::APIInfo& apiInfo, const std::string& path) {
+            try {
+                const auto dbPath = pathOfDatabase(path);
+                SQLite::Database db(dbPath, SQLite::OPEN_READWRITE);
+
+                std::string queryString("DELETE FROM ");
+                queryString.append(m_tableName);
+
+                db.exec(queryString);
+            } catch (std::exception& ex) {
+                auto msg = ex.what();
+            }
+        }
+
+        void saveAPIInfo(const model::APIInfo& apiInfo, const std::string& path) {
+            try {
+                const auto dbPath = pathOfDatabase(path);
+                SQLite::Database db(dbPath, SQLite::OPEN_READWRITE);
+                std::string queryString("INSERT INTO ");
+                queryString.append(m_tableName);
+                queryString.append(" (Uri, Version) VALUES (?, ?)");
+
+                SQLite::Statement query(db, queryString);
+                query.bind(1, apiInfo.uri);
+                query.bind(2, apiInfo.version);
+
+                query.exec();
+            } catch (std::exception& ex) {
+                auto msg = ex.what();
+            }
+        }
+    private:
+        std::string apiInfoTable() noexcept { return "APIInfo"; }
+    };
+}}
+
+
+#endif //MEAR_APIREPOSITORY_H
diff --git a/app/src/main/cpp/repository/BaseRepository.h b/app/src/main/cpp/repository/BaseRepository.h
new file mode 100644
index 0000000..799d466
--- /dev/null
+++ b/app/src/main/cpp/repository/BaseRepository.h
@@ -0,0 +1,125 @@
+//
+// Created by brahmix on 10/6/19.
+//
+
+#ifndef MEAR_BASEREPOSITORY_H
+#define MEAR_BASEREPOSITORY_H
+
+#include <string>
+#include <exception>
+
+#include <SQLiteCpp/Database.h>
+
+#include "../types/ConnType.h"
+
+namespace repository { namespace local {
+    using type::ConnType;
+
+    class BaseRepository {
+    public:
+        bool databaseExist(const std::string& appPath) {
+            try {
+                const auto dbPath = pathOfDatabase(appPath);
+
+                SQLite::Database db(dbPath, SQLite::OPEN_READONLY);
+                return true;
+            } catch (std::exception& ex) {
+                auto msg = ex.what();
+            }
+
+            return false;
+        }
+
+        bool doesTableExist(const std::string& appPath) {
+            try {
+                const auto dbPath = pathOfDatabase(appPath);
+                SQLite::Database db(dbPath, SQLite::OPEN_READONLY);
+
+                auto result = db.tableExists(m_tableName);
+                return result;
+            } catch (std::exception& ex) {
+                auto msg = ex.what();
+            }
+
+            return false;
+        }
+
+        bool isTableEmpty(const std::string& appPath) {
+            try {
+                const auto dbPath = pathOfDatabase(appPath);
+                SQLite::Database db(dbPath, SQLite::OPEN_READONLY);
+                std::string queryStr("SELECT * FROM ");
+                queryStr.append(m_tableName);
+
+                SQLite::Statement query(db, queryStr);
+
+                const auto result = query.hasRow();
+
+                return result;
+            } catch (std::exception& ex) {
+                auto msg = ex.what();
+            }
+
+            return true;
+        }
+
+
+        void initializedDatabase(const std::string& appPath) {
+            try {
+                const auto dbPath = pathOfDatabase(appPath);
+
+                SQLite::Database db(dbPath, SQLite::OPEN_CREATE | SQLite::OPEN_READWRITE);
+            } catch (std::exception& ex) {
+                auto msg = ex.what();
+            }
+        }
+
+        void deleteRecord(const std::string& appPath) {
+            try {
+                const auto dbPath = pathOfDatabase(appPath);
+
+                SQLite::Database db(dbPath, SQLite::OPEN_CREATE | SQLite::OPEN_READWRITE);
+            } catch (std::exception& ex) {
+                auto msg = ex.what();
+            }
+        }
+    protected:
+        std::string pathOfDatabase(const std::string& appPath) {
+            std::string dbPath(appPath);
+            auto lastChar = dbPath.at(dbPath.size()-1);
+            if (lastChar != '/') {
+                dbPath.append("/");
+            }
+
+            dbPath.append(databaseName());
+
+            return dbPath;
+        }
+
+        template<typename Str = std::string>
+        const Str databaseName() noexcept { return "mear.db3"; }
+
+
+        SQLite::Database getDbConn(const std::string& path, ConnType dbType) {
+            auto dbPath = pathOfDatabase(path);
+            switch (dbType) {
+                case ConnType::ReadOnly:
+                    return SQLite::Database(dbPath, SQLite::OPEN_READONLY);
+                case ConnType::ReadWrite:
+                    return SQLite::Database(dbPath, SQLite::OPEN_READWRITE);
+                case ConnType::Create:
+                    return SQLite::Database(dbPath, SQLite::OPEN_CREATE);
+                default:
+                    break;
+            }
+
+            return SQLite::Database(dbPath);
+        }
+
+        std::string m_tableName;
+    private:
+    };
+} }
+
+
+#endif //MEAR_BASEREPOSITORY_H
diff --git a/app/src/main/cpp/CoverArtRepository.h b/app/src/main/cpp/repository/CoverArtRepository.h
similarity index 96%
rename from app/src/main/cpp/CoverArtRepository.h
rename to app/src/main/cpp/repository/CoverArtRepository.h
index f633a9e..e0673c4 100644
--- a/app/src/main/cpp/CoverArtRepository.h
+++ b/app/src/main/cpp/repository/CoverArtRepository.h
@@ -10,10 +10,10 @@
 #include <iterator>
 #include <vector>
 
-#include <curl/curl.h>
+#include "../3rdparty/android/include/curl/curl.h"
 
-#include "model/CoverArt.h"
-#include "model/Token.h"
+#include "../model/CoverArt.h"
+#include "../model/Token.h"
 
 using data = char;
 
diff --git a/app/src/main/cpp/repository/RepeatRepository.h b/app/src/main/cpp/repository/RepeatRepository.h
new file mode 100644
index 0000000..17a0c89
--- /dev/null
+++ b/app/src/main/cpp/repository/RepeatRepository.h
@@ -0,0 +1,105 @@
+//
+// Created by brahmix on 10/21/19.
+//
+
+#ifndef MEAR_REPEATREPOSITORY_H
+#define MEAR_REPEATREPOSITORY_H
+
+#include <string>
+
+#include "BaseRepository.h"
+#include "../types/RepeatTypes.h"
+
+namespace repository { namespace local {
+    class RepeatRepository : public BaseRepository {
+    public:
+        RepeatRepository() {
+            m_tableName = repeatTable();
+        }
+
+
+        RepeatTypes retrieveRepeatMode(const std::string& path) {
+            try {
+                auto db = getDbConn(path, ConnType::ReadOnly);
+                std::string queryString("SELECT * FROM ");
+                queryString.append(m_tableName);
+                queryString.append(" LIMIT 1");
+
+                SQLite::Statement query(db, queryString);
+
+                const auto result = query.executeStep();
+
+                auto repeatType = query.getColumn(1).getInt();
+                auto val = static_cast<RepeatTypes>(repeatType);
+                return val;
+            } catch (std::exception& ex) {
+                auto msg = ex.what();
+            }
+
+            return RepeatTypes::RepeatOff;
+        }
+
+
+        void createRepeatTable(const std::string& path) {
+            try {
+                auto db = getDbConn(path, ConnType::ReadWrite);
+                std::string queryString("CREATE TABLE ");
+                queryString.append(m_tableName);
+                queryString.append(" (Id INTEGER PRIMARY KEY, RepeatMode INT)");
+
+                db.exec(queryString);
+
+                queryString = "INSERT INTO " + m_tableName + " (RepeatMode) VALUES(?)";
+                SQLite::Statement query(db, queryString);
+                query.bind(1, static_cast<int>(RepeatTypes::RepeatOff));
+                query.exec();
+
+            } catch (std::exception &ex) {
+                auto msg = ex.what();
+            }
+        }
+
+        void updateRepeat(const std::string& path) {
+            try {
+                auto db = getDbConn(path, ConnType::ReadWrite);
+
+                if (isTableEmpty(path)) {
+                    std::string queryString("INSERT INTO ");
+                    queryString.append(m_tableName);
+                    queryString.append(" (RepeatMode) VALUES (?)");
+
+                    SQLite::Statement query(db, queryString);
+                    query.bind(1, static_cast<int>(RepeatTypes::RepeatOff));
+                    query.exec();
+                } else {
+                    std::string queryString("UPDATE ");
+                    queryString.append(m_tableName);
+                    queryString.append(" SET RepeatMode = ?");
+
+                    auto repeatMode = retrieveRepeatMode(path);
+                    SQLite::Statement query(db, queryString);
+
+                    switch (repeatMode) {
+                        case RepeatTypes::RepeatOff:
+                            query.bind(1, static_cast<int>(RepeatTypes::RepeatSong));
+                            break;
+                        case RepeatTypes::RepeatSong:
+                            query.bind(1, static_cast<int>(RepeatTypes::RepeatOff));
+                            break;
+                        default:
+                            break;
+                    }
+
+                    query.exec();
+                }
+            } catch (std::exception &ex) {
+                auto msg = ex.what();
+            }
+        }
+    private:
+        std::string repeatTable() noexcept { return "Repeat"; }
+    };
+}}
+
+
+#endif //MEAR_REPEATREPOSITORY_H
diff --git a/app/src/main/cpp/repository/ShuffleRepository.h b/app/src/main/cpp/repository/ShuffleRepository.h
new file mode 100644
index 0000000..9f8223c
--- /dev/null
+++ b/app/src/main/cpp/repository/ShuffleRepository.h
@@ -0,0 +1,109 @@
+//
+// Created by brahmix on 10/21/19.
+//
+
+#ifndef MEAR_SHUFFLEREPOSITORY_H
+#define MEAR_SHUFFLEREPOSITORY_H
+
+#include <string>
+
+#include "BaseRepository.h"
+#include "../types/ShuffleTypes.h"
+
+namespace repository { namespace local {
+    class ShuffleRepository : public BaseRepository {
+    public:
+        ShuffleRepository() {
+            m_tableName = shuffleTable();
+        }
+
+
+        ShuffleTypes retrieveShuffleMode(const std::string& path) {
+            try {
+                auto db = getDbConn(path, ConnType::ReadOnly);
+                std::string queryString("SELECT * FROM ");
+                queryString.append(m_tableName);
+                queryString.append(" LIMIT 1");
+
+                SQLite::Statement query(db, queryString);
+
+                const auto result = query.executeStep();
+                auto shuffleType = query.getColumn(1).getInt();
+                auto val = static_cast<ShuffleTypes>(shuffleType);
+
+                return val;
+
+            } catch (std::exception &ex) {
+                auto msg = ex.what();
+            }
+
+            return ShuffleTypes::ShuffleOff;
+        }
+
+
+        void createShuffleTable(const std::string& path) {
+            try {
+                auto db = getDbConn(path, ConnType::ReadWrite);
+                std::string queryString("CREATE TABLE ");
+                queryString.append(m_tableName);
+                queryString.append(" (Id INTEGER PRIMARY KEY, ShuffleMode INT)");
+
+                db.exec(queryString);
+
+                queryString = "INSERT INTO ";
+                queryString.append(m_tableName);
+                queryString.append(" (ShuffleMode) VALUES(?)");
+                SQLite::Statement query(db, queryString);
+                query.bind(1, static_cast<int>(ShuffleTypes::ShuffleOff));
+                query.exec();
+            } catch (std::exception &ex) {
+                auto msg = ex.what();
+            }
+        }
+
+        void updateShuffle(const std::string& path) {
+            try {
+                auto db = getDbConn(path, ConnType::ReadWrite);
+
+                if (!doesTableExist(path)) {
+                    createShuffleTable(path);
+                }
+
+                if (isTableEmpty(path)) {
+                    constexpr auto queryString = "INSERT INTO ? (ShuffleMode) VALUES(?)";
+                    SQLite::Statement query(db, queryString);
+                    query.bind(1, m_tableName);
+                    query.bind(2, static_cast<int>(ShuffleTypes::ShuffleOff));
+                    query.exec();
+                } else {
+                    std::string queryString("UPDATE ");
+                    queryString.append(m_tableName);
+                    queryString.append(" SET ShuffleMode = ?");
+
+                    auto shuffleMode = retrieveShuffleMode(path);
+                    SQLite::Statement query(db, queryString);
+
+                    switch (shuffleMode) {
+                        case ShuffleTypes::ShuffleOff:
+                            query.bind(1, static_cast<int>(ShuffleTypes::ShuffleOn));
+                            break;
+                        case ShuffleTypes::ShuffleOn:
+                            query.bind(1, static_cast<int>(ShuffleTypes::ShuffleOff));
+                            break;
+                        default:
+                            break;
+                    }
+
+                    query.exec();
+                }
+            } catch (std::exception &ex) {
+                auto msg = ex.what();
+            }
+        }
+    private:
+        std::string shuffleTable() noexcept { return "Shuffle"; }
+    };
+}}
+
+
+#endif //MEAR_SHUFFLEREPOSITORY_H
diff --git a/app/src/main/cpp/SongRepository.h b/app/src/main/cpp/repository/SongRepository.h
similarity index 83%
rename from app/src/main/cpp/SongRepository.h
rename to app/src/main/cpp/repository/SongRepository.h
index eacc1da..50b6e3c 100644
--- a/app/src/main/cpp/SongRepository.h
+++ b/app/src/main/cpp/repository/SongRepository.h
@@ -8,12 +8,12 @@
 #include <string>
 #include <vector>
 
-#include <curl/curl.h>
-#include <nlohmann/json.hpp>
+#include "../3rdparty/android/include/curl/curl.h"
+#include "../3rdparty/json/single_include/nlohmann/json.hpp"
 
-#include "model/Song.h"
-#include "model/Token.h"
-#include "GeneralUtility.h"
+#include "../model/Song.h"
+#include "../model/Token.h"
+#include "../utility/GeneralUtility.h"
 
 namespace repository {
 
@@ -61,10 +61,6 @@ namespace repository {
                             songJson["album_artist"].get<std::string>(),
                             songJson["genre"].get<std::string>(), songJson["duration"].get<int>(),
                             songJson["year"].get<int>(), songJson["coverart_id"].get<int>());
-                    /**
-                    song.albumArtist = songJson["album_artist"].get<std::string>();
-                    song.coverArtId = songJson["coverart_id"].get<int>();
-                     */
 
                     songs.push_back(song);
                 }
@@ -113,17 +109,6 @@ namespace repository {
                         s["album_artist"].get<std::string>(), s["genre"].get<std::string>(),
                         s["duration"].get<int>(), s["year"].get<int>(),
                         s["coverart_id"].get<int>());
-                /**
-                song.id = s["id"].get<int>();
-                song.title = s["title"].get<std::string>();
-                song.album = s["album"].get<std::string>();
-                song.albumArtist = s["album_artist"].get<std::string>();
-                song.artist = s["artist"].get<std::string>();
-                song.genre = s["genre"].get<std::string>();
-                song.duration = s["duration"].get<int>();
-                song.year = s["year"].get<int>();
-                song.coverArtId = s["coverart_id"].get<int>();
-                 */
 
                 return song;
             }
@@ -164,13 +149,9 @@ namespace repository {
             return size * nmemb;
         }
 
-        constexpr auto songRecordEndpoint() noexcept {
-            return "api/v1/song/";
-        }
+        constexpr auto songRecordEndpoint() noexcept { return "api/v1/song/"; }
 
-        constexpr auto songDownloadEndpoint() noexcept {
-            return "api/v1/song/data/";
-        }
+        constexpr auto songDownloadEndpoint() noexcept { return "api/v1/song/data/"; }
     };
 }
 
diff --git a/app/src/main/cpp/repository/TokenRepository.h b/app/src/main/cpp/repository/TokenRepository.h
new file mode 100644
index 0000000..f04792d
--- /dev/null
+++ b/app/src/main/cpp/repository/TokenRepository.h
@@ -0,0 +1,81 @@
+//
+// Created by brahmix on 10/6/19.
+//
+
+#ifndef MEAR_TOKENREPOSITORY_H
+#define MEAR_TOKENREPOSITORY_H
+
+#include <string>
+
+#include "../model/Token.h"
+#include "BaseRepository.h"
+
+namespace repository { namespace local {
+    template<class Token = model::Token>
+    class TokenRepository: public BaseRepository {
+    public:
+        TokenRepository() {
+            m_tableName = tokenTable();
+        }
+
+
+        Token retrieveToken(const std::string& path) {
+            Token token;
+
+            try {
+                auto db = getDbConn(path, ConnType::ReadOnly);
+                std::string queryString("SELECT * FROM ");
+                queryString.append(m_tableName);
+                queryString.append(" LIMIT 1");
+
+                SQLite::Statement query(db, queryString);
+
+                auto result = query.executeStep();
+                token.accessToken = std::move(query.getColumn(1).getString());
+
+                return token;
+            } catch (std::exception& ex) {
+                auto msg = ex.what();
+            }
+
+            return token;
+        }
+
+
+        void createTokenTable(const std::string& path) {
+            try {
+                auto db = getDbConn(path, ConnType::ReadWrite);
+
+                std::string queryString("CREATE TABLE ");
+                queryString.append(m_tableName);
+                queryString.append(" (Id INTEGER PRIMARY KEY, AccessToken TEXT)");
+
+                db.exec(queryString);
+            } catch (std::exception& ex) {
+                auto msg = ex.what();
+            }
+        }
+
+        void saveToken(const Token& token, const std::string& path) {
+            try {
+                auto db = getDbConn(path, ConnType::ReadWrite);
+
+                std::string queryString("INSERT INTO ");
+                queryString.append(m_tableName);
+                queryString.append(" (AccessToken) VALUES (?)");
+
+                SQLite::Statement query(db, queryString);
+                query.bind(1, token.accessToken);
+
+                query.exec();
+            } catch (std::exception& ex) {
+                auto msg = ex.what();
+            }
+        }
+    private:
+        std::string tokenTable() noexcept { return "Token"; }
+    };
+}}
+
+
+#endif //MEAR_TOKENREPOSITORY_H
diff --git a/app/src/main/cpp/repository/UserRepository.h b/app/src/main/cpp/repository/UserRepository.h
new file mode 100644
index 0000000..460cfa5
--- /dev/null
+++ b/app/src/main/cpp/repository/UserRepository.h
@@ -0,0 +1,104 @@
+//
+// Created by brahmix on 10/6/19.
+//
+
+#ifndef MEAR_USERREPOSITORY_H
+#define MEAR_USERREPOSITORY_H
+
+#include <string>
+
+#include "BaseRepository.h"
+#include "../model/User.h"
+
+
+namespace repository { namespace local {
+    template<class User = model::User>
+    class UserRepository : public BaseRepository {
+    public:
+        UserRepository() {
+            m_tableName = userTable();
+        }
+
+
+        User retrieveUserCredentials(const std::string& appPath) {
+            User user;
+            try {
+                const auto dbPath = pathOfDatabase(appPath);
+                SQLite::Database db(dbPath, SQLite::OPEN_READONLY);
+
+                std::string queryString("SELECT * FROM ");
+                queryString.append(m_tableName);
+                queryString.append(" LIMIT 1");
+
+                SQLite::Statement query(db, queryString);
+
+                auto result = query.executeStep();
+
+                auto valZero = query.getColumn(1);
+                auto valOne = query.getColumn(2);
+
+                user.username = valZero.getString();
+                user.password = valOne.getString();
+
+                return user;
+
+            } catch (std::exception& ex) {
+                auto msg = ex.what();
+            }
+
+            return user;
+        }
+
+
+        void createUserTable(const std::string& appPath) {
+            try {
+                const auto dbPath = pathOfDatabase(appPath);
+                SQLite::Database db(dbPath, SQLite::OPEN_READWRITE);
+
+                std::string queryString("CREATE TABLE ");
+                queryString.append(m_tableName);
+                queryString.append(" (Id INTEGER PRIMARY KEY, Username TEXT, Password TEXT)");
+                db.exec(queryString);
+            } catch (std::exception& ex) {
+                auto msg = ex.what();
+            }
+        }
+
+        void deleteUserTable(const std::string& appPath) {
+            try {
+                const auto dbPath = pathOfDatabase(appPath);
+                SQLite::Database db(dbPath, SQLite::OPEN_READWRITE);
+
+                std::string queryStr("DELETE FROM ");
+                queryStr.append(m_tableName);
+
+                db.exec(queryStr);
+            } catch (std::exception& ex) {
+                auto msg = ex.what();
+            }
+        }
+
+        void saveUserCred(const User& user, const std::string& appPath) {
+            try {
+                const auto dbPath = pathOfDatabase(appPath);
+                SQLite::Database db(dbPath, SQLite::OPEN_READWRITE);
+                std::string queryString("INSERT INTO ");
+                queryString.append(m_tableName);
+                queryString.append(" (Username, Password) VALUES (?, ?)");
+
+                SQLite::Statement query(db, queryString);
+                query.bind(1, user.username);
+                query.bind(2, user.password);
+
+                query.exec();
+            } catch (std::exception& ex) {
+                auto msg = ex.what();
+            }
+        }
+    private:
+        std::string userTable() noexcept { return "User"; }
+    };
+
+}}
+
+#endif //MEAR_USERREPOSITORY_H
diff --git a/app/src/main/cpp/types/ConnType.h b/app/src/main/cpp/types/ConnType.h
new file mode 100644
index 0000000..7b653b3
--- /dev/null
+++ b/app/src/main/cpp/types/ConnType.h
@@ -0,0 +1,16 @@
+//
+// Created by brahmix on 11/29/19.
+//
+
+#ifndef MEAR_CONNTYPE_H
+#define MEAR_CONNTYPE_H
+
+namespace type {
+    enum class ConnType {
+        ReadOnly = 0,
+        ReadWrite = 1,
+        Create = 2
+    };
+}
+
+#endif //MEAR_CONNTYPE_H
diff --git a/app/src/main/cpp/RepeatTypes.h b/app/src/main/cpp/types/RepeatTypes.h
similarity index 100%
rename from app/src/main/cpp/RepeatTypes.h
rename to app/src/main/cpp/types/RepeatTypes.h
diff --git a/app/src/main/cpp/ShuffleTypes.h b/app/src/main/cpp/types/ShuffleTypes.h
similarity index 100%
rename from app/src/main/cpp/ShuffleTypes.h
rename to app/src/main/cpp/types/ShuffleTypes.h
diff --git a/app/src/main/cpp/utility/GeneralUtility.h b/app/src/main/cpp/utility/GeneralUtility.h
new file mode 100644
index 0000000..4f2743d
--- /dev/null
+++ b/app/src/main/cpp/utility/GeneralUtility.h
@@ -0,0 +1,35 @@
+//
+// Created by brahmix on 11/25/19.
+//
+
+#ifndef MEAR_GENERALUTILITY_H
+#define MEAR_GENERALUTILITY_H
+
+#include <string>
+
+#include "../model/Token.h"
+
+namespace utility {
+    class GeneralUtility {
+    public:
+        template<typename S = std::string>
+        static S appendForwardSlashToUri(const S& uri) {
+            S fullUri(uri);
+            if (fullUri.at(fullUri.size() - 1) != '/') {
+                fullUri.append("/");
+            }
+
+            return fullUri;
+        }
+        template<typename S = std::string, class Token = model::Token>
+        static S authHeader(const Token& token) {
+            std::string header("Authorization: Bearer ");
+            header.append(token.accessToken);
+
+            return header;
+        }
+    private:
+    };
+}
+
+#endif //MEAR_GENERALUTILITY_H
diff --git a/build.gradle b/build.gradle
index 8bc2ea4..f9a0084 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/mear.iml b/mear.iml
index d34ada0..8bb884e 100644
--- a/mear.iml
+++ b/mear.iml
@@ -12,7 +12,6 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
     <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />