diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 091cb7c..2b85e58 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".Activities.MainActivity"
+            android:name=".activities.MainActivity"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
@@ -29,45 +29,45 @@
             android:resource="@array/preloaded_fonts" />
 
         <activity
-            android:name=".Activities.HomeworksActivity"
+            android:name=".activities.HomeworksActivity"
             android:label="@string/homeworks"
-            android:parentActivityName=".Activities.MainActivity" />
+            android:parentActivityName=".activities.MainActivity" />
 
         <meta-data
             android:name="android.support.PARENT_ACTIVITY"
-            android:value=".Activities.HomeworksActivity" />
+            android:value=".activities.HomeworksActivity" />
 
         <activity
-            android:name=".Activities.NotesActivity"
+            android:name=".activities.NotesActivity"
             android:label="Notes"
-            android:parentActivityName=".Activities.MainActivity" />
+            android:parentActivityName=".activities.MainActivity" />
         <activity
-            android:name=".Activities.NoteInfoActivity"
+            android:name=".activities.NoteInfoActivity"
             android:label="Notes"
-            android:parentActivityName=".Activities.NotesActivity" />
+            android:parentActivityName=".activities.NotesActivity" />
         <activity
-            android:name=".Activities.TeachersActivity"
+            android:name=".activities.TeachersActivity"
             android:label="Teachers"
-            android:parentActivityName=".Activities.MainActivity" />
+            android:parentActivityName=".activities.MainActivity" />
         <activity
-            android:name=".Activities.SettingsActivity"
+            android:name=".activities.SettingsActivity"
             android:label="Settings"
-            android:parentActivityName=".Activities.MainActivity">
+            android:parentActivityName=".activities.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".Activities.MainActivity" />
+                android:value=".activities.MainActivity" />
         </activity>
         <activity
-            android:name=".Activities.ExamsActivity"
+            android:name=".activities.ExamsActivity"
             android:label="Exams"
-            android:parentActivityName=".Activities.MainActivity" />
+            android:parentActivityName=".activities.MainActivity" />
 
         <receiver
-            android:name=".Utils.DailyReceiver"
+            android:name=".utils.DailyReceiver"
             android:enabled="true" />
 
         <receiver
-            android:name=".Utils.WakeUpAlarmReceiver"
+            android:name=".utils.WakeUpAlarmReceiver"
             android:enabled="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
diff --git a/app/src/main/java/com/ulan/timetable/Activities/ExamsActivity.java b/app/src/main/java/com/ulan/timetable/activities/ExamsActivity.java
similarity index 94%
rename from app/src/main/java/com/ulan/timetable/Activities/ExamsActivity.java
rename to app/src/main/java/com/ulan/timetable/activities/ExamsActivity.java
index 1b7ad80..c3af4be 100644
--- a/app/src/main/java/com/ulan/timetable/Activities/ExamsActivity.java
+++ b/app/src/main/java/com/ulan/timetable/activities/ExamsActivity.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Activities;
+package com.ulan.timetable.activities;
 
 import android.content.Context;
 import android.support.v7.app.AppCompatActivity;
@@ -12,11 +12,11 @@
 import android.widget.AbsListView;
 import android.widget.ListView;
 
-import com.ulan.timetable.Adapters.ExamsAdapter;
-import com.ulan.timetable.Model.Exam;
+import com.ulan.timetable.adapters.ExamsAdapter;
+import com.ulan.timetable.model.Exam;
 import com.ulan.timetable.R;
-import com.ulan.timetable.Utils.AlertDialogsHelper;
-import com.ulan.timetable.Utils.DbHelper;
+import com.ulan.timetable.utils.AlertDialogsHelper;
+import com.ulan.timetable.utils.DbHelper;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/com/ulan/timetable/Activities/HomeworksActivity.java b/app/src/main/java/com/ulan/timetable/activities/HomeworksActivity.java
similarity index 94%
rename from app/src/main/java/com/ulan/timetable/Activities/HomeworksActivity.java
rename to app/src/main/java/com/ulan/timetable/activities/HomeworksActivity.java
index cc74aee..10f607e 100644
--- a/app/src/main/java/com/ulan/timetable/Activities/HomeworksActivity.java
+++ b/app/src/main/java/com/ulan/timetable/activities/HomeworksActivity.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Activities;
+package com.ulan.timetable.activities;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -12,11 +12,11 @@
 import android.widget.AbsListView;
 import android.widget.ListView;
 
-import com.ulan.timetable.Adapters.HomeworksAdapter;
-import com.ulan.timetable.Model.Homework;
+import com.ulan.timetable.adapters.HomeworksAdapter;
+import com.ulan.timetable.model.Homework;
 import com.ulan.timetable.R;
-import com.ulan.timetable.Utils.AlertDialogsHelper;
-import com.ulan.timetable.Utils.DbHelper;
+import com.ulan.timetable.utils.AlertDialogsHelper;
+import com.ulan.timetable.utils.DbHelper;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/com/ulan/timetable/Activities/MainActivity.java b/app/src/main/java/com/ulan/timetable/activities/MainActivity.java
similarity index 92%
rename from app/src/main/java/com/ulan/timetable/Activities/MainActivity.java
rename to app/src/main/java/com/ulan/timetable/activities/MainActivity.java
index 514c937..20882ad 100644
--- a/app/src/main/java/com/ulan/timetable/Activities/MainActivity.java
+++ b/app/src/main/java/com/ulan/timetable/activities/MainActivity.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Activities;
+package com.ulan.timetable.activities;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -22,21 +22,21 @@
 import android.view.MenuItem;
 
 
