diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1fbc04ec..3234ebac 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,22 +29,22 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".messages.MessagesComposeActivity"
+            android:name="pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/messages_compose_title"
             android:theme="@style/AppTheme.Black" />
         <activity
-            android:name=".activities.FeedbackActivity"
+            android:name=".ui.modules.base.FeedbackActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:label="@string/app_name"
             android:theme="@style/AppTheme" />
         <activity
-            android:name=".login.LoginActivity"
+            android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginActivity"
             android:configChanges="orientation|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/AppTheme.Light" />
         <activity
-            android:name=".intro.ChangelogIntroActivity"
+            android:name=".ui.modules.intro.ChangelogIntroActivity"
             android:configChanges="orientation|keyboardHidden"
             android:label="@string/app_name"
             android:theme="@style/Theme.Intro" />
@@ -57,7 +57,7 @@
              |_|    |_|_|  \___|_.__/ \__,_|___/\___/
         -->
         <activity
-            android:name=".activities.CrashActivity"
+            android:name=".ui.modules.base.CrashActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:process=":error_activity"
             android:theme="@style/DeadTheme" />
@@ -72,7 +72,7 @@
                                                                         |___/
         -->
         <activity
-            android:name=".activities.CrashGtfoActivity"
+            android:name=".ui.modules.base.CrashGtfoActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:theme="@style/DeadTheme" />
         <activity
@@ -103,7 +103,7 @@
             android:theme="@style/AppTheme.NoDisplay" />
 
         <activity
-            android:name=".activities.SettingsLicenseActivity"
+            android:name=".ui.modules.settings.SettingsLicenseActivity"
             android:configChanges="orientation|keyboardHidden"
             android:theme="@style/AppTheme" />
 
@@ -113,14 +113,14 @@
             android:theme="@style/Base.Theme.AppCompat" />
 
         <activity
-            android:name=".activities.WebPushConfigActivity"
+            android:name=".ui.modules.webpush.WebPushConfigActivity"
             android:configChanges="orientation|keyboardHidden"
             android:theme="@style/AppTheme.Dark" />
 
         <activity
-            android:name=".activities.CounterActivity"
+            android:name=".ui.modules.home.CounterActivity"
             android:theme="@style/AppTheme.Black" />
-        <activity android:name=".activities.QrScannerActivity" />
+        <activity android:name=".ui.modules.webpush.QrScannerActivity" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
@@ -231,4 +231,4 @@
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/App.java b/app/src/main/java/pl/szczodrzynski/edziennik/App.java
index 57237a9e..7822861b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/App.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/App.java
@@ -63,7 +63,7 @@ import me.leolin.shortcutbadger.ShortcutBadger;
 import okhttp3.ConnectionSpec;
 import okhttp3.OkHttpClient;
 import okhttp3.TlsVersion;
-import pl.szczodrzynski.edziennik.activities.CrashActivity;
+import pl.szczodrzynski.edziennik.ui.modules.base.CrashActivity;
 import pl.szczodrzynski.edziennik.api.Edziennik;
 import pl.szczodrzynski.edziennik.api.Iuczniowie;
 import pl.szczodrzynski.edziennik.api.Librus;
@@ -74,7 +74,7 @@ import pl.szczodrzynski.edziennik.datamodels.DebugLog;
 import pl.szczodrzynski.edziennik.datamodels.LoginStore;
 import pl.szczodrzynski.edziennik.datamodels.Profile;
 import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
-import pl.szczodrzynski.edziennik.models.AppConfig;
+import pl.szczodrzynski.edziennik.utils.models.AppConfig;
 import pl.szczodrzynski.edziennik.network.NetworkUtils;
 import pl.szczodrzynski.edziennik.network.TLSSocketFactory;
 import pl.szczodrzynski.edziennik.receivers.JobsCreator;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
index 3a9f77a4..77e72edb 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
@@ -48,15 +48,28 @@ import pl.szczodrzynski.edziennik.databinding.ActivitySzkolnyBinding
 import pl.szczodrzynski.edziennik.datamodels.LoginStore
 import pl.szczodrzynski.edziennik.datamodels.Profile
 import pl.szczodrzynski.edziennik.datamodels.ProfileFull
-import pl.szczodrzynski.edziennik.dialogs.ChangelogDialog
-import pl.szczodrzynski.edziennik.fragments.*
-import pl.szczodrzynski.edziennik.homework.HomeworkFragment
-import pl.szczodrzynski.edziennik.login.LoginActivity
-import pl.szczodrzynski.edziennik.messages.MessagesDetailsFragment
-import pl.szczodrzynski.edziennik.messages.MessagesFragment
-import pl.szczodrzynski.edziennik.models.NavTarget
+import pl.szczodrzynski.edziennik.ui.dialogs.changelog.ChangelogDialog
+import pl.szczodrzynski.edziennik.ui.modules.homework.HomeworkFragment
+import pl.szczodrzynski.edziennik.ui.modules.login.LoginActivity
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesDetailsFragment
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesFragment
+import pl.szczodrzynski.edziennik.utils.models.NavTarget
 import pl.szczodrzynski.edziennik.network.ServerRequest
 import pl.szczodrzynski.edziennik.sync.SyncJob
+import pl.szczodrzynski.edziennik.ui.modules.agenda.RegisterAgendaDefaultFragment
+import pl.szczodrzynski.edziennik.ui.modules.announcements.RegisterAnnouncementsFragment
+import pl.szczodrzynski.edziennik.ui.modules.attendance.RegisterAttendancesFragment
+import pl.szczodrzynski.edziennik.ui.modules.base.DebugFragment
+import pl.szczodrzynski.edziennik.ui.modules.base.FeedbackFragment
+import pl.szczodrzynski.edziennik.ui.modules.base.HelpFragment
+import pl.szczodrzynski.edziennik.ui.modules.grades.editor.GradesEditorFragment
+import pl.szczodrzynski.edziennik.ui.modules.grades.RegisterGradesFragment
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
+import pl.szczodrzynski.edziennik.ui.modules.notices.RegisterNoticesFragment
+import pl.szczodrzynski.edziennik.ui.modules.notifications.RegisterNotificationsFragment
+import pl.szczodrzynski.edziennik.ui.modules.settings.ProfileManagerFragment
+import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsNewFragment
+import pl.szczodrzynski.edziennik.ui.modules.timetable.RegisterTimetableFragment
 import pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoTouch
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/Notifier.java b/app/src/main/java/pl/szczodrzynski/edziennik/Notifier.java
index 512affed..0ad8cc23 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/Notifier.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/Notifier.java
@@ -17,8 +17,8 @@ import java.util.Collections;
 import java.util.List;
 
 import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 import pl.szczodrzynski.edziennik.receivers.BootReceiver;
 import pl.szczodrzynski.edziennik.sync.SyncJob;
 import pl.szczodrzynski.edziennik.sync.SyncService;
