diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index beb4a9acd..a33772621 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="io.github.wulkanowy"
     android:installLocation="internalOnly">
 
@@ -15,9 +16,10 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
-        android:usesCleartextTraffic="true">
+        android:usesCleartextTraffic="true"
+        tools:ignore="GoogleAppIndexingWarning">
         <activity
-            android:name=".ui.splash.SplashActivity"
+            android:name=".ui.modules.splash.SplashActivity"
             android:screenOrientation="portrait"
             android:theme="@style/WulkanowyTheme.SplashScreen">
             <intent-filter>
@@ -27,12 +29,12 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.login.LoginActivity"
+            android:name="ui.modules.login.LoginActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/login_title"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".ui.main.MainActivity"
+            android:name="ui.modules.main.MainActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/main_title"
             android:launchMode="singleTop"
diff --git a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
index dbed90bb9..e6a8b6492 100644
--- a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
@@ -6,8 +6,7 @@ import dagger.Provides
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.WulkanowyApp
-import io.github.wulkanowy.utils.schedulers.SchedulersManager
-import io.github.wulkanowy.utils.schedulers.SchedulersProvider
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Singleton
 
 @Module
@@ -19,7 +18,7 @@ internal class AppModule {
 
     @Singleton
     @Provides
-    fun provideSchedulers(): SchedulersManager = SchedulersProvider()
+    fun provideSchedulersProvider() = SchedulersProvider()
 
     @Provides
     fun provideFlexibleAdapter() = FlexibleAdapter<AbstractFlexibleItem<*>>(null, null, true)
diff --git a/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt b/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
index ead235a2e..66adcd554 100644
--- a/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
@@ -3,11 +3,11 @@ package io.github.wulkanowy.di
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.di.scopes.PerActivity
-import io.github.wulkanowy.ui.login.LoginActivity
-import io.github.wulkanowy.ui.login.LoginModule
-import io.github.wulkanowy.ui.main.MainActivity
-import io.github.wulkanowy.ui.main.MainModule
-import io.github.wulkanowy.ui.splash.SplashActivity
+import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.ui.modules.login.LoginModule
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainModule
+import io.github.wulkanowy.ui.modules.splash.SplashActivity
 
 @Module
 internal abstract class BuilderModule {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/about/AboutFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
similarity index 96%
rename from app/src/main/java/io/github/wulkanowy/ui/main/about/AboutFragment.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
index 2aa8b1b01..b7c57cbce 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/about/AboutFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.about
+package io.github.wulkanowy.ui.modules.about
 
 import android.content.Intent
 import android.os.Bundle
@@ -9,7 +9,7 @@ import com.mikepenz.aboutlibraries.LibsBuilder
 import com.mikepenz.aboutlibraries.LibsFragmentCompat
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.main.MainView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.withOnExtraListener
 import javax.inject.Inject
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/about/AboutModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutModule.kt
similarity index 85%
rename from app/src/main/java/io/github/wulkanowy/ui/main/about/AboutModule.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutModule.kt
index 5842db1d8..675026659 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/about/AboutModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutModule.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.about
+package io.github.wulkanowy.ui.modules.about
 
 import com.mikepenz.aboutlibraries.LibsFragmentCompat
 import dagger.Module
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/about/AboutPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
similarity index 93%
rename from app/src/main/java/io/github/wulkanowy/ui/main/about/AboutPresenter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
index fa083296a..422de450e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/about/AboutPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.about
+package io.github.wulkanowy.ui.modules.about
 
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.Libs.SpecialButton.SPECIAL1
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/about/AboutView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
similarity index 75%
rename from app/src/main/java/io/github/wulkanowy/ui/main/about/AboutView.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
index cfdba9924..1e05bfc54 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/about/AboutView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.about
+package io.github.wulkanowy.ui.modules.about
 
 import io.github.wulkanowy.ui.base.BaseView
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceDialog.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
index 4d07b6afb..611dd999e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.attendance
+package io.github.wulkanowy.ui.modules.attendance
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceFragment.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
index 1e8eea742..92226be29 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.attendance
+package io.github.wulkanowy.ui.modules.attendance
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -10,7 +10,7 @@ import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.main.MainView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_attendance.*
 import javax.inject.Inject
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceItem.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceItem.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceItem.kt
index 13e4d0dfe..c2698ebba 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceItem.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.attendance
+package io.github.wulkanowy.ui.modules.attendance
 
 import android.view.View
 import android.view.View.INVISIBLE
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
similarity index 92%
rename from app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendancePresenter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
index 8a20d6267..f64ebc9b1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendancePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.attendance
+package io.github.wulkanowy.ui.modules.attendance
 
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.ErrorHandler
@@ -7,7 +7,6 @@ import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SessionRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.utils.*
-import io.github.wulkanowy.utils.schedulers.SchedulersManager
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.ofEpochDay
@@ -16,7 +15,7 @@ import javax.inject.Inject
 
 class AttendancePresenter @Inject constructor(
         private val errorHandler: ErrorHandler,
-        private val schedulers: SchedulersManager,
+        private val schedulers: SchedulersProvider,
         private val attendanceRepository: AttendanceRepository,
         private val sessionRepository: SessionRepository,
         private val prefRepository: PreferencesRepository
@@ -68,8 +67,8 @@ class AttendancePresenter @Inject constructor(
                         else list.filter { !it.presence }
                     }
                     .map { items -> items.map { AttendanceItem(it) } }
-                    .subscribeOn(schedulers.backgroundThread())
-                    .observeOn(schedulers.mainThread())
+                    .subscribeOn(schedulers.backgroundThread)
+                    .observeOn(schedulers.mainThread)
                     .doFinally {
                         view?.run {
                             hideRefresh()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
similarity index 91%
rename from app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceView.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
index 4c9d18b8d..3479086ac 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.attendance
+package io.github.wulkanowy.ui.modules.attendance
 
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.ui.base.BaseView
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamDialog.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
index 436498641..ed5092c96 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.exam
+package io.github.wulkanowy.ui.modules.exam
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamFragment.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
index 9403dbacc..3e1f7cad2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.exam
+package io.github.wulkanowy.ui.modules.exam
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -11,7 +11,7 @@ import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.main.MainView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_exam.*
 import javax.inject.Inject
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamHeader.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamHeader.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamHeader.kt
index 45be5f1da..0a5b862c3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamHeader.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamHeader.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.exam
+package io.github.wulkanowy.ui.modules.exam
 
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamItem.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt
index e849c1ded..318685e93 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.exam
+package io.github.wulkanowy.ui.modules.exam
 
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
similarity index 92%
rename from app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamPresenter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
index afe1b3cf1..5ca7fbfee 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.exam
+package io.github.wulkanowy.ui.modules.exam
 
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.ErrorHandler
@@ -7,7 +7,6 @@ import io.github.wulkanowy.data.repositories.ExamRepository
 import io.github.wulkanowy.data.repositories.SessionRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.utils.*
-import io.github.wulkanowy.utils.schedulers.SchedulersManager
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.ofEpochDay
@@ -16,7 +15,7 @@ import javax.inject.Inject
 
 class ExamPresenter @Inject constructor(
         private val errorHandler: ErrorHandler,
-        private val schedulers: SchedulersManager,
+        private val schedulers: SchedulersProvider,
         private val examRepository: ExamRepository,
         private val sessionRepository: SessionRepository
 ) : BasePresenter<ExamView>(errorHandler) {
@@ -65,8 +64,8 @@ class ExamPresenter @Inject constructor(
                         examRepository.getExams(it, currentDate.monday, currentDate.friday, forceRefresh)
                     }.map { it.groupBy { exam -> exam.date }.toSortedMap() }
                     .map { createExamItems(it) }
-                    .subscribeOn(schedulers.backgroundThread())
-                    .observeOn(schedulers.mainThread())
+                    .subscribeOn(schedulers.backgroundThread)
+                    .observeOn(schedulers.mainThread)
                     .doFinally {
                         view?.run {
                             hideRefresh()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
similarity index 92%
rename from app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamView.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
index 43f7d4d82..cfe1cb9b7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/exam/ExamView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.exam
+package io.github.wulkanowy.ui.modules.exam
 
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.ui.base.BaseView
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
similarity index 94%
rename from app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeFragment.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
index e49b4ff8b..57140c16d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.grade
+package io.github.wulkanowy.ui.modules.grade
 
 import android.os.Bundle
 import android.view.*
@@ -8,9 +8,9 @@ import androidx.appcompat.app.AlertDialog
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BasePagerAdapter
-import io.github.wulkanowy.ui.main.MainView
-import io.github.wulkanowy.ui.main.grade.details.GradeDetailsFragment
-import io.github.wulkanowy.ui.main.grade.summary.GradeSummaryFragment
+import io.github.wulkanowy.ui.modules.grade.details.GradeDetailsFragment
+import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.setOnSelectPageListener
 import kotlinx.android.synthetic.main.fragment_grade.*
 import javax.inject.Inject
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
similarity index 79%
rename from app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeModule.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
index d9312f07a..186ab4db6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.grade
+package io.github.wulkanowy.ui.modules.grade
 
 import dagger.Module
 import dagger.Provides
@@ -6,8 +6,8 @@ import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.di.scopes.PerChildFragment
 import io.github.wulkanowy.di.scopes.PerFragment
 import io.github.wulkanowy.ui.base.BasePagerAdapter
-import io.github.wulkanowy.ui.main.grade.details.GradeDetailsFragment
-import io.github.wulkanowy.ui.main.grade.summary.GradeSummaryFragment
+import io.github.wulkanowy.ui.modules.grade.details.GradeDetailsFragment
+import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
 
 @Module
 abstract class GradeModule {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
similarity index 88%
rename from app/src/main/java/io/github/wulkanowy/ui/main/grade/GradePresenter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
index e8e700625..85243b253 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
@@ -1,17 +1,17 @@
-package io.github.wulkanowy.ui.main.grade
+package io.github.wulkanowy.ui.modules.grade
 
 import io.github.wulkanowy.data.ErrorHandler
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.repositories.SessionRepository
 import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.utils.schedulers.SchedulersManager
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.reactivex.Completable
 import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class GradePresenter @Inject constructor(
         private val errorHandler: ErrorHandler,
-        private val schedulers: SchedulersManager,
+        private val schedulers: SchedulersProvider,
         private val sessionRepository: SessionRepository) : BasePresenter<GradeView>(errorHandler) {
 
     var selectedIndex = 0
@@ -23,7 +23,7 @@ class GradePresenter @Inject constructor(
 
     fun onAttachView(view: GradeView, savedIndex: Int?) {
         super.onAttachView(view)
-        disposable.add(Completable.timer(150, MILLISECONDS, schedulers.mainThread())
+        disposable.add(Completable.timer(150, MILLISECONDS, schedulers.mainThread)
                 .subscribe {
                     selectedIndex = savedIndex ?: 0
                     view.initView()
@@ -52,7 +52,7 @@ class GradePresenter @Inject constructor(
     }
 
     fun onChildViewRefresh() {
-        view?.let { loadChild(it.currentPageIndex, forceRefresh = true) }
+        view?.let { loadChild(it.currentPageIndex, true) }
     }
 
     fun onChildViewLoaded(semesterId: Int) {
@@ -75,8 +75,8 @@ class GradePresenter @Inject constructor(
                         semesters = it.filter { semester -> semester.diaryId == current.diaryId }
                     }
                 }
-                .subscribeOn(schedulers.backgroundThread())
-                .observeOn(schedulers.mainThread())
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
                 .subscribe({ _ ->
                     view?.let { loadChild(it.currentPageIndex) }
                 }) { errorHandler.proceed(it) })
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
similarity index 93%
rename from app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeView.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
index 4c1df29a9..c48dcb95a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/GradeView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.grade
+package io.github.wulkanowy.ui.modules.grade
 
 import io.github.wulkanowy.ui.base.BaseView
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
similarity index 98%
rename from app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsDialog.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
index c40ee540e..323db812b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.grade.details
+package io.github.wulkanowy.ui.modules.grade.details
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
similarity index 96%
rename from app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsFragment.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
index 15ed2d66d..b10d3dec7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.grade.details
+package io.github.wulkanowy.ui.modules.grade.details
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -13,8 +13,8 @@ import eu.davidea.flexibleadapter.items.IFlexible
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.main.grade.GradeFragment
-import io.github.wulkanowy.ui.main.grade.GradeView
+import io.github.wulkanowy.ui.modules.grade.GradeFragment
+import io.github.wulkanowy.ui.modules.grade.GradeView
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_grade_details.*
 import javax.inject.Inject
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsHeader.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt
index 92636e490..3b4ee8fba 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsHeader.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.grade.details
+package io.github.wulkanowy.ui.modules.grade.details
 
 import android.view.View
 import android.view.View.GONE
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsItem.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
index 4154a6283..bb3480c02 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.grade.details
+package io.github.wulkanowy.ui.modules.grade.details
 
 import android.annotation.SuppressLint
 import android.view.View
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
similarity index 91%
rename from app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsPresenter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
index 4189fa710..20e1a7f83 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.grade.details
+package io.github.wulkanowy.ui.modules.grade.details
 
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.ErrorHandler
@@ -6,14 +6,14 @@ import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.repositories.GradeRepository
 import io.github.wulkanowy.data.repositories.SessionRepository
 import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.calcAverage
-import io.github.wulkanowy.utils.schedulers.SchedulersManager
 import io.github.wulkanowy.utils.valueColor
 import javax.inject.Inject
 
 class GradeDetailsPresenter @Inject constructor(
         private val errorHandler: ErrorHandler,
-        private val schedulers: SchedulersManager,
+        private val schedulers: SchedulersProvider,
         private val gradeRepository: GradeRepository,
         private val sessionRepository: SessionRepository) : BasePresenter<GradeDetailsView>(errorHandler) {
 
@@ -26,8 +26,8 @@ class GradeDetailsPresenter @Inject constructor(
         disposable.add(sessionRepository.getSemesters()
                 .flatMap { gradeRepository.getGrades(it.first { item -> item.semesterId == semesterId }, forceRefresh) }
                 .map { createGradeItems(it.groupBy { grade -> grade.subject }.toSortedMap()) }
-                .subscribeOn(schedulers.backgroundThread())
-                .observeOn(schedulers.mainThread())
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
                 .doFinally {
                     view?.run {
                         showRefresh(false)
@@ -117,8 +117,8 @@ class GradeDetailsPresenter @Inject constructor(
 
     private fun updateGrade(grade: Grade) {
         disposable.add(gradeRepository.updateGrade(grade)
-                .subscribeOn(schedulers.backgroundThread())
-                .observeOn(schedulers.mainThread())
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
                 .subscribe({}) { error -> errorHandler.proceed(error) })
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
similarity index 94%
rename from app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsView.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
index a292ee95b..2fb480b42 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/details/GradeDetailsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.grade.details
+package io.github.wulkanowy.ui.modules.grade.details
 
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import eu.davidea.flexibleadapter.items.IExpandable
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
similarity index 95%
rename from app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryFragment.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
index e3e160223..76473b401 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.grade.summary
+package io.github.wulkanowy.ui.modules.grade.summary
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -10,8 +10,8 @@ import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.main.grade.GradeFragment
-import io.github.wulkanowy.ui.main.grade.GradeView
+import io.github.wulkanowy.ui.modules.grade.GradeFragment
+import io.github.wulkanowy.ui.modules.grade.GradeView
 import kotlinx.android.synthetic.main.fragment_grade_summary.*
 import javax.inject.Inject
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryHeader.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryHeader.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryHeader.kt
index c3dd6b3c6..fba3fde62 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryHeader.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryHeader.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.grade.summary
+package io.github.wulkanowy.ui.modules.grade.summary
 
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryItem.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt
index d2ad9cac4..98e5db927 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.grade.summary
+package io.github.wulkanowy.ui.modules.grade.summary
 
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
similarity index 94%
rename from app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryPresenter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
index 048619a2a..1a2296f86 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.grade.summary
+package io.github.wulkanowy.ui.modules.grade.summary
 
 import io.github.wulkanowy.data.ErrorHandler
 import io.github.wulkanowy.data.db.entities.GradeSummary
@@ -6,8 +6,8 @@ import io.github.wulkanowy.data.repositories.GradeRepository
 import io.github.wulkanowy.data.repositories.GradeSummaryRepository
 import io.github.wulkanowy.data.repositories.SessionRepository
 import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.calcAverage
-import io.github.wulkanowy.utils.schedulers.SchedulersManager
 import java.lang.String.format
 import java.util.Locale.FRANCE
 import javax.inject.Inject
@@ -17,7 +17,7 @@ class GradeSummaryPresenter @Inject constructor(
         private val gradeSummaryRepository: GradeSummaryRepository,
         private val gradeRepository: GradeRepository,
         private val sessionRepository: SessionRepository,
-        private val schedulers: SchedulersManager)
+        private val schedulers: SchedulersProvider)
     : BasePresenter<GradeSummaryView>(errorHandler) {
 
     override fun onAttachView(view: GradeSummaryView) {
@@ -46,8 +46,8 @@ class GradeSummaryPresenter @Inject constructor(
                                         }
                             }
                 }
-                .subscribeOn(schedulers.backgroundThread())
-                .observeOn(schedulers.mainThread())
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
                 .doFinally {
                     view?.run {
                         showRefresh(false)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryScrollableHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryScrollableHeader.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryScrollableHeader.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryScrollableHeader.kt
index d0c6ab1b6..f1c535c71 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryScrollableHeader.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryScrollableHeader.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.grade.summary
+package io.github.wulkanowy.ui.modules.grade.summary
 
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt
similarity index 91%
rename from app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryView.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt
index d5697edf7..f7035abc9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/grade/summary/GradeSummaryView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.grade.summary
+package io.github.wulkanowy.ui.modules.grade.summary
 
 import io.github.wulkanowy.ui.base.BaseView
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/login/LoginActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
similarity index 91%
rename from app/src/main/java/io/github/wulkanowy/ui/login/LoginActivity.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
index 1f6a4b993..c787e2367 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/login/LoginActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.login
+package io.github.wulkanowy.ui.modules.login
 
 import android.content.Context
 import android.content.Intent
@@ -6,8 +6,8 @@ import android.os.Bundle
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.BasePagerAdapter
-import io.github.wulkanowy.ui.login.form.LoginFormFragment
-import io.github.wulkanowy.ui.login.options.LoginOptionsFragment
+import io.github.wulkanowy.ui.modules.login.form.LoginFormFragment
+import io.github.wulkanowy.ui.modules.login.options.LoginOptionsFragment
 import io.github.wulkanowy.utils.setOnSelectPageListener
 import kotlinx.android.synthetic.main.activity_login.*
 import javax.inject.Inject
diff --git a/app/src/main/java/io/github/wulkanowy/ui/login/LoginErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
similarity index 92%
rename from app/src/main/java/io/github/wulkanowy/ui/login/LoginErrorHandler.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
index 93b66ab18..ab12479c2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/login/LoginErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.login
+package io.github.wulkanowy.ui.modules.login
 
 import android.content.res.Resources
 import io.github.wulkanowy.api.login.BadCredentialsException
diff --git a/app/src/main/java/io/github/wulkanowy/ui/login/LoginModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
similarity index 83%
rename from app/src/main/java/io/github/wulkanowy/ui/login/LoginModule.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
index ea5734116..bbf71e22b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/login/LoginModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.login
+package io.github.wulkanowy.ui.modules.login
 
 import android.content.Context
 import dagger.Module
@@ -7,8 +7,8 @@ import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.di.scopes.PerActivity
 import io.github.wulkanowy.di.scopes.PerFragment
 import io.github.wulkanowy.ui.base.BasePagerAdapter
-import io.github.wulkanowy.ui.login.form.LoginFormFragment
-import io.github.wulkanowy.ui.login.options.LoginOptionsFragment
+import io.github.wulkanowy.ui.modules.login.form.LoginFormFragment
+import io.github.wulkanowy.ui.modules.login.options.LoginOptionsFragment
 
 @Module
 internal abstract class LoginModule {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/login/LoginPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
similarity index 94%
rename from app/src/main/java/io/github/wulkanowy/ui/login/LoginPresenter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
index 103d1150f..cbee0e82a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/login/LoginPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.login
+package io.github.wulkanowy.ui.modules.login
 
 import io.github.wulkanowy.data.ErrorHandler
 import io.github.wulkanowy.ui.base.BasePresenter
diff --git a/app/src/main/java/io/github/wulkanowy/ui/login/LoginSwitchListener.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginSwitchListener.kt
similarity index 61%
rename from app/src/main/java/io/github/wulkanowy/ui/login/LoginSwitchListener.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginSwitchListener.kt
index c4b57c85c..564d1df95 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/login/LoginSwitchListener.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginSwitchListener.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.login
+package io.github.wulkanowy.ui.modules.login
 
 interface LoginSwitchListener {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/login/LoginView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
similarity index 83%
rename from app/src/main/java/io/github/wulkanowy/ui/login/LoginView.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
index 0ea646fc3..cc9a04cc4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/login/LoginView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.login
+package io.github.wulkanowy.ui.modules.login
 
 import io.github.wulkanowy.ui.base.BaseView
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/login/form/LoginFormFragment.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index 1f9091ccf..e6020342c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.login.form
+package io.github.wulkanowy.ui.modules.login.form
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -10,7 +10,7 @@ import android.view.inputmethod.EditorInfo
 import android.widget.ArrayAdapter
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.login.LoginSwitchListener
+import io.github.wulkanowy.ui.modules.login.LoginSwitchListener
 import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.showSoftInput
 import kotlinx.android.synthetic.main.fragment_login_form.*
diff --git a/app/src/main/java/io/github/wulkanowy/ui/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
similarity index 88%
rename from app/src/main/java/io/github/wulkanowy/ui/login/form/LoginFormPresenter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
index 1ecd783de..c1420a672 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/login/form/LoginFormPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
@@ -1,13 +1,13 @@
-package io.github.wulkanowy.ui.login.form
+package io.github.wulkanowy.ui.modules.login.form
 
 import io.github.wulkanowy.data.repositories.SessionRepository
 import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.ui.login.LoginErrorHandler
-import io.github.wulkanowy.utils.schedulers.SchedulersManager
+import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
 class LoginFormPresenter @Inject constructor(
-        private val schedulers: SchedulersManager,
+        private val schedulers: SchedulersProvider,
         private val errorHandler: LoginErrorHandler,
         private val sessionRepository: SessionRepository)
     : BasePresenter<LoginFormView>(errorHandler) {
@@ -22,8 +22,8 @@ class LoginFormPresenter @Inject constructor(
     fun attemptLogin(email: String, password: String, symbol: String, endpoint: String) {
         if (!validateCredentials(email, password, symbol)) return
         disposable.add(sessionRepository.getConnectedStudents(email, password, symbol, endpoint)
-                .observeOn(schedulers.mainThread())
-                .subscribeOn(schedulers.backgroundThread())
+                .observeOn(schedulers.mainThread)
+                .subscribeOn(schedulers.backgroundThread)
                 .doOnSubscribe {
                     view?.run {
                         hideSoftKeyboard()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/login/form/LoginFormView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
similarity index 91%
rename from app/src/main/java/io/github/wulkanowy/ui/login/form/LoginFormView.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
index 31dca472b..949d16b9d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/login/form/LoginFormView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.login.form
+package io.github.wulkanowy.ui.modules.login.form
 
 import io.github.wulkanowy.ui.base.BaseView
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/login/options/LoginOptionsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsFragment.kt
similarity index 95%
rename from app/src/main/java/io/github/wulkanowy/ui/login/options/LoginOptionsFragment.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsFragment.kt
index 5571880cb..ea1ccbeda 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/login/options/LoginOptionsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsFragment.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.login.options
+package io.github.wulkanowy.ui.modules.login.options
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -12,7 +12,7 @@ import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_login_options.*
 import javax.inject.Inject
diff --git a/app/src/main/java/io/github/wulkanowy/ui/login/options/LoginOptionsItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsItem.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/login/options/LoginOptionsItem.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsItem.kt
index 5abab9bc8..2d4de4754 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/login/options/LoginOptionsItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsItem.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.login.options
+package io.github.wulkanowy.ui.modules.login.options
 
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
diff --git a/app/src/main/java/io/github/wulkanowy/ui/login/options/LoginOptionsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenter.kt
similarity index 77%
rename from app/src/main/java/io/github/wulkanowy/ui/login/options/LoginOptionsPresenter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenter.kt
index bb38262ff..357f8a051 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/login/options/LoginOptionsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenter.kt
@@ -1,16 +1,16 @@
-package io.github.wulkanowy.ui.login.options
+package io.github.wulkanowy.ui.modules.login.options
 
 import io.github.wulkanowy.data.ErrorHandler
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.SessionRepository
 import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.utils.schedulers.SchedulersManager
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
 class LoginOptionsPresenter @Inject constructor(
         private val errorHandler: ErrorHandler,
         private val repository: SessionRepository,
-        private val schedulers: SchedulersManager)
+        private val schedulers: SchedulersProvider)
     : BasePresenter<LoginOptionsView>(errorHandler) {
 
     override fun onAttachView(view: LoginOptionsView) {
@@ -20,8 +20,8 @@ class LoginOptionsPresenter @Inject constructor(
 
     fun refreshData() {
         disposable.add(repository.cachedStudents
-                .observeOn(schedulers.mainThread())
-                .subscribeOn(schedulers.backgroundThread())
+                .observeOn(schedulers.mainThread)
+                .subscribeOn(schedulers.backgroundThread)
                 .doOnSubscribe { view?.showActionBar(true) }
                 .doFinally { repository.clearCache() }
                 .subscribe({
@@ -33,8 +33,8 @@ class LoginOptionsPresenter @Inject constructor(
 
     fun onSelectStudent(student: Student) {
         disposable.add(repository.saveStudent(student)
-                .subscribeOn(schedulers.backgroundThread())
-                .observeOn(schedulers.mainThread())
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
                 .doOnSubscribe { _ ->
                     view?.showLoginProgress(true)
                     view?.showActionBar(false)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/login/options/LoginOptionsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsView.kt
similarity index 83%
rename from app/src/main/java/io/github/wulkanowy/ui/login/options/LoginOptionsView.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsView.kt
index 9303839f0..306f8b314 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/login/options/LoginOptionsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsView.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.login.options
+package io.github.wulkanowy.ui.modules.login.options
 
 import io.github.wulkanowy.ui.base.BaseView
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
similarity index 92%
rename from app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
index 52737e1d0..4d1409a47 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main
+package io.github.wulkanowy.ui.modules.main
 
 import android.content.Context
 import android.content.Intent
@@ -11,11 +11,11 @@ import com.ncapdevi.fragnav.FragNavController
 import com.ncapdevi.fragnav.FragNavController.Companion.HIDE
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
-import io.github.wulkanowy.ui.main.attendance.AttendanceFragment
-import io.github.wulkanowy.ui.main.exam.ExamFragment
-import io.github.wulkanowy.ui.main.grade.GradeFragment
-import io.github.wulkanowy.ui.main.more.MoreFragment
-import io.github.wulkanowy.ui.main.timetable.TimetableFragment
+import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
+import io.github.wulkanowy.ui.modules.exam.ExamFragment
+import io.github.wulkanowy.ui.modules.grade.GradeFragment
+import io.github.wulkanowy.ui.modules.more.MoreFragment
+import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
 import io.github.wulkanowy.utils.safelyPopFragment
 import io.github.wulkanowy.utils.setOnViewChangeListener
 import kotlinx.android.synthetic.main.activity_main.*
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/MainModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
similarity index 71%
rename from app/src/main/java/io/github/wulkanowy/ui/main/MainModule.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
index 1c333cece..959f482da 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/MainModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main
+package io.github.wulkanowy.ui.modules.main
 
 import com.ncapdevi.fragnav.FragNavController
 import dagger.Module
@@ -7,14 +7,14 @@ import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.R
 import io.github.wulkanowy.di.scopes.PerActivity
 import io.github.wulkanowy.di.scopes.PerFragment
-import io.github.wulkanowy.ui.main.about.AboutFragment
-import io.github.wulkanowy.ui.main.about.AboutModule
-import io.github.wulkanowy.ui.main.attendance.AttendanceFragment
-import io.github.wulkanowy.ui.main.exam.ExamFragment
-import io.github.wulkanowy.ui.main.grade.GradeFragment
-import io.github.wulkanowy.ui.main.grade.GradeModule
-import io.github.wulkanowy.ui.main.more.MoreFragment
-import io.github.wulkanowy.ui.main.timetable.TimetableFragment
+import io.github.wulkanowy.ui.modules.about.AboutFragment
+import io.github.wulkanowy.ui.modules.about.AboutModule
+import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
+import io.github.wulkanowy.ui.modules.exam.ExamFragment
+import io.github.wulkanowy.ui.modules.grade.GradeFragment
+import io.github.wulkanowy.ui.modules.grade.GradeModule
+import io.github.wulkanowy.ui.modules.more.MoreFragment
+import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
 
 @Module
 abstract class MainModule {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/MainPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
similarity index 96%
rename from app/src/main/java/io/github/wulkanowy/ui/main/MainPresenter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
index af0606d1f..4cb716272 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/MainPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main
+package io.github.wulkanowy.ui.modules.main
 
 import io.github.wulkanowy.data.ErrorHandler
 import io.github.wulkanowy.data.repositories.PreferencesRepository
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/MainView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
similarity index 92%
rename from app/src/main/java/io/github/wulkanowy/ui/main/MainView.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
index c94bc03b8..9a5121d53 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/MainView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main
+package io.github.wulkanowy.ui.modules.main
 
 import io.github.wulkanowy.ui.base.BaseView
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/more/MoreFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
similarity index 90%
rename from app/src/main/java/io/github/wulkanowy/ui/main/more/MoreFragment.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
index f0b2cd8cc..8bb9b0e33 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/more/MoreFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.more
+package io.github.wulkanowy.ui.modules.more
 
 import android.graphics.drawable.Drawable
 import android.os.Bundle
@@ -11,10 +11,10 @@ import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.main.MainActivity
-import io.github.wulkanowy.ui.main.MainView
-import io.github.wulkanowy.ui.main.about.AboutFragment
-import io.github.wulkanowy.ui.main.settings.SettingsFragment
+import io.github.wulkanowy.ui.modules.about.AboutFragment
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.modules.settings.SettingsFragment
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_more.*
 import javax.inject.Inject
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/more/MoreItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/main/more/MoreItem.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt
index 78bca6608..20bad835f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/more/MoreItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.more
+package io.github.wulkanowy.ui.modules.more
 
 import android.graphics.drawable.Drawable
 import android.view.View
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/more/MorePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
similarity index 95%
rename from app/src/main/java/io/github/wulkanowy/ui/main/more/MorePresenter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
index ad03857eb..8da65f64f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/more/MorePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.more
+package io.github.wulkanowy.ui.modules.more
 
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.ErrorHandler
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/more/MoreView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
similarity index 88%
rename from app/src/main/java/io/github/wulkanowy/ui/main/more/MoreView.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
index ba598d396..273c6b035 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/more/MoreView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.more
+package io.github.wulkanowy.ui.modules.more
 
 import android.graphics.drawable.Drawable
 import io.github.wulkanowy.ui.base.BaseView
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/settings/SettingsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
similarity index 83%
rename from app/src/main/java/io/github/wulkanowy/ui/main/settings/SettingsFragment.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
index a1dcbd925..ef2c27f4b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/settings/SettingsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
@@ -1,9 +1,9 @@
-package io.github.wulkanowy.ui.main.settings
+package io.github.wulkanowy.ui.modules.settings
 
 import android.os.Bundle
 import com.takisoft.preferencex.PreferenceFragmentCompat
 import io.github.wulkanowy.R
-import io.github.wulkanowy.ui.main.MainView
+import io.github.wulkanowy.ui.modules.main.MainView
 
 class SettingsFragment : PreferenceFragmentCompat(), MainView.TitledView {
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/splash/SplashActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
similarity index 81%
rename from app/src/main/java/io/github/wulkanowy/ui/splash/SplashActivity.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
index 42fe39581..223d7abe6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/splash/SplashActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
@@ -1,9 +1,9 @@
-package io.github.wulkanowy.ui.splash
+package io.github.wulkanowy.ui.modules.splash
 
 import android.os.Bundle
 import io.github.wulkanowy.ui.base.BaseActivity
-import io.github.wulkanowy.ui.login.LoginActivity
-import io.github.wulkanowy.ui.main.MainActivity
+import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.ui.modules.main.MainActivity
 import javax.inject.Inject
 
 class SplashActivity : BaseActivity(), SplashView {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/splash/SplashPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
similarity index 92%
rename from app/src/main/java/io/github/wulkanowy/ui/splash/SplashPresenter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
index a04666ba7..0ff9120b2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/splash/SplashPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.splash
+package io.github.wulkanowy.ui.modules.splash
 
 import io.github.wulkanowy.data.ErrorHandler
 import io.github.wulkanowy.data.repositories.SessionRepository
diff --git a/app/src/main/java/io/github/wulkanowy/ui/splash/SplashView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashView.kt
similarity index 74%
rename from app/src/main/java/io/github/wulkanowy/ui/splash/SplashView.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashView.kt
index 340739334..9efd8123b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/splash/SplashView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashView.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.splash
+package io.github.wulkanowy.ui.modules.splash
 
 import io.github.wulkanowy.ui.base.BaseView
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
similarity index 98%
rename from app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableDialog.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
index 4ca860d1e..743f37e59 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.timetable
+package io.github.wulkanowy.ui.modules.timetable
 
 import android.annotation.SuppressLint
 import android.os.Bundle
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableFragment.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
index 9330e5c4a..dbd0ac3f8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.timetable
+package io.github.wulkanowy.ui.modules.timetable
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -10,7 +10,7 @@ import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.main.MainView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_timetable.*
 import javax.inject.Inject
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
similarity index 98%
rename from app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableItem.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
index 0d61f6985..f37c0f515 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.timetable
+package io.github.wulkanowy.ui.modules.timetable
 
 import android.annotation.SuppressLint
 import android.graphics.Paint
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetablePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
similarity index 91%
rename from app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetablePresenter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
index 0a34d16d0..726717fc7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetablePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.timetable
+package io.github.wulkanowy.ui.modules.timetable
 
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.ErrorHandler
@@ -6,7 +6,6 @@ import io.github.wulkanowy.data.repositories.SessionRepository
 import io.github.wulkanowy.data.repositories.TimetableRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.utils.*
-import io.github.wulkanowy.utils.schedulers.SchedulersManager
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.ofEpochDay
@@ -15,7 +14,7 @@ import javax.inject.Inject
 
 class TimetablePresenter @Inject constructor(
         private val errorHandler: ErrorHandler,
-        private val schedulers: SchedulersManager,
+        private val schedulers: SchedulersProvider,
         private val timetableRepository: TimetableRepository,
         private val sessionRepository: SessionRepository
 ) : BasePresenter<TimetableView>(errorHandler) {
@@ -62,8 +61,8 @@ class TimetablePresenter @Inject constructor(
                     .map { it.single { semester -> semester.current } }
                     .flatMap { timetableRepository.getTimetable(it, currentDate, currentDate, forceRefresh) }
                     .map { items -> items.map { TimetableItem(it, view?.roomString.orEmpty()) } }
-                    .subscribeOn(schedulers.backgroundThread())
-                    .observeOn(schedulers.mainThread())
+                    .subscribeOn(schedulers.backgroundThread)
+                    .observeOn(schedulers.mainThread)
                     .doFinally {
                         view?.run {
                             hideRefresh()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
similarity index 92%
rename from app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableView.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
index 5694ccb66..63ece69f7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main.timetable
+package io.github.wulkanowy.ui.modules.timetable
 
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.ui.base.BaseView
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SchedulersProvider.kt b/app/src/main/java/io/github/wulkanowy/utils/SchedulersProvider.kt
new file mode 100644
index 000000000..6f67e88fb
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/SchedulersProvider.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy.utils
+
+import io.reactivex.Scheduler
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+
+open class SchedulersProvider {
+
+    open val mainThread: Scheduler
+        get() = AndroidSchedulers.mainThread()
+
+    open val backgroundThread: Scheduler
+        get() = Schedulers.io()
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/utils/schedulers/SchedulersManager.kt b/app/src/main/java/io/github/wulkanowy/utils/schedulers/SchedulersManager.kt
deleted file mode 100644
index ec27fffaa..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/schedulers/SchedulersManager.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.github.wulkanowy.utils.schedulers
-
-import io.reactivex.Scheduler
-
-interface SchedulersManager {
-
-    fun mainThread(): Scheduler
-
-    fun backgroundThread(): Scheduler
-}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/schedulers/SchedulersProvider.kt b/app/src/main/java/io/github/wulkanowy/utils/schedulers/SchedulersProvider.kt
deleted file mode 100644
index 8201e85bf..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/schedulers/SchedulersProvider.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.github.wulkanowy.utils.schedulers
-
-import io.reactivex.Scheduler
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
-
-class SchedulersProvider : SchedulersManager {
-
-    override fun mainThread(): Scheduler = AndroidSchedulers.mainThread()
-
-    override fun backgroundThread(): Scheduler = Schedulers.io()
-}
\ No newline at end of file
diff --git a/app/src/test/java/io/github/wulkanowy/TestSchedulers.kt b/app/src/test/java/io/github/wulkanowy/TestSchedulers.kt
deleted file mode 100644
index 12114754f..000000000
--- a/app/src/test/java/io/github/wulkanowy/TestSchedulers.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.github.wulkanowy
-
-import io.github.wulkanowy.utils.schedulers.SchedulersManager
-import io.reactivex.Scheduler
-import io.reactivex.schedulers.Schedulers
-
-class TestSchedulers : SchedulersManager {
-
-    override fun backgroundThread(): Scheduler = Schedulers.trampoline()
-
-    override fun mainThread(): Scheduler = Schedulers.trampoline()
-}
-
diff --git a/app/src/test/java/io/github/wulkanowy/TestSchedulersProvider.kt b/app/src/test/java/io/github/wulkanowy/TestSchedulersProvider.kt
new file mode 100644
index 000000000..8c52d7b37
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/TestSchedulersProvider.kt
@@ -0,0 +1,15 @@
+package io.github.wulkanowy
+
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Scheduler
+import io.reactivex.schedulers.Schedulers
+
+class TestSchedulersProvider : SchedulersProvider() {
+
+    override val backgroundThread: Scheduler
+        get() = Schedulers.trampoline()
+
+    override val mainThread: Scheduler
+        get() = Schedulers.trampoline()
+}
+
diff --git a/app/src/test/java/io/github/wulkanowy/ui/login/LoginPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
similarity index 97%
rename from app/src/test/java/io/github/wulkanowy/ui/login/LoginPresenterTest.kt
rename to app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
index a06ea3884..4c3210be2 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/login/LoginPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.login
+package io.github.wulkanowy.ui.modules.login
 
 import org.junit.Assert.assertNotEquals
 import org.junit.Before
diff --git a/app/src/test/java/io/github/wulkanowy/ui/login/form/LoginFormPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
similarity index 95%
rename from app/src/test/java/io/github/wulkanowy/ui/login/form/LoginFormPresenterTest.kt
rename to app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
index 695edc0e0..d72d94dfc 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/login/form/LoginFormPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
@@ -1,9 +1,9 @@
-package io.github.wulkanowy.ui.login.form
+package io.github.wulkanowy.ui.modules.login.form
 
-import io.github.wulkanowy.TestSchedulers
+import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.SessionRepository
-import io.github.wulkanowy.ui.login.LoginErrorHandler
+import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.reactivex.Single
 import org.junit.Before
 import org.junit.Test
@@ -29,7 +29,7 @@ class LoginFormPresenterTest {
     fun initPresenter() {
         MockitoAnnotations.initMocks(this)
         clearInvocations(repository, loginFormView)
-        presenter = LoginFormPresenter(TestSchedulers(), errorHandler, repository)
+        presenter = LoginFormPresenter(TestSchedulersProvider(), errorHandler, repository)
         presenter.onAttachView(loginFormView)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/ui/login/options/LoginOptionsPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenterTest.kt
similarity index 94%
rename from app/src/test/java/io/github/wulkanowy/ui/login/options/LoginOptionsPresenterTest.kt
rename to app/src/test/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenterTest.kt
index 87507cb44..231b145cf 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/login/options/LoginOptionsPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenterTest.kt
@@ -1,6 +1,6 @@
-package io.github.wulkanowy.ui.login.options
+package io.github.wulkanowy.ui.modules.login.options
 
-import io.github.wulkanowy.TestSchedulers
+import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.ErrorHandler
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.SessionRepository
@@ -33,7 +33,7 @@ class LoginOptionsPresenterTest {
     fun initPresenter() {
         MockitoAnnotations.initMocks(this)
         clearInvocations(repository, loginOptionsView)
-        presenter = LoginOptionsPresenter(errorHandler, repository, TestSchedulers())
+        presenter = LoginOptionsPresenter(errorHandler, repository, TestSchedulersProvider())
         presenter.onAttachView(loginOptionsView)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/ui/main/MainPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
similarity index 95%
rename from app/src/test/java/io/github/wulkanowy/ui/main/MainPresenterTest.kt
rename to app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
index 4002f99da..7071fa27e 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/main/MainPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.main
+package io.github.wulkanowy.ui.modules.main
 
 import io.github.wulkanowy.data.ErrorHandler
 import io.github.wulkanowy.data.repositories.PreferencesRepository
diff --git a/app/src/test/java/io/github/wulkanowy/ui/splash/SplashPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
similarity index 95%
rename from app/src/test/java/io/github/wulkanowy/ui/splash/SplashPresenterTest.kt
rename to app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
index a63ea45bd..529c0a2a5 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/splash/SplashPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.splash
+package io.github.wulkanowy.ui.modules.splash
 
 import io.github.wulkanowy.data.ErrorHandler
 import io.github.wulkanowy.data.repositories.SessionRepository