-import com.ulan.timetable.Adapters.FragmentsTabAdapter;
-import com.ulan.timetable.Fragments.FridayFragment;
-import com.ulan.timetable.Fragments.MondayFragment;
-import com.ulan.timetable.Fragments.SaturdayFragment;
-import com.ulan.timetable.Fragments.SundayFragment;
-import com.ulan.timetable.Fragments.ThursdayFragment;
-import com.ulan.timetable.Fragments.TuesdayFragment;
-import com.ulan.timetable.Fragments.WednesdayFragment;
+import com.ulan.timetable.adapters.FragmentsTabAdapter;
+import com.ulan.timetable.fragments.FridayFragment;
+import com.ulan.timetable.fragments.MondayFragment;
+import com.ulan.timetable.fragments.SaturdayFragment;
+import com.ulan.timetable.fragments.SundayFragment;
+import com.ulan.timetable.fragments.ThursdayFragment;
+import com.ulan.timetable.fragments.TuesdayFragment;
+import com.ulan.timetable.fragments.WednesdayFragment;
 import com.ulan.timetable.R;
-import com.ulan.timetable.Utils.AlertDialogsHelper;
-import com.ulan.timetable.Utils.DailyReceiver;
+import com.ulan.timetable.utils.AlertDialogsHelper;
+import com.ulan.timetable.utils.DailyReceiver;
 
 import java.util.Calendar;
 
-import static com.ulan.timetable.Utils.BrowserUtil.openUrlInChromeCustomTab;
+import static com.ulan.timetable.utils.BrowserUtil.openUrlInChromeCustomTab;
 
 
 public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
diff --git a/app/src/main/java/com/ulan/timetable/Activities/NoteInfoActivity.java b/app/src/main/java/com/ulan/timetable/activities/NoteInfoActivity.java
similarity index 93%
rename from app/src/main/java/com/ulan/timetable/Activities/NoteInfoActivity.java
rename to app/src/main/java/com/ulan/timetable/activities/NoteInfoActivity.java
index 74016ff..cc2091c 100644
--- a/app/src/main/java/com/ulan/timetable/Activities/NoteInfoActivity.java
+++ b/app/src/main/java/com/ulan/timetable/activities/NoteInfoActivity.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Activities;
+package com.ulan.timetable.activities;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
@@ -6,9 +6,9 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
-import com.ulan.timetable.Model.Note;
+import com.ulan.timetable.model.Note;
 import com.ulan.timetable.R;