@@ -221,7 +221,7 @@ public class Notifier {
          | . ` |/ _ \| __| |  _| |/ __/ _` | __| |/ _ \| '_ \
          | |\  | (_) | |_| | | | | (_| (_| | |_| | (_) | | | |
          |_| \_|\___/ \__|_|_| |_|\___\__,_|\__|_|\___/|_| |*/
-    public void add(pl.szczodrzynski.edziennik.models.Notification notification) {
+    public void add(pl.szczodrzynski.edziennik.utils.models.Notification notification) {
         app.appConfig.notifications.add(notification);
     }
 
@@ -235,8 +235,8 @@ public class Notifier {
         }
 
         int unreadCount = 0;
-        List<pl.szczodrzynski.edziennik.models.Notification> notificationList = new ArrayList<>();
-        for (pl.szczodrzynski.edziennik.models.Notification notification: app.appConfig.notifications) {
+        List<pl.szczodrzynski.edziennik.utils.models.Notification> notificationList = new ArrayList<>();
+        for (pl.szczodrzynski.edziennik.utils.models.Notification notification: app.appConfig.notifications) {
             if (!notification.notified) {
                 notification.seen = false;
                 notification.notified = true;
@@ -250,7 +250,7 @@ public class Notifier {
             }
         }
 
-        for (pl.szczodrzynski.edziennik.models.Notification notification: notificationList) {
+        for (pl.szczodrzynski.edziennik.utils.models.Notification notification: notificationList) {
             Intent intent = new Intent(app, MainActivity.class);
             notification.fillIntent(intent);
             PendingIntent pendingIntent = PendingIntent.getActivity(app, notification.id, intent, 0);
@@ -258,9 +258,9 @@ public class Notifier {
                     // title, text, type, date
                     .setContentTitle(notification.title)
                     .setContentText(notification.text)
-                    .setSubText(pl.szczodrzynski.edziennik.models.Notification.stringType(app, notification.type))
+                    .setSubText(pl.szczodrzynski.edziennik.utils.models.Notification.stringType(app, notification.type))
                     .setWhen(notification.addedDate)
-                    .setTicker(app.getString(R.string.notification_ticker_format, pl.szczodrzynski.edziennik.models.Notification.stringType(app, notification.type)))
+                    .setTicker(app.getString(R.string.notification_ticker_format, pl.szczodrzynski.edziennik.utils.models.Notification.stringType(app, notification.type)))
                     // icon, color, lights, priority
                     .setSmallIcon(R.drawable.ic_notification)
                     .setColor(notificationColor)
@@ -349,7 +349,7 @@ public class Notifier {
     }
 
     public void dump() {
-        for (pl.szczodrzynski.edziennik.models.Notification notification: app.appConfig.notifications) {
+        for (pl.szczodrzynski.edziennik.utils.models.Notification notification: app.appConfig.notifications) {
             Log.d(TAG, "Profile"+notification.profileId+" Notification from "+ Date.fromMillis(notification.addedDate).getFormattedString()+" "+ Time.fromMillis(notification.addedDate).getStringHMS()+" - "+notification.text);
         }
     }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/WidgetTimetable.java b/app/src/main/java/pl/szczodrzynski/edziennik/WidgetTimetable.java
index 8a2fe720..194dace4 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/WidgetTimetable.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/WidgetTimetable.java
@@ -32,11 +32,11 @@ import pl.szczodrzynski.edziennik.datamodels.EventFull;
 import pl.szczodrzynski.edziennik.datamodels.LessonChange;
 import pl.szczodrzynski.edziennik.datamodels.LessonFull;
 import pl.szczodrzynski.edziennik.datamodels.Profile;
-import pl.szczodrzynski.edziennik.fragments.HomeFragment;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.ItemWidgetTimetableModel;
-import pl.szczodrzynski.edziennik.models.Time;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.ItemWidgetTimetableModel;
+import pl.szczodrzynski.edziennik.utils.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 import pl.szczodrzynski.edziennik.widgets.WidgetConfig;
 import pl.szczodrzynski.edziennik.sync.SyncJob;
 import pl.szczodrzynski.edziennik.widgets.timetable.LessonDetailsActivity;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/Edziennik.java b/app/src/main/java/pl/szczodrzynski/edziennik/api/Edziennik.java
index eb0fde7c..c085e092 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/Edziennik.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/Edziennik.java
@@ -62,8 +62,8 @@ import pl.szczodrzynski.edziennik.datamodels.NoticeFull;
 import pl.szczodrzynski.edziennik.datamodels.Profile;
 import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
 import pl.szczodrzynski.edziennik.datamodels.Team;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Notification;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Notification;
 import pl.szczodrzynski.edziennik.network.ServerRequest;
 import pl.szczodrzynski.edziennik.sync.SyncJob;
 import pl.szczodrzynski.edziennik.utils.Themes;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/Iuczniowie.java b/app/src/main/java/pl/szczodrzynski/edziennik/api/Iuczniowie.java
index ad32cb24..ef582884 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/Iuczniowie.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/Iuczniowie.java
@@ -59,11 +59,11 @@ import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
 import pl.szczodrzynski.edziennik.datamodels.Teacher;
 import pl.szczodrzynski.edziennik.datamodels.Team;
-import pl.szczodrzynski.edziennik.messages.MessagesComposeInfo;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Endpoint;
-import pl.szczodrzynski.edziennik.models.Time;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Endpoint;
+import pl.szczodrzynski.edziennik.utils.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 
 import static pl.szczodrzynski.edziennik.api.AppError.CODE_INVALID_LOGIN;
 import static pl.szczodrzynski.edziennik.api.AppError.CODE_INVALID_SCHOOL_NAME;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/Librus.java b/app/src/main/java/pl/szczodrzynski/edziennik/api/Librus.java
index e1787377..9eb31ea0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/Librus.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/Librus.java
@@ -73,11 +73,11 @@ import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
 import pl.szczodrzynski.edziennik.datamodels.Teacher;
 import pl.szczodrzynski.edziennik.datamodels.Team;
-import pl.szczodrzynski.edziennik.messages.MessagesComposeInfo;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Endpoint;
-import pl.szczodrzynski.edziennik.models.Time;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Endpoint;
+import pl.szczodrzynski.edziennik.utils.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 import pl.szczodrzynski.edziennik.utils.Utils;
 
 import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/Mobidziennik.java b/app/src/main/java/pl/szczodrzynski/edziennik/api/Mobidziennik.java
index 14a1e168..e3ac7922 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/Mobidziennik.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/Mobidziennik.java
@@ -65,11 +65,11 @@ import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
 import pl.szczodrzynski.edziennik.datamodels.Teacher;
 import pl.szczodrzynski.edziennik.datamodels.Team;
-import pl.szczodrzynski.edziennik.messages.MessagesComposeInfo;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Endpoint;
-import pl.szczodrzynski.edziennik.models.Time;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Endpoint;
+import pl.szczodrzynski.edziennik.utils.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 
 import static pl.szczodrzynski.edziennik.api.AppError.CODE_INVALID_LOGIN;
 import static pl.szczodrzynski.edziennik.api.AppError.CODE_MAINTENANCE;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/Vulcan.java b/app/src/main/java/pl/szczodrzynski/edziennik/api/Vulcan.java
index 85893a62..6694fc5d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/Vulcan.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/Vulcan.java
@@ -59,11 +59,11 @@ import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
 import pl.szczodrzynski.edziennik.datamodels.Teacher;
 import pl.szczodrzynski.edziennik.datamodels.Team;
-import pl.szczodrzynski.edziennik.messages.MessagesComposeInfo;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Endpoint;
-import pl.szczodrzynski.edziennik.models.Time;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Endpoint;
+import pl.szczodrzynski.edziennik.utils.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 import pl.szczodrzynski.edziennik.utils.Utils;
 
 import static pl.szczodrzynski.edziennik.api.AppError.CODE_OTHER;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/interfaces/EdziennikInterface.java b/app/src/main/java/pl/szczodrzynski/edziennik/api/interfaces/EdziennikInterface.java
index 2d33d515..15770e2f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/interfaces/EdziennikInterface.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/interfaces/EdziennikInterface.java
@@ -7,12 +7,11 @@ import androidx.annotation.Nullable;
 import java.util.Map;
 
 import pl.szczodrzynski.edziennik.datamodels.LoginStore;
-import pl.szczodrzynski.edziennik.datamodels.Message;
 import pl.szczodrzynski.edziennik.datamodels.MessageFull;
 import pl.szczodrzynski.edziennik.datamodels.Profile;
 import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
-import pl.szczodrzynski.edziennik.messages.MessagesComposeInfo;
-import pl.szczodrzynski.edziennik.models.Endpoint;
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo;
+import pl.szczodrzynski.edziennik.utils.models.Endpoint;
 
 public interface EdziennikInterface {
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/Librus.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/Librus.kt
index 8ba1f79e..d99bce51 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/Librus.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/Librus.kt
@@ -19,8 +19,8 @@ import pl.szczodrzynski.edziennik.datamodels.LoginStore
 import pl.szczodrzynski.edziennik.datamodels.MessageFull
 import pl.szczodrzynski.edziennik.datamodels.Profile
 import pl.szczodrzynski.edziennik.datamodels.ProfileFull
-import pl.szczodrzynski.edziennik.messages.MessagesComposeInfo
-import pl.szczodrzynski.edziennik.models.Endpoint
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo
+import pl.szczodrzynski.edziennik.utils.models.Endpoint
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import java.lang.Exception
 
@@ -198,4 +198,4 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore) :
     override fun isEndpointEnabled(profile: Profile?, defaultActive: Boolean, name: String?): Boolean {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/DataStore.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/DataStore.kt
index 552340fa..a3d12e97 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/DataStore.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/DataStore.kt
@@ -4,7 +4,7 @@ import android.util.LongSparseArray
 import androidx.core.util.forEach
 import androidx.core.util.isNotEmpty
 import pl.szczodrzynski.edziennik.datamodels.*
-import pl.szczodrzynski.edziennik.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Date
 
 data class DataStore(private val appDb: AppDb, val profileId: Int) {
     val teacherList: LongSparseArray<Teacher> = LongSparseArray()
@@ -115,4 +115,4 @@ data class DataStore(private val appDb: AppDb, val profileId: Int) {
         if (messageMetadataList.isNotEmpty())
             appDb.metadataDao().setSeen(messageMetadataList)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Announcement.java b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Announcement.java
index cfde4da3..516071f8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Announcement.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Announcement.java
@@ -5,7 +5,7 @@ import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.Ignore;
 import androidx.room.Index;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 @Entity(tableName = "announcements",
         primaryKeys = {"profileId", "announcementId"},
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/AppDb.java b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/AppDb.java
index fba95f57..05d390fd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/AppDb.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/AppDb.java
@@ -6,7 +6,7 @@ import androidx.room.Room;
 import androidx.room.RoomDatabase;
 import androidx.room.TypeConverters;
 import androidx.room.migration.Migration;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Attendance.java b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Attendance.java
index 50fec470..ca8a5f58 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Attendance.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Attendance.java
@@ -6,8 +6,8 @@ import androidx.room.Entity;
 import androidx.room.Ignore;
 import androidx.room.Index;
 
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 @Entity(tableName = "attendances",
         primaryKeys = {"profileId", "attendanceId", "attendanceLessonDate", "attendanceStartTime"},
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/AttendanceDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/AttendanceDao.java
index d6367227..5dacf4f0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/AttendanceDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/AttendanceDao.java
@@ -8,11 +8,10 @@ import androidx.room.Insert;
 import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 import androidx.room.RawQuery;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 import java.util.List;
 
-import static pl.szczodrzynski.edziennik.datamodels.Attendance.TYPE_PRESENT;
 import static pl.szczodrzynski.edziennik.datamodels.Metadata.TYPE_ATTENDANCE;
 
 @Dao
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/ConverterDate.java b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/ConverterDate.java
index fa23123b..e77c3e2b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/ConverterDate.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/ConverterDate.java
@@ -2,7 +2,7 @@ package pl.szczodrzynski.edziennik.datamodels;
 
 import androidx.room.TypeConverter;
 
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 public class ConverterDate {
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/ConverterTime.java b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/ConverterTime.java
index 6ac9a8c6..c3a37864 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/ConverterTime.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/ConverterTime.java
@@ -2,7 +2,7 @@ package pl.szczodrzynski.edziennik.datamodels;
 
 import androidx.room.TypeConverter;
 
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 public class ConverterTime {
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Event.java b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Event.java
index c6e1244a..24c916f0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Event.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Event.java
@@ -4,8 +4,8 @@ import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.Ignore;
 import androidx.room.Index;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 @Entity(tableName = "events",
         primaryKeys = {"profileId", "eventId"},
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/EventDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/EventDao.java
index 3ae3affb..63c53ed1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/EventDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/EventDao.java
@@ -14,8 +14,8 @@ import android.util.Log;
 
 import java.util.List;
 
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 import static pl.szczodrzynski.edziennik.datamodels.Metadata.TYPE_EVENT;
 import static pl.szczodrzynski.edziennik.datamodels.Metadata.TYPE_HOMEWORK;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Lesson.java b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Lesson.java
index 69fe76c9..0a1278e2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Lesson.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Lesson.java
@@ -8,8 +8,8 @@ import androidx.room.Ignore;
 import androidx.room.Index;
 import androidx.annotation.NonNull;
 
-import pl.szczodrzynski.edziennik.models.Time;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.utils.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 
 @Entity(tableName = "lessons",
         primaryKeys = {"profileId", "lessonWeekDay", "lessonStartTime", "lessonEndTime"},
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonChange.java b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonChange.java
index 41cfcbc6..f85f34e4 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonChange.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonChange.java
@@ -7,8 +7,8 @@ import androidx.annotation.NonNull;
 
 import java.util.List;
 
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 @Entity(tableName = "lessonChanges",
         primaryKeys = {"profileId", "lessonChangeDate", "lessonChangeStartTime", "lessonChangeEndTime"},
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonChangeDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonChangeDao.java
index a8238b4e..3e91bfde 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonChangeDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonChangeDao.java
@@ -11,8 +11,8 @@ import androidx.room.RawQuery;
 
 import java.util.List;
 
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.db.LessonChangeCounter;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.db.LessonChangeCounter;
 
 import static pl.szczodrzynski.edziennik.datamodels.Metadata.TYPE_LESSON_CHANGE;
 import static pl.szczodrzynski.edziennik.utils.Utils.d;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonDao.java
index a464b886..e2de1e2f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonDao.java
@@ -9,12 +9,11 @@ import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 import androidx.room.RawQuery;
 import androidx.annotation.NonNull;
-import android.util.Log;
 
 import java.util.List;
 
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 @Dao
 public abstract class LessonDao {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonFull.java b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonFull.java
index 2486b491..e60b26d3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonFull.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonFull.java
@@ -5,7 +5,7 @@ import android.content.Context;
 import androidx.annotation.Nullable;
 
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 import static pl.szczodrzynski.edziennik.datamodels.LessonChange.TYPE_ADDED;
 import static pl.szczodrzynski.edziennik.datamodels.LessonChange.TYPE_CANCELLED;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LuckyNumber.java b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LuckyNumber.java
index 0ddc8032..6350a5f1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LuckyNumber.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LuckyNumber.java
@@ -4,7 +4,7 @@ import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.annotation.NonNull;
 
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 @Entity(tableName = "luckyNumbers",
         primaryKeys = {"profileId", "luckyNumberDate"})
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LuckyNumberDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LuckyNumberDao.java
index 308b3045..9fe62154 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LuckyNumberDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LuckyNumberDao.java
@@ -8,7 +8,7 @@ import androidx.room.Query;
 
 import java.util.List;
 
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 @Dao
 public interface LuckyNumberDao {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/MetadataDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/MetadataDao.java
index 321ee89b..40a44d25 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/MetadataDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/MetadataDao.java
@@ -9,7 +9,7 @@ import androidx.room.Transaction;
 
 import java.util.List;
 
-import pl.szczodrzynski.edziennik.models.db.UnreadCounter;
+import pl.szczodrzynski.edziennik.utils.models.db.UnreadCounter;
 
 import static pl.szczodrzynski.edziennik.datamodels.Metadata.TYPE_ANNOUNCEMENT;
 import static pl.szczodrzynski.edziennik.datamodels.Metadata.TYPE_ATTENDANCE;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Profile.kt b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Profile.kt
index 1404e8bf..5cf1b446 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Profile.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Profile.kt
@@ -3,25 +3,20 @@ package pl.szczodrzynski.edziennik.datamodels
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import android.content.Context
-import android.graphics.BitmapFactory
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.graphics.drawable.Drawable
-import android.media.ThumbnailUtils
 import android.net.ConnectivityManager
-import android.net.NetworkInfo
 import android.widget.ImageView
-import androidx.core.graphics.drawable.RoundedBitmapDrawable
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
 
-import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 
 import androidx.room.Ignore
 import pl.droidsonroids.gif.GifDrawable
 import pl.szczodrzynski.edziennik.colorFromName
 
-import pl.szczodrzynski.edziennik.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.navlib.ImageHolder
 import pl.szczodrzynski.navlib.R
 import pl.szczodrzynski.navlib.drawer.IDrawerProfile
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/MyFirebaseMessagingService.java b/app/src/main/java/pl/szczodrzynski/edziennik/sync/MyFirebaseMessagingService.java
index 2b56b9bc..a9984194 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/sync/MyFirebaseMessagingService.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/sync/MyFirebaseMessagingService.java
@@ -23,8 +23,8 @@ import pl.szczodrzynski.edziennik.datamodels.EventType;
 import pl.szczodrzynski.edziennik.datamodels.FeedbackMessage;
 import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
 import pl.szczodrzynski.edziennik.datamodels.Team;
-import pl.szczodrzynski.edziennik.fragments.DebugFragment;
-import pl.szczodrzynski.edziennik.models.Notification;
+import pl.szczodrzynski.edziennik.ui.modules.base.DebugFragment;
+import pl.szczodrzynski.edziennik.utils.models.Notification;
 import pl.szczodrzynski.edziennik.network.ServerRequest;
 
 import static pl.szczodrzynski.edziennik.App.APP_URL;
@@ -195,7 +195,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
                                 app.checkDevModePassword();
                                 feedbackMessage.text = "devmode "+(App.devMode ? "allowed" : "disallowed");
                             }
-                            Intent intent = new Intent("pl.szczodrzynski.edziennik.activities.FeedbackActivity");
+                            Intent intent = new Intent("pl.szczodrzynski.edziennik.ui.modules.base.FeedbackActivity");
                             intent.putExtra("type", "user_chat");
                             intent.putExtra("message", app.gson.toJson(feedbackMessage));
                             app.sendBroadcast(intent);
@@ -217,7 +217,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
                         feedbackMessage.fromUser = remoteMessage.getData().get("from_user");
                         feedbackMessage.fromUserName = remoteMessage.getData().get("from_user_name");
                         feedbackMessage.sentTime = Long.parseLong(remoteMessage.getData().get("sent_time"));
-                        Intent intent = new Intent("pl.szczodrzynski.edziennik.activities.FeedbackActivity");
+                        Intent intent = new Intent("pl.szczodrzynski.edziennik.ui.modules.base.FeedbackActivity");
                         intent.putExtra("type", "user_chat");
                         intent.putExtra("message", app.gson.toJson(feedbackMessage));
                         app.sendBroadcast(intent);
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/dialogs/GenericDialog.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/GenericDialog.java
similarity index 87%
rename from app/src/main/java/pl/szczodrzynski/edziennik/dialogs/GenericDialog.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/GenericDialog.java
index 2b5b23ef..df691a58 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/dialogs/GenericDialog.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/GenericDialog.java
@@ -1,15 +1,11 @@
-package pl.szczodrzynski.edziennik.dialogs;
+package pl.szczodrzynski.edziennik.ui.dialogs;
 
 import android.content.Context;
-import android.content.res.Resources;
-import androidx.annotation.ColorInt;
-import android.util.TypedValue;
 import android.view.View;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
 import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
 
 public class GenericDialog {
     private App app;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/dialogs/ChangelogDialog.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/changelog/ChangelogDialog.java
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/dialogs/ChangelogDialog.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/changelog/ChangelogDialog.java
index d27b7726..dfae3081 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/dialogs/ChangelogDialog.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/changelog/ChangelogDialog.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.dialogs;
+package pl.szczodrzynski.edziennik.ui.dialogs.changelog;
 
 import android.app.Dialog;
 import android.os.Bundle;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/EventListAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListAdapter.java
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/adapters/EventListAdapter.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListAdapter.java
index b22b2308..3df99e78 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/EventListAdapter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListAdapter.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.adapters;
+package pl.szczodrzynski.edziennik.ui.dialogs.event;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
@@ -20,9 +20,7 @@ import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.datamodels.Event;
 import pl.szczodrzynski.edziennik.datamodels.EventFull;
-import pl.szczodrzynski.edziennik.dialogs.EventListDialog;
-import pl.szczodrzynski.edziennik.dialogs.EventManualDialog;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 import pl.szczodrzynski.edziennik.utils.Utils;
 
 import static pl.szczodrzynski.edziennik.datamodels.Event.TYPE_HOMEWORK;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/dialogs/EventListDialog.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListDialog.java
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/dialogs/EventListDialog.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListDialog.java
index dd974450..57ae66fc 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/dialogs/EventListDialog.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListDialog.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.dialogs;
+package pl.szczodrzynski.edziennik.ui.dialogs.event;
 
 import android.content.Context;
 import android.content.DialogInterface;
@@ -16,20 +16,13 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import java.util.Calendar;
-import java.util.List;
-import java.util.Locale;
-
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.adapters.EventListAdapter;
 import pl.szczodrzynski.edziennik.datamodels.LessonChange;
 import pl.szczodrzynski.edziennik.datamodels.LessonFull;
-import pl.szczodrzynski.edziennik.fragments.agenda.LessonChangeEvent;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
-import pl.szczodrzynski.edziennik.models.db.LessonChangeCounter;
-import pl.szczodrzynski.edziennik.utils.Colors;
+import pl.szczodrzynski.edziennik.ui.dialogs.lessonchange.LessonChangeDialog;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 public class EventListDialog {
     private App app;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/dialogs/EventManualDialog.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/dialogs/EventManualDialog.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.java
index 6b5fca15..bfdb5be7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/dialogs/EventManualDialog.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.dialogs;
+package pl.szczodrzynski.edziennik.ui.dialogs.event;
 
 
 import android.app.Activity;
@@ -46,9 +46,9 @@ import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
 import pl.szczodrzynski.edziennik.datamodels.Teacher;
 import pl.szczodrzynski.edziennik.datamodels.Team;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 import pl.szczodrzynski.edziennik.network.ServerRequest;
 import pl.szczodrzynski.edziennik.utils.TextInputDropDown;
 import pl.szczodrzynski.edziennik.utils.Themes;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/dialogs/GradeDetailsDialog.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.java
similarity index 87%
rename from app/src/main/java/pl/szczodrzynski/edziennik/dialogs/GradeDetailsDialog.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.java
index 4082cf5d..43ad22d3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/dialogs/GradeDetailsDialog.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.java
@@ -1,38 +1,26 @@
-package pl.szczodrzynski.edziennik.dialogs;
+package pl.szczodrzynski.edziennik.ui.dialogs.grade;
 
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
-import android.graphics.Typeface;
 import android.os.AsyncTask;
 import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.graphics.ColorUtils;
-import androidx.lifecycle.LifecycleOwner;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
 import java.text.DecimalFormat;
-import java.util.ArrayList;
 import java.util.List;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.adapters.EventListAdapter;
-import pl.szczodrzynski.edziennik.adapters.GradesListAdapter;
+import pl.szczodrzynski.edziennik.ui.modules.grades.GradesListAdapter;
 import pl.szczodrzynski.edziennik.databinding.DialogGradeDetailsBinding;
 import pl.szczodrzynski.edziennik.datamodels.Grade;
 import pl.szczodrzynski.edziennik.datamodels.GradeFull;
-import pl.szczodrzynski.edziennik.datamodels.LessonChange;
-import pl.szczodrzynski.edziennik.datamodels.LessonFull;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
 import pl.szczodrzynski.edziennik.utils.Colors;
 
 import static pl.szczodrzynski.edziennik.datamodels.Profile.COLOR_MODE_DEFAULT;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/dialogs/LessonChangeDialog.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeDialog.java
similarity index 86%
rename from app/src/main/java/pl/szczodrzynski/edziennik/dialogs/LessonChangeDialog.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeDialog.java
index ed03ca71..3d58f199 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/dialogs/LessonChangeDialog.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeDialog.java
@@ -1,11 +1,8 @@
-package pl.szczodrzynski.edziennik.dialogs;
+package pl.szczodrzynski.edziennik.ui.dialogs.lessonchange;
 
 import android.content.Context;
-import android.content.res.Resources;
-import android.util.TypedValue;
 import android.view.View;
 
-import androidx.annotation.ColorInt;
 import androidx.databinding.DataBindingUtil;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -17,13 +14,11 @@ import java.util.List;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.adapters.TimetableAdapter;
+import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableAdapter;
 import pl.szczodrzynski.edziennik.databinding.DialogLessonChangeListBinding;
-import pl.szczodrzynski.edziennik.datamodels.Lesson;
-import pl.szczodrzynski.edziennik.datamodels.LessonChange;
 import pl.szczodrzynski.edziennik.datamodels.LessonFull;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 public class LessonChangeDialog {
     private App app;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/agenda/LessonChangeEvent.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/LessonChangeEvent.java
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/agenda/LessonChangeEvent.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/LessonChangeEvent.java
index 0d92e6cd..41e3f44a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/agenda/LessonChangeEvent.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/LessonChangeEvent.java
@@ -1,13 +1,12 @@
-package pl.szczodrzynski.edziennik.fragments.agenda;
+package pl.szczodrzynski.edziennik.ui.modules.agenda;
 
-import com.github.tibolte.agendacalendarview.models.BaseCalendarEvent;
 import com.github.tibolte.agendacalendarview.models.CalendarEvent;
 import com.github.tibolte.agendacalendarview.models.IDayItem;
 import com.github.tibolte.agendacalendarview.models.IWeekItem;
 
 import java.util.Calendar;
 
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 public class LessonChangeEvent implements CalendarEvent {
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/agenda/LessonChangeEventRenderer.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/LessonChangeEventRenderer.java
similarity index 84%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/agenda/LessonChangeEventRenderer.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/LessonChangeEventRenderer.java
index 5a821614..b0e529cf 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/agenda/LessonChangeEventRenderer.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/LessonChangeEventRenderer.java
@@ -1,8 +1,6 @@
-package pl.szczodrzynski.edziennik.fragments.agenda;
+package pl.szczodrzynski.edziennik.ui.modules.agenda;
 
-import android.graphics.Color;
 import android.view.View;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.cardview.widget.CardView;
@@ -10,7 +8,6 @@ import androidx.cardview.widget.CardView;
 import com.github.tibolte.agendacalendarview.render.EventRenderer;
 
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.datamodels.Lesson;
 
 public class LessonChangeEventRenderer extends EventRenderer<LessonChangeEvent> {
     @Override
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterAgendaCalendarFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/RegisterAgendaCalendarFragment.java
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterAgendaCalendarFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/RegisterAgendaCalendarFragment.java
index bad747f9..4048694b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterAgendaCalendarFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/RegisterAgendaCalendarFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.agenda;
 
 import android.app.Activity;
 import android.content.Context;
@@ -30,8 +30,8 @@ import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.databinding.FragmentRegisterAgendaCalendarBinding;
 import pl.szczodrzynski.edziennik.datamodels.EventFull;
 import pl.szczodrzynski.edziennik.datamodels.LessonFull;
-import pl.szczodrzynski.edziennik.dialogs.EventListDialog;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventListDialog;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 import pl.szczodrzynski.edziennik.utils.Themes;
 
 import static pl.szczodrzynski.edziennik.utils.Utils.intToStr;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterAgendaDefaultFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/RegisterAgendaDefaultFragment.java
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterAgendaDefaultFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/RegisterAgendaDefaultFragment.java
index b7d12bae..3e9ffcba 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterAgendaDefaultFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/RegisterAgendaDefaultFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.agenda;
 
 import android.app.Activity;
 import android.content.Context;
@@ -40,14 +40,12 @@ import pl.szczodrzynski.edziennik.databinding.FragmentRegisterAgendaCalendarBind
 import pl.szczodrzynski.edziennik.databinding.FragmentRegisterAgendaDefaultBinding;
 import pl.szczodrzynski.edziennik.datamodels.EventFull;
 import pl.szczodrzynski.edziennik.datamodels.LessonFull;
-import pl.szczodrzynski.edziennik.dialogs.EventListDialog;
-import pl.szczodrzynski.edziennik.dialogs.EventManualDialog;
-import pl.szczodrzynski.edziennik.dialogs.LessonChangeDialog;
-import pl.szczodrzynski.edziennik.fragments.agenda.LessonChangeEvent;
-import pl.szczodrzynski.edziennik.fragments.agenda.LessonChangeEventRenderer;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
-import pl.szczodrzynski.edziennik.models.db.LessonChangeCounter;
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventListDialog;
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog;
+import pl.szczodrzynski.edziennik.ui.dialogs.lessonchange.LessonChangeDialog;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.db.LessonChangeCounter;
 import pl.szczodrzynski.edziennik.utils.Colors;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.edziennik.utils.Utils;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/AnnouncementsAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsAdapter.java
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/adapters/AnnouncementsAdapter.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsAdapter.java
index 26df42c9..3b76fcb7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/AnnouncementsAdapter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsAdapter.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.adapters;
+package pl.szczodrzynski.edziennik.ui.modules.announcements;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterAnnouncementsFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/RegisterAnnouncementsFragment.java
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterAnnouncementsFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/RegisterAnnouncementsFragment.java
index e6f955db..5b8d36a7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterAnnouncementsFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/RegisterAnnouncementsFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.announcements;
 
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -19,7 +19,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.adapters.AnnouncementsAdapter;
 import pl.szczodrzynski.edziennik.databinding.DialogAnnouncementBinding;
 import pl.szczodrzynski.edziennik.databinding.FragmentRegisterSchoolNoticesBinding;
 import pl.szczodrzynski.edziennik.utils.Themes;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/AttendancesAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendancesAdapter.java
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/adapters/AttendancesAdapter.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendancesAdapter.java
index 79793f93..35d3d1de 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/AttendancesAdapter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendancesAdapter.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.adapters;
+package pl.szczodrzynski.edziennik.ui.modules.attendance;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
@@ -125,4 +125,4 @@ public class AttendancesAdapter extends RecyclerView.Adapter<AttendancesAdapter.
             attendanceTime = itemView.findViewById(R.id.attendanceTime);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterAttendancesFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/RegisterAttendancesFragment.java
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterAttendancesFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/RegisterAttendancesFragment.java
index dbc83a48..638c934c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterAttendancesFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/RegisterAttendancesFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.attendance;
 
 import androidx.appcompat.widget.PopupMenu;
 import androidx.databinding.DataBindingUtil;
@@ -39,12 +39,11 @@ import antonkozyriatskyi.circularprogressindicator.CircularProgressIndicator;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.adapters.AttendancesAdapter;
 import pl.szczodrzynski.edziennik.databinding.FragmentRegisterAttendancesBinding;
 import pl.szczodrzynski.edziennik.datamodels.AttendanceFull;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/activities/CrashActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashActivity.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/activities/CrashActivity.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashActivity.java
index de8ed06c..2371e286 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/activities/CrashActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashActivity.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.activities;
+package pl.szczodrzynski.edziennik.ui.modules.base;
 
 /*
  * Copyright 2014-2017 Eduard Ereza Martínez
@@ -177,4 +177,4 @@ public final class CrashActivity extends AppCompatActivity {
             Toast.makeText(CrashActivity.this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/activities/CrashGtfoActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashGtfoActivity.java
similarity index 92%
rename from app/src/main/java/pl/szczodrzynski/edziennik/activities/CrashGtfoActivity.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashGtfoActivity.java
index b954a9a4..c5b54d03 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/activities/CrashGtfoActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashGtfoActivity.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.activities;
+package pl.szczodrzynski.edziennik.ui.modules.base;
 
 import android.content.Context;
 import android.os.Bundle;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/DebugFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/DebugFragment.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/DebugFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/DebugFragment.java
index 35faaca3..0e606126 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/DebugFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/DebugFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.base;
 
 import android.os.Bundle;
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/activities/FeedbackActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/FeedbackActivity.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/activities/FeedbackActivity.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/FeedbackActivity.java
index 97cdba68..b09d8211 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/activities/FeedbackActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/FeedbackActivity.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.activities;
+package pl.szczodrzynski.edziennik.ui.modules.base;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.databinding.DataBindingUtil;
@@ -352,7 +352,7 @@ public class FeedbackActivity extends AppCompatActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        registerReceiver(receiver, new IntentFilter("pl.szczodrzynski.edziennik.activities.FeedbackActivity"));
+        registerReceiver(receiver, new IntentFilter("pl.szczodrzynski.edziennik.ui.modules.base.FeedbackActivity"));
     }
 
     @Override
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/FeedbackFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/FeedbackFragment.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/FeedbackFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/FeedbackFragment.kt
index a0b774fa..e0689141 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/FeedbackFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/FeedbackFragment.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments
+package pl.szczodrzynski.edziennik.ui.modules.base
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -323,7 +323,7 @@ class FeedbackFragment : Fragment() {
     override fun onResume() {
         super.onResume()
         if (receiver != null)
-            activity.registerReceiver(receiver, IntentFilter("pl.szczodrzynski.edziennik.activities.FeedbackActivity"))
+            activity.registerReceiver(receiver, IntentFilter("pl.szczodrzynski.edziennik.ui.modules.base.FeedbackActivity"))
     }
 
     override fun onPause() {
@@ -331,4 +331,4 @@ class FeedbackFragment : Fragment() {
         if (receiver != null)
             activity.unregisterReceiver(receiver)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/HelpFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/HelpFragment.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/HelpFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/HelpFragment.kt
index 4553a7b0..d54e0fc6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/HelpFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/HelpFragment.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments
+package pl.szczodrzynski.edziennik.ui.modules.base
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/LoadingFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/LoadingFragment.kt
similarity index 93%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/LoadingFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/LoadingFragment.kt
index 4573f4fd..b5626fa4 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/LoadingFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/LoadingFragment.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments
+package pl.szczodrzynski.edziennik.ui.modules.base
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -20,4 +20,4 @@ class LoadingFragment : Fragment() {
         b = FragmentLoadingBinding.inflate(inflater)
         return b.root
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/TemplateFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/TemplateFragment.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/TemplateFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/TemplateFragment.kt
index a7c8d526..6b055750 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/TemplateFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/TemplateFragment.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments
+package pl.szczodrzynski.edziennik.ui.modules.base
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/GradesListAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListAdapter.java
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/adapters/GradesListAdapter.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListAdapter.java
index 722aa823..ec902e12 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/GradesListAdapter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListAdapter.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.adapters;
+package pl.szczodrzynski.edziennik.ui.modules.grades;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
@@ -20,8 +20,8 @@ import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.datamodels.Grade;
 import pl.szczodrzynski.edziennik.datamodels.GradeFull;
-import pl.szczodrzynski.edziennik.dialogs.GradeDetailsDialog;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.ui.dialogs.grade.GradeDetailsDialog;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 import pl.szczodrzynski.edziennik.utils.Colors;
 
 import static pl.szczodrzynski.edziennik.datamodels.Profile.COLOR_MODE_DEFAULT;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/GradesSubjectAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesSubjectAdapter.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/adapters/GradesSubjectAdapter.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesSubjectAdapter.java
index 0038612c..30dd7562 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/GradesSubjectAdapter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesSubjectAdapter.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.adapters;
+package pl.szczodrzynski.edziennik.ui.modules.grades;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
@@ -33,7 +33,8 @@ import pl.szczodrzynski.edziennik.MainActivity;
 import pl.szczodrzynski.edziennik.datamodels.AppDb;
 import pl.szczodrzynski.edziennik.datamodels.GradeFull;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
-import pl.szczodrzynski.edziennik.models.ItemGradesSubjectModel;
+import pl.szczodrzynski.edziennik.ui.modules.grades.GradesListAdapter;
+import pl.szczodrzynski.edziennik.utils.models.ItemGradesSubjectModel;
 import pl.szczodrzynski.edziennik.utils.Anim;
 import pl.szczodrzynski.edziennik.utils.Colors;
 import pl.szczodrzynski.edziennik.utils.Utils;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterGradesFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/RegisterGradesFragment.java
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterGradesFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/RegisterGradesFragment.java
index 693675d4..f74f8b22 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterGradesFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/RegisterGradesFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.grades;
 
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -23,12 +23,11 @@ import java.util.List;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.adapters.GradesSubjectAdapter;
 import pl.szczodrzynski.edziennik.databinding.FragmentRegisterGradesBinding;
 import pl.szczodrzynski.edziennik.datamodels.Grade;
 import pl.szczodrzynski.edziennik.datamodels.GradeFull;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
-import pl.szczodrzynski.edziennik.models.ItemGradesSubjectModel;
+import pl.szczodrzynski.edziennik.utils.models.ItemGradesSubjectModel;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem;
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem;
@@ -39,9 +38,9 @@ import static pl.szczodrzynski.edziennik.datamodels.Profile.YEAR_1_AVG_2_SEM;
 import static pl.szczodrzynski.edziennik.datamodels.Profile.YEAR_1_SEM_2_AVG;
 import static pl.szczodrzynski.edziennik.datamodels.Profile.YEAR_1_SEM_2_SEM;
 import static pl.szczodrzynski.edziennik.datamodels.Profile.YEAR_ALL_GRADES;
-import static pl.szczodrzynski.edziennik.models.AppConfig.ORDER_BY_DATE_ASC;
-import static pl.szczodrzynski.edziennik.models.AppConfig.ORDER_BY_DATE_DESC;
-import static pl.szczodrzynski.edziennik.models.AppConfig.ORDER_BY_SUBJECT_ASC;
+import static pl.szczodrzynski.edziennik.utils.models.AppConfig.ORDER_BY_DATE_ASC;
+import static pl.szczodrzynski.edziennik.utils.models.AppConfig.ORDER_BY_DATE_DESC;
+import static pl.szczodrzynski.edziennik.utils.models.AppConfig.ORDER_BY_SUBJECT_ASC;
 
 public class RegisterGradesFragment extends Fragment {
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/GradesEditorAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/editor/GradesEditorAdapter.kt
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/adapters/GradesEditorAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/editor/GradesEditorAdapter.kt
index 62701eff..c7553bb7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/GradesEditorAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/editor/GradesEditorAdapter.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.adapters
+package pl.szczodrzynski.edziennik.ui.modules.grades.editor
 
 import android.content.Context
 import android.graphics.PorterDuff
@@ -15,8 +15,7 @@ import com.daimajia.swipe.SwipeLayout
 import com.mikepenz.iconics.view.IconicsImageView
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.fragments.GradesEditorFragment
-import pl.szczodrzynski.edziennik.fragments.GradesEditorFragment.Companion.modifyGradeChooser
+import pl.szczodrzynski.edziennik.ui.modules.grades.editor.GradesEditorFragment.Companion.modifyGradeChooser
 import pl.szczodrzynski.edziennik.utils.Colors.gradeNameToColor
 import java.text.DecimalFormat
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/GradesEditorFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/editor/GradesEditorFragment.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/GradesEditorFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/editor/GradesEditorFragment.kt
index 4d19f06c..2d362f62 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/GradesEditorFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/editor/GradesEditorFragment.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments
+package pl.szczodrzynski.edziennik.ui.modules.grades.editor
 
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
@@ -13,7 +13,6 @@ import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.afollestad.materialdialogs.MaterialDialog
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.adapters.GradesEditorAdapter
 import pl.szczodrzynski.edziennik.databinding.FragmentGradesEditorBinding
 import pl.szczodrzynski.edziennik.datamodels.Grade
 import pl.szczodrzynski.edziennik.datamodels.Profile.Companion.YEAR_1_AVG_2_AVG
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/activities/CounterActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CounterActivity.java
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/activities/CounterActivity.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CounterActivity.java
index 0e11eff0..5c408573 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/activities/CounterActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CounterActivity.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.activities;
+package pl.szczodrzynski.edziennik.ui.modules.home;
 
 import androidx.databinding.DataBindingUtil;
 import android.os.AsyncTask;
@@ -16,11 +16,11 @@ import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.databinding.ActivityCounterBinding;
 import pl.szczodrzynski.edziennik.datamodels.LessonFull;
-import pl.szczodrzynski.edziennik.fragments.HomeFragment;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
-import static pl.szczodrzynski.edziennik.fragments.HomeFragment.updateInterval;
+import static pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment.updateInterval;
 
 public class CounterActivity extends AppCompatActivity {
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/HomeFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.java
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/HomeFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.java
index 1836d5a9..5498305f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/HomeFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.home;
 
 import android.app.Activity;
 import android.content.Context;
@@ -29,7 +29,6 @@ import androidx.databinding.DataBindingUtil;
 import androidx.fragment.app.Fragment;
 
 import com.afollestad.materialdialogs.MaterialDialog;
-import com.google.gson.JsonObject;
 import com.mikepenz.iconics.IconicsColor;
 import com.mikepenz.iconics.IconicsDrawable;
 import com.mikepenz.iconics.IconicsSize;
@@ -42,22 +41,17 @@ import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.BuildConfig;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.api.AppError;
-import pl.szczodrzynski.edziennik.api.interfaces.SyncCallback;
-import pl.szczodrzynski.edziennik.api.v2.librus.Librus;
 import pl.szczodrzynski.edziennik.databinding.CardLuckyNumberBinding;
 import pl.szczodrzynski.edziennik.databinding.CardUpdateBinding;
 import pl.szczodrzynski.edziennik.databinding.FragmentHomeBinding;
 import pl.szczodrzynski.edziennik.datamodels.GradeFull;
 import pl.szczodrzynski.edziennik.datamodels.LessonFull;
-import pl.szczodrzynski.edziennik.datamodels.LoginStore;
 import pl.szczodrzynski.edziennik.datamodels.Profile;
-import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
-import pl.szczodrzynski.edziennik.messages.MessagesComposeActivity;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.ItemGradesSubjectModel;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeActivity;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.ItemGradesSubjectModel;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 import pl.szczodrzynski.edziennik.receivers.BootReceiver;
 import pl.szczodrzynski.edziennik.utils.Colors;
 import pl.szczodrzynski.edziennik.utils.Themes;
@@ -72,7 +66,6 @@ import static pl.szczodrzynski.edziennik.datamodels.Grade.TYPE_SEMESTER2_FINAL;
 import static pl.szczodrzynski.edziennik.datamodels.Grade.TYPE_SEMESTER2_PROPOSED;
 import static pl.szczodrzynski.edziennik.datamodels.Grade.TYPE_YEAR_FINAL;
 import static pl.szczodrzynski.edziennik.datamodels.Grade.TYPE_YEAR_PROPOSED;
-import static pl.szczodrzynski.edziennik.datamodels.LoginStore.LOGIN_TYPE_LIBRUS;
 import static pl.szczodrzynski.edziennik.datamodels.LoginStore.LOGIN_TYPE_MOBIDZIENNIK;
 
 public class HomeFragment extends Fragment {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/HomeTimetableCard.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeTimetableCard.java
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/HomeTimetableCard.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeTimetableCard.java
index 937d3fed..ab75de3d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/HomeTimetableCard.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeTimetableCard.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.home;
 
 import android.content.Intent;
 import android.os.AsyncTask;
@@ -23,17 +23,16 @@ import java.util.TimerTask;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.activities.CounterActivity;
 import pl.szczodrzynski.edziennik.databinding.CardTimetableBinding;
 import pl.szczodrzynski.edziennik.datamodels.EventFull;
 import pl.szczodrzynski.edziennik.datamodels.LessonFull;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 
 import static pl.szczodrzynski.edziennik.datamodels.LessonChange.TYPE_CANCELLED;
 import static pl.szczodrzynski.edziennik.datamodels.LessonChange.TYPE_CHANGE;
-import static pl.szczodrzynski.edziennik.fragments.HomeFragment.updateInterval;
+import static pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment.updateInterval;
 import static pl.szczodrzynski.edziennik.utils.Utils.bs;
 
 public class HomeTimetableCard {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkAdapter.java
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkAdapter.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkAdapter.java
index e59a98ba..547b37f6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkAdapter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkAdapter.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.homework;
+package pl.szczodrzynski.edziennik.ui.modules.homework;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
@@ -18,9 +18,9 @@ import java.util.List;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.datamodels.EventFull;
-import pl.szczodrzynski.edziennik.dialogs.EventManualDialog;
-import pl.szczodrzynski.edziennik.fragments.HomeFragment;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog;
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 import static pl.szczodrzynski.edziennik.utils.Utils.bs;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkDate.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkDate.kt
similarity index 66%
rename from app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkDate.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkDate.kt
index 53773502..d923c5a1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkDate.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkDate.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.homework
+package pl.szczodrzynski.edziennik.ui.modules.homework
 
 class HomeworkDate {
     companion object {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt
index 9f7525c9..171f4bf9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.homework
+package pl.szczodrzynski.edziennik.ui.modules.homework
 
 import android.os.AsyncTask
 import android.os.Bundle
@@ -9,14 +9,13 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.viewpager.widget.ViewPager
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
-import kotlinx.android.synthetic.main.activity_szkolny.*
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.FragmentHomeworkBinding
 import pl.szczodrzynski.edziennik.datamodels.Metadata
-import pl.szczodrzynski.edziennik.dialogs.EventManualDialog
-import pl.szczodrzynski.edziennik.messages.MessagesFragment
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesFragment
 import pl.szczodrzynski.edziennik.utils.Themes
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkListFragment.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkListFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkListFragment.kt
index 2e601755..e0ac9d97 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/homework/HomeworkListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkListFragment.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.homework
+package pl.szczodrzynski.edziennik.ui.modules.homework
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -13,7 +13,7 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.HomeworkListBinding
 import pl.szczodrzynski.edziennik.datamodels.Event
 import pl.szczodrzynski.edziennik.getInt
-import pl.szczodrzynski.edziennik.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.Themes
 
 class HomeworkListFragment : Fragment() {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/intro/ChangelogIntroActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/intro/ChangelogIntroActivity.java
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/intro/ChangelogIntroActivity.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/intro/ChangelogIntroActivity.java
index d8d9441b..eac89b71 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/intro/ChangelogIntroActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/intro/ChangelogIntroActivity.java
@@ -1,10 +1,9 @@
-package pl.szczodrzynski.edziennik.intro;
+package pl.szczodrzynski.edziennik.ui.modules.intro;
 
 import android.os.Build;
 import android.os.Bundle;
 
 import com.heinrichreimersoftware.materialintro.app.IntroActivity;
-import com.heinrichreimersoftware.materialintro.slide.SimpleSlide;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.BuildConfig;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/intro/FragmentSlideMod.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/intro/FragmentSlideMod.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/intro/FragmentSlideMod.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/intro/FragmentSlideMod.java
index e2a0c9ca..1d3cfb92 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/intro/FragmentSlideMod.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/intro/FragmentSlideMod.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package pl.szczodrzynski.edziennik.intro;
+package pl.szczodrzynski.edziennik.ui.modules.intro;
 
 import android.content.Context;
 import android.os.Build;
@@ -284,4 +284,4 @@ public class FragmentSlideMod implements Slide, RestorableSlide, ButtonCtaSlide
             return localInflater.inflate(getArguments().getInt(ARGUMENT_LAYOUT_RES), container, false);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginActivity.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginActivity.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginActivity.java
index c6d49280..b95f5b3a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginActivity.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginChooserFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.java
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginChooserFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.java
index 0e36f157..8615d2aa 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginChooserFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -13,7 +13,7 @@ import androidx.fragment.app.Fragment;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
 import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.activities.FeedbackActivity;
+import pl.szczodrzynski.edziennik.ui.modules.base.FeedbackActivity;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginChooserBinding;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginFinishFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFinishFragment.java
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginFinishFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFinishFragment.java
index 4adfd2b6..a5c9cd47 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginFinishFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFinishFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginIuczniowieFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginIuczniowieFragment.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginIuczniowieFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginIuczniowieFragment.java
index feb1dc0a..484710ea 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginIuczniowieFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginIuczniowieFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.os.Bundle;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginIuczniowieHelpFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginIuczniowieHelpFragment.java
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginIuczniowieHelpFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginIuczniowieHelpFragment.java
index 5de85bd2..7b5c9d96 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginIuczniowieHelpFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginIuczniowieHelpFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginLibrusFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginLibrusFragment.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginLibrusFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginLibrusFragment.java
index cde63c64..cf08423b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginLibrusFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginLibrusFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.os.Bundle;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginLibrusHelpFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginLibrusHelpFragment.java
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginLibrusHelpFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginLibrusHelpFragment.java
index 5dcca8ab..6984498a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginLibrusHelpFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginLibrusHelpFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginMigrationFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMigrationFragment.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginMigrationFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMigrationFragment.java
index 11000498..e5679f59 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginMigrationFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMigrationFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.app.Activity;
 import android.content.Context;
@@ -32,8 +32,8 @@ import pl.szczodrzynski.edziennik.datamodels.Profile;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
 import pl.szczodrzynski.edziennik.datamodels.Teacher;
 import pl.szczodrzynski.edziennik.datamodels.Team;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 import android.util.LongSparseArray;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginMigrationSyncFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMigrationSyncFragment.java
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginMigrationSyncFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMigrationSyncFragment.java
index ebb8edad..fed6e16d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginMigrationSyncFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMigrationSyncFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginMobidziennikFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMobidziennikFragment.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginMobidziennikFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMobidziennikFragment.java
index 549bad84..f5797ac7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginMobidziennikFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMobidziennikFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginMobidziennikHelpFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMobidziennikHelpFragment.java
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginMobidziennikHelpFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMobidziennikHelpFragment.java
index f6ba19ab..511f6682 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginMobidziennikHelpFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMobidziennikHelpFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginProfileObject.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProfileObject.java
similarity index 93%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginProfileObject.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProfileObject.java
index 8bed9821..88fb5d4c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginProfileObject.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProfileObject.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginProgressFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProgressFragment.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginProgressFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProgressFragment.java
index 572cb78d..63a9aea9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginProgressFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProgressFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import androidx.databinding.DataBindingUtil;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginSummaryFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSummaryFragment.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginSummaryFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSummaryFragment.java
index d2e48969..d1e5a57f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginSummaryFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSummaryFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import androidx.databinding.DataBindingUtil;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginSyncErrorFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncErrorFragment.java
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginSyncErrorFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncErrorFragment.java
index 3dc7d1cf..951c53e8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginSyncErrorFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncErrorFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.os.Bundle;
 
@@ -11,7 +11,6 @@ import androidx.navigation.Navigation;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginSyncErrorBinding;
-import pl.szczodrzynski.edziennik.login.LoginActivity;
 
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginSyncFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncFragment.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginSyncFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncFragment.java
index ba0d70d0..9c5ab3f9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginSyncFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 
 import android.content.Context;
@@ -224,4 +224,4 @@ public class LoginSyncFragment extends Fragment {
 
         begin();
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginTemplateFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginTemplateFragment.java
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginTemplateFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginTemplateFragment.java
index 8a2ed9df..41ff3beb 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginTemplateFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginTemplateFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginVulcanFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginVulcanFragment.java
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginVulcanFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginVulcanFragment.java
index 297a0ca8..2c6911c4 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginVulcanFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginVulcanFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.content.Intent;
 import android.graphics.Color;
@@ -36,7 +36,7 @@ import javax.crypto.ShortBufferException;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.activities.QrScannerActivity;
+import pl.szczodrzynski.edziennik.ui.modules.webpush.QrScannerActivity;
 import pl.szczodrzynski.edziennik.api.AppError;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginVulcanBinding;
 import pl.szczodrzynski.edziennik.utils.Utils;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginVulcanHelpFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginVulcanHelpFragment.java
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/login/LoginVulcanHelpFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginVulcanHelpFragment.java
index 9a1875d0..0aa899ae 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/login/LoginVulcanHelpFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginVulcanHelpFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesAdapter.java
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesAdapter.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesAdapter.java
index 33d3e5b7..7a1574bf 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesAdapter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesAdapter.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.messages;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 import android.graphics.Typeface;
 import android.text.Html;
@@ -18,8 +18,7 @@ import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.databinding.MessagesItemBinding;
 import pl.szczodrzynski.edziennik.datamodels.MessageFull;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.utils.Utils;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 import static pl.szczodrzynski.edziennik.datamodels.Message.TYPE_DRAFT;
 import static pl.szczodrzynski.edziennik.datamodels.Message.TYPE_SENT;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesComposeActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeActivity.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesComposeActivity.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeActivity.java
index 767e73de..c496039c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesComposeActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeActivity.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.messages;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 import android.content.Context;
 import android.graphics.Color;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesComposeInfo.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeInfo.java
similarity index 93%
rename from app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesComposeInfo.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeInfo.java
index ad472272..6812e00d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesComposeInfo.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeInfo.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.messages;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 public class MessagesComposeInfo {
     /**
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesComposeSuggestionAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeSuggestionAdapter.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesComposeSuggestionAdapter.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeSuggestionAdapter.java
index 441959fe..525fa9e6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesComposeSuggestionAdapter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeSuggestionAdapter.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.messages;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 import android.content.Context;
 import android.text.Html;
@@ -188,4 +188,4 @@ public class MessagesComposeSuggestionAdapter extends ArrayAdapter<Teacher> {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesDetailsFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesDetailsFragment.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesDetailsFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesDetailsFragment.java
index 1174b654..654e424d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesDetailsFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesDetailsFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.messages;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 import android.content.Context;
 import android.content.Intent;
@@ -60,8 +60,8 @@ import pl.szczodrzynski.edziennik.datamodels.MessageFull;
 import pl.szczodrzynski.edziennik.datamodels.MessageRecipientFull;
 import pl.szczodrzynski.edziennik.datamodels.Profile;
 import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 import pl.szczodrzynski.edziennik.utils.Anim;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.edziennik.utils.Utils;
@@ -673,4 +673,4 @@ public class MessagesDetailsFragment extends Fragment {
                                 .show();
                         b.messageSender.setOnClickListener(onClickListener);
                         b.messageProfileBackground.setOnClickListener(onClickListener);
-                    }*/
\ No newline at end of file
+                    }*/
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesFragment.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesFragment.kt
index bee3ff13..3b130c0b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesFragment.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.messages
+package pl.szczodrzynski.edziennik.ui.modules.messages
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -103,4 +103,4 @@ class MessagesFragment : Fragment() {
             return mFragmentTitleList[position]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesListFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesListFragment.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesListFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesListFragment.java
index 2d4b9b9f..d4216103 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesListFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesListFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.messages;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 
 import android.content.Context;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesUtils.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesUtils.java
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesUtils.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesUtils.java
index d7c97888..8c3d1c1e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/messages/MessagesUtils.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesUtils.java
@@ -1,11 +1,9 @@
-package pl.szczodrzynski.edziennik.messages;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
-import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.RectF;
-import android.graphics.drawable.Drawable;
 
 import androidx.core.graphics.ColorUtils;
 import pl.szczodrzynski.edziennik.App;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterMessagesWebFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/RegisterMessagesWebFragment.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterMessagesWebFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/RegisterMessagesWebFragment.java
index 9c168eaf..aeda8455 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterMessagesWebFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/RegisterMessagesWebFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/messages/SlideExplode.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/SlideExplode.java
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/messages/SlideExplode.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/SlideExplode.java
index bac1d687..6161b6dd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/messages/SlideExplode.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/SlideExplode.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.messages;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/messages/Transitions.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/Transitions.java
similarity index 89%
rename from app/src/main/java/pl/szczodrzynski/edziennik/messages/Transitions.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/Transitions.java
index 67b3a5b3..4e6f38a2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/messages/Transitions.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/Transitions.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.messages;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 import android.animation.TimeInterpolator;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/NoticesAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notices/NoticesAdapter.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/adapters/NoticesAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notices/NoticesAdapter.kt
index ef8f1328..2d4daaa3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/NoticesAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notices/NoticesAdapter.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.adapters
+package pl.szczodrzynski.edziennik.ui.modules.notices
 
 import android.content.Context
 import android.graphics.PorterDuff
@@ -20,7 +20,7 @@ import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.datamodels.Notice
 import pl.szczodrzynski.edziennik.datamodels.NoticeFull
-import pl.szczodrzynski.edziennik.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Date
 
 import pl.szczodrzynski.edziennik.datamodels.LoginStore.LOGIN_TYPE_MOBIDZIENNIK
 import pl.szczodrzynski.edziennik.utils.Utils.bs
@@ -88,4 +88,4 @@ class NoticesAdapter//getting the context and product list with constructor
         var noticesItemTeacherName: TextView = itemView.findViewById(R.id.noticesItemTeacherName)
         var noticesItemAddedDate: TextView = itemView.findViewById(R.id.noticesItemAddedDate)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterNoticesFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notices/RegisterNoticesFragment.java
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterNoticesFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notices/RegisterNoticesFragment.java
index fc495bbd..02dbbd2f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterNoticesFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notices/RegisterNoticesFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.notices;
 
 import android.graphics.Color;
 import android.os.AsyncTask;
@@ -25,7 +25,6 @@ import com.mikepenz.iconics.typeface.library.community.material.CommunityMateria
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.adapters.NoticesAdapter;
 import pl.szczodrzynski.edziennik.databinding.FragmentRegisterNoticesBinding;
 import pl.szczodrzynski.edziennik.datamodels.Notice;
 import pl.szczodrzynski.edziennik.datamodels.NoticeFull;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/NotificationsAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsAdapter.java
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/adapters/NotificationsAdapter.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsAdapter.java
index 8ec253b0..f54810b9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/NotificationsAdapter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsAdapter.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.adapters;
+package pl.szczodrzynski.edziennik.ui.modules.notifications;
 
 import android.app.Activity;
 import android.content.Context;
@@ -19,8 +19,8 @@ import java.util.List;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Notification;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Notification;
 
 import static pl.szczodrzynski.edziennik.utils.Utils.d;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterNotificationsFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/RegisterNotificationsFragment.java
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterNotificationsFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/RegisterNotificationsFragment.java
index 7b96196c..44c7e8d0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterNotificationsFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/RegisterNotificationsFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.notifications;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -14,7 +14,6 @@ import android.view.ViewGroup;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.adapters.NotificationsAdapter;
 import pl.szczodrzynski.edziennik.databinding.FragmentRegisterNotificationsBinding;
 import pl.szczodrzynski.edziennik.utils.Themes;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/ProfileManagerFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/ProfileManagerFragment.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/ProfileManagerFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/ProfileManagerFragment.kt
index 43dc77a2..06952328 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/ProfileManagerFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/ProfileManagerFragment.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments
+package pl.szczodrzynski.edziennik.ui.modules.settings
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/activities/SettingsLicenseActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsLicenseActivity.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/activities/SettingsLicenseActivity.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsLicenseActivity.kt
index 32b40443..31933c4d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/activities/SettingsLicenseActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsLicenseActivity.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.activities
+package pl.szczodrzynski.edziennik.ui.modules.settings
 
 import android.content.Context
 import android.net.Uri
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/SettingsNewFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/SettingsNewFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java
index bde0ecd7..9883f7ac 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/SettingsNewFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.settings;
 
 import android.app.Activity;
 import android.content.Context;
@@ -45,15 +45,15 @@ import pl.szczodrzynski.edziennik.BuildConfig;
 import pl.szczodrzynski.edziennik.Notifier;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.activities.SettingsLicenseActivity;
-import pl.szczodrzynski.edziennik.activities.WebPushConfigActivity;
-import pl.szczodrzynski.edziennik.dialogs.ChangelogDialog;
-import pl.szczodrzynski.edziennik.models.Endpoint;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.ui.modules.webpush.WebPushConfigActivity;
+import pl.szczodrzynski.edziennik.ui.dialogs.changelog.ChangelogDialog;
+import pl.szczodrzynski.edziennik.utils.models.Endpoint;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 import pl.szczodrzynski.edziennik.network.NetworkUtils;
 import pl.szczodrzynski.edziennik.network.ServerRequest;
 import pl.szczodrzynski.edziennik.receivers.BootReceiver;
 import pl.szczodrzynski.edziennik.sync.SyncJob;
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.edziennik.utils.Utils;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterTimetableDayFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/RegisterTimetableDayFragment.java
similarity index 94%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterTimetableDayFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/RegisterTimetableDayFragment.java
index 93f47d7d..ae04e29b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterTimetableDayFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/RegisterTimetableDayFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.timetable;
 
 import android.os.Bundle;
 import androidx.annotation.NonNull;
@@ -17,10 +17,9 @@ import java.util.ArrayList;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.adapters.TimetableAdapter;
 import pl.szczodrzynski.edziennik.databinding.FragmentRegisterTimetableDayBinding;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 import pl.szczodrzynski.edziennik.utils.Themes;
 
 public class RegisterTimetableDayFragment extends Fragment {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterTimetableFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/RegisterTimetableFragment.java
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterTimetableFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/RegisterTimetableFragment.java
index bf7a9229..01efce47 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/fragments/RegisterTimetableFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/RegisterTimetableFragment.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.timetable;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -51,10 +51,11 @@ import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
 import pl.szczodrzynski.edziennik.databinding.FragmentRegisterTimetableBinding;
 import pl.szczodrzynski.edziennik.datamodels.LessonFull;
-import pl.szczodrzynski.edziennik.dialogs.EventManualDialog;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog;
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 import pl.szczodrzynski.edziennik.utils.SpannableHtmlTagHandler;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.edziennik.utils.Utils;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/TimetableAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableAdapter.java
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/adapters/TimetableAdapter.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableAdapter.java
index d056c26c..bb29cd46 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/adapters/TimetableAdapter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableAdapter.java
@@ -1,7 +1,6 @@
-package pl.szczodrzynski.edziennik.adapters;
+package pl.szczodrzynski.edziennik.ui.modules.timetable;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.Typeface;
@@ -28,8 +27,8 @@ import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.datamodels.EventFull;
 import pl.szczodrzynski.edziennik.datamodels.LessonChange;
 import pl.szczodrzynski.edziennik.datamodels.LessonFull;
-import pl.szczodrzynski.edziennik.dialogs.EventListDialog;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventListDialog;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 import pl.szczodrzynski.edziennik.utils.SpannableHtmlTagHandler;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.edziennik.utils.Utils;
@@ -199,4 +198,4 @@ public class TimetableAdapter extends RecyclerView.Adapter<TimetableAdapter.View
             timetableItemEvent3 = itemView.findViewById(R.id.timetableItemEvent3);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/activities/QrScannerActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/webpush/QrScannerActivity.java
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/activities/QrScannerActivity.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/webpush/QrScannerActivity.java
index bd91328c..b9028ac5 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/activities/QrScannerActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/webpush/QrScannerActivity.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.activities;
+package pl.szczodrzynski.edziennik.ui.modules.webpush;
 
 import android.Manifest;
 import android.content.pm.PackageManager;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/activities/WebPushConfigActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/webpush/WebPushConfigActivity.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/activities/WebPushConfigActivity.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/webpush/WebPushConfigActivity.java
index 916416e0..006551c2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/activities/WebPushConfigActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/webpush/WebPushConfigActivity.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.activities;
+package pl.szczodrzynski.edziennik.ui.modules.webpush;
 
 import android.Manifest;
 import android.content.pm.PackageManager;
@@ -296,4 +296,4 @@ public class WebPushConfigActivity extends AppCompatActivity implements ZXingSca
         }
         super.onBackPressed();
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/models/AppConfig.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/AppConfig.java
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/models/AppConfig.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/utils/models/AppConfig.java
index 89335486..473e8a9e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/models/AppConfig.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/AppConfig.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.models;
+package pl.szczodrzynski.edziennik.utils.models;
 
 import android.util.Pair;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/models/Date.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/models/Date.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java
index 1c609f2b..3b69cdc9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/models/Date.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.models;
+package pl.szczodrzynski.edziennik.utils.models;
 
 import androidx.annotation.NonNull;
 
@@ -222,4 +222,4 @@ public class Date implements Comparable<Date> {
                 ", day=" + day +
                 '}';
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/models/Endpoint.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Endpoint.java
similarity index 90%
rename from app/src/main/java/pl/szczodrzynski/edziennik/models/Endpoint.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Endpoint.java
index 56b4f239..79bfaacf 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/models/Endpoint.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Endpoint.java
@@ -1,6 +1,4 @@
-package pl.szczodrzynski.edziennik.models;
-
-import androidx.annotation.StringRes;
+package pl.szczodrzynski.edziennik.utils.models;
 
 import java.util.List;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/models/ItemGradesSubjectModel.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/ItemGradesSubjectModel.java
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/models/ItemGradesSubjectModel.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/utils/models/ItemGradesSubjectModel.java
index 48f04b27..abcf6f06 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/models/ItemGradesSubjectModel.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/ItemGradesSubjectModel.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.models;
+package pl.szczodrzynski.edziennik.utils.models;
 
 import java.util.List;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/models/ItemTimetableModel.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/ItemTimetableModel.java
similarity index 90%
rename from app/src/main/java/pl/szczodrzynski/edziennik/models/ItemTimetableModel.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/utils/models/ItemTimetableModel.java
index 515f6dc0..24197cbf 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/models/ItemTimetableModel.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/ItemTimetableModel.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.models;
+package pl.szczodrzynski.edziennik.utils.models;
 
 import java.util.List;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/models/ItemWidgetTimetableModel.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/ItemWidgetTimetableModel.java
similarity index 94%
rename from app/src/main/java/pl/szczodrzynski/edziennik/models/ItemWidgetTimetableModel.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/utils/models/ItemWidgetTimetableModel.java
index 15f09f08..479845da 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/models/ItemWidgetTimetableModel.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/ItemWidgetTimetableModel.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.models;
+package pl.szczodrzynski.edziennik.utils.models;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/models/NavTarget.kt b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/NavTarget.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/models/NavTarget.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/utils/models/NavTarget.kt
index 38389c83..5e707993 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/models/NavTarget.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/NavTarget.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.models
+package pl.szczodrzynski.edziennik.utils.models
 
 import androidx.fragment.app.Fragment
 import com.mikepenz.iconics.typeface.IIcon
@@ -88,4 +88,4 @@ data class NavTarget(
         this.subItems = items
         return this
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/models/Notification.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Notification.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/models/Notification.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Notification.java
index 6d420358..047cd16f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/models/Notification.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Notification.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.models;
+package pl.szczodrzynski.edziennik.utils.models;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/models/Time.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Time.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/models/Time.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Time.java
index f990df1a..12277516 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/models/Time.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Time.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.models;
+package pl.szczodrzynski.edziennik.utils.models;
 
 import java.util.Calendar;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/models/Week.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Week.java
similarity index 76%
rename from app/src/main/java/pl/szczodrzynski/edziennik/models/Week.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Week.java
index 33a5866b..309466c8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/models/Week.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Week.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.models;
+package pl.szczodrzynski.edziennik.utils.models;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -15,7 +15,7 @@ public class Week {
     public static int SATURDAY = 5;
     public static int SUNDAY = 6;
 
-    public static pl.szczodrzynski.edziennik.models.Date getNearestWeekDayDate(int day)
+    public static pl.szczodrzynski.edziennik.utils.models.Date getNearestWeekDayDate(int day)
     {
         Calendar c = Calendar.getInstance();
         int dayDiff = day - getTodayWeekDay();
@@ -23,21 +23,21 @@ public class Week {
             dayDiff = 7 + dayDiff;
         }
         c.setTimeInMillis(c.getTimeInMillis() + (dayDiff * 24 * 60 * 60 * 1000));
-        return new pl.szczodrzynski.edziennik.models.Date(c.get(Calendar.YEAR), c.get(Calendar.MONTH)+1, c.get(Calendar.DAY_OF_MONTH));
+        return new pl.szczodrzynski.edziennik.utils.models.Date(c.get(Calendar.YEAR), c.get(Calendar.MONTH)+1, c.get(Calendar.DAY_OF_MONTH));
     }
 
-    public static pl.szczodrzynski.edziennik.models.Date getWeekStart() {
-        pl.szczodrzynski.edziennik.models.Date date = pl.szczodrzynski.edziennik.models.Date.getToday();
+    public static pl.szczodrzynski.edziennik.utils.models.Date getWeekStart() {
+        pl.szczodrzynski.edziennik.utils.models.Date date = pl.szczodrzynski.edziennik.utils.models.Date.getToday();
         date.stepForward(0, 0, -date.getWeekDay());
         return date;
     }
-    public static pl.szczodrzynski.edziennik.models.Date getWeekEnd() {
-        pl.szczodrzynski.edziennik.models.Date date = pl.szczodrzynski.edziennik.models.Date.getToday();
+    public static pl.szczodrzynski.edziennik.utils.models.Date getWeekEnd() {
+        pl.szczodrzynski.edziennik.utils.models.Date date = pl.szczodrzynski.edziennik.utils.models.Date.getToday();
         date.stepForward(0, 0, 6-date.getWeekDay());
         return date;
     }
 
-    public static int getWeekDayFromDate(pl.szczodrzynski.edziennik.models.Date date)
+    public static int getWeekDayFromDate(pl.szczodrzynski.edziennik.utils.models.Date date)
     {
         Calendar c = Calendar.getInstance();
         c.set(date.year, date.month - 1, date.day);
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/models/db/LessonChangeCounter.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/db/LessonChangeCounter.java
similarity index 55%
rename from app/src/main/java/pl/szczodrzynski/edziennik/models/db/LessonChangeCounter.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/utils/models/db/LessonChangeCounter.java
index b98869c3..2ebf319a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/models/db/LessonChangeCounter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/db/LessonChangeCounter.java
@@ -1,6 +1,6 @@
-package pl.szczodrzynski.edziennik.models.db;
+package pl.szczodrzynski.edziennik.utils.models.db;
 
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 public class LessonChangeCounter {
     public int profileId;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/models/db/UnreadCounter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/db/UnreadCounter.kt
similarity index 86%
rename from app/src/main/java/pl/szczodrzynski/edziennik/models/db/UnreadCounter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/utils/models/db/UnreadCounter.kt
index 04530296..7e05bc2b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/models/db/UnreadCounter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/db/UnreadCounter.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.models.db
+package pl.szczodrzynski.edziennik.utils.models.db
 
 import pl.szczodrzynski.navlib.drawer.IUnreadCounter
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/WidgetConfigActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/WidgetConfigActivity.java
index 9649cc0b..5e466f19 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/WidgetConfigActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/WidgetConfigActivity.java
@@ -3,22 +3,15 @@ package pl.szczodrzynski.edziennik.widgets;
 import android.app.Activity;
 import android.app.WallpaperManager;
 import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
 import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.ColorDrawable;
-import android.media.ThumbnailUtils;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.widget.SeekBar;
 
-import androidx.core.graphics.drawable.RoundedBitmapDrawable;
-import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
-
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.simplelist.MaterialSimpleListAdapter;
 import com.afollestad.materialdialogs.simplelist.MaterialSimpleListItem;
@@ -34,7 +27,6 @@ import pl.szczodrzynski.edziennik.widgets.luckynumber.WidgetLuckyNumber;
 import pl.szczodrzynski.edziennik.widgets.notifications.WidgetNotifications;
 
 import static pl.szczodrzynski.edziennik.ExtensionsKt.filterOutArchived;
-import static pl.szczodrzynski.edziennik.utils.Utils.d;
 
 public class WidgetConfigActivity extends Activity {
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/luckynumber/WidgetLuckyNumber.java b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/luckynumber/WidgetLuckyNumber.java
index 7c2b847c..02ea44a7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/luckynumber/WidgetLuckyNumber.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/luckynumber/WidgetLuckyNumber.java
@@ -25,7 +25,7 @@ import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
 import pl.szczodrzynski.edziennik.datamodels.Profile;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 import pl.szczodrzynski.edziennik.sync.SyncJob;
 import pl.szczodrzynski.edziennik.widgets.WidgetConfig;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/notifications/WidgetNotificationsListProvider.java b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/notifications/WidgetNotificationsListProvider.java
index ff655dca..b3da2ee6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/notifications/WidgetNotificationsListProvider.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/notifications/WidgetNotificationsListProvider.java
@@ -7,13 +7,10 @@ import android.util.Log;
 import android.widget.RemoteViews;
 import android.widget.RemoteViewsService;
 
-import java.util.List;
-
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.ItemWidgetTimetableModel;
-import pl.szczodrzynski.edziennik.models.Notification;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Notification;
 
 public class WidgetNotificationsListProvider implements RemoteViewsService.RemoteViewsFactory {
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/LessonDetailsActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/LessonDetailsActivity.java
index 12f7c157..7be441e6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/LessonDetailsActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/LessonDetailsActivity.java
@@ -14,9 +14,9 @@ import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
 import pl.szczodrzynski.edziennik.WidgetTimetable;
-import pl.szczodrzynski.edziennik.dialogs.EventListDialog;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventListDialog;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 import pl.szczodrzynski.edziennik.utils.Themes;
 
 import static android.content.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT;
@@ -68,4 +68,4 @@ public class LessonDetailsActivity extends AppCompatActivity {
         Toast.makeText(app, R.string.error_reading_lesson_details, Toast.LENGTH_SHORT).show();
         finish();
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/WidgetTimetableListProvider.java b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/WidgetTimetableListProvider.java
index 01e3475f..2872c15f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/WidgetTimetableListProvider.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/WidgetTimetableListProvider.java
@@ -28,9 +28,9 @@ import java.util.List;
 
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.WidgetTimetable;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.ItemWidgetTimetableModel;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.ItemWidgetTimetableModel;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 public class WidgetTimetableListProvider implements RemoteViewsService.RemoteViewsFactory {
 
@@ -308,4 +308,4 @@ public class WidgetTimetableListProvider implements RemoteViewsService.RemoteVie
     public boolean hasStableIds() {
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/WidgetTimetableService.java b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/WidgetTimetableService.java
index eedc3f5b..594fe591 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/WidgetTimetableService.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/WidgetTimetableService.java
@@ -3,8 +3,6 @@ package pl.szczodrzynski.edziennik.widgets.timetable;
 import android.content.Intent;
 import android.widget.RemoteViewsService;
 
-import pl.szczodrzynski.edziennik.widgets.timetable.WidgetTimetableListProvider;
-
 public class WidgetTimetableService extends RemoteViewsService {
     /*
      * So pretty simple just defining the Adapter of the listview
@@ -16,4 +14,4 @@ public class WidgetTimetableService extends RemoteViewsService {
         return (new WidgetTimetableListProvider(this.getApplicationContext(), intent));
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/activity_feedback.xml b/app/src/main/res/layout/activity_feedback.xml
index 59860d56..491780d5 100644
--- a/app/src/main/res/layout/activity_feedback.xml
+++ b/app/src/main/res/layout/activity_feedback.xml
@@ -7,7 +7,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        tools:context=".activities.FeedbackActivity">
+        tools:context=".ui.modules.base.FeedbackActivity">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
@@ -147,4 +147,4 @@
         </LinearLayout>
 
     </LinearLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/dialog_grade_details.xml b/app/src/main/res/layout/dialog_grade_details.xml
index d875abd5..691ca1ff 100644
--- a/app/src/main/res/layout/dialog_grade_details.xml
+++ b/app/src/main/res/layout/dialog_grade_details.xml
@@ -5,8 +5,8 @@
     <data>
         <import type="android.view.View"/>
         <import type="pl.szczodrzynski.edziennik.utils.Utils"/>
-        <import type="pl.szczodrzynski.edziennik.models.Date"/>
-        <import type="pl.szczodrzynski.edziennik.models.Time"/>
+        <import type="pl.szczodrzynski.edziennik.utils.models.Date"/>
+        <import type="pl.szczodrzynski.edziennik.utils.models.Time"/>
         <variable
             name="grade"
             type="pl.szczodrzynski.edziennik.datamodels.GradeFull" />
diff --git a/app/src/main/res/layout/fragment_debug.xml b/app/src/main/res/layout/fragment_debug.xml
index 2608ac75..6dd2413c 100644
--- a/app/src/main/res/layout/fragment_debug.xml
+++ b/app/src/main/res/layout/fragment_debug.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".fragments.DebugFragment">
+    tools:context=".ui.modules.base.DebugFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 768c0861..b2df5150 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -16,7 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            tools:context=".fragments.HomeFragment">
+            tools:context=".ui.modules.home.HomeFragment">
 
             <LinearLayout
                 android:id="@+id/cardInsertPoint"
@@ -61,4 +61,4 @@
         </LinearLayout>
     </ScrollView>
     </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/messages_compose_activity.xml b/app/src/main/res/layout/messages_compose_activity.xml
index d826b83b..ce5cb2e3 100644
--- a/app/src/main/res/layout/messages_compose_activity.xml
+++ b/app/src/main/res/layout/messages_compose_activity.xml
@@ -6,7 +6,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        tools:context=".messages.MessagesComposeActivity">
+        tools:context=".ui.modules.messages.MessagesComposeActivity">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
@@ -67,4 +67,4 @@
         </FrameLayout>
 
     </LinearLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/navigation/nav_login.xml b/app/src/main/res/navigation/nav_login.xml
index 9c2b1bba..825b646f 100644
--- a/app/src/main/res/navigation/nav_login.xml
+++ b/app/src/main/res/navigation/nav_login.xml
@@ -6,7 +6,7 @@
 
     <fragment
         android:id="@+id/loginChooserFragment"
-        android:name="pl.szczodrzynski.edziennik.login.LoginChooserFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginChooserFragment"
         android:label="fragment_login_type"
         tools:layout="@layout/fragment_login_chooser" >
         <action
@@ -27,7 +27,7 @@
     </fragment>
     <fragment
         android:id="@+id/loginMobidziennikFragment"
-        android:name="pl.szczodrzynski.edziennik.login.LoginMobidziennikFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginMobidziennikFragment"
         android:label="fragment_login_mobidziennik"
         tools:layout="@layout/fragment_login_mobidziennik" >
         <action
@@ -39,7 +39,7 @@
     </fragment>
     <fragment
         android:id="@+id/loginLibrusFragment"
-        android:name="pl.szczodrzynski.edziennik.login.LoginLibrusFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginLibrusFragment"
         android:label="fragment_login_librus"
         tools:layout="@layout/fragment_login_librus" >
         <action
@@ -51,7 +51,7 @@
     </fragment>
     <fragment
         android:id="@+id/loginProgressFragment"
-        android:name="pl.szczodrzynski.edziennik.login.LoginProgressFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginProgressFragment"
         android:label="fragment_login_progress"
         tools:layout="@layout/fragment_login_progress" >
         <action
@@ -60,17 +60,17 @@
     </fragment>
     <fragment
         android:id="@+id/loginMobidziennikHelpFragment"
-        android:name="pl.szczodrzynski.edziennik.login.LoginMobidziennikHelpFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginMobidziennikHelpFragment"
         android:label="fragment_login_mobidziennik_help"
         tools:layout="@layout/fragment_login_mobidziennik_help" />
     <fragment
         android:id="@+id/loginLibrusHelpFragment"
-        android:name="pl.szczodrzynski.edziennik.login.LoginLibrusHelpFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginLibrusHelpFragment"
         android:label="fragment_login_librus_help"
         tools:layout="@layout/fragment_login_librus_help" />
     <fragment
         android:id="@+id/loginSummaryFragment"
-        android:name="pl.szczodrzynski.edziennik.login.LoginSummaryFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginSummaryFragment"
         android:label="fragment_login_summary"
         tools:layout="@layout/fragment_login_summary" >
         <action
@@ -82,7 +82,7 @@
     </fragment>
     <fragment
         android:id="@+id/loginSyncFragment"
-        android:name="pl.szczodrzynski.edziennik.login.LoginSyncFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginSyncFragment"
         android:label="fragment_login_sync"
         tools:layout="@layout/fragment_login_sync" >
         <action
@@ -94,7 +94,7 @@
     </fragment>
     <fragment
         android:id="@+id/loginIuczniowieFragment"
-        android:name="pl.szczodrzynski.edziennik.login.LoginIuczniowieFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginIuczniowieFragment"
         android:label="fragment_login_iuczniowie"
         tools:layout="@layout/fragment_login_iuczniowie" >
         <action
@@ -106,7 +106,7 @@
     </fragment>
     <fragment
         android:id="@+id/loginVulcanFragment"
-        android:name="pl.szczodrzynski.edziennik.login.LoginVulcanFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginVulcanFragment"
         android:label="fragment_login_vulcan"
         tools:layout="@layout/fragment_login_vulcan" >
         <action
@@ -118,22 +118,22 @@
     </fragment>
     <fragment
         android:id="@+id/loginVulcanHelpFragment"
-        android:name="pl.szczodrzynski.edziennik.login.LoginVulcanHelpFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginVulcanHelpFragment"
         android:label="fragment_login_vulcan_help"
         tools:layout="@layout/fragment_login_vulcan_help" />
     <fragment
         android:id="@+id/loginIuczniowieHelpFragment"
-        android:name="pl.szczodrzynski.edziennik.login.LoginIuczniowieHelpFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginIuczniowieHelpFragment"
         android:label="fragment_login_iuczniowie_help"
         tools:layout="@layout/fragment_login_iuczniowie_help" />
     <fragment
         android:id="@+id/loginFinishFragment"
-        android:name="pl.szczodrzynski.edziennik.login.LoginFinishFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginFinishFragment"
         android:label="fragment_login_finish"
         tools:layout="@layout/fragment_login_finish" />
     <fragment
         android:id="@+id/loginMigrationFragment"
-        android:name="pl.szczodrzynski.edziennik.login.LoginMigrationFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginMigrationFragment"
         android:label="fragment_login_migration"
         tools:layout="@layout/fragment_login_migration" >
         <action
@@ -142,16 +142,16 @@
     </fragment>
     <fragment
         android:id="@+id/loginMigrationSyncFragment"
-        android:name="pl.szczodrzynski.edziennik.login.LoginMigrationSyncFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginMigrationSyncFragment"
         android:label="fragment_login_migration_sync"
         tools:layout="@layout/fragment_login_migration_sync" />
     <fragment
         android:id="@+id/loginSyncErrorFragment"
-        android:name="pl.szczodrzynski.edziennik.login.LoginSyncErrorFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginSyncErrorFragment"
         android:label="fragment_login_sync_error"
         tools:layout="@layout/fragment_login_sync_error" >
         <action
             android:id="@+id/action_loginSyncErrorFragment_to_loginFinishFragment"
             app:destination="@id/loginFinishFragment" />
     </fragment>
-</navigation>
\ No newline at end of file
+</navigation>
diff --git a/app/src/main/res/xml/widget_lucky_number_info.xml b/app/src/main/res/xml/widget_lucky_number_info.xml
index e768ceaa..18721b35 100644
--- a/app/src/main/res/xml/widget_lucky_number_info.xml
+++ b/app/src/main/res/xml/widget_lucky_number_info.xml
@@ -12,4 +12,4 @@
     android:updatePeriodMillis="1800000"
     android:widgetCategory="home_screen"
     android:configure="pl.szczodrzynski.edziennik.widgets.WidgetConfigActivity"
-    tools:ignore="UnusedAttribute" />
\ No newline at end of file
+    tools:ignore="UnusedAttribute" />
diff --git a/app/src/main/res/xml/widget_notifications_info.xml b/app/src/main/res/xml/widget_notifications_info.xml
index b4931451..e15ea4b9 100644
--- a/app/src/main/res/xml/widget_notifications_info.xml
+++ b/app/src/main/res/xml/widget_notifications_info.xml
@@ -12,4 +12,4 @@
     android:updatePeriodMillis="5400000"
     android:widgetCategory="home_screen"
     android:configure="pl.szczodrzynski.edziennik.widgets.WidgetConfigActivity"
-    tools:ignore="UnusedAttribute" />
\ No newline at end of file
+    tools:ignore="UnusedAttribute" />
diff --git a/app/src/main/res/xml/widget_timetable_info.xml b/app/src/main/res/xml/widget_timetable_info.xml
index e8b8dadb..a549737f 100644
--- a/app/src/main/res/xml/widget_timetable_info.xml
+++ b/app/src/main/res/xml/widget_timetable_info.xml
@@ -12,4 +12,4 @@
     android:updatePeriodMillis="1800000"
     android:widgetCategory="home_screen"
     android:configure="pl.szczodrzynski.edziennik.widgets.WidgetConfigActivity"
-    tools:ignore="UnusedAttribute" />
\ No newline at end of file
+    tools:ignore="UnusedAttribute" />