-import com.ulan.timetable.Utils.DbHelper;
+import com.ulan.timetable.utils.DbHelper;
 
 public class NoteInfoActivity extends AppCompatActivity {
 
diff --git a/app/src/main/java/com/ulan/timetable/Activities/NotesActivity.java b/app/src/main/java/com/ulan/timetable/activities/NotesActivity.java
similarity index 95%
rename from app/src/main/java/com/ulan/timetable/Activities/NotesActivity.java
rename to app/src/main/java/com/ulan/timetable/activities/NotesActivity.java
index d68423e..2f015a1 100644
--- a/app/src/main/java/com/ulan/timetable/Activities/NotesActivity.java
+++ b/app/src/main/java/com/ulan/timetable/activities/NotesActivity.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Activities;
+package com.ulan.timetable.activities;
 
 import android.content.Context;
 import android.content.Intent;
@@ -14,11 +14,11 @@
 import android.widget.AdapterView;
 import android.widget.ListView;
 
-import com.ulan.timetable.Adapters.NotesAdapter;
-import com.ulan.timetable.Model.Note;
+import com.ulan.timetable.adapters.NotesAdapter;
+import com.ulan.timetable.model.Note;
 import com.ulan.timetable.R;
-import com.ulan.timetable.Utils.AlertDialogsHelper;
-import com.ulan.timetable.Utils.DbHelper;
+import com.ulan.timetable.utils.AlertDialogsHelper;
+import com.ulan.timetable.utils.DbHelper;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/com/ulan/timetable/Activities/SettingsActivity.java b/app/src/main/java/com/ulan/timetable/activities/SettingsActivity.java
similarity index 87%
rename from app/src/main/java/com/ulan/timetable/Activities/SettingsActivity.java
rename to app/src/main/java/com/ulan/timetable/activities/SettingsActivity.java
index 635d9ed..4311a65 100644
--- a/app/src/main/java/com/ulan/timetable/Activities/SettingsActivity.java
+++ b/app/src/main/java/com/ulan/timetable/activities/SettingsActivity.java
@@ -1,9 +1,9 @@
-package com.ulan.timetable.Activities;
+package com.ulan.timetable.activities;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 
-import com.ulan.timetable.Fragments.SettingsFragment;
+import com.ulan.timetable.fragments.SettingsFragment;
 import com.ulan.timetable.R;
 
 public class SettingsActivity extends AppCompatActivity {
diff --git a/app/src/main/java/com/ulan/timetable/Activities/TeachersActivity.java b/app/src/main/java/com/ulan/timetable/activities/TeachersActivity.java
similarity index 93%
rename from app/src/main/java/com/ulan/timetable/Activities/TeachersActivity.java
rename to app/src/main/java/com/ulan/timetable/activities/TeachersActivity.java
index 77aaff0..00fe339 100644
--- a/app/src/main/java/com/ulan/timetable/Activities/TeachersActivity.java
+++ b/app/src/main/java/com/ulan/timetable/activities/TeachersActivity.java
@@ -1,8 +1,7 @@
-package com.ulan.timetable.Activities;
+package com.ulan.timetable.activities;
 
 import android.content.Context;
 import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.SparseBooleanArray;
@@ -14,11 +13,11 @@
 import android.widget.AbsListView;
 import android.widget.ListView;
 
-import com.ulan.timetable.Adapters.TeachersAdapter;
-import com.ulan.timetable.Model.Teacher;
+import com.ulan.timetable.adapters.TeachersAdapter;
+import com.ulan.timetable.model.Teacher;
 import com.ulan.timetable.R;
-import com.ulan.timetable.Utils.AlertDialogsHelper;
-import com.ulan.timetable.Utils.DbHelper;
+import com.ulan.timetable.utils.AlertDialogsHelper;
+import com.ulan.timetable.utils.DbHelper;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/com/ulan/timetable/Adapters/ExamsAdapter.java b/app/src/main/java/com/ulan/timetable/adapters/ExamsAdapter.java
similarity index 96%
rename from app/src/main/java/com/ulan/timetable/Adapters/ExamsAdapter.java
rename to app/src/main/java/com/ulan/timetable/adapters/ExamsAdapter.java
index d06e45d..5377fe8 100644
--- a/app/src/main/java/com/ulan/timetable/Adapters/ExamsAdapter.java
+++ b/app/src/main/java/com/ulan/timetable/adapters/ExamsAdapter.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Adapters;
+package com.ulan.timetable.adapters;
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
@@ -14,10 +14,10 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.ulan.timetable.Model.Exam;
+import com.ulan.timetable.model.Exam;
 import com.ulan.timetable.R;
-import com.ulan.timetable.Utils.AlertDialogsHelper;
-import com.ulan.timetable.Utils.DbHelper;
+import com.ulan.timetable.utils.AlertDialogsHelper;
+import com.ulan.timetable.utils.DbHelper;
 
 import java.util.ArrayList;
 import java.util.Objects;
diff --git a/app/src/main/java/com/ulan/timetable/Adapters/FragmentsTabAdapter.java b/app/src/main/java/com/ulan/timetable/adapters/FragmentsTabAdapter.java
similarity index 97%
rename from app/src/main/java/com/ulan/timetable/Adapters/FragmentsTabAdapter.java
rename to app/src/main/java/com/ulan/timetable/adapters/FragmentsTabAdapter.java
index 37acfe3..b6c9cb1 100644
--- a/app/src/main/java/com/ulan/timetable/Adapters/FragmentsTabAdapter.java
+++ b/app/src/main/java/com/ulan/timetable/adapters/FragmentsTabAdapter.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Adapters;
+package com.ulan.timetable.adapters;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
diff --git a/app/src/main/java/com/ulan/timetable/Adapters/HomeworksAdapter.java b/app/src/main/java/com/ulan/timetable/adapters/HomeworksAdapter.java
similarity index 96%
rename from app/src/main/java/com/ulan/timetable/Adapters/HomeworksAdapter.java
rename to app/src/main/java/com/ulan/timetable/adapters/HomeworksAdapter.java
index 778a96c..ed87530 100644
--- a/app/src/main/java/com/ulan/timetable/Adapters/HomeworksAdapter.java
+++ b/app/src/main/java/com/ulan/timetable/adapters/HomeworksAdapter.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Adapters;
+package com.ulan.timetable.adapters;
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
@@ -14,10 +14,10 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.ulan.timetable.Model.Homework;
+import com.ulan.timetable.model.Homework;
 import com.ulan.timetable.R;
-import com.ulan.timetable.Utils.AlertDialogsHelper;
-import com.ulan.timetable.Utils.DbHelper;
+import com.ulan.timetable.utils.AlertDialogsHelper;
+import com.ulan.timetable.utils.DbHelper;
 
 import java.util.ArrayList;
 import java.util.Objects;
diff --git a/app/src/main/java/com/ulan/timetable/Adapters/NotesAdapter.java b/app/src/main/java/com/ulan/timetable/adapters/NotesAdapter.java
similarity index 96%
rename from app/src/main/java/com/ulan/timetable/Adapters/NotesAdapter.java
rename to app/src/main/java/com/ulan/timetable/adapters/NotesAdapter.java
index a604a24..b773b59 100644
--- a/app/src/main/java/com/ulan/timetable/Adapters/NotesAdapter.java
+++ b/app/src/main/java/com/ulan/timetable/adapters/NotesAdapter.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Adapters;
+package com.ulan.timetable.adapters;
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
@@ -15,10 +15,10 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.ulan.timetable.Model.Note;
+import com.ulan.timetable.model.Note;
 import com.ulan.timetable.R;
-import com.ulan.timetable.Utils.AlertDialogsHelper;
-import com.ulan.timetable.Utils.DbHelper;
+import com.ulan.timetable.utils.AlertDialogsHelper;
+import com.ulan.timetable.utils.DbHelper;
 
 import java.util.ArrayList;
 import java.util.Objects;
diff --git a/app/src/main/java/com/ulan/timetable/Adapters/TeachersAdapter.java b/app/src/main/java/com/ulan/timetable/adapters/TeachersAdapter.java
similarity index 96%
rename from app/src/main/java/com/ulan/timetable/Adapters/TeachersAdapter.java
rename to app/src/main/java/com/ulan/timetable/adapters/TeachersAdapter.java
index d661203..d2df716 100644
--- a/app/src/main/java/com/ulan/timetable/Adapters/TeachersAdapter.java
+++ b/app/src/main/java/com/ulan/timetable/adapters/TeachersAdapter.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Adapters;
+package com.ulan.timetable.adapters;
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
@@ -14,10 +14,10 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.ulan.timetable.Model.Teacher;
+import com.ulan.timetable.model.Teacher;
 import com.ulan.timetable.R;
-import com.ulan.timetable.Utils.AlertDialogsHelper;
-import com.ulan.timetable.Utils.DbHelper;
+import com.ulan.timetable.utils.AlertDialogsHelper;
+import com.ulan.timetable.utils.DbHelper;
 
 import java.util.ArrayList;
 import java.util.Objects;
diff --git a/app/src/main/java/com/ulan/timetable/Adapters/WeekAdapter.java b/app/src/main/java/com/ulan/timetable/adapters/WeekAdapter.java
similarity index 96%
rename from app/src/main/java/com/ulan/timetable/Adapters/WeekAdapter.java
rename to app/src/main/java/com/ulan/timetable/adapters/WeekAdapter.java
index c8f481c..172d99b 100644
--- a/app/src/main/java/com/ulan/timetable/Adapters/WeekAdapter.java
+++ b/app/src/main/java/com/ulan/timetable/adapters/WeekAdapter.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Adapters;
+package com.ulan.timetable.adapters;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -16,9 +16,9 @@
 import android.widget.TextView;
 
 import com.ulan.timetable.R;
-import com.ulan.timetable.Model.Week;
-import com.ulan.timetable.Utils.AlertDialogsHelper;
-import com.ulan.timetable.Utils.DbHelper;
+import com.ulan.timetable.model.Week;
+import com.ulan.timetable.utils.AlertDialogsHelper;
+import com.ulan.timetable.utils.DbHelper;
 
 import java.util.ArrayList;
 import java.util.Objects;
diff --git a/app/src/main/java/com/ulan/timetable/Fragments/FridayFragment.java b/app/src/main/java/com/ulan/timetable/fragments/FridayFragment.java
similarity index 88%
rename from app/src/main/java/com/ulan/timetable/Fragments/FridayFragment.java
rename to app/src/main/java/com/ulan/timetable/fragments/FridayFragment.java
index df05312..2b83982 100644
--- a/app/src/main/java/com/ulan/timetable/Fragments/FridayFragment.java
+++ b/app/src/main/java/com/ulan/timetable/fragments/FridayFragment.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Fragments;
+package com.ulan.timetable.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -7,10 +7,10 @@
 import android.view.ViewGroup;
 import android.widget.ListView;
 
-import com.ulan.timetable.Adapters.WeekAdapter;
-import com.ulan.timetable.Utils.DbHelper;
+import com.ulan.timetable.adapters.WeekAdapter;
+import com.ulan.timetable.utils.DbHelper;
 import com.ulan.timetable.R;
-import com.ulan.timetable.Utils.FragmentHelper;
+import com.ulan.timetable.utils.FragmentHelper;
 
 
 public class FridayFragment extends Fragment {
diff --git a/app/src/main/java/com/ulan/timetable/Fragments/MondayFragment.java b/app/src/main/java/com/ulan/timetable/fragments/MondayFragment.java
similarity index 88%
rename from app/src/main/java/com/ulan/timetable/Fragments/MondayFragment.java
rename to app/src/main/java/com/ulan/timetable/fragments/MondayFragment.java
index b26c345..904cabc 100644
--- a/app/src/main/java/com/ulan/timetable/Fragments/MondayFragment.java
+++ b/app/src/main/java/com/ulan/timetable/fragments/MondayFragment.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Fragments;
+package com.ulan.timetable.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -8,10 +8,10 @@
 import android.widget.ImageView;
 import android.widget.ListView;
 
-import com.ulan.timetable.Adapters.WeekAdapter;
-import com.ulan.timetable.Utils.DbHelper;
+import com.ulan.timetable.adapters.WeekAdapter;
+import com.ulan.timetable.utils.DbHelper;
 import com.ulan.timetable.R;
-import com.ulan.timetable.Utils.FragmentHelper;
+import com.ulan.timetable.utils.FragmentHelper;
 
 
 public class MondayFragment extends Fragment {
diff --git a/app/src/main/java/com/ulan/timetable/Fragments/SaturdayFragment.java b/app/src/main/java/com/ulan/timetable/fragments/SaturdayFragment.java
similarity index 88%
rename from app/src/main/java/com/ulan/timetable/Fragments/SaturdayFragment.java
rename to app/src/main/java/com/ulan/timetable/fragments/SaturdayFragment.java
index c459f69..cea5705 100644
--- a/app/src/main/java/com/ulan/timetable/Fragments/SaturdayFragment.java
+++ b/app/src/main/java/com/ulan/timetable/fragments/SaturdayFragment.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Fragments;
+package com.ulan.timetable.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -7,10 +7,10 @@
 import android.view.ViewGroup;
 import android.widget.ListView;
 
-import com.ulan.timetable.Adapters.WeekAdapter;
-import com.ulan.timetable.Utils.DbHelper;
+import com.ulan.timetable.adapters.WeekAdapter;
+import com.ulan.timetable.utils.DbHelper;
 import com.ulan.timetable.R;
-import com.ulan.timetable.Utils.FragmentHelper;
+import com.ulan.timetable.utils.FragmentHelper;
 
 public class SaturdayFragment extends Fragment {
 
diff --git a/app/src/main/java/com/ulan/timetable/Fragments/SettingsFragment.java b/app/src/main/java/com/ulan/timetable/fragments/SettingsFragment.java
similarity index 90%
rename from app/src/main/java/com/ulan/timetable/Fragments/SettingsFragment.java
rename to app/src/main/java/com/ulan/timetable/fragments/SettingsFragment.java
index ebfd07d..c832a58 100644
--- a/app/src/main/java/com/ulan/timetable/Fragments/SettingsFragment.java
+++ b/app/src/main/java/com/ulan/timetable/fragments/SettingsFragment.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Fragments;
+package com.ulan.timetable.fragments;
 
 import android.os.Bundle;
 import android.support.v7.preference.PreferenceFragmentCompat;
diff --git a/app/src/main/java/com/ulan/timetable/Fragments/SundayFragment.java b/app/src/main/java/com/ulan/timetable/fragments/SundayFragment.java
similarity index 88%
rename from app/src/main/java/com/ulan/timetable/Fragments/SundayFragment.java
rename to app/src/main/java/com/ulan/timetable/fragments/SundayFragment.java
index 3871792..ea81373 100644
--- a/app/src/main/java/com/ulan/timetable/Fragments/SundayFragment.java
+++ b/app/src/main/java/com/ulan/timetable/fragments/SundayFragment.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Fragments;
+package com.ulan.timetable.fragments;
 
 import android.support.v4.app.Fragment;
 import android.os.Bundle;;
@@ -7,10 +7,10 @@
 import android.view.ViewGroup;
 import android.widget.ListView;
 
-import com.ulan.timetable.Adapters.WeekAdapter;
-import com.ulan.timetable.Utils.DbHelper;
+import com.ulan.timetable.adapters.WeekAdapter;
+import com.ulan.timetable.utils.DbHelper;
 import com.ulan.timetable.R;
-import com.ulan.timetable.Utils.FragmentHelper;
+import com.ulan.timetable.utils.FragmentHelper;
 
 
 /**
diff --git a/app/src/main/java/com/ulan/timetable/Fragments/ThursdayFragment.java b/app/src/main/java/com/ulan/timetable/fragments/ThursdayFragment.java
similarity index 88%
rename from app/src/main/java/com/ulan/timetable/Fragments/ThursdayFragment.java
rename to app/src/main/java/com/ulan/timetable/fragments/ThursdayFragment.java
index 5ce2365..eac9f0f 100644
--- a/app/src/main/java/com/ulan/timetable/Fragments/ThursdayFragment.java
+++ b/app/src/main/java/com/ulan/timetable/fragments/ThursdayFragment.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Fragments;
+package com.ulan.timetable.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -7,10 +7,10 @@
 import android.view.ViewGroup;
 import android.widget.ListView;
 
-import com.ulan.timetable.Adapters.WeekAdapter;
-import com.ulan.timetable.Utils.DbHelper;
+import com.ulan.timetable.adapters.WeekAdapter;
+import com.ulan.timetable.utils.DbHelper;
 import com.ulan.timetable.R;
-import com.ulan.timetable.Utils.FragmentHelper;
+import com.ulan.timetable.utils.FragmentHelper;
 
 
 public class ThursdayFragment extends Fragment {
diff --git a/app/src/main/java/com/ulan/timetable/Fragments/TuesdayFragment.java b/app/src/main/java/com/ulan/timetable/fragments/TuesdayFragment.java
similarity index 88%
rename from app/src/main/java/com/ulan/timetable/Fragments/TuesdayFragment.java
rename to app/src/main/java/com/ulan/timetable/fragments/TuesdayFragment.java
index 519f2f0..a2aa9a0 100644
--- a/app/src/main/java/com/ulan/timetable/Fragments/TuesdayFragment.java
+++ b/app/src/main/java/com/ulan/timetable/fragments/TuesdayFragment.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Fragments;
+package com.ulan.timetable.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -7,10 +7,10 @@
 import android.view.ViewGroup;
 import android.widget.ListView;
 
-import com.ulan.timetable.Adapters.WeekAdapter;
-import com.ulan.timetable.Utils.DbHelper;
+import com.ulan.timetable.adapters.WeekAdapter;
+import com.ulan.timetable.utils.DbHelper;
 import com.ulan.timetable.R;
-import com.ulan.timetable.Utils.FragmentHelper;
+import com.ulan.timetable.utils.FragmentHelper;
 
 public class TuesdayFragment extends Fragment {
 
diff --git a/app/src/main/java/com/ulan/timetable/Fragments/WednesdayFragment.java b/app/src/main/java/com/ulan/timetable/fragments/WednesdayFragment.java
similarity index 88%
rename from app/src/main/java/com/ulan/timetable/Fragments/WednesdayFragment.java
rename to app/src/main/java/com/ulan/timetable/fragments/WednesdayFragment.java
index e080193..ea084d4 100644
--- a/app/src/main/java/com/ulan/timetable/Fragments/WednesdayFragment.java
+++ b/app/src/main/java/com/ulan/timetable/fragments/WednesdayFragment.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Fragments;
+package com.ulan.timetable.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -7,10 +7,10 @@
 import android.view.ViewGroup;
 import android.widget.ListView;
 
-import com.ulan.timetable.Adapters.WeekAdapter;
-import com.ulan.timetable.Utils.DbHelper;
+import com.ulan.timetable.adapters.WeekAdapter;
+import com.ulan.timetable.utils.DbHelper;
 import com.ulan.timetable.R;
-import com.ulan.timetable.Utils.FragmentHelper;
+import com.ulan.timetable.utils.FragmentHelper;
 
 
 public class WednesdayFragment extends Fragment {
diff --git a/app/src/main/java/com/ulan/timetable/Model/Exam.java b/app/src/main/java/com/ulan/timetable/model/Exam.java
similarity index 97%
rename from app/src/main/java/com/ulan/timetable/Model/Exam.java
rename to app/src/main/java/com/ulan/timetable/model/Exam.java
index 8f3417b..41cde32 100644
--- a/app/src/main/java/com/ulan/timetable/Model/Exam.java
+++ b/app/src/main/java/com/ulan/timetable/model/Exam.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Model;
+package com.ulan.timetable.model;
 
 /**
  * Created by Ulan on 07.12.2018.
diff --git a/app/src/main/java/com/ulan/timetable/Model/Homework.java b/app/src/main/java/com/ulan/timetable/model/Homework.java
similarity index 96%
rename from app/src/main/java/com/ulan/timetable/Model/Homework.java
rename to app/src/main/java/com/ulan/timetable/model/Homework.java
index f5bfa22..ce3051a 100644
--- a/app/src/main/java/com/ulan/timetable/Model/Homework.java
+++ b/app/src/main/java/com/ulan/timetable/model/Homework.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Model;
+package com.ulan.timetable.model;
 
 /**
  * Created by Ulan on 21.09.2018.
diff --git a/app/src/main/java/com/ulan/timetable/Model/Note.java b/app/src/main/java/com/ulan/timetable/model/Note.java
similarity index 96%
rename from app/src/main/java/com/ulan/timetable/Model/Note.java
rename to app/src/main/java/com/ulan/timetable/model/Note.java
index 22b6357..f31a66e 100644
--- a/app/src/main/java/com/ulan/timetable/Model/Note.java
+++ b/app/src/main/java/com/ulan/timetable/model/Note.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Model;
+package com.ulan.timetable.model;
 
 
 import java.io.Serializable;
diff --git a/app/src/main/java/com/ulan/timetable/Model/Teacher.java b/app/src/main/java/com/ulan/timetable/model/Teacher.java
similarity index 97%
rename from app/src/main/java/com/ulan/timetable/Model/Teacher.java
rename to app/src/main/java/com/ulan/timetable/model/Teacher.java
index fa1d92e..2185a3f 100644
--- a/app/src/main/java/com/ulan/timetable/Model/Teacher.java
+++ b/app/src/main/java/com/ulan/timetable/model/Teacher.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Model;
+package com.ulan.timetable.model;
 
 /**
  * Created by Ulan on 07.10.2018.
diff --git a/app/src/main/java/com/ulan/timetable/Model/Week.java b/app/src/main/java/com/ulan/timetable/model/Week.java
similarity index 98%
rename from app/src/main/java/com/ulan/timetable/Model/Week.java
rename to app/src/main/java/com/ulan/timetable/model/Week.java
index 93b864e..380553b 100644
--- a/app/src/main/java/com/ulan/timetable/Model/Week.java
+++ b/app/src/main/java/com/ulan/timetable/model/Week.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Model;
+package com.ulan.timetable.model;
 
 /**
  * Created by Ulan on 07.09.2018.
diff --git a/app/src/main/java/com/ulan/timetable/Utils/AlertDialogsHelper.java b/app/src/main/java/com/ulan/timetable/utils/AlertDialogsHelper.java
similarity index 99%
rename from app/src/main/java/com/ulan/timetable/Utils/AlertDialogsHelper.java
rename to app/src/main/java/com/ulan/timetable/utils/AlertDialogsHelper.java
index bff8daf..240caf4 100644
--- a/app/src/main/java/com/ulan/timetable/Utils/AlertDialogsHelper.java
+++ b/app/src/main/java/com/ulan/timetable/utils/AlertDialogsHelper.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Utils;
+package com.ulan.timetable.utils;
 
 import android.app.Activity;
 import android.app.DatePickerDialog;
@@ -19,17 +19,17 @@
 import android.widget.TextView;
 import android.widget.TimePicker;
 
-import com.ulan.timetable.Adapters.ExamsAdapter;
-import com.ulan.timetable.Adapters.FragmentsTabAdapter;
-import com.ulan.timetable.Adapters.HomeworksAdapter;
-import com.ulan.timetable.Adapters.NotesAdapter;
-import com.ulan.timetable.Adapters.TeachersAdapter;
-import com.ulan.timetable.Adapters.WeekAdapter;
-import com.ulan.timetable.Model.Exam;
-import com.ulan.timetable.Model.Homework;
-import com.ulan.timetable.Model.Note;
-import com.ulan.timetable.Model.Teacher;
-import com.ulan.timetable.Model.Week;
+import com.ulan.timetable.adapters.ExamsAdapter;
+import com.ulan.timetable.adapters.FragmentsTabAdapter;
+import com.ulan.timetable.adapters.HomeworksAdapter;
+import com.ulan.timetable.adapters.NotesAdapter;
+import com.ulan.timetable.adapters.TeachersAdapter;
+import com.ulan.timetable.adapters.WeekAdapter;
+import com.ulan.timetable.model.Exam;
+import com.ulan.timetable.model.Homework;
+import com.ulan.timetable.model.Note;
+import com.ulan.timetable.model.Teacher;
+import com.ulan.timetable.model.Week;
 import com.ulan.timetable.R;
 
 import org.xdty.preference.colorpicker.ColorPickerDialog;
diff --git a/app/src/main/java/com/ulan/timetable/Utils/BrowserUtil.java b/app/src/main/java/com/ulan/timetable/utils/BrowserUtil.java
similarity index 96%
rename from app/src/main/java/com/ulan/timetable/Utils/BrowserUtil.java
rename to app/src/main/java/com/ulan/timetable/utils/BrowserUtil.java
index c66307d..75cb8f3 100644
--- a/app/src/main/java/com/ulan/timetable/Utils/BrowserUtil.java
+++ b/app/src/main/java/com/ulan/timetable/utils/BrowserUtil.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Utils;
+package com.ulan.timetable.utils;
 
 import android.content.ActivityNotFoundException;
 import android.content.Context;
diff --git a/app/src/main/java/com/ulan/timetable/Utils/DailyReceiver.java b/app/src/main/java/com/ulan/timetable/utils/DailyReceiver.java
similarity index 97%
rename from app/src/main/java/com/ulan/timetable/Utils/DailyReceiver.java
rename to app/src/main/java/com/ulan/timetable/utils/DailyReceiver.java
index d1370e6..8fda250 100644
--- a/app/src/main/java/com/ulan/timetable/Utils/DailyReceiver.java
+++ b/app/src/main/java/com/ulan/timetable/utils/DailyReceiver.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Utils;
+package com.ulan.timetable.utils;
 
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -12,7 +12,7 @@
 import android.support.annotation.RequiresApi;
 import android.support.v4.app.NotificationCompat;
 
-import com.ulan.timetable.Activities.MainActivity;
+import com.ulan.timetable.activities.MainActivity;
 import com.ulan.timetable.R;
 
 import java.util.Calendar;
diff --git a/app/src/main/java/com/ulan/timetable/Utils/DbHelper.java b/app/src/main/java/com/ulan/timetable/utils/DbHelper.java
similarity index 98%
rename from app/src/main/java/com/ulan/timetable/Utils/DbHelper.java
rename to app/src/main/java/com/ulan/timetable/utils/DbHelper.java
index f06ceb5..3f32081 100644
--- a/app/src/main/java/com/ulan/timetable/Utils/DbHelper.java
+++ b/app/src/main/java/com/ulan/timetable/utils/DbHelper.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Utils;
+package com.ulan.timetable.utils;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -6,11 +6,11 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
-import com.ulan.timetable.Model.Exam;
-import com.ulan.timetable.Model.Homework;
-import com.ulan.timetable.Model.Note;
-import com.ulan.timetable.Model.Teacher;
-import com.ulan.timetable.Model.Week;
+import com.ulan.timetable.model.Exam;
+import com.ulan.timetable.model.Homework;
+import com.ulan.timetable.model.Note;
+import com.ulan.timetable.model.Teacher;
+import com.ulan.timetable.model.Week;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/com/ulan/timetable/Utils/FragmentHelper.java b/app/src/main/java/com/ulan/timetable/utils/FragmentHelper.java
similarity index 95%
rename from app/src/main/java/com/ulan/timetable/Utils/FragmentHelper.java
rename to app/src/main/java/com/ulan/timetable/utils/FragmentHelper.java
index b89fe52..049526e 100644
--- a/app/src/main/java/com/ulan/timetable/Utils/FragmentHelper.java
+++ b/app/src/main/java/com/ulan/timetable/utils/FragmentHelper.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Utils;
+package com.ulan.timetable.utils;
 
 import android.app.Activity;
 import android.util.SparseBooleanArray;
@@ -9,8 +9,8 @@
 import android.widget.AbsListView;
 import android.widget.ListView;
 
-import com.ulan.timetable.Adapters.WeekAdapter;
-import com.ulan.timetable.Model.Week;
+import com.ulan.timetable.adapters.WeekAdapter;
+import com.ulan.timetable.model.Week;
 import com.ulan.timetable.R;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/ulan/timetable/Utils/LinedEditText.java b/app/src/main/java/com/ulan/timetable/utils/LinedEditText.java
similarity index 97%
rename from app/src/main/java/com/ulan/timetable/Utils/LinedEditText.java
rename to app/src/main/java/com/ulan/timetable/utils/LinedEditText.java
index 01490d2..bc695e0 100644
--- a/app/src/main/java/com/ulan/timetable/Utils/LinedEditText.java
+++ b/app/src/main/java/com/ulan/timetable/utils/LinedEditText.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Utils;
+package com.ulan.timetable.utils;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/app/src/main/java/com/ulan/timetable/Utils/WakeUpAlarmReceiver.java b/app/src/main/java/com/ulan/timetable/utils/WakeUpAlarmReceiver.java
similarity index 97%
rename from app/src/main/java/com/ulan/timetable/Utils/WakeUpAlarmReceiver.java
rename to app/src/main/java/com/ulan/timetable/utils/WakeUpAlarmReceiver.java
index b494ef6..09c7228 100644
--- a/app/src/main/java/com/ulan/timetable/Utils/WakeUpAlarmReceiver.java
+++ b/app/src/main/java/com/ulan/timetable/utils/WakeUpAlarmReceiver.java
@@ -1,4 +1,4 @@
-package com.ulan.timetable.Utils;
+package com.ulan.timetable.utils;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
diff --git a/app/src/main/res/drawable/tab_background.xml b/app/src/main/res/drawable/tab_background.xml
new file mode 100644
index 0000000..d5a47b3
--- /dev/null
+++ b/app/src/main/res/drawable/tab_background.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:bottomLeftRadius="50dp"
+        android:bottomRightRadius="50dp"
+        android:topLeftRadius="50dp"
+        android:topRightRadius="50dp" />
+
+    <stroke
+        android:width="10dp"
+        android:color="@android:color/transparent"></stroke>
+
+    <solid android:color="@color/colorPrimary" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_exams.xml b/app/src/main/res/layout/activity_exams.xml
index 34bf7a9..cf1a6e6 100644
--- a/app/src/main/res/layout/activity_exams.xml
+++ b/app/src/main/res/layout/activity_exams.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Activities.ExamsActivity"
+    tools:context=".activities.ExamsActivity"
     android:orientation="vertical">
 
     <android.support.constraint.ConstraintLayout
diff --git a/app/src/main/res/layout/activity_homeworks.xml b/app/src/main/res/layout/activity_homeworks.xml
index 5eb3f6d..c0e54a9 100644
--- a/app/src/main/res/layout/activity_homeworks.xml
+++ b/app/src/main/res/layout/activity_homeworks.xml
@@ -5,7 +5,7 @@
     android:id="@+id/coordinatorHomeworks"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Activities.HomeworksActivity"
+    tools:context=".activities.HomeworksActivity"
     android:orientation="vertical">
 
     <android.support.constraint.ConstraintLayout
diff --git a/app/src/main/res/layout/activity_note_info.xml b/app/src/main/res/layout/activity_note_info.xml
index f016a6c..854a054 100644
--- a/app/src/main/res/layout/activity_note_info.xml
+++ b/app/src/main/res/layout/activity_note_info.xml
@@ -4,9 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Activities.NoteInfoActivity">
+    tools:context=".activities.NoteInfoActivity">
 
-    <com.ulan.timetable.Utils.LinedEditText
+    <com.ulan.timetable.utils.LinedEditText
         android:id="@+id/edittextNote"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_notes.xml b/app/src/main/res/layout/activity_notes.xml
index c0f32f2..79f4613 100644
--- a/app/src/main/res/layout/activity_notes.xml
+++ b/app/src/main/res/layout/activity_notes.xml
@@ -5,7 +5,7 @@
     android:id="@+id/coordinatorNotes"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Activities.NotesActivity"
+    tools:context=".activities.NotesActivity"
     android:orientation="vertical">
 
     <android.support.constraint.ConstraintLayout
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 2d00be7..4a4970a 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -4,6 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Activities.SettingsActivity">
+    tools:context=".activities.SettingsActivity">
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_teachers.xml b/app/src/main/res/layout/activity_teachers.xml
index e8a66b2..81624f4 100644
--- a/app/src/main/res/layout/activity_teachers.xml
+++ b/app/src/main/res/layout/activity_teachers.xml
@@ -5,7 +5,7 @@
     android:id="@+id/coordinatorTeachers"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Activities.NotesActivity"
+    tools:context=".activities.NotesActivity"
     android:orientation="vertical">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 47414ac..64963df 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Activities.MainActivity"
+    tools:context=".activities.MainActivity"
     android:orientation="vertical">
 
     <android.support.design.widget.AppBarLayout
+        android:id="@+id/app_bar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
@@ -17,26 +18,35 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
-        <android.support.design.widget.TabLayout
-            android:id="@+id/tabLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:tabIndicatorColor="@color/colorAccent"
-            app:tabBackground="@color/colorPrimary"
-            app:tabGravity="fill"
-            app:tabMode="scrollable">
-        </android.support.design.widget.TabLayout>
-    </android.support.design.widget.AppBarLayout>
+            app:popupTheme="@style/AppTheme.PopupOverlay"
+            app:layout_scrollFlags="scroll|enterAlways"/>
 
-    <include layout="@layout/content_main" />
+    </android.support.design.widget.AppBarLayout>
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
+    <android.support.design.widget.TabLayout
+        android:id="@+id/tabLayout"
+        android:theme="@style/AppTheme.AppBarOverlay"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        android:src="@drawable/baseline_add_white_24" />
+        android:layout_margin="3dp"
+        android:clipToPadding="false"
+        app:layout_anchor="@+id/include"
+        app:layout_anchorGravity="top|center"
+        app:layout_constraintTop_toBottomOf="@id/app_bar_layout"
+        app:tabBackground="@drawable/tab_background"
+        app:tabGravity="fill"
+        app:tabIndicatorHeight="0dp"
+        app:tabMode="scrollable"
+        app:tabPaddingEnd="20dp"
+        app:tabPaddingStart="20dp"
+        app:tabSelectedTextColor="#FFFFFF"
+        >
+
+    </android.support.design.widget.TabLayout>
+
+
+    <include
+        android:id="@+id/include"
+        layout="@layout/content_main" />
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 067b8fa..5bbcd88 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".Activities.MainActivity"
+    tools:context=".activities.MainActivity"
     tools:showIn="@layout/app_bar_main">
 
     <android.support.v4.view.ViewPager
@@ -14,4 +14,14 @@
         android:layout_height="match_parent">
     </android.support.v4.view.ViewPager>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        android:src="@drawable/baseline_add_white_24"
+        tools:layout_editor_absoluteX="339dp"
+        tools:layout_editor_absoluteY="546dp" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_friday.xml b/app/src/main/res/layout/fragment_friday.xml
index b1086c9..09b4c90 100644
--- a/app/src/main/res/layout/fragment_friday.xml
+++ b/app/src/main/res/layout/fragment_friday.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Fragments.FridayFragment">
+    tools:context=".fragments.FridayFragment">
 
     <ListView
         android:id="@+id/fridaylist"
diff --git a/app/src/main/res/layout/fragment_monday.xml b/app/src/main/res/layout/fragment_monday.xml
index 4c118b2..19c55a9 100644
--- a/app/src/main/res/layout/fragment_monday.xml
+++ b/app/src/main/res/layout/fragment_monday.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Fragments.MondayFragment">
+    tools:context=".fragments.MondayFragment">
 
     <ListView
         android:id="@+id/mondaylist"
diff --git a/app/src/main/res/layout/fragment_saturday.xml b/app/src/main/res/layout/fragment_saturday.xml
index 46986db..eb61d8f 100644
--- a/app/src/main/res/layout/fragment_saturday.xml
+++ b/app/src/main/res/layout/fragment_saturday.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Fragments.SaturdayFragment">
+    tools:context=".fragments.SaturdayFragment">
 
     <ListView
         android:id="@+id/saturdaylist"
diff --git a/app/src/main/res/layout/fragment_sunday.xml b/app/src/main/res/layout/fragment_sunday.xml
index 4d9542b..c707a01 100644
--- a/app/src/main/res/layout/fragment_sunday.xml
+++ b/app/src/main/res/layout/fragment_sunday.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Fragments.MondayFragment">
+    tools:context=".fragments.MondayFragment">
 
     <ListView
         android:id="@+id/sundaylist"
diff --git a/app/src/main/res/layout/fragment_thursday.xml b/app/src/main/res/layout/fragment_thursday.xml
index 3735d95..3ade1c7 100644
--- a/app/src/main/res/layout/fragment_thursday.xml
+++ b/app/src/main/res/layout/fragment_thursday.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Fragments.ThursdayFragment">
+    tools:context=".fragments.ThursdayFragment">
 
     <ListView
         android:id="@+id/thursdaylist"
diff --git a/app/src/main/res/layout/fragment_tuesday.xml b/app/src/main/res/layout/fragment_tuesday.xml
index e5f9b6b..cdd9fda 100644
--- a/app/src/main/res/layout/fragment_tuesday.xml
+++ b/app/src/main/res/layout/fragment_tuesday.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Fragments.TuesdayFragment">
+    tools:context=".fragments.TuesdayFragment">
 
     <ListView
         android:id="@+id/tuesdaylist"
diff --git a/app/src/main/res/layout/fragment_wednesday.xml b/app/src/main/res/layout/fragment_wednesday.xml
index e0aef7e..827ad68 100644
--- a/app/src/main/res/layout/fragment_wednesday.xml
+++ b/app/src/main/res/layout/fragment_wednesday.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Fragments.WednesdayFragment">
+    tools:context=".fragments.WednesdayFragment">
 
     <ListView
         android:id="@+id/wednesdaylist"
diff --git a/app/src/main/res/menu/toolbar_action_mode.xml b/app/src/main/res/menu/toolbar_action_mode.xml
index b40e923..71d30cd 100644
--- a/app/src/main/res/menu/toolbar_action_mode.xml
+++ b/app/src/main/res/menu/toolbar_action_mode.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".Activities.MainActivity">
+    tools:context=".activities.MainActivity">
 
     <item
         android:id="@+id/action_delete"
diff --git a/screenshots/timetable_screenshot_1.jpg b/screenshots/timetable_screenshot_1.jpg
index 811df1f..589553b 100644
Binary files a/screenshots/timetable_screenshot_1.jpg and b/screenshots/timetable_screenshot_1.jpg differ
diff --git a/screenshots/timetable_screenshot_2.jpg b/screenshots/timetable_screenshot_2.jpg
index 50a092e..acc2d76 100644
Binary files a/screenshots/timetable_screenshot_2.jpg and b/screenshots/timetable_screenshot_2.jpg differ
diff --git a/screenshots/timetable_screenshot_3.jpg b/screenshots/timetable_screenshot_3.jpg
index cfdbe0d..1318623 100644
Binary files a/screenshots/timetable_screenshot_3.jpg and b/screenshots/timetable_screenshot_3.jpg differ