From f1e58db151a35444aad20f84ae8c1624670a8386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= <kuba@szczodrzynski.pl>
Date: Sun, 17 Oct 2021 21:02:35 +0200
Subject: [PATCH] [Refactor] Flatten .ui package.

---
 app/proguard-rules.pro                        |  4 +-
 app/src/main/AndroidManifest.xml              | 16 ++---
 .../java/pl/szczodrzynski/edziennik/App.kt    |  2 +-
 .../{ui/dialogs => }/DialogExtensions.kt      |  3 +-
 .../szczodrzynski/edziennik/MainActivity.kt   | 58 +++++++++----------
 .../edziennik/MainActivityRequestHandler.kt   |  2 +-
 .../edziennik/config/ProfileConfigUI.kt       |  2 +-
 .../edziennik/config/utils/ConfigGsonUtils.kt |  4 +-
 .../edziennik/data/api/szkolny/SzkolnyApi.kt  |  6 +-
 .../data/api/szkolny/SzkolnyService.kt        |  2 +-
 .../edziennik/data/db/full/EventFull.kt       |  2 +-
 .../edziennik/data/db/full/MessageFull.kt     |  2 +-
 .../ui/{modules => }/agenda/AgendaFragment.kt |  7 +--
 .../agenda/AgendaFragmentDefault.kt           | 27 +++++----
 .../ui/{modules => }/agenda/BaseEvent.kt      |  2 +-
 .../ui/{dialogs/day => agenda}/DayDialog.kt   | 22 +++----
 .../{modules => }/agenda/event/AgendaEvent.kt |  4 +-
 .../agenda/event/AgendaEventGroup.kt          |  4 +-
 .../agenda/event/AgendaEventGroupRenderer.kt  |  2 +-
 .../agenda/event/AgendaEventRenderer.kt       |  2 +-
 .../lessonchanges/LessonChangesAdapter.kt}    |  6 +-
 .../lessonchanges/LessonChangesDialog.kt}     |  8 +--
 .../lessonchanges/LessonChangesEvent.kt       |  4 +-
 .../LessonChangesEventRenderer.kt             |  2 +-
 .../teacherabsence/TeacherAbsenceAdapter.kt   |  2 +-
 .../teacherabsence/TeacherAbsenceDialog.kt    |  2 +-
 .../teacherabsence/TeacherAbsenceEvent.kt     |  4 +-
 .../TeacherAbsenceEventRenderer.kt            |  2 +-
 .../announcements/AnnouncementsAdapter.java   |  4 +-
 .../announcements/AnnouncementsFragment.java  | 10 ++--
 .../attendance/AttendanceAdapter.kt           | 10 ++--
 .../{modules => }/attendance/AttendanceBar.kt |  2 +-
 .../attendance/AttendanceDetailsDialog.kt     |  2 +-
 .../attendance/AttendanceFragment.kt          |  4 +-
 .../attendance/AttendanceListFragment.kt      | 12 ++--
 .../attendance/AttendanceSummaryFragment.kt   | 10 ++--
 .../attendance/AttendanceView.kt              |  2 +-
 .../attendance/models/AttendanceCount.kt      |  2 +-
 .../attendance/models/AttendanceDayRange.kt   |  4 +-
 .../attendance/models/AttendanceEmpty.kt      |  2 +-
 .../attendance/models/AttendanceMonth.kt      |  4 +-
 .../attendance/models/AttendanceSubject.kt    |  4 +-
 .../attendance/models/AttendanceTypeGroup.kt  |  4 +-
 .../viewholder/AttendanceViewHolder.kt        | 12 ++--
 .../viewholder/DayRangeViewHolder.kt          | 12 ++--
 .../attendance/viewholder/EmptyViewHolder.kt  |  8 +--
 .../attendance/viewholder/MonthViewHolder.kt  | 12 ++--
 .../viewholder/SubjectViewHolder.kt           | 10 ++--
 .../attendance/viewholder/TypeViewHolder.kt   |  8 +--
 .../base/BuildInvalidActivity.kt              |  2 +-
 .../ui/{modules => }/base/CrashActivity.kt    |  2 +-
 .../ui/{modules => }/base/MainSnackbar.kt     |  2 +-
 .../lazypager/FragmentLazyPagerAdapter.kt     |  2 +-
 .../base/lazypager/LazyFragment.kt            |  2 +-
 .../base/lazypager/LazyPagerAdapter.kt        |  2 +-
 .../base/lazypager/LazyViewPager.kt           |  2 +-
 .../behaviour/BehaviourFragment.java          |  8 +--
 .../{modules => }/behaviour/NoticesAdapter.kt |  2 +-
 .../captcha/LibrusCaptchaDialog.kt            |  2 +-
 .../{dialogs => }/captcha/RecaptchaDialog.kt  |  2 +-
 .../ui/{modules => }/debug/DebugFragment.java |  2 +-
 .../ui/{modules => }/debug/LabFragment.kt     |  4 +-
 .../ui/{modules => }/debug/LabJsonAdapter.kt  | 20 +++----
 .../ui/{modules => }/debug/LabPageFragment.kt |  6 +-
 .../{modules => }/debug/LabProfileFragment.kt |  5 +-
 .../debug/models/LabJsonArray.kt              |  4 +-
 .../debug/models/LabJsonElement.kt            |  2 +-
 .../debug/models/LabJsonObject.kt             |  4 +-
 .../debug/viewholder/JsonArrayViewHolder.kt   | 10 ++--
 .../debug/viewholder/JsonElementViewHolder.kt |  8 +--
 .../debug/viewholder/JsonObjectViewHolder.kt  | 10 ++--
 .../viewholder/JsonSubObjectViewHolder.kt     | 10 ++--
 .../ui/dialogs/{bell => }/BellSyncDialog.kt   |  2 +-
 .../{bell => }/BellSyncTimeChooseDialog.kt    |  2 +-
 .../{changelog => }/ChangelogDialog.kt        |  2 +-
 .../{profile => }/ProfileRemoveDialog.kt      |  2 +-
 .../AgendaConfigDialog.kt                     |  3 +-
 .../settings/AttendanceConfigDialog.kt        |  2 +-
 .../BellSyncConfigDialog.kt                   |  2 +-
 .../{grade => settings}/GradesConfigDialog.kt |  2 +-
 .../{ => settings}/MessagesConfigDialog.kt    |  2 +-
 .../NotificationFilterDialog.kt               |  2 +-
 .../ProfileConfigDialog.kt                    |  3 +-
 .../QuietHoursConfigDialog.kt                 |  2 +-
 .../RegistrationConfigDialog.kt               |  2 +-
 .../{home => settings}/StudentNumberDialog.kt |  4 +-
 .../{sync => settings}/SyncIntervalDialog.kt  |  2 +-
 .../{ => sync}/RegisterUnavailableDialog.kt   |  2 +-
 .../dialogs/{ => sync}/ServerMessageDialog.kt |  2 +-
 .../ui/dialogs/sync/SyncViewListDialog.kt     |  2 +-
 .../{ => sync}/UpdateAvailableDialog.kt       |  2 +-
 .../{modules => }/error/ErrorDetailsDialog.kt |  2 +-
 .../ui/{modules => }/error/ErrorDialog.kt     |  2 +-
 .../ui/{modules => }/error/ErrorSnackbar.kt   |  2 +-
 .../{modules => }/event/EventDetailsDialog.kt |  4 +-
 .../{modules => }/event/EventListAdapter.kt   |  4 +-
 .../{modules => }/event/EventManualDialog.kt  |  6 +-
 .../ui/{modules => }/event/EventViewHolder.kt |  4 +-
 .../feedback/FeedbackActivity.kt              |  2 +-
 .../feedback/FeedbackFragment.kt              |  2 +-
 .../grade => grades}/GradeDetailsDialog.kt    |  4 +-
 .../ui/{modules => }/grades/GradeView.kt      |  2 +-
 .../ui/{modules => }/grades/GradesAdapter.kt  |  6 +-
 .../grades/GradesListFragment.kt              | 13 ++---
 .../grades/editor/GradesEditorAdapter.kt      |  4 +-
 .../grades/editor/GradesEditorFragment.kt     |  3 +-
 .../grades/models/ExpandableItemModel.kt      |  4 +-
 .../grades/models/GradesAverages.kt           |  2 +-
 .../grades/models/GradesEmpty.kt              |  2 +-
 .../grades/models/GradesSemester.kt           |  2 +-
 .../grades/models/GradesStats.kt              |  2 +-
 .../grades/models/GradesSubject.kt            |  2 +-
 .../grades/viewholder/BindableViewHolder.kt   |  2 +-
 .../grades/viewholder/EmptyViewHolder.kt      |  6 +-
 .../grades/viewholder/GradeViewHolder.kt      |  6 +-
 .../grades/viewholder/SemesterViewHolder.kt   |  8 +--
 .../grades/viewholder/StatsViewHolder.kt      |  8 +--
 .../grades/viewholder/SubjectViewHolder.kt    | 10 ++--
 .../home/CardItemTouchHelperCallback.kt       |  6 +-
 .../ui/{modules => }/home/CounterActivity.kt  |  4 +-
 .../ui/{modules => }/home/HomeCard.kt         |  4 +-
 .../ui/{modules => }/home/HomeCardAdapter.kt  |  4 +-
 .../ui/{modules => }/home/HomeCardModel.kt    |  4 +-
 .../ui/{modules => }/home/HomeConfigDialog.kt | 10 ++--
 .../ui/{modules => }/home/HomeDummyCard.kt    |  2 +-
 .../ui/{modules => }/home/HomeFragment.kt     |  6 +-
 .../home/cards/HomeArchiveCard.kt             |  8 +--
 .../home/cards/HomeAvailabilityCard.kt        | 12 ++--
 .../{modules => }/home/cards/HomeDebugCard.kt | 10 ++--
 .../home/cards/HomeEventsCard.kt              | 14 ++---
 .../home/cards/HomeGradesCard.kt              | 10 ++--
 .../home/cards/HomeLuckyNumberCard.kt         | 10 ++--
 .../home/cards/HomeTemplateCard.kt            |  8 +--
 .../home/cards/HomeTimetableCard.kt           | 12 ++--
 .../ui/{modules => }/homework/HomeworkDate.kt |  2 +-
 .../homework/HomeworkFragment.kt              |  6 +-
 .../homework/HomeworkListFragment.kt          | 10 ++--
 .../intro/ChangelogIntroActivity.java         |  2 +-
 .../{modules => }/intro/FragmentSlideMod.java | 15 ++---
 .../ui/{modules => }/login/LoginActivity.kt   |  4 +-
 .../login/LoginChooserAdapter.kt              | 10 ++--
 .../login/LoginChooserFragment.kt             |  6 +-
 .../{modules => }/login/LoginEggsFragment.kt  |  2 +-
 .../login/LoginFinishFragment.kt              |  2 +-
 .../{modules => }/login/LoginFormFragment.kt  |  2 +-
 .../ui/{modules => }/login/LoginInfo.kt       |  4 +-
 .../login/LoginPlatformAdapter.kt             |  4 +-
 .../login/LoginPlatformListFragment.kt        |  2 +-
 .../{modules => }/login/LoginPrizeFragment.kt |  2 +-
 .../login/LoginProgressFragment.kt            |  2 +-
 .../login/LoginSummaryAdapter.kt              |  2 +-
 .../login/LoginSummaryFragment.kt             |  2 +-
 .../login/LoginSyncErrorFragment.kt           |  2 +-
 .../{modules => }/login/LoginSyncFragment.kt  |  2 +-
 .../login/viewholder/ModeViewHolder.kt        |  8 +--
 .../login/viewholder/PlatformViewHolder.kt    |  8 +--
 .../login/viewholder/RegisterViewHolder.kt    |  8 +--
 .../{modules => }/messages/MessagesUtils.kt   |  2 +-
 .../compose/MessagesComposeChipCreator.kt     |  4 +-
 .../compose/MessagesComposeChipTokenizer.kt   |  2 +-
 .../compose/MessagesComposeFragment.kt        |  6 +-
 .../messages/compose/MessagesComposeInfo.kt   |  2 +-
 .../MessagesComposeSuggestionAdapter.kt       |  4 +-
 .../messages/list/MessageViewHolder.kt        |  6 +-
 .../messages/list/MessagesAdapter.kt          |  4 +-
 .../messages/list/MessagesFragment.kt         |  6 +-
 .../messages/list/MessagesListFragment.kt     |  4 +-
 .../messages/single/MessageFragment.kt        |  8 +--
 .../notifications/NotificationsAdapter.kt     |  2 +-
 .../NotificationsListFragment.kt              |  2 +-
 .../ui/{modules => }/search/SearchField.kt    |  2 +-
 .../ui/{modules => }/search/SearchFilter.kt   |  2 +-
 .../{modules => }/search/SearchTextWatcher.kt |  2 +-
 .../{modules => }/search/SearchViewHolder.kt  |  2 +-
 .../ui/{modules => }/search/Searchable.kt     |  2 +-
 .../{modules => }/search/SearchableAdapter.kt |  2 +-
 .../settings/MaterialAboutProfileItem.kt      |  2 +-
 .../settings/ProfileManagerFragment.kt        |  2 +-
 .../ui/{modules => }/settings/SettingsCard.kt |  2 +-
 .../settings/SettingsFragment.kt              |  4 +-
 .../settings/SettingsLicenseActivity.kt       |  2 +-
 .../ui/{modules => }/settings/SettingsUtil.kt |  2 +-
 .../settings/SettingsViewTypeManager.kt       |  4 +-
 .../settings/cards/SettingsAboutCard.kt       | 12 ++--
 .../settings/cards/SettingsProfileCard.kt     | 12 ++--
 .../settings/cards/SettingsRegisterCard.kt    | 13 ++---
 .../settings/cards/SettingsSyncCard.kt        | 12 ++--
 .../settings/cards/SettingsThemeCard.kt       |  6 +-
 .../contributors/ContributorsActivity.kt      |  6 +-
 .../contributors/ContributorsAdapter.kt       |  2 +-
 .../contributors/ContributorsFragment.kt      |  4 +-
 .../{modules => }/template/TemplateAdapter.kt |  2 +-
 .../{modules => }/template/TemplateDialog.kt  |  2 +-
 .../template/TemplateFragment.kt              |  8 +--
 .../template/TemplateListFragment.kt          |  2 +-
 .../template/TemplateListPageFragment.kt      |  4 +-
 .../template/TemplatePageFragment.kt          |  4 +-
 .../template/TemplatePagerAdapter.kt          |  4 +-
 .../timetable/GenerateBlockTimetableDialog.kt |  5 +-
 .../timetable/LessonDetailsDialog.kt          | 11 ++--
 .../timetable/TimetableDayFragment.kt         | 12 ++--
 .../timetable/TimetableFragment.kt            |  5 +-
 .../timetable/TimetablePagerAdapter.kt        |  6 +-
 .../{modules => }/views/AttachmentAdapter.kt  |  2 +-
 .../ui/{modules => }/views/AttachmentsView.kt |  2 +-
 .../ui/{modules => }/views/DateDropdown.kt    |  2 +-
 .../{modules => }/views/EventTypeDropdown.kt  |  2 +-
 .../ui/{modules => }/views/SubjectDropdown.kt |  4 +-
 .../ui/{modules => }/views/TeacherDropdown.kt |  2 +-
 .../ui/{modules => }/views/TeamDropdown.kt    |  2 +-
 .../ui/{modules => }/views/TimeDropdown.kt    |  2 +-
 .../webpush/WebPushBrowserAdapter.kt          |  2 +-
 .../{modules => }/webpush/WebPushFragment.kt  |  2 +-
 .../ui/widgets/LessonDialogActivity.kt        |  2 +-
 .../edziennik/utils/managers/BuildManager.kt  |  2 +-
 .../edziennik/utils/managers/GradesManager.kt |  4 +-
 .../utils/managers/MessageManager.kt          |  2 +-
 .../utils/managers/UserActionManager.kt       |  2 +-
 .../main/res/layout/attendance_fragment.xml   |  2 +-
 .../res/layout/attendance_item_attendance.xml |  2 +-
 .../main/res/layout/attendance_item_month.xml |  4 +-
 .../res/layout/attendance_item_subject.xml    |  2 +-
 .../main/res/layout/attendance_item_type.xml  |  2 +-
 .../layout/attendance_summary_fragment.xml    |  4 +-
 .../main/res/layout/contributors_activity.xml |  2 +-
 .../main/res/layout/dialog_event_details.xml  |  2 +-
 .../res/layout/dialog_event_manual_v2.xml     | 12 ++--
 .../main/res/layout/dialog_lesson_details.xml |  2 +-
 app/src/main/res/layout/fragment_debug.xml    |  2 +-
 .../main/res/layout/fragment_timetable_v2.xml |  2 +-
 app/src/main/res/layout/grades_item_grade.xml |  2 +-
 .../main/res/layout/grades_item_semester.xml  |  4 +-
 app/src/main/res/layout/homework_fragment.xml |  2 +-
 app/src/main/res/layout/lab_fragment.xml      |  2 +-
 app/src/main/res/layout/message_fragment.xml  |  2 +-
 app/src/main/res/layout/messages_fragment.xml |  2 +-
 app/src/main/res/layout/template_fragment.xml |  2 +-
 app/src/main/res/navigation/nav_login.xml     | 20 +++----
 238 files changed, 572 insertions(+), 591 deletions(-)
 rename app/src/main/java/pl/szczodrzynski/edziennik/{ui/dialogs => }/DialogExtensions.kt (94%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/agenda/AgendaFragment.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/agenda/AgendaFragmentDefault.kt (90%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/agenda/BaseEvent.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{dialogs/day => agenda}/DayDialog.kt (89%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/agenda/event/AgendaEvent.kt (76%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/agenda/event/AgendaEventGroup.kt (81%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/agenda/event/AgendaEventGroupRenderer.kt (94%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/agenda/event/AgendaEventRenderer.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{dialogs/lessonchange/LessonChangeAdapter.kt => agenda/lessonchanges/LessonChangesAdapter.kt} (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{dialogs/lessonchange/LessonChangeDialog.kt => agenda/lessonchanges/LessonChangesDialog.kt} (92%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/agenda/lessonchanges/LessonChangesEvent.kt (79%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/agenda/lessonchanges/LessonChangesEventRenderer.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{dialogs => agenda}/teacherabsence/TeacherAbsenceAdapter.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{dialogs => agenda}/teacherabsence/TeacherAbsenceDialog.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/agenda/teacherabsence/TeacherAbsenceEvent.kt (75%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/agenda/teacherabsence/TeacherAbsenceEventRenderer.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/announcements/AnnouncementsAdapter.java (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/announcements/AnnouncementsFragment.java (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/AttendanceAdapter.kt (95%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/AttendanceBar.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/AttendanceDetailsDialog.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/AttendanceFragment.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/AttendanceListFragment.kt (95%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/AttendanceSummaryFragment.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/AttendanceView.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/models/AttendanceCount.kt (84%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/models/AttendanceDayRange.kt (81%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/models/AttendanceEmpty.kt (54%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/models/AttendanceMonth.kt (83%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/models/AttendanceSubject.kt (83%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/models/AttendanceTypeGroup.kt (82%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/viewholder/AttendanceViewHolder.kt (85%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/viewholder/DayRangeViewHolder.kt (84%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/viewholder/EmptyViewHolder.kt (73%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/viewholder/MonthViewHolder.kt (88%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/viewholder/SubjectViewHolder.kt (81%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/attendance/viewholder/TypeViewHolder.kt (88%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/base/BuildInvalidActivity.kt (95%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/base/CrashActivity.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/base/MainSnackbar.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/base/lazypager/FragmentLazyPagerAdapter.kt (90%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/base/lazypager/LazyFragment.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/base/lazypager/LazyPagerAdapter.kt (94%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/base/lazypager/LazyViewPager.kt (95%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/behaviour/BehaviourFragment.java (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/behaviour/NoticesAdapter.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{dialogs => }/captcha/LibrusCaptchaDialog.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{dialogs => }/captcha/RecaptchaDialog.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/debug/DebugFragment.java (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/debug/LabFragment.kt (94%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/debug/LabJsonAdapter.kt (90%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/debug/LabPageFragment.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/debug/LabProfileFragment.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/debug/models/LabJsonArray.kt (68%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/debug/models/LabJsonElement.kt (77%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/debug/models/LabJsonObject.kt (71%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/debug/viewholder/JsonArrayViewHolder.kt (83%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/debug/viewholder/JsonElementViewHolder.kt (87%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/debug/viewholder/JsonObjectViewHolder.kt (83%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/debug/viewholder/JsonSubObjectViewHolder.kt (79%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/{bell => }/BellSyncDialog.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/{bell => }/BellSyncTimeChooseDialog.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/{changelog => }/ChangelogDialog.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/{profile => }/ProfileRemoveDialog.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/{agenda => settings}/AgendaConfigDialog.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/{bell => settings}/BellSyncConfigDialog.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/{grade => settings}/GradesConfigDialog.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/{ => settings}/MessagesConfigDialog.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/{sync => settings}/NotificationFilterDialog.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/{profile => settings}/ProfileConfigDialog.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/{sync => settings}/QuietHoursConfigDialog.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/{sync => settings}/RegistrationConfigDialog.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/{home => settings}/StudentNumberDialog.kt (93%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/{sync => settings}/SyncIntervalDialog.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/{ => sync}/RegisterUnavailableDialog.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/{ => sync}/ServerMessageDialog.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/{ => sync}/UpdateAvailableDialog.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/error/ErrorDetailsDialog.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/error/ErrorDialog.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/error/ErrorSnackbar.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/event/EventDetailsDialog.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/event/EventListAdapter.kt (94%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/event/EventManualDialog.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/event/EventViewHolder.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/feedback/FeedbackActivity.kt (93%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/feedback/FeedbackFragment.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{dialogs/grade => grades}/GradeDetailsDialog.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/grades/GradeView.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/grades/GradesAdapter.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/grades/GradesListFragment.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/grades/editor/GradesEditorAdapter.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/grades/editor/GradesEditorFragment.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/grades/models/ExpandableItemModel.kt (56%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/grades/models/GradesAverages.kt (84%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/grades/models/GradesEmpty.kt (55%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/grades/models/GradesSemester.kt (88%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/grades/models/GradesStats.kt (89%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/grades/models/GradesSubject.kt (90%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/grades/viewholder/BindableViewHolder.kt (81%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/grades/viewholder/EmptyViewHolder.kt (79%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/grades/viewholder/GradeViewHolder.kt (93%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/grades/viewholder/SemesterViewHolder.kt (89%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/grades/viewholder/StatsViewHolder.kt (95%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/grades/viewholder/SubjectViewHolder.kt (94%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/home/CardItemTouchHelperCallback.kt (90%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/home/CounterActivity.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/home/HomeCard.kt (94%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/home/HomeCardAdapter.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/home/HomeCardModel.kt (70%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/home/HomeConfigDialog.kt (87%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/home/HomeDummyCard.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/home/HomeFragment.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/home/cards/HomeArchiveCard.kt (91%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/home/cards/HomeAvailabilityCard.kt (90%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/home/cards/HomeDebugCard.kt (94%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/home/cards/HomeEventsCard.kt (89%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/home/cards/HomeGradesCard.kt (95%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/home/cards/HomeLuckyNumberCard.kt (93%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/home/cards/HomeTemplateCard.kt (87%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/home/cards/HomeTimetableCard.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/homework/HomeworkDate.kt (66%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/homework/HomeworkFragment.kt (95%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/homework/HomeworkListFragment.kt (91%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/intro/ChangelogIntroActivity.java (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/intro/FragmentSlideMod.java (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/login/LoginActivity.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/login/LoginChooserAdapter.kt (92%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/login/LoginChooserFragment.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/login/LoginEggsFragment.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/login/LoginFinishFragment.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/login/LoginFormFragment.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/login/LoginInfo.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/login/LoginPlatformAdapter.kt (92%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/login/LoginPlatformListFragment.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/login/LoginPrizeFragment.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/login/LoginProgressFragment.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/login/LoginSummaryAdapter.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/login/LoginSummaryFragment.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/login/LoginSyncErrorFragment.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/login/LoginSyncFragment.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/login/viewholder/ModeViewHolder.kt (87%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/login/viewholder/PlatformViewHolder.kt (79%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/login/viewholder/RegisterViewHolder.kt (78%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/messages/MessagesUtils.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/messages/compose/MessagesComposeChipCreator.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/messages/compose/MessagesComposeChipTokenizer.kt (90%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/messages/compose/MessagesComposeFragment.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/messages/compose/MessagesComposeInfo.kt (89%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/messages/compose/MessagesComposeSuggestionAdapter.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/messages/list/MessageViewHolder.kt (93%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/messages/list/MessagesAdapter.kt (92%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/messages/list/MessagesFragment.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/messages/list/MessagesListFragment.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/messages/single/MessageFragment.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/notifications/NotificationsAdapter.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/notifications/NotificationsListFragment.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/search/SearchField.kt (90%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/search/SearchFilter.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/search/SearchTextWatcher.kt (95%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/search/SearchViewHolder.kt (95%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/search/Searchable.kt (91%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/search/SearchableAdapter.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/settings/MaterialAboutProfileItem.kt (95%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/settings/ProfileManagerFragment.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/settings/SettingsCard.kt (93%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/settings/SettingsFragment.kt (93%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/settings/SettingsLicenseActivity.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/settings/SettingsUtil.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/settings/SettingsViewTypeManager.kt (90%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/settings/cards/SettingsAboutCard.kt (93%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/settings/cards/SettingsProfileCard.kt (75%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/settings/cards/SettingsRegisterCard.kt (90%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/settings/cards/SettingsSyncCard.kt (95%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/settings/cards/SettingsThemeCard.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/settings/contributors/ContributorsActivity.kt (95%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/settings/contributors/ContributorsAdapter.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/settings/contributors/ContributorsFragment.kt (92%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/template/TemplateAdapter.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/template/TemplateDialog.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/template/TemplateFragment.kt (90%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/template/TemplateListFragment.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/template/TemplateListPageFragment.kt (95%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/template/TemplatePageFragment.kt (92%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/template/TemplatePagerAdapter.kt (78%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{dialogs => }/timetable/GenerateBlockTimetableDialog.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{dialogs => }/timetable/LessonDetailsDialog.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/timetable/TimetableDayFragment.kt (96%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/timetable/TimetableFragment.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/timetable/TimetablePagerAdapter.kt (87%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/views/AttachmentAdapter.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/views/AttachmentsView.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/views/DateDropdown.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/views/EventTypeDropdown.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/views/SubjectDropdown.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/views/TeacherDropdown.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/views/TeamDropdown.kt (98%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/views/TimeDropdown.kt (99%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/webpush/WebPushBrowserAdapter.kt (97%)
 rename app/src/main/java/pl/szczodrzynski/edziennik/ui/{modules => }/webpush/WebPushFragment.kt (98%)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 0816fb00..3820b739 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -25,7 +25,7 @@
 -keep class pl.szczodrzynski.edziennik.data.db.entity.Event { *; }
 -keep class pl.szczodrzynski.edziennik.data.db.full.EventFull { *; }
 -keep class pl.szczodrzynski.edziennik.data.db.entity.FeedbackMessage { *; }
--keep class pl.szczodrzynski.edziennik.ui.modules.home.HomeCardModel { *; }
+-keep class pl.szczodrzynski.edziennik.ui.home.HomeCardModel { *; }
 -keepclassmembers class pl.szczodrzynski.edziennik.ui.widgets.WidgetConfig { public *; }
 -keepnames class pl.szczodrzynski.edziennik.ui.widgets.timetable.WidgetTimetableProvider
 -keepnames class pl.szczodrzynski.edziennik.ui.widgets.notifications.WidgetNotificationsProvider
@@ -67,7 +67,7 @@
 
 -keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; }
 -keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.response.** { *; }
--keepclassmembernames class pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo$Platform { *; }
+-keepclassmembernames class pl.szczodrzynski.edziennik.ui.login.LoginInfo$Platform { *; }
 
 -keepclassmembernames class pl.szczodrzynski.fslogin.realm.RealmData { *; }
 -keepclassmembernames class pl.szczodrzynski.fslogin.realm.RealmData$Type { *; }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cbe7bd48..c710c6b8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -121,32 +121,32 @@
               / ____ \ (__| |_| |\ V /| | |_| |  __/\__ \
              /_/    \_\___|\__|_| \_/ |_|\__|_|\___||___/
         -->
-        <activity android:name=".ui.modules.base.CrashActivity"
+        <activity android:name=".ui.base.CrashActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:process=":error_activity"
             android:theme="@style/DeadTheme" />
-        <activity android:name=".ui.modules.intro.ChangelogIntroActivity"
+        <activity android:name=".ui.intro.ChangelogIntroActivity"
             android:configChanges="orientation|keyboardHidden"
             android:label="@string/app_name"
             android:theme="@style/Theme.Intro" />
-        <activity android:name=".ui.modules.login.LoginActivity"
+        <activity android:name=".ui.login.LoginActivity"
             android:configChanges="orientation|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/AppTheme.Light" />
-        <activity android:name=".ui.modules.home.CounterActivity"
+        <activity android:name=".ui.home.CounterActivity"
             android:theme="@style/AppTheme.Black" />
-        <activity android:name=".ui.modules.feedback.FeedbackActivity"
+        <activity android:name=".ui.feedback.FeedbackActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:label="@string/app_name"
             android:theme="@style/AppTheme" />
-        <activity android:name=".ui.modules.settings.SettingsLicenseActivity"
+        <activity android:name=".ui.settings.SettingsLicenseActivity"
             android:configChanges="orientation|keyboardHidden"
             android:theme="@style/AppTheme" />
         <activity android:name="com.canhub.cropper.CropImageActivity"
             android:configChanges="orientation|keyboardHidden"
             android:theme="@style/Base.Theme.AppCompat" />
-        <activity android:name=".ui.modules.base.BuildInvalidActivity" />
-        <activity android:name=".ui.modules.settings.contributors.ContributorsActivity" />
+        <activity android:name=".ui.base.BuildInvalidActivity" />
+        <activity android:name=".ui.settings.contributors.ContributorsActivity" />
 
         <!--  _____               _
              |  __ \             (_)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
index 55b0ff69..0d590592 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
@@ -41,7 +41,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.network.cookie.DumbCookieJar
 import pl.szczodrzynski.edziennik.sync.SyncWorker
 import pl.szczodrzynski.edziennik.sync.UpdateWorker
-import pl.szczodrzynski.edziennik.ui.modules.base.CrashActivity
+import pl.szczodrzynski.edziennik.ui.base.CrashActivity
 import pl.szczodrzynski.edziennik.utils.*
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import pl.szczodrzynski.edziennik.utils.managers.*
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/DialogExtensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/DialogExtensions.kt
similarity index 94%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/DialogExtensions.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/DialogExtensions.kt
index 5bf46d16..0ebcc9da 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/DialogExtensions.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/DialogExtensions.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-3-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs
+package pl.szczodrzynski.edziennik
 
 import android.text.InputType
 import android.view.LayoutInflater
@@ -11,7 +11,6 @@ import androidx.core.widget.addTextChangedListener
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputEditText
 import pl.szczodrzynski.edziennik.databinding.DialogEditTextBinding
-import pl.szczodrzynski.edziennik.isNotNullNorBlank
 
 fun MaterialAlertDialogBuilder.input(
     message: CharSequence? = null,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
index b27af5bb..4d642959 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
@@ -48,36 +48,36 @@ import pl.szczodrzynski.edziennik.databinding.ActivitySzkolnyBinding
 import pl.szczodrzynski.edziennik.sync.AppManagerDetectedEvent
 import pl.szczodrzynski.edziennik.sync.SyncWorker
 import pl.szczodrzynski.edziennik.sync.UpdateWorker
-import pl.szczodrzynski.edziennik.ui.dialogs.RegisterUnavailableDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.ServerMessageDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.UpdateAvailableDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.changelog.ChangelogDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.profile.ProfileConfigDialog
+import pl.szczodrzynski.edziennik.ui.agenda.AgendaFragment
+import pl.szczodrzynski.edziennik.ui.announcements.AnnouncementsFragment
+import pl.szczodrzynski.edziennik.ui.attendance.AttendanceFragment
+import pl.szczodrzynski.edziennik.ui.base.MainSnackbar
+import pl.szczodrzynski.edziennik.ui.behaviour.BehaviourFragment
+import pl.szczodrzynski.edziennik.ui.debug.DebugFragment
+import pl.szczodrzynski.edziennik.ui.debug.LabFragment
+import pl.szczodrzynski.edziennik.ui.dialogs.ChangelogDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.ProfileConfigDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.sync.RegisterUnavailableDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.sync.ServerMessageDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.sync.SyncViewListDialog
-import pl.szczodrzynski.edziennik.ui.modules.agenda.AgendaFragment
-import pl.szczodrzynski.edziennik.ui.modules.announcements.AnnouncementsFragment
-import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceFragment
-import pl.szczodrzynski.edziennik.ui.modules.base.MainSnackbar
-import pl.szczodrzynski.edziennik.ui.modules.behaviour.BehaviourFragment
-import pl.szczodrzynski.edziennik.ui.modules.debug.DebugFragment
-import pl.szczodrzynski.edziennik.ui.modules.debug.LabFragment
-import pl.szczodrzynski.edziennik.ui.modules.error.ErrorDetailsDialog
-import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar
-import pl.szczodrzynski.edziennik.ui.modules.event.EventManualDialog
-import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackFragment
-import pl.szczodrzynski.edziennik.ui.modules.grades.GradesListFragment
-import pl.szczodrzynski.edziennik.ui.modules.grades.editor.GradesEditorFragment
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
-import pl.szczodrzynski.edziennik.ui.modules.homework.HomeworkFragment
-import pl.szczodrzynski.edziennik.ui.modules.login.LoginActivity
-import pl.szczodrzynski.edziennik.ui.modules.messages.compose.MessagesComposeFragment
-import pl.szczodrzynski.edziennik.ui.modules.messages.list.MessagesFragment
-import pl.szczodrzynski.edziennik.ui.modules.messages.single.MessageFragment
-import pl.szczodrzynski.edziennik.ui.modules.notifications.NotificationsListFragment
-import pl.szczodrzynski.edziennik.ui.modules.settings.ProfileManagerFragment
-import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsFragment
-import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableFragment
-import pl.szczodrzynski.edziennik.ui.modules.webpush.WebPushFragment
+import pl.szczodrzynski.edziennik.ui.dialogs.sync.UpdateAvailableDialog
+import pl.szczodrzynski.edziennik.ui.error.ErrorDetailsDialog
+import pl.szczodrzynski.edziennik.ui.error.ErrorSnackbar
+import pl.szczodrzynski.edziennik.ui.event.EventManualDialog
+import pl.szczodrzynski.edziennik.ui.feedback.FeedbackFragment
+import pl.szczodrzynski.edziennik.ui.grades.GradesListFragment
+import pl.szczodrzynski.edziennik.ui.grades.editor.GradesEditorFragment
+import pl.szczodrzynski.edziennik.ui.home.HomeFragment
+import pl.szczodrzynski.edziennik.ui.homework.HomeworkFragment
+import pl.szczodrzynski.edziennik.ui.login.LoginActivity
+import pl.szczodrzynski.edziennik.ui.messages.compose.MessagesComposeFragment
+import pl.szczodrzynski.edziennik.ui.messages.list.MessagesFragment
+import pl.szczodrzynski.edziennik.ui.messages.single.MessageFragment
+import pl.szczodrzynski.edziennik.ui.notifications.NotificationsListFragment
+import pl.szczodrzynski.edziennik.ui.settings.ProfileManagerFragment
+import pl.szczodrzynski.edziennik.ui.settings.SettingsFragment
+import pl.szczodrzynski.edziennik.ui.timetable.TimetableFragment
+import pl.szczodrzynski.edziennik.ui.webpush.WebPushFragment
 import pl.szczodrzynski.edziennik.utils.*
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import pl.szczodrzynski.edziennik.utils.Utils.dpToPx
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivityRequestHandler.kt b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivityRequestHandler.kt
index a39a5872..ff165a46 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivityRequestHandler.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivityRequestHandler.kt
@@ -11,7 +11,7 @@ import android.provider.OpenableColumns
 import com.canhub.cropper.CropImage
 import com.canhub.cropper.CropImageView
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.ui.modules.login.LoginActivity
+import pl.szczodrzynski.edziennik.ui.login.LoginActivity
 import java.io.File
 import java.io.FileOutputStream
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigUI.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigUI.kt
index d40f0dfc..187cb6bd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigUI.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigUI.kt
@@ -7,7 +7,7 @@ package pl.szczodrzynski.edziennik.config
 import pl.szczodrzynski.edziennik.config.utils.get
 import pl.szczodrzynski.edziennik.config.utils.set
 import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.AGENDA_DEFAULT
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardModel
+import pl.szczodrzynski.edziennik.ui.home.HomeCardModel
 
 class ProfileConfigUI(private val config: ProfileConfig) {
     private var mAgendaViewType: Int? = null
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigGsonUtils.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigGsonUtils.kt
index eb04578d..383f7df0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigGsonUtils.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigGsonUtils.kt
@@ -6,7 +6,7 @@ package pl.szczodrzynski.edziennik.config.utils
 import com.google.gson.Gson
 import com.google.gson.JsonParser
 import pl.szczodrzynski.edziennik.getInt
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardModel
+import pl.szczodrzynski.edziennik.ui.home.HomeCardModel
 import pl.szczodrzynski.edziennik.utils.models.Time
 
 class ConfigGsonUtils {
@@ -41,4 +41,4 @@ class ConfigGsonUtils {
 
         return list
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt
index 3b574b96..7c1c43f0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt
@@ -28,9 +28,9 @@ import pl.szczodrzynski.edziennik.data.db.entity.FeedbackMessage
 import pl.szczodrzynski.edziennik.data.db.entity.Notification
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
-import pl.szczodrzynski.edziennik.ui.modules.error.ErrorDetailsDialog
-import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar
-import pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo
+import pl.szczodrzynski.edziennik.ui.error.ErrorDetailsDialog
+import pl.szczodrzynski.edziennik.ui.error.ErrorSnackbar
+import pl.szczodrzynski.edziennik.ui.login.LoginInfo
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
 import retrofit2.Response
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyService.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyService.kt
index 26a9a44e..0e86a7bd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyService.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyService.kt
@@ -6,7 +6,7 @@ package pl.szczodrzynski.edziennik.data.api.szkolny
 
 import pl.szczodrzynski.edziennik.data.api.szkolny.request.*
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.*
-import pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo
+import pl.szczodrzynski.edziennik.ui.login.LoginInfo
 import retrofit2.Call
 import retrofit2.http.*
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/EventFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/EventFull.kt
index 5e3e62de..bfa6954b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/EventFull.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/EventFull.kt
@@ -6,7 +6,7 @@ package pl.szczodrzynski.edziennik.data.db.full
 import androidx.room.Ignore
 import pl.szczodrzynski.edziennik.data.db.entity.Event
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.ui.modules.search.Searchable
+import pl.szczodrzynski.edziennik.ui.search.Searchable
 import pl.szczodrzynski.edziennik.utils.html.BetterHtml
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/MessageFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/MessageFull.kt
index 8ff6fd73..c3bf8543 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/MessageFull.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/MessageFull.kt
@@ -7,7 +7,7 @@ import androidx.room.Ignore
 import androidx.room.Relation
 import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
-import pl.szczodrzynski.edziennik.ui.modules.search.Searchable
+import pl.szczodrzynski.edziennik.ui.search.Searchable
 import pl.szczodrzynski.edziennik.utils.html.BetterHtml
 
 class MessageFull(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/AgendaFragment.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/AgendaFragment.kt
index 949e36cc..a13b9b02 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/AgendaFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kacper Ziubryniewicz 2020-1-25
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.agenda
+package pl.szczodrzynski.edziennik.ui.agenda
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -26,9 +26,8 @@ import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.databinding.FragmentAgendaCalendarBinding
 import pl.szczodrzynski.edziennik.databinding.FragmentAgendaDefaultBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.agenda.AgendaConfigDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.day.DayDialog
-import pl.szczodrzynski.edziennik.ui.modules.event.EventManualDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.AgendaConfigDialog
+import pl.szczodrzynski.edziennik.ui.event.EventManualDialog
 import pl.szczodrzynski.edziennik.utils.Themes
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragmentDefault.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/AgendaFragmentDefault.kt
similarity index 90%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragmentDefault.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/AgendaFragmentDefault.kt
index 68240e0b..be01c222 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragmentDefault.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/AgendaFragmentDefault.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-4-8.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.agenda
+package pl.szczodrzynski.edziennik.ui.agenda
 
 import android.util.SparseIntArray
 import android.widget.AbsListView
@@ -21,18 +21,17 @@ import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.databinding.FragmentAgendaDefaultBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.day.DayDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.lessonchange.LessonChangeDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.teacherabsence.TeacherAbsenceDialog
-import pl.szczodrzynski.edziennik.ui.modules.agenda.event.AgendaEvent
-import pl.szczodrzynski.edziennik.ui.modules.agenda.event.AgendaEventGroup
-import pl.szczodrzynski.edziennik.ui.modules.agenda.event.AgendaEventGroupRenderer
-import pl.szczodrzynski.edziennik.ui.modules.agenda.event.AgendaEventRenderer
-import pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchanges.LessonChangesEvent
-import pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchanges.LessonChangesEventRenderer
-import pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence.TeacherAbsenceEvent
-import pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence.TeacherAbsenceEventRenderer
-import pl.szczodrzynski.edziennik.ui.modules.event.EventDetailsDialog
+import pl.szczodrzynski.edziennik.ui.agenda.event.AgendaEvent
+import pl.szczodrzynski.edziennik.ui.agenda.event.AgendaEventGroup
+import pl.szczodrzynski.edziennik.ui.agenda.event.AgendaEventGroupRenderer
+import pl.szczodrzynski.edziennik.ui.agenda.event.AgendaEventRenderer
+import pl.szczodrzynski.edziennik.ui.agenda.lessonchanges.LessonChangesDialog
+import pl.szczodrzynski.edziennik.ui.agenda.lessonchanges.LessonChangesEvent
+import pl.szczodrzynski.edziennik.ui.agenda.lessonchanges.LessonChangesEventRenderer
+import pl.szczodrzynski.edziennik.ui.agenda.teacherabsence.TeacherAbsenceDialog
+import pl.szczodrzynski.edziennik.ui.agenda.teacherabsence.TeacherAbsenceEvent
+import pl.szczodrzynski.edziennik.ui.agenda.teacherabsence.TeacherAbsenceEventRenderer
+import pl.szczodrzynski.edziennik.ui.event.EventDetailsDialog
 import pl.szczodrzynski.edziennik.utils.models.Date
 import java.util.*
 
@@ -149,7 +148,7 @@ class AgendaFragmentDefault(
 
                     when (event) {
                         is AgendaEvent -> EventDetailsDialog(activity, event.event)
-                        is LessonChangesEvent -> LessonChangeDialog(activity, app.profileId, date)
+                        is LessonChangesEvent -> LessonChangesDialog(activity, app.profileId, date)
                         is TeacherAbsenceEvent -> TeacherAbsenceDialog(
                             activity,
                             app.profileId,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/BaseEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/BaseEvent.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/BaseEvent.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/BaseEvent.kt
index 62569504..3f28ca40 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/BaseEvent.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/BaseEvent.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-4-9.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.agenda
+package pl.szczodrzynski.edziennik.ui.agenda
 
 import com.github.tibolte.agendacalendarview.models.CalendarEvent
 import com.github.tibolte.agendacalendarview.models.IDayItem
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/day/DayDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/DayDialog.kt
similarity index 89%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/day/DayDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/DayDialog.kt
index 55850a0e..36936dca 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/day/DayDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/DayDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-12-16.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.day
+package pl.szczodrzynski.edziennik.ui.agenda
 
 import android.view.View
 import androidx.appcompat.app.AlertDialog
@@ -14,15 +14,15 @@ import kotlinx.coroutines.*
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Lesson
 import pl.szczodrzynski.edziennik.databinding.DialogDayBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.lessonchange.LessonChangeDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.teacherabsence.TeacherAbsenceDialog
-import pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchanges.LessonChangesEvent
-import pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchanges.LessonChangesEventRenderer
-import pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence.TeacherAbsenceEvent
-import pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence.TeacherAbsenceEventRenderer
-import pl.szczodrzynski.edziennik.ui.modules.event.EventDetailsDialog
-import pl.szczodrzynski.edziennik.ui.modules.event.EventListAdapter
-import pl.szczodrzynski.edziennik.ui.modules.event.EventManualDialog
+import pl.szczodrzynski.edziennik.ui.agenda.lessonchanges.LessonChangesDialog
+import pl.szczodrzynski.edziennik.ui.agenda.lessonchanges.LessonChangesEvent
+import pl.szczodrzynski.edziennik.ui.agenda.lessonchanges.LessonChangesEventRenderer
+import pl.szczodrzynski.edziennik.ui.agenda.teacherabsence.TeacherAbsenceDialog
+import pl.szczodrzynski.edziennik.ui.agenda.teacherabsence.TeacherAbsenceEvent
+import pl.szczodrzynski.edziennik.ui.agenda.teacherabsence.TeacherAbsenceEventRenderer
+import pl.szczodrzynski.edziennik.ui.event.EventDetailsDialog
+import pl.szczodrzynski.edziennik.ui.event.EventListAdapter
+import pl.szczodrzynski.edziennik.ui.event.EventManualDialog
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
@@ -124,7 +124,7 @@ class DayDialog(
             )
 
             b.lessonChangesFrame.onClick {
-                LessonChangeDialog(
+                LessonChangesDialog(
                     activity,
                     profileId,
                     date,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/event/AgendaEvent.kt
similarity index 76%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEvent.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/event/AgendaEvent.kt
index e6ba6e23..ebff08f9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEvent.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/event/AgendaEvent.kt
@@ -2,10 +2,10 @@
  * Copyright (c) Kuba Szczodrzyński 2021-4-8.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.agenda.event
+package pl.szczodrzynski.edziennik.ui.agenda.event
 
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
-import pl.szczodrzynski.edziennik.ui.modules.agenda.BaseEvent
+import pl.szczodrzynski.edziennik.ui.agenda.BaseEvent
 
 class AgendaEvent(
     val event: EventFull,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEventGroup.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/event/AgendaEventGroup.kt
similarity index 81%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEventGroup.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/event/AgendaEventGroup.kt
index 3ef4eb47..cccfb292 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEventGroup.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/event/AgendaEventGroup.kt
@@ -2,9 +2,9 @@
  * Copyright (c) Kuba Szczodrzyński 2021-4-10.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.agenda.event
+package pl.szczodrzynski.edziennik.ui.agenda.event
 
-import pl.szczodrzynski.edziennik.ui.modules.agenda.BaseEvent
+import pl.szczodrzynski.edziennik.ui.agenda.BaseEvent
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class AgendaEventGroup(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEventGroupRenderer.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/event/AgendaEventGroupRenderer.kt
similarity index 94%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEventGroupRenderer.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/event/AgendaEventGroupRenderer.kt
index 2a1f9af8..529668cf 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEventGroupRenderer.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/event/AgendaEventGroupRenderer.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-4-10.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.agenda.event
+package pl.szczodrzynski.edziennik.ui.agenda.event
 
 import android.view.View
 import androidx.core.view.isVisible
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEventRenderer.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/event/AgendaEventRenderer.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEventRenderer.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/event/AgendaEventRenderer.kt
index 2e857cd3..2e0d8d17 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEventRenderer.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/event/AgendaEventRenderer.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-4-8.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.agenda.event
+package pl.szczodrzynski.edziennik.ui.agenda.event
 
 import android.annotation.SuppressLint
 import android.view.View
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/lessonchanges/LessonChangesAdapter.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/lessonchanges/LessonChangesAdapter.kt
index b15803ed..a1d7fa8d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/lessonchanges/LessonChangesAdapter.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-12-19.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.lessonchange
+package pl.szczodrzynski.edziennik.ui.agenda.lessonchanges
 
 import android.content.Context
 import android.graphics.PorterDuff
@@ -17,10 +17,10 @@ import pl.szczodrzynski.edziennik.data.db.full.LessonFull
 import pl.szczodrzynski.edziennik.databinding.TimetableLessonBinding
 import pl.szczodrzynski.navlib.getColorFromAttr
 
-class LessonChangeAdapter(
+class LessonChangesAdapter(
         val context: Context,
         private val onItemClick: ((lesson: LessonFull) -> Unit)? = null
-) : RecyclerView.Adapter<LessonChangeAdapter.ViewHolder>() {
+) : RecyclerView.Adapter<LessonChangesAdapter.ViewHolder>() {
 
     var items = listOf<LessonFull>()
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/lessonchanges/LessonChangesDialog.kt
similarity index 92%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/lessonchanges/LessonChangesDialog.kt
index 78d40e68..8fd2b454 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/lessonchanges/LessonChangesDialog.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.dialogs.lessonchange
+package pl.szczodrzynski.edziennik.ui.agenda.lessonchanges
 
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
@@ -8,11 +8,11 @@ import kotlinx.coroutines.*
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.DialogLessonChangeListBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.timetable.LessonDetailsDialog
+import pl.szczodrzynski.edziennik.ui.timetable.LessonDetailsDialog
 import pl.szczodrzynski.edziennik.utils.models.Date
 import kotlin.coroutines.CoroutineContext
 
-class LessonChangeDialog(
+class LessonChangesDialog(
         val activity: AppCompatActivity,
         val profileId: Int,
         private val defaultDate: Date,
@@ -54,7 +54,7 @@ class LessonChangeDialog(
             app.db.timetableDao().getChangesForDateNow(profileId, defaultDate)
         }
 
-        val adapter = LessonChangeAdapter(
+        val adapter = LessonChangesAdapter(
                 activity,
                 onItemClick = {
                     LessonDetailsDialog(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchanges/LessonChangesEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/lessonchanges/LessonChangesEvent.kt
similarity index 79%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchanges/LessonChangesEvent.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/lessonchanges/LessonChangesEvent.kt
index b38d8829..c011af59 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchanges/LessonChangesEvent.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/lessonchanges/LessonChangesEvent.kt
@@ -2,9 +2,9 @@
  * Copyright (c) Kuba Szczodrzyński 2021-4-8.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchanges
+package pl.szczodrzynski.edziennik.ui.agenda.lessonchanges
 
-import pl.szczodrzynski.edziennik.ui.modules.agenda.BaseEvent
+import pl.szczodrzynski.edziennik.ui.agenda.BaseEvent
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class LessonChangesEvent(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchanges/LessonChangesEventRenderer.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/lessonchanges/LessonChangesEventRenderer.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchanges/LessonChangesEventRenderer.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/lessonchanges/LessonChangesEventRenderer.kt
index 5f66cc27..23ad7376 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchanges/LessonChangesEventRenderer.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/lessonchanges/LessonChangesEventRenderer.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-4-8.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchanges
+package pl.szczodrzynski.edziennik.ui.agenda.lessonchanges
 
 import android.view.View
 import androidx.core.view.isVisible
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/teacherabsence/TeacherAbsenceAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/teacherabsence/TeacherAbsenceAdapter.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/teacherabsence/TeacherAbsenceAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/teacherabsence/TeacherAbsenceAdapter.kt
index 443d4734..89cbf3ee 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/teacherabsence/TeacherAbsenceAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/teacherabsence/TeacherAbsenceAdapter.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.dialogs.teacherabsence
+package pl.szczodrzynski.edziennik.ui.agenda.teacherabsence
 
 import android.content.Context
 import android.view.LayoutInflater
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/teacherabsence/TeacherAbsenceDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/teacherabsence/TeacherAbsenceDialog.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/teacherabsence/TeacherAbsenceDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/teacherabsence/TeacherAbsenceDialog.kt
index 7ffab515..a4f527ff 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/teacherabsence/TeacherAbsenceDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/teacherabsence/TeacherAbsenceDialog.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.dialogs.teacherabsence
+package pl.szczodrzynski.edziennik.ui.agenda.teacherabsence
 
 import android.view.View
 import androidx.appcompat.app.AlertDialog
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/teacherabsence/TeacherAbsenceEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/teacherabsence/TeacherAbsenceEvent.kt
similarity index 75%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/teacherabsence/TeacherAbsenceEvent.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/teacherabsence/TeacherAbsenceEvent.kt
index b0b01f50..d9defda1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/teacherabsence/TeacherAbsenceEvent.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/teacherabsence/TeacherAbsenceEvent.kt
@@ -2,9 +2,9 @@
  * Copyright (c) Kuba Szczodrzyński 2021-4-8.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence
+package pl.szczodrzynski.edziennik.ui.agenda.teacherabsence
 
-import pl.szczodrzynski.edziennik.ui.modules.agenda.BaseEvent
+import pl.szczodrzynski.edziennik.ui.agenda.BaseEvent
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class TeacherAbsenceEvent(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/teacherabsence/TeacherAbsenceEventRenderer.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/teacherabsence/TeacherAbsenceEventRenderer.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/teacherabsence/TeacherAbsenceEventRenderer.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/teacherabsence/TeacherAbsenceEventRenderer.kt
index 8d70f941..5cba1fd2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/teacherabsence/TeacherAbsenceEventRenderer.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/agenda/teacherabsence/TeacherAbsenceEventRenderer.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-4-8.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence
+package pl.szczodrzynski.edziennik.ui.agenda.teacherabsence
 
 import android.view.View
 import androidx.core.view.isVisible
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/announcements/AnnouncementsAdapter.java
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsAdapter.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/announcements/AnnouncementsAdapter.java
index ee88da07..73156558 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsAdapter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/announcements/AnnouncementsAdapter.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.announcements;
+package pl.szczodrzynski.edziennik.ui.announcements;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -18,7 +18,7 @@ import java.util.List;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull;
 import pl.szczodrzynski.edziennik.databinding.RowAnnouncementsItemBinding;
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesUtils;
+import pl.szczodrzynski.edziennik.ui.messages.MessagesUtils;
 
 public class AnnouncementsAdapter extends RecyclerView.Adapter<AnnouncementsAdapter.ViewHolder> {
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/announcements/AnnouncementsFragment.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/announcements/AnnouncementsFragment.java
index d8cdbc2c..c9c1032b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/announcements/AnnouncementsFragment.java
@@ -1,4 +1,8 @@
-package pl.szczodrzynski.edziennik.ui.modules.announcements;
+package pl.szczodrzynski.edziennik.ui.announcements;
+
+import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
+import static pl.szczodrzynski.edziennik.data.db.entity.LoginStore.LOGIN_TYPE_LIBRUS;
+import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_ANNOUNCEMENT;
 
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -33,10 +37,6 @@ import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem;
 
-import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
-import static pl.szczodrzynski.edziennik.data.db.entity.LoginStore.LOGIN_TYPE_LIBRUS;
-import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_ANNOUNCEMENT;
-
 public class AnnouncementsFragment extends Fragment {
 
     private App app = null;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceAdapter.kt
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceAdapter.kt
index 0dcae97e..b6c8a117 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceAdapter.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-29.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance
+package pl.szczodrzynski.edziennik.ui.attendance
 
 import android.animation.ObjectAnimator
 import android.view.LayoutInflater
@@ -19,10 +19,10 @@ import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull
 import pl.szczodrzynski.edziennik.startCoroutineTimer
-import pl.szczodrzynski.edziennik.ui.modules.attendance.models.*
-import pl.szczodrzynski.edziennik.ui.modules.attendance.viewholder.*
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.ui.attendance.models.*
+import pl.szczodrzynski.edziennik.ui.attendance.viewholder.*
+import pl.szczodrzynski.edziennik.ui.grades.models.ExpandableItemModel
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
 import kotlin.coroutines.CoroutineContext
 
 class AttendanceAdapter(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceBar.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceBar.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceBar.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceBar.kt
index 70be9256..2de496ec 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceBar.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceBar.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-5-1.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance
+package pl.szczodrzynski.edziennik.ui.attendance
 
 import android.annotation.SuppressLint
 import android.content.Context
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceDetailsDialog.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceDetailsDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceDetailsDialog.kt
index 5ee6bdc3..33d85c14 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceDetailsDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceDetailsDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-5-9.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance
+package pl.szczodrzynski.edziennik.ui.attendance
 
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceFragment.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceFragment.kt
index 194f36d2..6daf8605 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance
+package pl.szczodrzynski.edziennik.ui.attendance
 
 import android.os.AsyncTask
 import android.os.Bundle
@@ -18,8 +18,8 @@ import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.databinding.AttendanceFragmentBinding
+import pl.szczodrzynski.edziennik.ui.base.lazypager.FragmentLazyPagerAdapter
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.AttendanceConfigDialog
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.FragmentLazyPagerAdapter
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
 import kotlin.coroutines.CoroutineContext
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceListFragment.kt
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceListFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceListFragment.kt
index 523dd09c..8a5a8f42 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceListFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance
+package pl.szczodrzynski.edziennik.ui.attendance
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -19,11 +19,11 @@ import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull
 import pl.szczodrzynski.edziennik.databinding.AttendanceListFragmentBinding
 import pl.szczodrzynski.edziennik.isNotNullNorEmpty
 import pl.szczodrzynski.edziennik.startCoroutineTimer
-import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceDayRange
-import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceMonth
-import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceTypeGroup
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyFragment
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.GradesSubject
+import pl.szczodrzynski.edziennik.ui.attendance.models.AttendanceDayRange
+import pl.szczodrzynski.edziennik.ui.attendance.models.AttendanceMonth
+import pl.szczodrzynski.edziennik.ui.attendance.models.AttendanceTypeGroup
+import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.grades.models.GradesSubject
 import pl.szczodrzynski.edziennik.utils.models.Date
 import kotlin.coroutines.CoroutineContext
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceSummaryFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceSummaryFragment.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceSummaryFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceSummaryFragment.kt
index 39282325..0529e36f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceSummaryFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceSummaryFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-5-4.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance
+package pl.szczodrzynski.edziennik.ui.attendance
 
 import android.graphics.Color
 import android.os.Bundle
@@ -24,10 +24,10 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Attendance
 import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull
 import pl.szczodrzynski.edziennik.databinding.AttendanceSummaryFragmentBinding
-import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceFragment.Companion.VIEW_SUMMARY
-import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceSubject
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyFragment
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.GradesSubject
+import pl.szczodrzynski.edziennik.ui.attendance.AttendanceFragment.Companion.VIEW_SUMMARY
+import pl.szczodrzynski.edziennik.ui.attendance.models.AttendanceSubject
+import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.grades.models.GradesSubject
 import pl.szczodrzynski.edziennik.utils.models.Date
 import java.text.DecimalFormat
 import kotlin.coroutines.CoroutineContext
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceView.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceView.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceView.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceView.kt
index dfe20eda..2d3e4764 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceView.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/AttendanceView.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-29.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance
+package pl.szczodrzynski.edziennik.ui.attendance
 
 import android.annotation.SuppressLint
 import android.content.Context
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceCount.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/models/AttendanceCount.kt
similarity index 84%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceCount.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/models/AttendanceCount.kt
index c2595885..787c10e3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceCount.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/models/AttendanceCount.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance.models
+package pl.szczodrzynski.edziennik.ui.attendance.models
 
 class AttendanceCount {
     var normalSum = 0f
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceDayRange.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/models/AttendanceDayRange.kt
similarity index 81%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceDayRange.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/models/AttendanceDayRange.kt
index e993d785..a3815861 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceDayRange.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/models/AttendanceDayRange.kt
@@ -2,11 +2,11 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance.models
+package pl.szczodrzynski.edziennik.ui.attendance.models
 
 import pl.szczodrzynski.edziennik.data.db.entity.Attendance
 import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel
+import pl.szczodrzynski.edziennik.ui.grades.models.ExpandableItemModel
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 data class AttendanceDayRange(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceEmpty.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/models/AttendanceEmpty.kt
similarity index 54%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceEmpty.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/models/AttendanceEmpty.kt
index 46877f63..82a8a5be 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceEmpty.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/models/AttendanceEmpty.kt
@@ -2,6 +2,6 @@
  * Copyright (c) Kuba Szczodrzyński 2020-5-4.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance.models
+package pl.szczodrzynski.edziennik.ui.attendance.models
 
 class AttendanceEmpty
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceMonth.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/models/AttendanceMonth.kt
similarity index 83%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceMonth.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/models/AttendanceMonth.kt
index c6d14914..a51af848 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceMonth.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/models/AttendanceMonth.kt
@@ -2,12 +2,12 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance.models
+package pl.szczodrzynski.edziennik.ui.attendance.models
 
 import pl.szczodrzynski.edziennik.data.db.entity.Attendance
 import pl.szczodrzynski.edziennik.data.db.entity.AttendanceType
 import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel
+import pl.szczodrzynski.edziennik.ui.grades.models.ExpandableItemModel
 
 data class AttendanceMonth(
         val year: Int,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceSubject.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/models/AttendanceSubject.kt
similarity index 83%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceSubject.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/models/AttendanceSubject.kt
index b56cd62a..db5f34a1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceSubject.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/models/AttendanceSubject.kt
@@ -2,12 +2,12 @@
  * Copyright (c) Kuba Szczodrzyński 2020-5-4.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance.models
+package pl.szczodrzynski.edziennik.ui.attendance.models
 
 import pl.szczodrzynski.edziennik.data.db.entity.Attendance
 import pl.szczodrzynski.edziennik.data.db.entity.AttendanceType
 import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel
+import pl.szczodrzynski.edziennik.ui.grades.models.ExpandableItemModel
 
 data class AttendanceSubject(
         val subjectId: Long,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceTypeGroup.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/models/AttendanceTypeGroup.kt
similarity index 82%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceTypeGroup.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/models/AttendanceTypeGroup.kt
index d6b431ec..a6399456 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceTypeGroup.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/models/AttendanceTypeGroup.kt
@@ -2,12 +2,12 @@
  * Copyright (c) Kuba Szczodrzyński 2020-5-8.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance.models
+package pl.szczodrzynski.edziennik.ui.attendance.models
 
 import pl.szczodrzynski.edziennik.data.db.entity.Attendance
 import pl.szczodrzynski.edziennik.data.db.entity.AttendanceType
 import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel
+import pl.szczodrzynski.edziennik.ui.grades.models.ExpandableItemModel
 
 data class AttendanceTypeGroup(
         val type: AttendanceType,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/AttendanceViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/viewholder/AttendanceViewHolder.kt
similarity index 85%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/AttendanceViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/viewholder/AttendanceViewHolder.kt
index 3e7a1d32..ac434a7f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/AttendanceViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/viewholder/AttendanceViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance.viewholder
+package pl.szczodrzynski.edziennik.ui.attendance.viewholder
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -15,11 +15,11 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.concat
 import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull
 import pl.szczodrzynski.edziennik.databinding.AttendanceItemAttendanceBinding
-import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter
-import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceDayRange
-import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceMonth
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.ui.attendance.AttendanceAdapter
+import pl.szczodrzynski.edziennik.ui.attendance.models.AttendanceDayRange
+import pl.szczodrzynski.edziennik.ui.attendance.models.AttendanceMonth
+import pl.szczodrzynski.edziennik.ui.grades.models.ExpandableItemModel
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
 import pl.szczodrzynski.edziennik.utils.Themes
 import pl.szczodrzynski.edziennik.utils.models.Week
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/DayRangeViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/viewholder/DayRangeViewHolder.kt
similarity index 84%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/DayRangeViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/viewholder/DayRangeViewHolder.kt
index b42d5e16..8f7c1f1c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/DayRangeViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/viewholder/DayRangeViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance.viewholder
+package pl.szczodrzynski.edziennik.ui.attendance.viewholder
 
 import android.view.LayoutInflater
 import android.view.View
@@ -17,11 +17,11 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.concat
 import pl.szczodrzynski.edziennik.data.db.entity.Attendance
 import pl.szczodrzynski.edziennik.databinding.AttendanceItemDayRangeBinding
-import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter
-import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter.Companion.STATE_CLOSED
-import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceView
-import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceDayRange
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.ui.attendance.AttendanceAdapter
+import pl.szczodrzynski.edziennik.ui.attendance.AttendanceAdapter.Companion.STATE_CLOSED
+import pl.szczodrzynski.edziennik.ui.attendance.AttendanceView
+import pl.szczodrzynski.edziennik.ui.attendance.models.AttendanceDayRange
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
 import pl.szczodrzynski.edziennik.utils.Themes
 
 class DayRangeViewHolder(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/EmptyViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/viewholder/EmptyViewHolder.kt
similarity index 73%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/EmptyViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/viewholder/EmptyViewHolder.kt
index 37fe635c..0a0786d6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/EmptyViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/viewholder/EmptyViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-5-4.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance.viewholder
+package pl.szczodrzynski.edziennik.ui.attendance.viewholder
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -10,9 +10,9 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.databinding.AttendanceItemEmptyBinding
-import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter
-import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceEmpty
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.ui.attendance.AttendanceAdapter
+import pl.szczodrzynski.edziennik.ui.attendance.models.AttendanceEmpty
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
 
 class EmptyViewHolder(
         inflater: LayoutInflater,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/MonthViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/viewholder/MonthViewHolder.kt
similarity index 88%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/MonthViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/viewholder/MonthViewHolder.kt
index 71c139ac..9cbed343 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/MonthViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/viewholder/MonthViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance.viewholder
+package pl.szczodrzynski.edziennik.ui.attendance.viewholder
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -16,11 +16,11 @@ import androidx.recyclerview.widget.RecyclerView
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Attendance
 import pl.szczodrzynski.edziennik.databinding.AttendanceItemMonthBinding
-import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter
-import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter.Companion.STATE_CLOSED
-import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceView
-import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceMonth
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.ui.attendance.AttendanceAdapter
+import pl.szczodrzynski.edziennik.ui.attendance.AttendanceAdapter.Companion.STATE_CLOSED
+import pl.szczodrzynski.edziennik.ui.attendance.AttendanceView
+import pl.szczodrzynski.edziennik.ui.attendance.models.AttendanceMonth
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
 import pl.szczodrzynski.edziennik.utils.Themes
 import pl.szczodrzynski.edziennik.utils.models.Date
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/SubjectViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/viewholder/SubjectViewHolder.kt
similarity index 81%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/SubjectViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/viewholder/SubjectViewHolder.kt
index e439111d..4636aefd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/SubjectViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/viewholder/SubjectViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-5-4.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance.viewholder
+package pl.szczodrzynski.edziennik.ui.attendance.viewholder
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -14,10 +14,10 @@ import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.AttendanceItemSubjectBinding
 import pl.szczodrzynski.edziennik.setText
-import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter
-import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter.Companion.STATE_CLOSED
-import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceSubject
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.ui.attendance.AttendanceAdapter
+import pl.szczodrzynski.edziennik.ui.attendance.AttendanceAdapter.Companion.STATE_CLOSED
+import pl.szczodrzynski.edziennik.ui.attendance.models.AttendanceSubject
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
 import pl.szczodrzynski.edziennik.utils.Themes
 
 class SubjectViewHolder(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/TypeViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/viewholder/TypeViewHolder.kt
similarity index 88%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/TypeViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/viewholder/TypeViewHolder.kt
index a2f8b689..e8037a0c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/TypeViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/attendance/viewholder/TypeViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-5-8.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.attendance.viewholder
+package pl.szczodrzynski.edziennik.ui.attendance.viewholder
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -15,9 +15,9 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.concat
 import pl.szczodrzynski.edziennik.data.db.entity.Attendance
 import pl.szczodrzynski.edziennik.databinding.AttendanceItemTypeBinding
-import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter
-import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceTypeGroup
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.ui.attendance.AttendanceAdapter
+import pl.szczodrzynski.edziennik.ui.attendance.models.AttendanceTypeGroup
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
 import pl.szczodrzynski.edziennik.utils.Themes
 import pl.szczodrzynski.edziennik.utils.models.Date
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/BuildInvalidActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/BuildInvalidActivity.kt
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/BuildInvalidActivity.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/BuildInvalidActivity.kt
index 766c79ad..f76d23fa 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/BuildInvalidActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/BuildInvalidActivity.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-3-27.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.base
+package pl.szczodrzynski.edziennik.ui.base
 
 import android.graphics.Color
 import android.os.Bundle
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/CrashActivity.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashActivity.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/CrashActivity.kt
index bd892fd4..3b9443e9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/CrashActivity.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.base
+package pl.szczodrzynski.edziennik.ui.base
 
 import android.content.ClipData
 import android.content.ClipboardManager
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/MainSnackbar.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/MainSnackbar.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/MainSnackbar.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/MainSnackbar.kt
index 362ffe9b..93e340b3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/MainSnackbar.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/MainSnackbar.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-12-22.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.base
+package pl.szczodrzynski.edziennik.ui.base
 
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/FragmentLazyPagerAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/FragmentLazyPagerAdapter.kt
similarity index 90%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/FragmentLazyPagerAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/FragmentLazyPagerAdapter.kt
index bc794073..91159270 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/FragmentLazyPagerAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/FragmentLazyPagerAdapter.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.base.lazypager
+package pl.szczodrzynski.edziennik.ui.base.lazypager
 
 import androidx.fragment.app.FragmentManager
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/LazyFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/LazyFragment.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/LazyFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/LazyFragment.kt
index b5f26172..dd00436a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/LazyFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/LazyFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-29.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.base.lazypager
+package pl.szczodrzynski.edziennik.ui.base.lazypager
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/LazyPagerAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/LazyPagerAdapter.kt
similarity index 94%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/LazyPagerAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/LazyPagerAdapter.kt
index b70de59e..383d0c6f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/LazyPagerAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/LazyPagerAdapter.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-29.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.base.lazypager
+package pl.szczodrzynski.edziennik.ui.base.lazypager
 
 import android.util.SparseBooleanArray
 import androidx.core.util.set
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/LazyViewPager.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/LazyViewPager.kt
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/LazyViewPager.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/LazyViewPager.kt
index 45337990..2026d974 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/LazyViewPager.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/base/lazypager/LazyViewPager.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-29.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.base.lazypager
+package pl.szczodrzynski.edziennik.ui.base.lazypager
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/BehaviourFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/BehaviourFragment.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/BehaviourFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/BehaviourFragment.java
index d0b46f4a..ea388d00 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/BehaviourFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/BehaviourFragment.java
@@ -1,4 +1,7 @@
-package pl.szczodrzynski.edziennik.ui.modules.behaviour;
+package pl.szczodrzynski.edziennik.ui.behaviour;
+
+import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
+import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_NOTICE;
 
 import android.graphics.Color;
 import android.os.AsyncTask;
@@ -32,9 +35,6 @@ import pl.szczodrzynski.edziennik.databinding.FragmentBehaviourBinding;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem;
 
-import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
-import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_NOTICE;
-
 public class BehaviourFragment extends Fragment {
 
     private App app = null;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/NoticesAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/NoticesAdapter.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/NoticesAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/NoticesAdapter.kt
index 61ac01f1..e37b7ed9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/NoticesAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/NoticesAdapter.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.behaviour
+package pl.szczodrzynski.edziennik.ui.behaviour
 
 import android.content.Context
 import android.graphics.PorterDuff
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/captcha/LibrusCaptchaDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/captcha/LibrusCaptchaDialog.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/captcha/LibrusCaptchaDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/captcha/LibrusCaptchaDialog.kt
index e502ef28..a7355c47 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/captcha/LibrusCaptchaDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/captcha/LibrusCaptchaDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-15.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.captcha
+package pl.szczodrzynski.edziennik.ui.captcha
 
 import android.graphics.drawable.Drawable
 import android.view.View
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/captcha/RecaptchaDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/captcha/RecaptchaDialog.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/captcha/RecaptchaDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/captcha/RecaptchaDialog.kt
index 427ca44c..81fd82af 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/captcha/RecaptchaDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/captcha/RecaptchaDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-15.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.captcha
+package pl.szczodrzynski.edziennik.ui.captcha
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/DebugFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/DebugFragment.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/DebugFragment.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/DebugFragment.java
index 62d5462b..6ff081db 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/DebugFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/DebugFragment.java
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-3.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.debug;
+package pl.szczodrzynski.edziennik.ui.debug;
 
 import android.os.Bundle;
 import android.util.Log;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabFragment.kt
similarity index 94%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabFragment.kt
index f7c8952d..58632d5a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-3.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.debug
+package pl.szczodrzynski.edziennik.ui.debug
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -16,7 +16,7 @@ import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.addOnPageSelectedListener
 import pl.szczodrzynski.edziennik.databinding.TemplateFragmentBinding
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.FragmentLazyPagerAdapter
+import pl.szczodrzynski.edziennik.ui.base.lazypager.FragmentLazyPagerAdapter
 import kotlin.coroutines.CoroutineContext
 
 class LabFragment : Fragment(), CoroutineScope {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabJsonAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabJsonAdapter.kt
similarity index 90%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabJsonAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabJsonAdapter.kt
index a4a332c5..8d605885 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabJsonAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabJsonAdapter.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-5-12.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.debug
+package pl.szczodrzynski.edziennik.ui.debug
 
 import android.animation.ObjectAnimator
 import android.view.LayoutInflater
@@ -20,15 +20,15 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.ui.modules.debug.models.LabJsonArray
-import pl.szczodrzynski.edziennik.ui.modules.debug.models.LabJsonElement
-import pl.szczodrzynski.edziennik.ui.modules.debug.models.LabJsonObject
-import pl.szczodrzynski.edziennik.ui.modules.debug.viewholder.JsonArrayViewHolder
-import pl.szczodrzynski.edziennik.ui.modules.debug.viewholder.JsonElementViewHolder
-import pl.szczodrzynski.edziennik.ui.modules.debug.viewholder.JsonObjectViewHolder
-import pl.szczodrzynski.edziennik.ui.modules.debug.viewholder.JsonSubObjectViewHolder
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.ui.debug.models.LabJsonArray
+import pl.szczodrzynski.edziennik.ui.debug.models.LabJsonElement
+import pl.szczodrzynski.edziennik.ui.debug.models.LabJsonObject
+import pl.szczodrzynski.edziennik.ui.debug.viewholder.JsonArrayViewHolder
+import pl.szczodrzynski.edziennik.ui.debug.viewholder.JsonElementViewHolder
+import pl.szczodrzynski.edziennik.ui.debug.viewholder.JsonObjectViewHolder
+import pl.szczodrzynski.edziennik.ui.debug.viewholder.JsonSubObjectViewHolder
+import pl.szczodrzynski.edziennik.ui.grades.models.ExpandableItemModel
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
 import kotlin.coroutines.CoroutineContext
 
 class LabJsonAdapter(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabPageFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabPageFragment.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabPageFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabPageFragment.kt
index 19598af5..82c9ef7f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabPageFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabPageFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-5-12.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.debug
+package pl.szczodrzynski.edziennik.ui.debug
 
 import android.os.Bundle
 import android.os.Process
@@ -18,8 +18,8 @@ import kotlinx.coroutines.launch
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.config.Config
 import pl.szczodrzynski.edziennik.databinding.LabFragmentBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.profile.ProfileRemoveDialog
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.dialogs.ProfileRemoveDialog
 import pl.szczodrzynski.edziennik.utils.TextInputDropDown
 import pl.szczodrzynski.fslogin.decode
 import kotlin.coroutines.CoroutineContext
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabProfileFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabProfileFragment.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabProfileFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabProfileFragment.kt
index f4b03f55..0df1207e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/LabProfileFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/LabProfileFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-5-12.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.debug
+package pl.szczodrzynski.edziennik.ui.debug
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -18,8 +18,7 @@ import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.databinding.TemplateListPageFragmentBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.input
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
 import kotlin.coroutines.CoroutineContext
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/models/LabJsonArray.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/models/LabJsonArray.kt
similarity index 68%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/models/LabJsonArray.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/models/LabJsonArray.kt
index a606e238..e4cbbf65 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/models/LabJsonArray.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/models/LabJsonArray.kt
@@ -2,11 +2,11 @@
  * Copyright (c) Kuba Szczodrzyński 2020-5-12.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.debug.models
+package pl.szczodrzynski.edziennik.ui.debug.models
 
 import com.google.gson.JsonArray
 import com.google.gson.JsonElement
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel
+import pl.szczodrzynski.edziennik.ui.grades.models.ExpandableItemModel
 
 data class LabJsonArray(
         val key: String,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/models/LabJsonElement.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/models/LabJsonElement.kt
similarity index 77%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/models/LabJsonElement.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/models/LabJsonElement.kt
index e0e0e686..3592168c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/models/LabJsonElement.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/models/LabJsonElement.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-5-12.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.debug.models
+package pl.szczodrzynski.edziennik.ui.debug.models
 
 import com.google.gson.JsonElement
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/models/LabJsonObject.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/models/LabJsonObject.kt
similarity index 71%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/models/LabJsonObject.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/models/LabJsonObject.kt
index 43a69201..e67e609e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/models/LabJsonObject.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/models/LabJsonObject.kt
@@ -2,11 +2,11 @@
  * Copyright (c) Kuba Szczodrzyński 2020-5-12.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.debug.models
+package pl.szczodrzynski.edziennik.ui.debug.models
 
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel
+import pl.szczodrzynski.edziennik.ui.grades.models.ExpandableItemModel
 
 data class LabJsonObject(
         val key: String,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonArrayViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/viewholder/JsonArrayViewHolder.kt
similarity index 83%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonArrayViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/viewholder/JsonArrayViewHolder.kt
index 56645c28..c2a8115c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonArrayViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/viewholder/JsonArrayViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-5-12.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.debug.viewholder
+package pl.szczodrzynski.edziennik.ui.debug.viewholder
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
@@ -14,10 +14,10 @@ import androidx.recyclerview.widget.RecyclerView
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.databinding.LabItemObjectBinding
 import pl.szczodrzynski.edziennik.dp
-import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter
-import pl.szczodrzynski.edziennik.ui.modules.debug.LabJsonAdapter
-import pl.szczodrzynski.edziennik.ui.modules.debug.models.LabJsonArray
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.ui.attendance.AttendanceAdapter
+import pl.szczodrzynski.edziennik.ui.debug.LabJsonAdapter
+import pl.szczodrzynski.edziennik.ui.debug.models.LabJsonArray
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
 import pl.szczodrzynski.edziennik.utils.Themes
 
 class JsonArrayViewHolder(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonElementViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/viewholder/JsonElementViewHolder.kt
similarity index 87%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonElementViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/viewholder/JsonElementViewHolder.kt
index 20b1c2c8..c54ee8c3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonElementViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/viewholder/JsonElementViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-5-12.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.debug.viewholder
+package pl.szczodrzynski.edziennik.ui.debug.viewholder
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
@@ -14,9 +14,9 @@ import com.google.gson.JsonNull
 import com.google.gson.JsonPrimitive
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.databinding.LabItemElementBinding
-import pl.szczodrzynski.edziennik.ui.modules.debug.LabJsonAdapter
-import pl.szczodrzynski.edziennik.ui.modules.debug.models.LabJsonElement
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.ui.debug.LabJsonAdapter
+import pl.szczodrzynski.edziennik.ui.debug.models.LabJsonElement
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
 import pl.szczodrzynski.edziennik.utils.Themes
 
 class JsonElementViewHolder(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonObjectViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/viewholder/JsonObjectViewHolder.kt
similarity index 83%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonObjectViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/viewholder/JsonObjectViewHolder.kt
index b4de8efe..f878a6d7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonObjectViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/viewholder/JsonObjectViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-5-12.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.debug.viewholder
+package pl.szczodrzynski.edziennik.ui.debug.viewholder
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
@@ -14,10 +14,10 @@ import androidx.recyclerview.widget.RecyclerView
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.databinding.LabItemObjectBinding
 import pl.szczodrzynski.edziennik.dp
-import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter
-import pl.szczodrzynski.edziennik.ui.modules.debug.LabJsonAdapter
-import pl.szczodrzynski.edziennik.ui.modules.debug.models.LabJsonObject
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.ui.attendance.AttendanceAdapter
+import pl.szczodrzynski.edziennik.ui.debug.LabJsonAdapter
+import pl.szczodrzynski.edziennik.ui.debug.models.LabJsonObject
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
 import pl.szczodrzynski.edziennik.utils.Themes
 
 class JsonObjectViewHolder(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonSubObjectViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/viewholder/JsonSubObjectViewHolder.kt
similarity index 79%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonSubObjectViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/viewholder/JsonSubObjectViewHolder.kt
index dbc71ca2..2379edc1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/debug/viewholder/JsonSubObjectViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/debug/viewholder/JsonSubObjectViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-2-26.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.debug.viewholder
+package pl.szczodrzynski.edziennik.ui.debug.viewholder
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
@@ -13,10 +13,10 @@ import androidx.recyclerview.widget.RecyclerView
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.databinding.LabItemSubObjectBinding
 import pl.szczodrzynski.edziennik.dp
-import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter
-import pl.szczodrzynski.edziennik.ui.modules.debug.LabJsonAdapter
-import pl.szczodrzynski.edziennik.ui.modules.debug.models.LabJsonObject
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.ui.attendance.AttendanceAdapter
+import pl.szczodrzynski.edziennik.ui.debug.LabJsonAdapter
+import pl.szczodrzynski.edziennik.ui.debug.models.LabJsonObject
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
 import pl.szczodrzynski.edziennik.utils.Themes
 
 class JsonSubObjectViewHolder(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/bell/BellSyncDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/BellSyncDialog.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/bell/BellSyncDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/BellSyncDialog.kt
index ab1b1f8f..09cee613 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/bell/BellSyncDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/BellSyncDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kacper Ziubryniewicz 2019-12-20
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.bell
+package pl.szczodrzynski.edziennik.ui.dialogs
 
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/bell/BellSyncTimeChooseDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/BellSyncTimeChooseDialog.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/bell/BellSyncTimeChooseDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/BellSyncTimeChooseDialog.kt
index 4116ab83..e43100a8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/bell/BellSyncTimeChooseDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/BellSyncTimeChooseDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kacper Ziubryniewicz 2019-12-20
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.bell
+package pl.szczodrzynski.edziennik.ui.dialogs
 
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/changelog/ChangelogDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ChangelogDialog.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/changelog/ChangelogDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ChangelogDialog.kt
index aab73a69..f6abb92b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/changelog/ChangelogDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ChangelogDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-12-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.changelog
+package pl.szczodrzynski.edziennik.ui.dialogs
 
 import android.os.Build
 import android.widget.ScrollView
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/profile/ProfileRemoveDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ProfileRemoveDialog.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/profile/ProfileRemoveDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ProfileRemoveDialog.kt
index 7071f00d..dfb3e95e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/profile/ProfileRemoveDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ProfileRemoveDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-11-13.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.profile
+package pl.szczodrzynski.edziennik.ui.dialogs
 
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/agenda/AgendaConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AgendaConfigDialog.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/agenda/AgendaConfigDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AgendaConfigDialog.kt
index 150d7d65..cb7c741c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/agenda/AgendaConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AgendaConfigDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-4-10.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.agenda
+package pl.szczodrzynski.edziennik.ui.dialogs.settings
 
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
@@ -11,7 +11,6 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.REGISTRATION_ENABLED
 import pl.szczodrzynski.edziennik.databinding.DialogConfigAgendaBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.sync.RegistrationConfigDialog
 import java.util.*
 
 class AgendaConfigDialog(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AttendanceConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AttendanceConfigDialog.kt
index e7d66ed5..b5847f50 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AttendanceConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AttendanceConfigDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Kuba Szczodrzyński 2020-5-4.
+ * Copyright (c) Kuba Szczodrzyński 2021-10-17.
  */
 
 package pl.szczodrzynski.edziennik.ui.dialogs.settings
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/bell/BellSyncConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/BellSyncConfigDialog.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/bell/BellSyncConfigDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/BellSyncConfigDialog.kt
index 13dcb6f9..a28bb3e3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/bell/BellSyncConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/BellSyncConfigDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-3-20.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.bell
+package pl.szczodrzynski.edziennik.ui.dialogs.settings
 
 import android.widget.TextView
 import android.widget.Toast
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradesConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/GradesConfigDialog.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradesConfigDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/GradesConfigDialog.kt
index 20325447..e74f3577 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradesConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/GradesConfigDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kacper Ziubryniewicz 2020-1-16
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.grade
+package pl.szczodrzynski.edziennik.ui.dialogs.settings
 
 import android.annotation.SuppressLint
 import androidx.appcompat.app.AlertDialog
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/MessagesConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/MessagesConfigDialog.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/MessagesConfigDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/MessagesConfigDialog.kt
index e42bf61f..722f416c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/MessagesConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/MessagesConfigDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-4-14.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs
+package pl.szczodrzynski.edziennik.ui.dialogs.settings
 
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/NotificationFilterDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/NotificationFilterDialog.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/NotificationFilterDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/NotificationFilterDialog.kt
index ad31c02d..8ce6ca9e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/NotificationFilterDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/NotificationFilterDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-21.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.sync
+package pl.szczodrzynski.edziennik.ui.dialogs.settings
 
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/profile/ProfileConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileConfigDialog.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/profile/ProfileConfigDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileConfigDialog.kt
index e9204090..bbe1dc6a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/profile/ProfileConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileConfigDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-3-23.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.profile
+package pl.szczodrzynski.edziennik.ui.dialogs.settings
 
 import android.content.res.ColorStateList
 import androidx.appcompat.app.AlertDialog
@@ -16,6 +16,7 @@ import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.databinding.DialogProfileConfigBinding
+import pl.szczodrzynski.edziennik.ui.dialogs.ProfileRemoveDialog
 import kotlin.coroutines.CoroutineContext
 
 class ProfileConfigDialog(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/QuietHoursConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/QuietHoursConfigDialog.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/QuietHoursConfigDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/QuietHoursConfigDialog.kt
index 5c933e20..1319b540 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/QuietHoursConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/QuietHoursConfigDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-3-20.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.sync
+package pl.szczodrzynski.edziennik.ui.dialogs.settings
 
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/RegistrationConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/RegistrationConfigDialog.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/RegistrationConfigDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/RegistrationConfigDialog.kt
index 4a309536..f5b45320 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/RegistrationConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/RegistrationConfigDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-15.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.sync
+package pl.szczodrzynski.edziennik.ui.dialogs.settings
 
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/home/StudentNumberDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/StudentNumberDialog.kt
similarity index 93%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/home/StudentNumberDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/StudentNumberDialog.kt
index 3f3f8176..28953ed0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/home/StudentNumberDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/StudentNumberDialog.kt
@@ -2,14 +2,14 @@
  * Copyright (c) Kuba Szczodrzyński 2019-11-24.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.home
+package pl.szczodrzynski.edziennik.ui.dialogs.settings
 
 import android.text.InputType
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
-import pl.szczodrzynski.edziennik.ui.dialogs.input
+import pl.szczodrzynski.edziennik.input
 
 class StudentNumberDialog(
         val activity: AppCompatActivity,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncIntervalDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/SyncIntervalDialog.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncIntervalDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/SyncIntervalDialog.kt
index 6f4f027b..5c5327da 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncIntervalDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/SyncIntervalDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-3-20.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.sync
+package pl.szczodrzynski.edziennik.ui.dialogs.settings
 
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/RegisterUnavailableDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/RegisterUnavailableDialog.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/RegisterUnavailableDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/RegisterUnavailableDialog.kt
index 10853812..291ec7c2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/RegisterUnavailableDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/RegisterUnavailableDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-9-3.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs
+package pl.szczodrzynski.edziennik.ui.dialogs.sync
 
 import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ServerMessageDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/ServerMessageDialog.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ServerMessageDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/ServerMessageDialog.kt
index cebc4e04..8cbe4430 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ServerMessageDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/ServerMessageDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-1-19.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs
+package pl.szczodrzynski.edziennik.ui.dialogs.sync
 
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt
index 96a72cb5..35636eb6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt
@@ -14,7 +14,7 @@ import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.databinding.DialogLessonDetailsBinding
-import pl.szczodrzynski.edziennik.ui.modules.messages.list.MessagesFragment
+import pl.szczodrzynski.edziennik.ui.messages.list.MessagesFragment
 import kotlin.coroutines.CoroutineContext
 
 class SyncViewListDialog(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/UpdateAvailableDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/UpdateAvailableDialog.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/UpdateAvailableDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/UpdateAvailableDialog.kt
index 3c54dc92..2f84e363 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/UpdateAvailableDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/UpdateAvailableDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-9-3.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs
+package pl.szczodrzynski.edziennik.ui.dialogs.sync
 
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/error/ErrorDetailsDialog.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorDetailsDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/error/ErrorDetailsDialog.kt
index 32ec46b9..f78efe5b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorDetailsDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/error/ErrorDetailsDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-16.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.error
+package pl.szczodrzynski.edziennik.ui.error
 
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/error/ErrorDialog.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/error/ErrorDialog.kt
index bf0ff712..20f47522 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/error/ErrorDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-11-13.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.error
+package pl.szczodrzynski.edziennik.ui.error
 
 import android.util.Log
 import androidx.appcompat.app.AlertDialog
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorSnackbar.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/error/ErrorSnackbar.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorSnackbar.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/error/ErrorSnackbar.kt
index be715f4d..0057eabd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorSnackbar.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/error/ErrorSnackbar.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-11-13.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.error
+package pl.szczodrzynski.edziennik.ui.error
 
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/event/EventDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventDetailsDialog.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/event/EventDetailsDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventDetailsDialog.kt
index 1b23d45e..eb2a5374 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/event/EventDetailsDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventDetailsDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-12-18.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.event
+package pl.szczodrzynski.edziennik.ui.event
 
 import android.content.ActivityNotFoundException
 import android.content.Intent
@@ -24,7 +24,7 @@ import pl.szczodrzynski.edziennik.data.api.events.EventGetEvent
 import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.databinding.DialogEventDetailsBinding
-import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableFragment
+import pl.szczodrzynski.edziennik.ui.timetable.TimetableFragment
 import pl.szczodrzynski.edziennik.utils.BetterLink
 import pl.szczodrzynski.edziennik.utils.models.Date
 import kotlin.coroutines.CoroutineContext
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/event/EventListAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventListAdapter.kt
similarity index 94%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/event/EventListAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventListAdapter.kt
index 40de3145..c8970c73 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/event/EventListAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventListAdapter.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kacper Ziubryniewicz 2019-11-30
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.event
+package pl.szczodrzynski.edziennik.ui.event
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -14,7 +14,7 @@ import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.startCoroutineTimer
-import pl.szczodrzynski.edziennik.ui.modules.search.SearchableAdapter
+import pl.szczodrzynski.edziennik.ui.search.SearchableAdapter
 import kotlin.coroutines.CoroutineContext
 
 class EventListAdapter(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/event/EventManualDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventManualDialog.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/event/EventManualDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventManualDialog.kt
index 51557351..6b777007 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/event/EventManualDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventManualDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-11-12.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.event
+package pl.szczodrzynski.edziennik.ui.event
 
 import android.view.View
 import android.widget.Toast
@@ -31,8 +31,8 @@ import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.data.db.full.LessonFull
 import pl.szczodrzynski.edziennik.databinding.DialogEventManualV2Binding
 import pl.szczodrzynski.edziennik.ui.dialogs.StyledTextDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.sync.RegistrationConfigDialog
-import pl.szczodrzynski.edziennik.ui.modules.views.TimeDropdown.Companion.DISPLAY_LESSONS
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.RegistrationConfigDialog
+import pl.szczodrzynski.edziennik.ui.views.TimeDropdown.Companion.DISPLAY_LESSONS
 import pl.szczodrzynski.edziennik.utils.Anim
 import pl.szczodrzynski.edziennik.utils.html.BetterHtml
 import pl.szczodrzynski.edziennik.utils.managers.TextStylingManager.HtmlMode.SIMPLE
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/event/EventViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventViewHolder.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/event/EventViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventViewHolder.kt
index 8aff06dc..fefd40ac 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/event/EventViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/event/EventViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-10-10.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.event
+package pl.szczodrzynski.edziennik.ui.event
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.databinding.EventListItemBinding
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Week
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/feedback/FeedbackActivity.kt
similarity index 93%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackActivity.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/feedback/FeedbackActivity.kt
index fb751e3a..d27b4dd0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/feedback/FeedbackActivity.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.feedback
+package pl.szczodrzynski.edziennik.ui.feedback
 
 import android.os.Bundle
 import android.view.MenuItem
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/feedback/FeedbackFragment.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/feedback/FeedbackFragment.kt
index 3c33be8d..a743d5a9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/feedback/FeedbackFragment.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.feedback
+package pl.szczodrzynski.edziennik.ui.feedback
 
 import android.content.BroadcastReceiver
 import android.graphics.Bitmap
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradeDetailsDialog.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradeDetailsDialog.kt
index a42f9e2f..5f664e72 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradeDetailsDialog.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.dialogs.grade
+package pl.szczodrzynski.edziennik.ui.grades
 
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
@@ -13,7 +13,7 @@ import pl.szczodrzynski.edziennik.data.db.full.GradeFull
 import pl.szczodrzynski.edziennik.databinding.DialogGradeDetailsBinding
 import pl.szczodrzynski.edziennik.onClick
 import pl.szczodrzynski.edziennik.setTintColor
-import pl.szczodrzynski.edziennik.ui.modules.grades.GradesAdapter
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.GradesConfigDialog
 import pl.szczodrzynski.edziennik.utils.BetterLink
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
 import kotlin.coroutines.CoroutineContext
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradeView.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradeView.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradeView.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradeView.kt
index b80ad2ac..7478bea5 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradeView.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradeView.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-1.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.grades
+package pl.szczodrzynski.edziennik.ui.grades
 
 import android.annotation.SuppressLint
 import android.content.Context
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradesAdapter.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradesAdapter.kt
index 086f073d..e1dcd9f1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradesAdapter.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-29.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.grades
+package pl.szczodrzynski.edziennik.ui.grades
 
 import android.animation.ObjectAnimator
 import android.view.LayoutInflater
@@ -19,8 +19,8 @@ import pl.szczodrzynski.edziennik.data.db.entity.Grade
 import pl.szczodrzynski.edziennik.data.db.full.GradeFull
 import pl.szczodrzynski.edziennik.onClick
 import pl.szczodrzynski.edziennik.startCoroutineTimer
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.*
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.*
+import pl.szczodrzynski.edziennik.ui.grades.models.*
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.*
 import kotlin.coroutines.CoroutineContext
 
 class GradesAdapter(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradesListFragment.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradesListFragment.kt
index 63c935ff..7dc27d6f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradesListFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-4.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.grades
+package pl.szczodrzynski.edziennik.ui.grades
 
 import android.os.AsyncTask
 import android.os.Bundle
@@ -22,12 +22,11 @@ import pl.szczodrzynski.edziennik.data.db.entity.Grade
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_GRADE
 import pl.szczodrzynski.edziennik.data.db.full.GradeFull
 import pl.szczodrzynski.edziennik.databinding.GradesListFragmentBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.grade.GradeDetailsDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.grade.GradesConfigDialog
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.GradesAverages
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.GradesSemester
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.GradesStats
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.GradesSubject
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.GradesConfigDialog
+import pl.szczodrzynski.edziennik.ui.grades.models.GradesAverages
+import pl.szczodrzynski.edziennik.ui.grades.models.GradesSemester
+import pl.szczodrzynski.edziennik.ui.grades.models.GradesStats
+import pl.szczodrzynski.edziennik.ui.grades.models.GradesSubject
 import pl.szczodrzynski.edziennik.utils.managers.GradesManager
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/editor/GradesEditorAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/editor/GradesEditorAdapter.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/editor/GradesEditorAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/editor/GradesEditorAdapter.kt
index df9faad5..22a7b7e8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/editor/GradesEditorAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/editor/GradesEditorAdapter.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.grades.editor
+package pl.szczodrzynski.edziennik.ui.grades.editor
 
 import android.content.Context
 import android.graphics.PorterDuff
@@ -14,7 +14,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.ui.modules.grades.editor.GradesEditorFragment.Companion.modifyGradeChooser
+import pl.szczodrzynski.edziennik.ui.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/ui/modules/grades/editor/GradesEditorFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/editor/GradesEditorFragment.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/editor/GradesEditorFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/editor/GradesEditorFragment.kt
index 2d90f4f9..afb06521 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/editor/GradesEditorFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/editor/GradesEditorFragment.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.grades.editor
+package pl.szczodrzynski.edziennik.ui.grades.editor
 
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
@@ -15,7 +15,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Grade
 import pl.szczodrzynski.edziennik.databinding.FragmentGradesEditorBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.input
 import pl.szczodrzynski.edziennik.utils.Colors
 import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.YEAR_1_AVG_2_AVG
 import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.YEAR_1_AVG_2_SEM
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/ExpandableItemModel.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/models/ExpandableItemModel.kt
similarity index 56%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/ExpandableItemModel.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/models/ExpandableItemModel.kt
index 20cb3ffc..39b2a08c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/ExpandableItemModel.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/models/ExpandableItemModel.kt
@@ -2,9 +2,9 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-29.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.grades.models
+package pl.szczodrzynski.edziennik.ui.grades.models
 
-import pl.szczodrzynski.edziennik.ui.modules.grades.GradesAdapter.Companion.STATE_CLOSED
+import pl.szczodrzynski.edziennik.ui.grades.GradesAdapter.Companion.STATE_CLOSED
 
 abstract class ExpandableItemModel<T>(open val items: MutableList<T>) {
     open var level: Int = 3
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/GradesAverages.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/models/GradesAverages.kt
similarity index 84%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/GradesAverages.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/models/GradesAverages.kt
index 185710d1..551f145c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/GradesAverages.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/models/GradesAverages.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-1.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.grades.models
+package pl.szczodrzynski.edziennik.ui.grades.models
 
 class GradesAverages {
     var normalSum = 0f
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/GradesEmpty.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/models/GradesEmpty.kt
similarity index 55%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/GradesEmpty.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/models/GradesEmpty.kt
index 4b726f3f..3b80e741 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/GradesEmpty.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/models/GradesEmpty.kt
@@ -2,6 +2,6 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-1.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.grades.models
+package pl.szczodrzynski.edziennik.ui.grades.models
 
 class GradesEmpty
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/GradesSemester.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/models/GradesSemester.kt
similarity index 88%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/GradesSemester.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/models/GradesSemester.kt
index e8e107ad..51f063df 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/GradesSemester.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/models/GradesSemester.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-29.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.grades.models
+package pl.szczodrzynski.edziennik.ui.grades.models
 
 import pl.szczodrzynski.edziennik.data.db.full.GradeFull
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/GradesStats.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/models/GradesStats.kt
similarity index 89%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/GradesStats.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/models/GradesStats.kt
index 76833b45..26041dcd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/GradesStats.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/models/GradesStats.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-3.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.grades.models
+package pl.szczodrzynski.edziennik.ui.grades.models
 
 class GradesStats {
     var normalSem1 = 0f
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/GradesSubject.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/models/GradesSubject.kt
similarity index 90%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/GradesSubject.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/models/GradesSubject.kt
index a61abc0d..c1495815 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/models/GradesSubject.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/models/GradesSubject.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-29.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.grades.models
+package pl.szczodrzynski.edziennik.ui.grades.models
 
 import pl.szczodrzynski.edziennik.data.db.full.GradeFull
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/BindableViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/BindableViewHolder.kt
similarity index 81%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/BindableViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/BindableViewHolder.kt
index 6dd83384..caa5605b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/BindableViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/BindableViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-29.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.grades.viewholder
+package pl.szczodrzynski.edziennik.ui.grades.viewholder
 
 import androidx.appcompat.app.AppCompatActivity
 import pl.szczodrzynski.edziennik.App
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/EmptyViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/EmptyViewHolder.kt
similarity index 79%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/EmptyViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/EmptyViewHolder.kt
index ec0eb8ba..866eda04 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/EmptyViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/EmptyViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-1.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.grades.viewholder
+package pl.szczodrzynski.edziennik.ui.grades.viewholder
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -10,8 +10,8 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.databinding.GradesItemEmptyBinding
-import pl.szczodrzynski.edziennik.ui.modules.grades.GradesAdapter
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.GradesEmpty
+import pl.szczodrzynski.edziennik.ui.grades.GradesAdapter
+import pl.szczodrzynski.edziennik.ui.grades.models.GradesEmpty
 
 class EmptyViewHolder(
     inflater: LayoutInflater,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/GradeViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/GradeViewHolder.kt
similarity index 93%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/GradeViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/GradeViewHolder.kt
index 2af79ba3..b8cab8b7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/GradeViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/GradeViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-29.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.grades.viewholder
+package pl.szczodrzynski.edziennik.ui.grades.viewholder
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -13,8 +13,8 @@ import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.db.full.GradeFull
 import pl.szczodrzynski.edziennik.databinding.GradesItemGradeBinding
-import pl.szczodrzynski.edziennik.ui.modules.grades.GradesAdapter
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.GradesSubject
+import pl.szczodrzynski.edziennik.ui.grades.GradesAdapter
+import pl.szczodrzynski.edziennik.ui.grades.models.GradesSubject
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class GradeViewHolder(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/SemesterViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/SemesterViewHolder.kt
similarity index 89%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/SemesterViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/SemesterViewHolder.kt
index 5686a37f..0362a6a9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/SemesterViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/SemesterViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-29.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.grades.viewholder
+package pl.szczodrzynski.edziennik.ui.grades.viewholder
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -13,9 +13,9 @@ import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.GradesItemSemesterBinding
 import pl.szczodrzynski.edziennik.setText
-import pl.szczodrzynski.edziennik.ui.modules.grades.GradesAdapter
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.GradesSemester
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.GradesSubject
+import pl.szczodrzynski.edziennik.ui.grades.GradesAdapter
+import pl.szczodrzynski.edziennik.ui.grades.models.GradesSemester
+import pl.szczodrzynski.edziennik.ui.grades.models.GradesSubject
 
 class SemesterViewHolder(
     inflater: LayoutInflater,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/StatsViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/StatsViewHolder.kt
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/StatsViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/StatsViewHolder.kt
index 532ade84..93b9c639 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/StatsViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/StatsViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-3.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.grades.viewholder
+package pl.szczodrzynski.edziennik.ui.grades.viewholder
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -15,9 +15,9 @@ import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.GradesItemStatsBinding
 import pl.szczodrzynski.edziennik.onClick
-import pl.szczodrzynski.edziennik.ui.dialogs.grade.GradesConfigDialog
-import pl.szczodrzynski.edziennik.ui.modules.grades.GradesAdapter
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.GradesStats
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.GradesConfigDialog
+import pl.szczodrzynski.edziennik.ui.grades.GradesAdapter
+import pl.szczodrzynski.edziennik.ui.grades.models.GradesStats
 import java.text.DecimalFormat
 
 class StatsViewHolder(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/SubjectViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/SubjectViewHolder.kt
similarity index 94%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/SubjectViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/SubjectViewHolder.kt
index 58015a0a..371e90e4 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/viewholder/SubjectViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/viewholder/SubjectViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-29.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.grades.viewholder
+package pl.szczodrzynski.edziennik.ui.grades.viewholder
 
 import android.text.TextUtils
 import android.view.LayoutInflater
@@ -18,10 +18,10 @@ import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.databinding.GradesItemSubjectBinding
-import pl.szczodrzynski.edziennik.ui.modules.grades.GradeView
-import pl.szczodrzynski.edziennik.ui.modules.grades.GradesAdapter
-import pl.szczodrzynski.edziennik.ui.modules.grades.GradesAdapter.Companion.STATE_CLOSED
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.GradesSubject
+import pl.szczodrzynski.edziennik.ui.grades.GradeView
+import pl.szczodrzynski.edziennik.ui.grades.GradesAdapter
+import pl.szczodrzynski.edziennik.ui.grades.GradesAdapter.Companion.STATE_CLOSED
+import pl.szczodrzynski.edziennik.ui.grades.models.GradesSubject
 import pl.szczodrzynski.edziennik.utils.Themes
 
 class SubjectViewHolder(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CardItemTouchHelperCallback.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/CardItemTouchHelperCallback.kt
similarity index 90%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CardItemTouchHelperCallback.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/home/CardItemTouchHelperCallback.kt
index 7cfb3c2f..d1a0aa49 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CardItemTouchHelperCallback.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/CardItemTouchHelperCallback.kt
@@ -2,14 +2,14 @@
  * Copyright (c) Kuba Szczodrzyński 2019-11-23.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.home
+package pl.szczodrzynski.edziennik.ui.home
 
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.ItemTouchHelper.*
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.card.MaterialCardView
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment.Companion.removeCard
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment.Companion.swapCards
+import pl.szczodrzynski.edziennik.ui.home.HomeFragment.Companion.removeCard
+import pl.szczodrzynski.edziennik.ui.home.HomeFragment.Companion.swapCards
 import pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator
 
 class CardItemTouchHelperCallback(private val cardAdapter: HomeCardAdapter, private val refreshLayout: SwipeRefreshLayoutNoIndicator?) : ItemTouchHelper.Callback() {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CounterActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/CounterActivity.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CounterActivity.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/home/CounterActivity.kt
index 868b330f..1b217351 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CounterActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/CounterActivity.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kacper Ziubryniewicz 2019-12-21
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.home
+package pl.szczodrzynski.edziennik.ui.home
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
@@ -15,7 +15,7 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Lesson
 import pl.szczodrzynski.edziennik.data.db.full.LessonFull
 import pl.szczodrzynski.edziennik.databinding.ActivityCounterBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.bell.BellSyncTimeChooseDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.BellSyncTimeChooseDialog
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
 import kotlin.coroutines.CoroutineContext
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeCard.kt
similarity index 94%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeCard.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeCard.kt
index 2c7894ce..af59bbb6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeCard.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-11-23.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.home
+package pl.szczodrzynski.edziennik.ui.home
 
 interface HomeCard {
     companion object {
@@ -30,4 +30,4 @@ interface HomeCard {
 
     fun bind(position: Int, holder: HomeCardAdapter.ViewHolder)
     fun unbind(position: Int, holder: HomeCardAdapter.ViewHolder)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeCardAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeCardAdapter.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeCardAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeCardAdapter.kt
index 05ba72b6..3e3df7f2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeCardAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeCardAdapter.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-11-23.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.home
+package pl.szczodrzynski.edziennik.ui.home
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
@@ -48,4 +48,4 @@ class HomeCardAdapter(var items: MutableList<HomeCard>) : RecyclerView.Adapter<R
             }*/
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeCardModel.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeCardModel.kt
similarity index 70%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeCardModel.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeCardModel.kt
index bc577713..40c688a1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeCardModel.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeCardModel.kt
@@ -2,11 +2,11 @@
  * Copyright (c) Kuba Szczodrzyński 2019-12-2.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.home
+package pl.szczodrzynski.edziennik.ui.home
 
 import java.io.Serializable
 
 data class HomeCardModel(
         val profileId: Int,
         val cardId: Int
-) : Serializable
\ No newline at end of file
+) : Serializable
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeConfigDialog.kt
similarity index 87%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeConfigDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeConfigDialog.kt
index 268bf211..bae682f2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeConfigDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeConfigDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-11.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.home
+package pl.szczodrzynski.edziennik.ui.home
 
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
@@ -10,10 +10,10 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCard.Companion.CARD_EVENTS
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCard.Companion.CARD_GRADES
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCard.Companion.CARD_LUCKY_NUMBER
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCard.Companion.CARD_TIMETABLE
+import pl.szczodrzynski.edziennik.ui.home.HomeCard.Companion.CARD_EVENTS
+import pl.szczodrzynski.edziennik.ui.home.HomeCard.Companion.CARD_GRADES
+import pl.szczodrzynski.edziennik.ui.home.HomeCard.Companion.CARD_LUCKY_NUMBER
+import pl.szczodrzynski.edziennik.ui.home.HomeCard.Companion.CARD_TIMETABLE
 import kotlin.collections.set
 
 class HomeConfigDialog(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeDummyCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeDummyCard.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeDummyCard.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeDummyCard.kt
index 1f6904d2..53fe9112 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeDummyCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeDummyCard.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-11-23.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.home
+package pl.szczodrzynski.edziennik.ui.home
 
 import android.widget.TextView
 import androidx.core.view.plusAssign
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeFragment.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeFragment.kt
index 5d5cbc45..dacc3426 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-11-23.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.home
+package pl.szczodrzynski.edziennik.ui.home
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -24,8 +24,8 @@ import kotlinx.coroutines.*
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.databinding.FragmentHomeBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.home.StudentNumberDialog
-import pl.szczodrzynski.edziennik.ui.modules.home.cards.*
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.StudentNumberDialog
+import pl.szczodrzynski.edziennik.ui.home.cards.*
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
 import kotlin.coroutines.CoroutineContext
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeArchiveCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeArchiveCard.kt
similarity index 91%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeArchiveCard.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeArchiveCard.kt
index 17fc89e4..01b82f4b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeArchiveCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeArchiveCard.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-8-25.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.home.cards
+package pl.szczodrzynski.edziennik.ui.home.cards
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -14,9 +14,9 @@ import kotlinx.coroutines.*
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.databinding.CardHomeArchiveBinding
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCard
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardAdapter
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
+import pl.szczodrzynski.edziennik.ui.home.HomeCard
+import pl.szczodrzynski.edziennik.ui.home.HomeCardAdapter
+import pl.szczodrzynski.edziennik.ui.home.HomeFragment
 import kotlin.coroutines.CoroutineContext
 
 class HomeArchiveCard(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeAvailabilityCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeAvailabilityCard.kt
similarity index 90%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeAvailabilityCard.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeAvailabilityCard.kt
index 411d3aef..4aa127fa 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeAvailabilityCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeAvailabilityCard.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-9-3.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.home.cards
+package pl.szczodrzynski.edziennik.ui.home.cards
 
 import android.view.LayoutInflater
 import android.view.View
@@ -19,11 +19,11 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.databinding.CardHomeAvailabilityBinding
 import pl.szczodrzynski.edziennik.sync.UpdateDownloaderService
-import pl.szczodrzynski.edziennik.ui.dialogs.RegisterUnavailableDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.UpdateAvailableDialog
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCard
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardAdapter
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
+import pl.szczodrzynski.edziennik.ui.dialogs.sync.RegisterUnavailableDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.sync.UpdateAvailableDialog
+import pl.szczodrzynski.edziennik.ui.home.HomeCard
+import pl.szczodrzynski.edziennik.ui.home.HomeCardAdapter
+import pl.szczodrzynski.edziennik.ui.home.HomeFragment
 import pl.szczodrzynski.edziennik.utils.html.BetterHtml
 import kotlin.coroutines.CoroutineContext
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeDebugCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeDebugCard.kt
similarity index 94%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeDebugCard.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeDebugCard.kt
index 3fde41ab..9dfcf31a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeDebugCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeDebugCard.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-12-22.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.home.cards
+package pl.szczodrzynski.edziennik.ui.home.cards
 
 import android.appwidget.AppWidgetManager
 import android.content.ComponentName
@@ -27,10 +27,10 @@ import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.databinding.CardHomeDebugBinding
 import pl.szczodrzynski.edziennik.dp
 import pl.szczodrzynski.edziennik.onClick
-import pl.szczodrzynski.edziennik.ui.dialogs.captcha.LibrusCaptchaDialog
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCard
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardAdapter
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
+import pl.szczodrzynski.edziennik.ui.captcha.LibrusCaptchaDialog
+import pl.szczodrzynski.edziennik.ui.home.HomeCard
+import pl.szczodrzynski.edziennik.ui.home.HomeCardAdapter
+import pl.szczodrzynski.edziennik.ui.home.HomeFragment
 import pl.szczodrzynski.edziennik.ui.widgets.WidgetConfigActivity
 import pl.szczodrzynski.edziennik.ui.widgets.luckynumber.WidgetLuckyNumberProvider
 import pl.szczodrzynski.edziennik.ui.widgets.notifications.WidgetNotificationsProvider
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeEventsCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeEventsCard.kt
similarity index 89%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeEventsCard.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeEventsCard.kt
index f92e86b8..baf84c15 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeEventsCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeEventsCard.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-28.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.home.cards
+package pl.szczodrzynski.edziennik.ui.home.cards
 
 import android.view.LayoutInflater
 import android.view.View
@@ -22,12 +22,12 @@ import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.databinding.CardHomeEventsBinding
 import pl.szczodrzynski.edziennik.dp
 import pl.szczodrzynski.edziennik.onClick
-import pl.szczodrzynski.edziennik.ui.modules.event.EventDetailsDialog
-import pl.szczodrzynski.edziennik.ui.modules.event.EventListAdapter
-import pl.szczodrzynski.edziennik.ui.modules.event.EventManualDialog
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCard
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardAdapter
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
+import pl.szczodrzynski.edziennik.ui.event.EventDetailsDialog
+import pl.szczodrzynski.edziennik.ui.event.EventListAdapter
+import pl.szczodrzynski.edziennik.ui.event.EventManualDialog
+import pl.szczodrzynski.edziennik.ui.home.HomeCard
+import pl.szczodrzynski.edziennik.ui.home.HomeCardAdapter
+import pl.szczodrzynski.edziennik.ui.home.HomeFragment
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
 import pl.szczodrzynski.edziennik.utils.models.Date
 import kotlin.coroutines.CoroutineContext
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeGradesCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeGradesCard.kt
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeGradesCard.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeGradesCard.kt
index f1c3373e..0e883063 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeGradesCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeGradesCard.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kacper Ziubryniewicz 2019-11-29
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.home.cards
+package pl.szczodrzynski.edziennik.ui.home.cards
 
 import android.graphics.Typeface
 import android.os.Build
@@ -30,10 +30,10 @@ import pl.szczodrzynski.edziennik.data.db.entity.Subject
 import pl.szczodrzynski.edziennik.data.db.full.GradeFull
 import pl.szczodrzynski.edziennik.databinding.CardHomeGradesBinding
 import pl.szczodrzynski.edziennik.dp
-import pl.szczodrzynski.edziennik.ui.modules.grades.GradeView
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCard
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardAdapter
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
+import pl.szczodrzynski.edziennik.ui.grades.GradeView
+import pl.szczodrzynski.edziennik.ui.home.HomeCard
+import pl.szczodrzynski.edziennik.ui.home.HomeCardAdapter
+import pl.szczodrzynski.edziennik.ui.home.HomeFragment
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.ItemGradesSubjectModel
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeLuckyNumberCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeLuckyNumberCard.kt
similarity index 93%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeLuckyNumberCard.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeLuckyNumberCard.kt
index 31611e48..046c653b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeLuckyNumberCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeLuckyNumberCard.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-11-24.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.home.cards
+package pl.szczodrzynski.edziennik.ui.home.cards
 
 import android.view.LayoutInflater
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
@@ -18,10 +18,10 @@ import kotlinx.coroutines.launch
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.databinding.CardHomeLuckyNumberBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.home.StudentNumberDialog
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCard
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardAdapter
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.StudentNumberDialog
+import pl.szczodrzynski.edziennik.ui.home.HomeCard
+import pl.szczodrzynski.edziennik.ui.home.HomeCardAdapter
+import pl.szczodrzynski.edziennik.ui.home.HomeFragment
 import pl.szczodrzynski.edziennik.utils.models.Date
 import kotlin.coroutines.CoroutineContext
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTemplateCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeTemplateCard.kt
similarity index 87%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTemplateCard.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeTemplateCard.kt
index 0bb2e881..ef6e9ea5 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTemplateCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeTemplateCard.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-12-22.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.home.cards
+package pl.szczodrzynski.edziennik.ui.home.cards
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -19,9 +19,9 @@ import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.databinding.CardHomeTemplateBinding
 import pl.szczodrzynski.edziennik.dp
 import pl.szczodrzynski.edziennik.onClick
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCard
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardAdapter
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
+import pl.szczodrzynski.edziennik.ui.home.HomeCard
+import pl.szczodrzynski.edziennik.ui.home.HomeCardAdapter
+import pl.szczodrzynski.edziennik.ui.home.HomeFragment
 import kotlin.coroutines.CoroutineContext
 
 class HomeTemplateCard(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeTimetableCard.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeTimetableCard.kt
index d1a30053..96c37d88 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/cards/HomeTimetableCard.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-11-24.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.home.cards
+package pl.szczodrzynski.edziennik.ui.home.cards
 
 import android.content.Intent
 import android.os.Bundle
@@ -29,11 +29,11 @@ import pl.szczodrzynski.edziennik.data.db.entity.Lesson
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.full.LessonFull
 import pl.szczodrzynski.edziennik.databinding.CardHomeTimetableBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.bell.BellSyncTimeChooseDialog
-import pl.szczodrzynski.edziennik.ui.modules.home.CounterActivity
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCard
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardAdapter
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
+import pl.szczodrzynski.edziennik.ui.dialogs.BellSyncTimeChooseDialog
+import pl.szczodrzynski.edziennik.ui.home.CounterActivity
+import pl.szczodrzynski.edziennik.ui.home.HomeCard
+import pl.szczodrzynski.edziennik.ui.home.HomeCardAdapter
+import pl.szczodrzynski.edziennik.ui.home.HomeFragment
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
 import pl.szczodrzynski.edziennik.utils.models.Week
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkDate.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/homework/HomeworkDate.kt
similarity index 66%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkDate.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/homework/HomeworkDate.kt
index d923c5a1..a66fed71 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkDate.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/homework/HomeworkDate.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.homework
+package pl.szczodrzynski.edziennik.ui.homework
 
 class HomeworkDate {
     companion object {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/homework/HomeworkFragment.kt
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/homework/HomeworkFragment.kt
index 54763fe7..310a9ccc 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/homework/HomeworkFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.homework
+package pl.szczodrzynski.edziennik.ui.homework
 
 import android.os.AsyncTask
 import android.os.Bundle
@@ -20,8 +20,8 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Event
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.databinding.HomeworkFragmentBinding
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.FragmentLazyPagerAdapter
-import pl.szczodrzynski.edziennik.ui.modules.event.EventManualDialog
+import pl.szczodrzynski.edziennik.ui.base.lazypager.FragmentLazyPagerAdapter
+import pl.szczodrzynski.edziennik.ui.event.EventManualDialog
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
 import kotlin.coroutines.CoroutineContext
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/homework/HomeworkListFragment.kt
similarity index 91%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkListFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/homework/HomeworkListFragment.kt
index 8c1e8b7e..167fa1da 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/homework/HomeworkListFragment.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.homework
+package pl.szczodrzynski.edziennik.ui.homework
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -13,10 +13,10 @@ import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Event
 import pl.szczodrzynski.edziennik.databinding.HomeworkListFragmentBinding
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyFragment
-import pl.szczodrzynski.edziennik.ui.modules.event.EventDetailsDialog
-import pl.szczodrzynski.edziennik.ui.modules.event.EventListAdapter
-import pl.szczodrzynski.edziennik.ui.modules.event.EventManualDialog
+import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.event.EventDetailsDialog
+import pl.szczodrzynski.edziennik.ui.event.EventListAdapter
+import pl.szczodrzynski.edziennik.ui.event.EventManualDialog
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
 import pl.szczodrzynski.edziennik.utils.models.Date
 import kotlin.coroutines.CoroutineContext
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/intro/ChangelogIntroActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/intro/ChangelogIntroActivity.java
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/intro/ChangelogIntroActivity.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/intro/ChangelogIntroActivity.java
index 0c60efbd..f5632876 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/intro/ChangelogIntroActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/intro/ChangelogIntroActivity.java
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.intro;
+package pl.szczodrzynski.edziennik.ui.intro;
 
 import android.os.Build;
 import android.os.Bundle;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/intro/FragmentSlideMod.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/intro/FragmentSlideMod.java
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/intro/FragmentSlideMod.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/intro/FragmentSlideMod.java
index 1d3cfb92..47bf2a48 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/intro/FragmentSlideMod.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/intro/FragmentSlideMod.java
@@ -22,22 +22,23 @@
  * SOFTWARE.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.intro;
+package pl.szczodrzynski.edziennik.ui.intro;
 
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
-import androidx.annotation.ColorRes;
-import androidx.annotation.LayoutRes;
-import androidx.annotation.StringRes;
-import androidx.annotation.StyleRes;
-import androidx.fragment.app.Fragment;
-import androidx.appcompat.view.ContextThemeWrapper;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.ColorRes;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.StringRes;
+import androidx.annotation.StyleRes;
+import androidx.appcompat.view.ContextThemeWrapper;
+import androidx.fragment.app.Fragment;
+
 import com.heinrichreimersoftware.materialintro.app.ButtonCtaFragment;
 import com.heinrichreimersoftware.materialintro.app.SlideFragment;
 import com.heinrichreimersoftware.materialintro.slide.ButtonCtaSlide;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginActivity.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginActivity.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginActivity.kt
index 32446605..1f8fb442 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginActivity.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-16.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.login
+package pl.szczodrzynski.edziennik.ui.login
 
 import android.app.Activity
 import android.os.Bundle
@@ -19,7 +19,7 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.databinding.LoginActivityBinding
-import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar
+import pl.szczodrzynski.edziennik.ui.error.ErrorSnackbar
 import kotlin.coroutines.CoroutineContext
 
 class LoginActivity : AppCompatActivity(), CoroutineScope {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginChooserAdapter.kt
similarity index 92%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginChooserAdapter.kt
index 704e660a..e2e02a05 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginChooserAdapter.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-16.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.login
+package pl.szczodrzynski.edziennik.ui.login
 
 import android.view.LayoutInflater
 import android.view.View
@@ -14,10 +14,10 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
-import pl.szczodrzynski.edziennik.ui.modules.login.viewholder.ModeViewHolder
-import pl.szczodrzynski.edziennik.ui.modules.login.viewholder.RegisterViewHolder
+import pl.szczodrzynski.edziennik.ui.grades.models.ExpandableItemModel
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.ui.login.viewholder.ModeViewHolder
+import pl.szczodrzynski.edziennik.ui.login.viewholder.RegisterViewHolder
 import kotlin.coroutines.CoroutineContext
 
 class LoginChooserAdapter(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginChooserFragment.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginChooserFragment.kt
index c69d3ec2..085a5ead 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginChooserFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-16.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.login
+package pl.szczodrzynski.edziennik.ui.login
 
 import android.animation.ValueAnimator
 import android.annotation.SuppressLint
@@ -26,8 +26,8 @@ import kotlinx.coroutines.*
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.databinding.LoginChooserFragmentBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.RegisterUnavailableDialog
-import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackActivity
+import pl.szczodrzynski.edziennik.ui.dialogs.sync.RegisterUnavailableDialog
+import pl.szczodrzynski.edziennik.ui.feedback.FeedbackActivity
 import pl.szczodrzynski.edziennik.utils.BetterLinkMovementMethod
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
 import pl.szczodrzynski.edziennik.utils.html.BetterHtml
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginEggsFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginEggsFragment.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginEggsFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginEggsFragment.kt
index a6b688b2..89bfad16 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginEggsFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginEggsFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-10-18.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.login
+package pl.szczodrzynski.edziennik.ui.login
 
 import android.annotation.SuppressLint
 import android.os.Build
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFinishFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginFinishFragment.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFinishFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginFinishFragment.kt
index 7b2e66b8..4b582936 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFinishFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginFinishFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-16.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.login
+package pl.szczodrzynski.edziennik.ui.login
 
 import android.app.Activity
 import android.os.Bundle
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFormFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginFormFragment.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFormFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginFormFragment.kt
index 39189a2a..1d98bdf8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFormFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginFormFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-16.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.login
+package pl.szczodrzynski.edziennik.ui.login
 
 import android.annotation.SuppressLint
 import android.os.Bundle
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginInfo.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginInfo.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginInfo.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginInfo.kt
index ed72f175..c9a15659 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginInfo.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginInfo.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-16.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.login
+package pl.szczodrzynski.edziennik.ui.login
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
@@ -10,7 +10,7 @@ import com.mikepenz.iconics.typeface.IIcon
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.*
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel
+import pl.szczodrzynski.edziennik.ui.grades.models.ExpandableItemModel
 import pl.szczodrzynski.fslogin.realm.RealmData
 
 object LoginInfo {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginPlatformAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginPlatformAdapter.kt
similarity index 92%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginPlatformAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginPlatformAdapter.kt
index 5bc80f36..5ca2013e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginPlatformAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginPlatformAdapter.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-16.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.login
+package pl.szczodrzynski.edziennik.ui.login
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -13,7 +13,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.onClick
-import pl.szczodrzynski.edziennik.ui.modules.login.viewholder.PlatformViewHolder
+import pl.szczodrzynski.edziennik.ui.login.viewholder.PlatformViewHolder
 import kotlin.coroutines.CoroutineContext
 
 class LoginPlatformAdapter(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginPlatformListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginPlatformListFragment.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginPlatformListFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginPlatformListFragment.kt
index 988d1bde..6a2181c6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginPlatformListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginPlatformListFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-16.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.login
+package pl.szczodrzynski.edziennik.ui.login
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginPrizeFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginPrizeFragment.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginPrizeFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginPrizeFragment.kt
index f14c6d19..ac80e55d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginPrizeFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginPrizeFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-10-18.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.login
+package pl.szczodrzynski.edziennik.ui.login
 
 import android.os.Bundle
 import android.os.Process
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProgressFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginProgressFragment.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProgressFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginProgressFragment.kt
index aaebbac0..5df51574 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProgressFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginProgressFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-16.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.login
+package pl.szczodrzynski.edziennik.ui.login
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSummaryAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginSummaryAdapter.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSummaryAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginSummaryAdapter.kt
index bc9cafbf..1e919cd0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSummaryAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginSummaryAdapter.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-16.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.login
+package pl.szczodrzynski.edziennik.ui.login
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSummaryFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginSummaryFragment.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSummaryFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginSummaryFragment.kt
index ceca8a00..80e02981 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSummaryFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginSummaryFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-16.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.login
+package pl.szczodrzynski.edziennik.ui.login
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncErrorFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginSyncErrorFragment.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncErrorFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginSyncErrorFragment.kt
index e13130a5..defb0926 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncErrorFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginSyncErrorFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-14.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.login
+package pl.szczodrzynski.edziennik.ui.login
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginSyncFragment.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginSyncFragment.kt
index 3736e20f..f434179d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/LoginSyncFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-16.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.login
+package pl.szczodrzynski.edziennik.ui.login
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/viewholder/ModeViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/viewholder/ModeViewHolder.kt
similarity index 87%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/viewholder/ModeViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/login/viewholder/ModeViewHolder.kt
index 6b0d20b5..05722113 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/viewholder/ModeViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/viewholder/ModeViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-10.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.login.viewholder
+package pl.szczodrzynski.edziennik.ui.login.viewholder
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -14,9 +14,9 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.LoginChooserModeItemBinding
 import pl.szczodrzynski.edziennik.resolveColor
 import pl.szczodrzynski.edziennik.setTintColor
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
-import pl.szczodrzynski.edziennik.ui.modules.login.LoginChooserAdapter
-import pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.ui.login.LoginChooserAdapter
+import pl.szczodrzynski.edziennik.ui.login.LoginInfo
 
 class ModeViewHolder(
         inflater: LayoutInflater,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/viewholder/PlatformViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/viewholder/PlatformViewHolder.kt
similarity index 79%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/viewholder/PlatformViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/login/viewholder/PlatformViewHolder.kt
index 2c08c27e..2a558479 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/viewholder/PlatformViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/viewholder/PlatformViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-10.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.login.viewholder
+package pl.szczodrzynski.edziennik.ui.login.viewholder
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -12,9 +12,9 @@ import androidx.recyclerview.widget.RecyclerView
 import coil.load
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.databinding.LoginPlatformItemBinding
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
-import pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo
-import pl.szczodrzynski.edziennik.ui.modules.login.LoginPlatformAdapter
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.ui.login.LoginInfo
+import pl.szczodrzynski.edziennik.ui.login.LoginPlatformAdapter
 
 class PlatformViewHolder(
         inflater: LayoutInflater,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/viewholder/RegisterViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/viewholder/RegisterViewHolder.kt
similarity index 78%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/viewholder/RegisterViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/login/viewholder/RegisterViewHolder.kt
index 921041c8..33f2b75d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/viewholder/RegisterViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/login/viewholder/RegisterViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-10.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.login.viewholder
+package pl.szczodrzynski.edziennik.ui.login.viewholder
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -11,9 +11,9 @@ import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.databinding.LoginChooserItemBinding
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
-import pl.szczodrzynski.edziennik.ui.modules.login.LoginChooserAdapter
-import pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.ui.login.LoginChooserAdapter
+import pl.szczodrzynski.edziennik.ui.login.LoginInfo
 
 class RegisterViewHolder(
         inflater: LayoutInflater,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesUtils.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/MessagesUtils.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesUtils.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/MessagesUtils.kt
index d61604d8..1c90e3e6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesUtils.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/MessagesUtils.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.messages
+package pl.szczodrzynski.edziennik.ui.messages
 
 import android.content.Context
 import android.graphics.Bitmap
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeChipCreator.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeChipCreator.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeChipCreator.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeChipCreator.kt
index bae40587..6cf8ab25 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeChipCreator.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeChipCreator.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-10-4.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.messages.compose
+package pl.szczodrzynski.edziennik.ui.messages.compose
 
 import android.content.Context
 import android.graphics.drawable.BitmapDrawable
@@ -17,7 +17,7 @@ import com.hootsuite.nachos.chip.ChipSpan
 import com.hootsuite.nachos.chip.ChipSpanChipCreator
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesUtils
+import pl.szczodrzynski.edziennik.ui.messages.MessagesUtils
 import pl.szczodrzynski.edziennik.utils.Colors
 import pl.szczodrzynski.edziennik.utils.Themes
 import pl.szczodrzynski.navlib.elevateSurface
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeChipTokenizer.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeChipTokenizer.kt
similarity index 90%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeChipTokenizer.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeChipTokenizer.kt
index 560b0a06..6dfc22f8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeChipTokenizer.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeChipTokenizer.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-10-4.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.messages.compose
+package pl.szczodrzynski.edziennik.ui.messages.compose
 
 import android.content.Context
 import com.hootsuite.nachos.NachoTextView
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeFragment.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeFragment.kt
index f8aefd1f..9a0210f8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-4.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.messages.compose
+package pl.szczodrzynski.edziennik.ui.messages.compose
 
 import android.annotation.SuppressLint
 import android.os.Bundle
@@ -36,8 +36,8 @@ import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.databinding.MessagesComposeFragmentBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.MessagesConfigDialog
-import pl.szczodrzynski.edziennik.ui.modules.messages.list.MessagesFragment
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.MessagesConfigDialog
+import pl.szczodrzynski.edziennik.ui.messages.list.MessagesFragment
 import pl.szczodrzynski.edziennik.utils.DefaultTextStyles
 import pl.szczodrzynski.edziennik.utils.Themes
 import pl.szczodrzynski.edziennik.utils.managers.MessageManager.UIConfig
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeInfo.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeInfo.kt
similarity index 89%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeInfo.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeInfo.kt
index 30b89472..71a0e14d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeInfo.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeInfo.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-4.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.messages.compose
+package pl.szczodrzynski.edziennik.ui.messages.compose
 
 class MessagesComposeInfo(
         /**
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeSuggestionAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeSuggestionAdapter.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeSuggestionAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeSuggestionAdapter.kt
index 83a5ba39..7fa79431 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeSuggestionAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/compose/MessagesComposeSuggestionAdapter.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.messages.compose
+package pl.szczodrzynski.edziennik.ui.messages.compose
 
 import android.content.Context
 import android.graphics.Typeface.BOLD
@@ -16,7 +16,7 @@ import pl.szczodrzynski.edziennik.asSpannable
 import pl.szczodrzynski.edziennik.cleanDiacritics
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.resolveAttr
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesUtils.getProfileImage
+import pl.szczodrzynski.edziennik.ui.messages.MessagesUtils.getProfileImage
 import java.util.*
 
 class MessagesComposeSuggestionAdapter(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/list/MessageViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessageViewHolder.kt
similarity index 93%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/list/MessageViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessageViewHolder.kt
index 230992c2..1c47e746 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/list/MessageViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessageViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-5.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.messages.list
+package pl.szczodrzynski.edziennik.ui.messages.list
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -12,8 +12,8 @@ import androidx.recyclerview.widget.RecyclerView
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.databinding.MessagesListItemBinding
-import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesUtils
+import pl.szczodrzynski.edziennik.ui.grades.viewholder.BindableViewHolder
+import pl.szczodrzynski.edziennik.ui.messages.MessagesUtils
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class MessageViewHolder(
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/list/MessagesAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessagesAdapter.kt
similarity index 92%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/list/MessagesAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessagesAdapter.kt
index 1061ac86..05bcb5a9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/list/MessagesAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessagesAdapter.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.messages.list
+package pl.szczodrzynski.edziennik.ui.messages.list
 
 import android.graphics.Typeface
 import android.view.LayoutInflater
@@ -8,7 +8,7 @@ import androidx.recyclerview.widget.RecyclerView
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
-import pl.szczodrzynski.edziennik.ui.modules.search.SearchableAdapter
+import pl.szczodrzynski.edziennik.ui.search.SearchableAdapter
 
 class MessagesAdapter(
     val activity: AppCompatActivity,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/list/MessagesFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessagesFragment.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/list/MessagesFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessagesFragment.kt
index faf0e3ee..509c1faa 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/list/MessagesFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessagesFragment.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.messages.list
+package pl.szczodrzynski.edziennik.ui.messages.list
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -12,8 +12,8 @@ import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.databinding.MessagesFragmentBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.MessagesConfigDialog
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.FragmentLazyPagerAdapter
+import pl.szczodrzynski.edziennik.ui.base.lazypager.FragmentLazyPagerAdapter
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.MessagesConfigDialog
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
 import kotlin.coroutines.CoroutineContext
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/list/MessagesListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessagesListFragment.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/list/MessagesListFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessagesListFragment.kt
index 19190e58..fe878622 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/list/MessagesListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/list/MessagesListFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-4.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.messages.list
+package pl.szczodrzynski.edziennik.ui.messages.list
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -18,7 +18,7 @@ import pl.szczodrzynski.edziennik.MainActivity.Companion.TARGET_MESSAGES_DETAILS
 import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.databinding.MessagesListFragmentBinding
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
 import kotlin.coroutines.CoroutineContext
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/single/MessageFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/single/MessageFragment.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/single/MessageFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/single/MessageFragment.kt
index f17c207e..5acc0cf1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/single/MessageFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/messages/single/MessageFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-11-12.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.messages.single
+package pl.szczodrzynski.edziennik.ui.messages.single
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -26,9 +26,9 @@ import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore.Companion.LOGIN_TYPE_IDZIENNIK
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.databinding.MessageFragmentBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.MessagesConfigDialog
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesUtils
-import pl.szczodrzynski.edziennik.ui.modules.messages.list.MessagesFragment
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.MessagesConfigDialog
+import pl.szczodrzynski.edziennik.ui.messages.MessagesUtils
+import pl.szczodrzynski.edziennik.ui.messages.list.MessagesFragment
 import pl.szczodrzynski.edziennik.utils.Anim
 import pl.szczodrzynski.edziennik.utils.BetterLink
 import pl.szczodrzynski.edziennik.utils.html.BetterHtml
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/notifications/NotificationsAdapter.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/notifications/NotificationsAdapter.kt
index 6c0fe067..fb065572 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/notifications/NotificationsAdapter.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.notifications
+package pl.szczodrzynski.edziennik.ui.notifications
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/notifications/NotificationsListFragment.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsListFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/notifications/NotificationsListFragment.kt
index 7cd9703b..efeb4323 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notifications/NotificationsListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/notifications/NotificationsListFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-11-22.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.notifications
+package pl.szczodrzynski.edziennik.ui.notifications
 
 import android.app.Activity
 import android.content.Intent
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/search/SearchField.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/search/SearchField.kt
similarity index 90%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/search/SearchField.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/search/SearchField.kt
index 00f7b49d..11c322ef 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/search/SearchField.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/search/SearchField.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-5.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.search
+package pl.szczodrzynski.edziennik.ui.search
 
 import android.widget.Filter
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/search/SearchFilter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/search/SearchFilter.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/search/SearchFilter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/search/SearchFilter.kt
index ffbcbf45..e7edf278 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/search/SearchFilter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/search/SearchFilter.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-4-14.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.search
+package pl.szczodrzynski.edziennik.ui.search
 
 import android.widget.Filter
 import pl.szczodrzynski.edziennik.cleanDiacritics
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/search/SearchTextWatcher.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/search/SearchTextWatcher.kt
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/search/SearchTextWatcher.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/search/SearchTextWatcher.kt
index f37b1760..fdf041e4 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/search/SearchTextWatcher.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/search/SearchTextWatcher.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-4-14.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.search
+package pl.szczodrzynski.edziennik.ui.search
 
 import android.text.Editable
 import android.text.TextWatcher
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/search/SearchViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/search/SearchViewHolder.kt
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/search/SearchViewHolder.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/search/SearchViewHolder.kt
index 06a38ab7..a9079672 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/search/SearchViewHolder.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/search/SearchViewHolder.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-5.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.search
+package pl.szczodrzynski.edziennik.ui.search
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/search/Searchable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/search/Searchable.kt
similarity index 91%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/search/Searchable.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/search/Searchable.kt
index 072d6db5..5c145f86 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/search/Searchable.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/search/Searchable.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-10-10.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.search
+package pl.szczodrzynski.edziennik.ui.search
 
 interface Searchable<in T> : Comparable<Searchable<*>> {
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/search/SearchableAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/search/SearchableAdapter.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/search/SearchableAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/search/SearchableAdapter.kt
index 7f9cc103..da30fe5e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/search/SearchableAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/search/SearchableAdapter.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-10-10.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.search
+package pl.szczodrzynski.edziennik.ui.search
 
 import android.text.SpannableStringBuilder
 import android.text.style.BackgroundColorSpan
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/MaterialAboutProfileItem.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/MaterialAboutProfileItem.kt
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/MaterialAboutProfileItem.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/MaterialAboutProfileItem.kt
index dfff3246..3e3fb642 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/MaterialAboutProfileItem.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/MaterialAboutProfileItem.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-3-17.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.settings
+package pl.szczodrzynski.edziennik.ui.settings
 
 import android.content.Context
 import android.view.View
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/ProfileManagerFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/ProfileManagerFragment.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/ProfileManagerFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/ProfileManagerFragment.kt
index 2ab29917..7ea042c0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/ProfileManagerFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/ProfileManagerFragment.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.settings
+package pl.szczodrzynski.edziennik.ui.settings
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsCard.kt
similarity index 93%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsCard.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsCard.kt
index 36ce3777..b04ee4a8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsCard.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-3-17.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.settings
+package pl.szczodrzynski.edziennik.ui.settings
 
 import com.danielstone.materialaboutlibrary.items.MaterialAboutItem
 import com.danielstone.materialaboutlibrary.model.MaterialAboutCard
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsFragment.kt
similarity index 93%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsFragment.kt
index cf7fa625..fca2b49e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-3-16.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.settings
+package pl.szczodrzynski.edziennik.ui.settings
 
 import android.content.Context
 import android.os.Bundle
@@ -16,7 +16,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
-import pl.szczodrzynski.edziennik.ui.modules.settings.cards.*
+import pl.szczodrzynski.edziennik.ui.settings.cards.*
 import kotlin.coroutines.CoroutineContext
 
 class SettingsFragment : MaterialAboutFragment(), CoroutineScope {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsLicenseActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsLicenseActivity.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsLicenseActivity.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsLicenseActivity.kt
index de829d8d..0f780ee6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsLicenseActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsLicenseActivity.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.settings
+package pl.szczodrzynski.edziennik.ui.settings
 
 import android.content.Context
 import android.net.Uri
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsUtil.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsUtil.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsUtil.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsUtil.kt
index a86fe2e3..9b488944 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsUtil.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsUtil.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-3-17.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.settings
+package pl.szczodrzynski.edziennik.ui.settings
 
 import com.danielstone.materialaboutlibrary.items.*
 import com.danielstone.materialaboutlibrary.model.MaterialAboutCard
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsViewTypeManager.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsViewTypeManager.kt
similarity index 90%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsViewTypeManager.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsViewTypeManager.kt
index 1fb14fcd..560862eb 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsViewTypeManager.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/SettingsViewTypeManager.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-3-17.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.settings
+package pl.szczodrzynski.edziennik.ui.settings
 
 import android.content.Context
 import android.view.View
@@ -11,7 +11,7 @@ import com.danielstone.materialaboutlibrary.items.MaterialAboutItem
 import com.danielstone.materialaboutlibrary.items.MaterialAboutTitleItem.MaterialAboutTitleItemViewHolder
 import com.danielstone.materialaboutlibrary.util.DefaultViewTypeManager
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsViewTypeManager.ItemType.Companion.PROFILE_ITEM
+import pl.szczodrzynski.edziennik.ui.settings.SettingsViewTypeManager.ItemType.Companion.PROFILE_ITEM
 
 class SettingsViewTypeManager : DefaultViewTypeManager() {
     class ItemType {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/cards/SettingsAboutCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsAboutCard.kt
similarity index 93%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/cards/SettingsAboutCard.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsAboutCard.kt
index f4cc0023..469d782c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/cards/SettingsAboutCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsAboutCard.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-3-18.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.settings.cards
+package pl.szczodrzynski.edziennik.ui.settings.cards
 
 import android.content.Intent
 import android.media.MediaPlayer
@@ -20,11 +20,11 @@ import pl.szczodrzynski.edziennik.BuildConfig
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.after
 import pl.szczodrzynski.edziennik.sync.UpdateWorker
-import pl.szczodrzynski.edziennik.ui.dialogs.changelog.ChangelogDialog
-import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsCard
-import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsLicenseActivity
-import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsUtil
-import pl.szczodrzynski.edziennik.ui.modules.settings.contributors.ContributorsActivity
+import pl.szczodrzynski.edziennik.ui.dialogs.ChangelogDialog
+import pl.szczodrzynski.edziennik.ui.settings.SettingsCard
+import pl.szczodrzynski.edziennik.ui.settings.SettingsLicenseActivity
+import pl.szczodrzynski.edziennik.ui.settings.SettingsUtil
+import pl.szczodrzynski.edziennik.ui.settings.contributors.ContributorsActivity
 import pl.szczodrzynski.edziennik.utils.Utils
 import kotlin.coroutines.CoroutineContext
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/cards/SettingsProfileCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsProfileCard.kt
similarity index 75%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/cards/SettingsProfileCard.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsProfileCard.kt
index f88a0242..9ae96073 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/cards/SettingsProfileCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsProfileCard.kt
@@ -2,16 +2,16 @@
  * Copyright (c) Kuba Szczodrzyński 2021-3-18.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.settings.cards
+package pl.szczodrzynski.edziennik.ui.settings.cards
 
 import android.content.Intent
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.ui.dialogs.profile.ProfileConfigDialog
-import pl.szczodrzynski.edziennik.ui.modules.login.LoginActivity
-import pl.szczodrzynski.edziennik.ui.modules.settings.MaterialAboutProfileItem
-import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsCard
-import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsUtil
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.ProfileConfigDialog
+import pl.szczodrzynski.edziennik.ui.login.LoginActivity
+import pl.szczodrzynski.edziennik.ui.settings.MaterialAboutProfileItem
+import pl.szczodrzynski.edziennik.ui.settings.SettingsCard
+import pl.szczodrzynski.edziennik.ui.settings.SettingsUtil
 
 class SettingsProfileCard(util: SettingsUtil) : SettingsCard(util) {
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/cards/SettingsRegisterCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsRegisterCard.kt
similarity index 90%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/cards/SettingsRegisterCard.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsRegisterCard.kt
index 8d3de849..67546bde 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/cards/SettingsRegisterCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsRegisterCard.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-3-18.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.settings.cards
+package pl.szczodrzynski.edziennik.ui.settings.cards
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
@@ -12,14 +12,9 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.after
 import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_LIBRUS
 import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.REGISTRATION_ENABLED
-import pl.szczodrzynski.edziennik.ui.dialogs.MessagesConfigDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.agenda.AgendaConfigDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.bell.BellSyncConfigDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.grade.GradesConfigDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.settings.AttendanceConfigDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.sync.RegistrationConfigDialog
-import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsCard
-import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsUtil
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.*
+import pl.szczodrzynski.edziennik.ui.settings.SettingsCard
+import pl.szczodrzynski.edziennik.ui.settings.SettingsUtil
 
 class SettingsRegisterCard(util: SettingsUtil) : SettingsCard(util) {
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/cards/SettingsSyncCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsSyncCard.kt
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/cards/SettingsSyncCard.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsSyncCard.kt
index 1d42b86b..0ae7b09e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/cards/SettingsSyncCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsSyncCard.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-3-18.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.settings.cards
+package pl.szczodrzynski.edziennik.ui.settings.cards
 
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
@@ -17,11 +17,11 @@ import pl.szczodrzynski.edziennik.after
 import pl.szczodrzynski.edziennik.getSyncInterval
 import pl.szczodrzynski.edziennik.sync.SyncWorker
 import pl.szczodrzynski.edziennik.sync.UpdateWorker
-import pl.szczodrzynski.edziennik.ui.dialogs.sync.NotificationFilterDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.sync.QuietHoursConfigDialog
-import pl.szczodrzynski.edziennik.ui.dialogs.sync.SyncIntervalDialog
-import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsCard
-import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsUtil
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.NotificationFilterDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.QuietHoursConfigDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.SyncIntervalDialog
+import pl.szczodrzynski.edziennik.ui.settings.SettingsCard
+import pl.szczodrzynski.edziennik.ui.settings.SettingsUtil
 import pl.szczodrzynski.edziennik.utils.models.Time
 
 class SettingsSyncCard(util: SettingsUtil) : SettingsCard(util) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/cards/SettingsThemeCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsThemeCard.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/cards/SettingsThemeCard.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsThemeCard.kt
index 1018e92c..e393090a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/cards/SettingsThemeCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsThemeCard.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-3-18.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.settings.cards
+package pl.szczodrzynski.edziennik.ui.settings.cards
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
@@ -10,8 +10,8 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.AppLanguageDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.MiniMenuConfigDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.ThemeChooserDialog
-import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsCard
-import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsUtil
+import pl.szczodrzynski.edziennik.ui.settings.SettingsCard
+import pl.szczodrzynski.edziennik.ui.settings.SettingsUtil
 import pl.szczodrzynski.edziennik.utils.BigNightUtil
 import pl.szczodrzynski.edziennik.utils.Themes
 import pl.szczodrzynski.edziennik.utils.models.Date
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/contributors/ContributorsActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsActivity.kt
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/contributors/ContributorsActivity.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsActivity.kt
index cc498495..c9206544 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/contributors/ContributorsActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsActivity.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.settings.contributors
+package pl.szczodrzynski.edziennik.ui.settings.contributors
 
 import android.os.Bundle
 import android.os.Process
@@ -15,8 +15,8 @@ import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.ContributorsResponse
 import pl.szczodrzynski.edziennik.databinding.ContributorsActivityBinding
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.FragmentLazyPagerAdapter
-import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar
+import pl.szczodrzynski.edziennik.ui.base.lazypager.FragmentLazyPagerAdapter
+import pl.szczodrzynski.edziennik.ui.error.ErrorSnackbar
 import kotlin.coroutines.CoroutineContext
 import kotlin.system.exitProcess
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/contributors/ContributorsAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsAdapter.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/contributors/ContributorsAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsAdapter.kt
index 6cb189b9..3160db16 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/contributors/ContributorsAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsAdapter.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-9-7.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.settings.contributors
+package pl.szczodrzynski.edziennik.ui.settings.contributors
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/contributors/ContributorsFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsFragment.kt
similarity index 92%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/contributors/ContributorsFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsFragment.kt
index 11741a85..d378848a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/contributors/ContributorsFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/contributors/ContributorsFragment.kt
@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.ui.modules.settings.contributors
+package pl.szczodrzynski.edziennik.ui.settings.contributors
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -8,7 +8,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.ContributorsResponse
 import pl.szczodrzynski.edziennik.databinding.ContributorsListFragmentBinding
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
 
 class ContributorsFragment : LazyFragment() {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplateAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateAdapter.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplateAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateAdapter.kt
index fe78396f..5efabb17 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplateAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateAdapter.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.template
+package pl.szczodrzynski.edziennik.ui.template
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplateDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateDialog.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplateDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateDialog.kt
index e5d68ebe..b33a730f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplateDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.template
+package pl.szczodrzynski.edziennik.ui.template
 
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplateFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateFragment.kt
similarity index 90%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplateFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateFragment.kt
index 8adee96a..2798cd73 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplateFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.template
+package pl.szczodrzynski.edziennik.ui.template
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -14,9 +14,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.databinding.TemplateFragmentBinding
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.FragmentLazyPagerAdapter
-import pl.szczodrzynski.edziennik.ui.modules.homework.HomeworkDate
-import pl.szczodrzynski.edziennik.ui.modules.homework.HomeworkListFragment
+import pl.szczodrzynski.edziennik.ui.base.lazypager.FragmentLazyPagerAdapter
+import pl.szczodrzynski.edziennik.ui.homework.HomeworkDate
+import pl.szczodrzynski.edziennik.ui.homework.HomeworkListFragment
 import kotlin.coroutines.CoroutineContext
 
 class TemplateFragment : Fragment(), CoroutineScope {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplateListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateListFragment.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplateListFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateListFragment.kt
index c044c4cf..0c4806cb 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplateListFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateListFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.template
+package pl.szczodrzynski.edziennik.ui.template
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplateListPageFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateListPageFragment.kt
similarity index 95%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplateListPageFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateListPageFragment.kt
index e2395668..bdf0a014 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplateListPageFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplateListPageFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.template
+package pl.szczodrzynski.edziennik.ui.template
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -19,7 +19,7 @@ import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.databinding.TemplateListPageFragmentBinding
 import pl.szczodrzynski.edziennik.isNotNullNorEmpty
 import pl.szczodrzynski.edziennik.startCoroutineTimer
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
 import kotlin.coroutines.CoroutineContext
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplatePageFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplatePageFragment.kt
similarity index 92%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplatePageFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplatePageFragment.kt
index f2404ea4..860536ce 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplatePageFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplatePageFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.template
+package pl.szczodrzynski.edziennik.ui.template
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -14,7 +14,7 @@ import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.databinding.TemplatePageFragmentBinding
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
 import kotlin.coroutines.CoroutineContext
 
 class TemplatePageFragment : LazyFragment(), CoroutineScope {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplatePagerAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplatePagerAdapter.kt
similarity index 78%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplatePagerAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplatePagerAdapter.kt
index eaa8ba1d..7cef63ec 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/template/TemplatePagerAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/template/TemplatePagerAdapter.kt
@@ -2,11 +2,11 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-30.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.template
+package pl.szczodrzynski.edziennik.ui.template
 
 import androidx.fragment.app.FragmentManager
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyPagerAdapter
+import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyPagerAdapter
 
 class TemplatePagerAdapter(fragmentManager: FragmentManager, swipeRefreshLayout: SwipeRefreshLayout) : LazyPagerAdapter(fragmentManager, swipeRefreshLayout) {
     override fun getPage(position: Int) = TemplatePageFragment()
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/GenerateBlockTimetableDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/GenerateBlockTimetableDialog.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/GenerateBlockTimetableDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/GenerateBlockTimetableDialog.kt
index 9eefffd0..90f52161 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/GenerateBlockTimetableDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/GenerateBlockTimetableDialog.kt
@@ -2,13 +2,12 @@
  * Copyright (c) Kacper Ziubryniewicz 2020-1-5
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.timetable
+package pl.szczodrzynski.edziennik.ui.timetable
 
 import android.content.ContentResolver
 import android.content.ContentValues
 import android.content.Intent
 import android.graphics.*
-import android.net.Uri
 import android.os.Build
 import android.os.Environment
 import android.provider.MediaStore
@@ -20,7 +19,6 @@ import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.cardview.widget.CardView
-import androidx.core.content.FileProvider
 import com.google.android.material.datepicker.MaterialDatePicker
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.*
@@ -39,7 +37,6 @@ import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
 import pl.szczodrzynski.edziennik.utils.models.Week
 import java.io.File
-import java.io.FileOutputStream
 import kotlin.coroutines.CoroutineContext
 import kotlin.math.roundToInt
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/LessonDetailsDialog.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/LessonDetailsDialog.kt
index 5662b1a0..fce95829 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/LessonDetailsDialog.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-11-11.
  */
 
-package pl.szczodrzynski.edziennik.ui.dialogs.timetable
+package pl.szczodrzynski.edziennik.ui.timetable
 
 import android.content.Intent
 import android.view.View
@@ -26,11 +26,10 @@ import pl.szczodrzynski.edziennik.data.db.full.LessonFull
 import pl.szczodrzynski.edziennik.databinding.DialogLessonDetailsBinding
 import pl.szczodrzynski.edziennik.onClick
 import pl.szczodrzynski.edziennik.setText
-import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceDetailsDialog
-import pl.szczodrzynski.edziennik.ui.modules.event.EventDetailsDialog
-import pl.szczodrzynski.edziennik.ui.modules.event.EventListAdapter
-import pl.szczodrzynski.edziennik.ui.modules.event.EventManualDialog
-import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableFragment
+import pl.szczodrzynski.edziennik.ui.attendance.AttendanceDetailsDialog
+import pl.szczodrzynski.edziennik.ui.event.EventDetailsDialog
+import pl.szczodrzynski.edziennik.ui.event.EventListAdapter
+import pl.szczodrzynski.edziennik.ui.event.EventManualDialog
 import pl.szczodrzynski.edziennik.utils.BetterLink
 import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
 import pl.szczodrzynski.edziennik.utils.models.Date
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableDayFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetableDayFragment.kt
similarity index 96%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableDayFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetableDayFragment.kt
index 5d13ee86..52e8d561 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableDayFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetableDayFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kacper Ziubryniewicz 2020-1-6
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.timetable
+package pl.szczodrzynski.edziennik.ui.timetable
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -16,15 +16,12 @@ import androidx.core.view.*
 import com.linkedin.android.tachyon.DayView
 import com.linkedin.android.tachyon.DayViewConfig
 import com.mikepenz.iconics.IconicsDrawable
-import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
 import com.mikepenz.iconics.utils.colorInt
 import com.mikepenz.iconics.utils.sizeDp
-import eu.szkolny.font.SzkolnyFont
 import kotlinx.coroutines.*
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_TIMETABLE
 import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
-import pl.szczodrzynski.edziennik.data.db.entity.Attendance
 import pl.szczodrzynski.edziennik.data.db.entity.Lesson
 import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
@@ -32,10 +29,9 @@ import pl.szczodrzynski.edziennik.data.db.full.LessonFull
 import pl.szczodrzynski.edziennik.databinding.TimetableDayFragmentBinding
 import pl.szczodrzynski.edziennik.databinding.TimetableLessonBinding
 import pl.szczodrzynski.edziennik.databinding.TimetableNoTimetableBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.timetable.LessonDetailsDialog
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyFragment
-import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableFragment.Companion.DEFAULT_END_HOUR
-import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableFragment.Companion.DEFAULT_START_HOUR
+import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.timetable.TimetableFragment.Companion.DEFAULT_END_HOUR
+import pl.szczodrzynski.edziennik.ui.timetable.TimetableFragment.Companion.DEFAULT_START_HOUR
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
 import java.util.*
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetableFragment.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetableFragment.kt
index 13d3ae2c..8d5c489a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetableFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kacper Ziubryniewicz 2020-1-6
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.timetable
+package pl.szczodrzynski.edziennik.ui.timetable
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -26,8 +26,7 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.databinding.FragmentTimetableV2Binding
 import pl.szczodrzynski.edziennik.getSchoolYearConstrains
-import pl.szczodrzynski.edziennik.ui.dialogs.timetable.GenerateBlockTimetableDialog
-import pl.szczodrzynski.edziennik.ui.modules.event.EventManualDialog
+import pl.szczodrzynski.edziennik.ui.event.EventManualDialog
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetablePagerAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetablePagerAdapter.kt
similarity index 87%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetablePagerAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetablePagerAdapter.kt
index 289860ac..fb8cf88a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetablePagerAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetablePagerAdapter.kt
@@ -2,12 +2,12 @@
  * Copyright (c) Kacper Ziubryniewicz 2020-1-6
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.timetable
+package pl.szczodrzynski.edziennik.ui.timetable
 
 import android.os.Bundle
 import androidx.fragment.app.FragmentManager
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyFragment
-import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyPagerAdapter
+import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyPagerAdapter
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Week
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/AttachmentAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/AttachmentAdapter.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/AttachmentAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/views/AttachmentAdapter.kt
index 5712207c..a91fee63 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/AttachmentAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/AttachmentAdapter.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-1.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.views
+package pl.szczodrzynski.edziennik.ui.views
 
 import android.content.Context
 import android.view.LayoutInflater
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/AttachmentsView.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/AttachmentsView.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/AttachmentsView.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/views/AttachmentsView.kt
index 59131672..734d3890 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/AttachmentsView.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/AttachmentsView.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-4-1.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.views
+package pl.szczodrzynski.edziennik.ui.views
 
 import android.content.Context
 import android.os.Bundle
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/DateDropdown.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/DateDropdown.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/DateDropdown.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/views/DateDropdown.kt
index 6c96c352..28903641 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/DateDropdown.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/DateDropdown.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-23.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.views
+package pl.szczodrzynski.edziennik.ui.views
 
 import android.content.Context
 import android.content.ContextWrapper
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/EventTypeDropdown.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/EventTypeDropdown.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/EventTypeDropdown.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/views/EventTypeDropdown.kt
index 878264c6..f61ec9a4 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/EventTypeDropdown.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/EventTypeDropdown.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2021-4-14.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.views
+package pl.szczodrzynski.edziennik.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/SubjectDropdown.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/SubjectDropdown.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/SubjectDropdown.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/views/SubjectDropdown.kt
index 4285ec7d..c3f5f15f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/SubjectDropdown.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/SubjectDropdown.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-23.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.views
+package pl.szczodrzynski.edziennik.ui.views
 
 import android.content.Context
 import android.content.ContextWrapper
@@ -16,7 +16,7 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.crc16
 import pl.szczodrzynski.edziennik.data.db.AppDb
 import pl.szczodrzynski.edziennik.data.db.entity.Subject
-import pl.szczodrzynski.edziennik.ui.dialogs.input
+import pl.szczodrzynski.edziennik.input
 import pl.szczodrzynski.edziennik.utils.TextInputDropDown
 
 class SubjectDropdown : TextInputDropDown {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/TeacherDropdown.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/TeacherDropdown.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/TeacherDropdown.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/views/TeacherDropdown.kt
index 23053359..c67011a2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/TeacherDropdown.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/TeacherDropdown.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-23.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.views
+package pl.szczodrzynski.edziennik.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/TeamDropdown.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/TeamDropdown.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/TeamDropdown.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/views/TeamDropdown.kt
index b5eee0ac..2a395d14 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/TeamDropdown.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/TeamDropdown.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-3-7.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.views
+package pl.szczodrzynski.edziennik.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/TimeDropdown.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/TimeDropdown.kt
similarity index 99%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/TimeDropdown.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/views/TimeDropdown.kt
index afecaf7e..1acb5c86 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/views/TimeDropdown.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/views/TimeDropdown.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2020-2-23.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.views
+package pl.szczodrzynski.edziennik.ui.views
 
 import android.content.Context
 import android.content.ContextWrapper
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/webpush/WebPushBrowserAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/webpush/WebPushBrowserAdapter.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/webpush/WebPushBrowserAdapter.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/webpush/WebPushBrowserAdapter.kt
index 72d9a963..4c2c58d4 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/webpush/WebPushBrowserAdapter.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/webpush/WebPushBrowserAdapter.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-12-19.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.webpush
+package pl.szczodrzynski.edziennik.ui.webpush
 
 import android.content.Context
 import android.view.LayoutInflater
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/webpush/WebPushFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/webpush/WebPushFragment.kt
similarity index 98%
rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/webpush/WebPushFragment.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/webpush/WebPushFragment.kt
index 0996c518..796c3b71 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/webpush/WebPushFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/webpush/WebPushFragment.kt
@@ -2,7 +2,7 @@
  * Copyright (c) Kuba Szczodrzyński 2019-12-19.
  */
 
-package pl.szczodrzynski.edziennik.ui.modules.webpush
+package pl.szczodrzynski.edziennik.ui.webpush
 
 import android.annotation.SuppressLint
 import android.os.Bundle
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/LessonDialogActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/LessonDialogActivity.kt
index 7a8f78ac..bfcfc1c7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/LessonDialogActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/LessonDialogActivity.kt
@@ -13,7 +13,7 @@ import androidx.appcompat.app.AppCompatActivity
 import kotlinx.coroutines.*
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
-import pl.szczodrzynski.edziennik.ui.dialogs.timetable.LessonDetailsDialog
+import pl.szczodrzynski.edziennik.ui.timetable.LessonDetailsDialog
 import pl.szczodrzynski.edziennik.utils.Themes
 import kotlin.coroutines.CoroutineContext
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/BuildManager.kt b/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/BuildManager.kt
index ab126826..d844c67f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/BuildManager.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/BuildManager.kt
@@ -13,7 +13,7 @@ import kotlinx.coroutines.*
 import okhttp3.Request
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing
-import pl.szczodrzynski.edziennik.ui.modules.base.BuildInvalidActivity
+import pl.szczodrzynski.edziennik.ui.base.BuildInvalidActivity
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import java.time.Instant
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/GradesManager.kt b/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/GradesManager.kt
index 61ea5ad2..ac373201 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/GradesManager.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/GradesManager.kt
@@ -15,8 +15,8 @@ import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_POINT_AVG
 import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_POINT_SUM
 import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_YEAR_FINAL
 import pl.szczodrzynski.edziennik.data.db.full.GradeFull
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.GradesAverages
-import pl.szczodrzynski.edziennik.ui.modules.grades.models.GradesSemester
+import pl.szczodrzynski.edziennik.ui.grades.models.GradesAverages
+import pl.szczodrzynski.edziennik.ui.grades.models.GradesSemester
 import java.text.DecimalFormat
 import kotlin.coroutines.CoroutineContext
 import kotlin.math.floor
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/MessageManager.kt b/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/MessageManager.kt
index f421cc74..70e11979 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/MessageManager.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/MessageManager.kt
@@ -22,7 +22,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesUtils
+import pl.szczodrzynski.edziennik.ui.messages.MessagesUtils
 import pl.szczodrzynski.edziennik.utils.TextInputKeyboardEdit
 import pl.szczodrzynski.edziennik.utils.html.BetterHtml
 import pl.szczodrzynski.edziennik.utils.managers.TextStylingManager.HtmlMode.ORIGINAL
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/UserActionManager.kt b/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/UserActionManager.kt
index 5145ad3a..fae71d82 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/UserActionManager.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/UserActionManager.kt
@@ -15,7 +15,7 @@ import pl.szczodrzynski.edziennik.data.api.ERROR_CAPTCHA_LIBRUS_PORTAL
 import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.events.UserActionRequiredEvent
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.ui.dialogs.captcha.LibrusCaptchaDialog
+import pl.szczodrzynski.edziennik.ui.captcha.LibrusCaptchaDialog
 
 class UserActionManager(val app: App) {
     companion object {
diff --git a/app/src/main/res/layout/attendance_fragment.xml b/app/src/main/res/layout/attendance_fragment.xml
index d83601f0..48fb1aa5 100644
--- a/app/src/main/res/layout/attendance_fragment.xml
+++ b/app/src/main/res/layout/attendance_fragment.xml
@@ -26,7 +26,7 @@
                 app:tabSelectedTextColor="?colorPrimary"
                 app:tabTextColor="?android:textColorPrimary" />
 
-            <pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyViewPager
+            <pl.szczodrzynski.edziennik.ui.base.lazypager.LazyViewPager
                 android:id="@+id/viewPager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/attendance_item_attendance.xml b/app/src/main/res/layout/attendance_item_attendance.xml
index 5362b4a6..8ca3f486 100644
--- a/app/src/main/res/layout/attendance_item_attendance.xml
+++ b/app/src/main/res/layout/attendance_item_attendance.xml
@@ -22,7 +22,7 @@
         android:orientation="horizontal"
         android:paddingVertical="8dp">
 
-        <pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceView
+        <pl.szczodrzynski.edziennik.ui.attendance.AttendanceView
             android:id="@+id/attendanceView"
             android:layout_width="36dp"
             android:layout_height="36dp"
diff --git a/app/src/main/res/layout/attendance_item_month.xml b/app/src/main/res/layout/attendance_item_month.xml
index f3dcb13d..cc0ad938 100644
--- a/app/src/main/res/layout/attendance_item_month.xml
+++ b/app/src/main/res/layout/attendance_item_month.xml
@@ -70,7 +70,7 @@
                 tools:src="@android:drawable/ic_menu_more" />
         </LinearLayout>
 
-        <pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceBar
+        <pl.szczodrzynski.edziennik.ui.attendance.AttendanceBar
             android:id="@+id/attendanceBar"
             android:layout_width="match_parent"
             android:layout_height="20dp"
@@ -96,7 +96,7 @@
                     android:layout_height="wrap_content"
                     android:paddingTop="8dp">
 
-                    <pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceView
+                    <pl.szczodrzynski.edziennik.ui.attendance.AttendanceView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         tools:background="@drawable/bg_rounded_4dp"
diff --git a/app/src/main/res/layout/attendance_item_subject.xml b/app/src/main/res/layout/attendance_item_subject.xml
index d1fb9ce8..46b2807e 100644
--- a/app/src/main/res/layout/attendance_item_subject.xml
+++ b/app/src/main/res/layout/attendance_item_subject.xml
@@ -70,7 +70,7 @@
                 tools:src="@android:drawable/ic_menu_more" />
         </LinearLayout>
 
-        <pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceBar
+        <pl.szczodrzynski.edziennik.ui.attendance.AttendanceBar
             android:id="@+id/attendanceBar"
             android:layout_width="match_parent"
             android:layout_height="12dp"
diff --git a/app/src/main/res/layout/attendance_item_type.xml b/app/src/main/res/layout/attendance_item_type.xml
index 682660a6..40f85b96 100644
--- a/app/src/main/res/layout/attendance_item_type.xml
+++ b/app/src/main/res/layout/attendance_item_type.xml
@@ -31,7 +31,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal">
 
-                <pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceView
+                <pl.szczodrzynski.edziennik.ui.attendance.AttendanceView
                     android:id="@+id/type"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/attendance_summary_fragment.xml b/app/src/main/res/layout/attendance_summary_fragment.xml
index cce5e3ec..83cfb0f4 100644
--- a/app/src/main/res/layout/attendance_summary_fragment.xml
+++ b/app/src/main/res/layout/attendance_summary_fragment.xml
@@ -87,7 +87,7 @@
                         android:visibility="invisible"
                         tools:visibility="visible" />
 
-                    <pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceBar
+                    <pl.szczodrzynski.edziennik.ui.attendance.AttendanceBar
                         android:id="@+id/attendanceBar"
                         android:layout_width="0dp"
                         android:layout_height="20dp"
@@ -115,7 +115,7 @@
                             android:layout_height="wrap_content"
                             android:paddingBottom="8dp">
 
-                            <pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceView
+                            <pl.szczodrzynski.edziennik.ui.attendance.AttendanceView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 tools:background="@drawable/bg_rounded_4dp"
diff --git a/app/src/main/res/layout/contributors_activity.xml b/app/src/main/res/layout/contributors_activity.xml
index a9d8a452..fa54100d 100644
--- a/app/src/main/res/layout/contributors_activity.xml
+++ b/app/src/main/res/layout/contributors_activity.xml
@@ -112,7 +112,7 @@
                 </com.google.android.material.appbar.CollapsingToolbarLayout>
             </com.google.android.material.appbar.AppBarLayout>
 
-            <pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyViewPager
+            <pl.szczodrzynski.edziennik.ui.base.lazypager.LazyViewPager
                 android:id="@+id/viewPager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/dialog_event_details.xml b/app/src/main/res/layout/dialog_event_details.xml
index 051adfc6..7e8d610c 100644
--- a/app/src/main/res/layout/dialog_event_details.xml
+++ b/app/src/main/res/layout/dialog_event_details.xml
@@ -201,7 +201,7 @@
                 android:text="@string/dialog_event_details_attachments"
                 android:textAppearance="@style/NavView.TextView.Helper" />
 
-            <pl.szczodrzynski.edziennik.ui.modules.views.AttachmentsView
+            <pl.szczodrzynski.edziennik.ui.views.AttachmentsView
                 android:id="@+id/attachmentsFragment"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/dialog_event_manual_v2.xml b/app/src/main/res/layout/dialog_event_manual_v2.xml
index 0490d391..e8451616 100644
--- a/app/src/main/res/layout/dialog_event_manual_v2.xml
+++ b/app/src/main/res/layout/dialog_event_manual_v2.xml
@@ -25,7 +25,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/dialog_event_manual_date">
-            <pl.szczodrzynski.edziennik.ui.modules.views.DateDropdown
+            <pl.szczodrzynski.edziennik.ui.views.DateDropdown
                 android:id="@+id/dateDropdown"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -39,7 +39,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:hint="@string/dialog_event_manual_time">
-            <pl.szczodrzynski.edziennik.ui.modules.views.TimeDropdown
+            <pl.szczodrzynski.edziennik.ui.views.TimeDropdown
                 android:id="@+id/timeDropdown"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -56,7 +56,7 @@
             android:layout_marginTop="8dp"
             android:hint="@string/dialog_event_manual_team">
 
-            <pl.szczodrzynski.edziennik.ui.modules.views.TeamDropdown
+            <pl.szczodrzynski.edziennik.ui.views.TeamDropdown
                 android:id="@+id/teamDropdown"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -94,7 +94,7 @@
                 android:layout_weight="1"
                 android:hint="@string/dialog_event_manual_type">
 
-                <pl.szczodrzynski.edziennik.ui.modules.views.EventTypeDropdown
+                <pl.szczodrzynski.edziennik.ui.views.EventTypeDropdown
                     android:id="@+id/typeDropdown"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -169,7 +169,7 @@
                 android:layout_marginTop="8dp"
                 android:hint="@string/dialog_event_manual_subject">
 
-                <pl.szczodrzynski.edziennik.ui.modules.views.SubjectDropdown
+                <pl.szczodrzynski.edziennik.ui.views.SubjectDropdown
                     android:id="@+id/subjectDropdown"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -184,7 +184,7 @@
                 android:layout_marginTop="8dp"
                 android:hint="@string/dialog_event_manual_teacher">
 
-                <pl.szczodrzynski.edziennik.ui.modules.views.TeacherDropdown
+                <pl.szczodrzynski.edziennik.ui.views.TeacherDropdown
                     android:id="@+id/teacherDropdown"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_lesson_details.xml b/app/src/main/res/layout/dialog_lesson_details.xml
index a304c641..7b4d3d6e 100644
--- a/app/src/main/res/layout/dialog_lesson_details.xml
+++ b/app/src/main/res/layout/dialog_lesson_details.xml
@@ -307,7 +307,7 @@
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
-                <pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceView
+                <pl.szczodrzynski.edziennik.ui.attendance.AttendanceView
                     android:id="@+id/attendanceView"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
diff --git a/app/src/main/res/layout/fragment_debug.xml b/app/src/main/res/layout/fragment_debug.xml
index bf27e110..f87bd64a 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=".ui.modules.debug.DebugFragment">
+    tools:context=".ui.debug.DebugFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/res/layout/fragment_timetable_v2.xml b/app/src/main/res/layout/fragment_timetable_v2.xml
index af7995d2..85f18695 100644
--- a/app/src/main/res/layout/fragment_timetable_v2.xml
+++ b/app/src/main/res/layout/fragment_timetable_v2.xml
@@ -40,7 +40,7 @@
                         app:rtl_tabTextAppearance="@style/rtl_RecyclerTabLayout.Tab" />
                 </com.google.android.material.appbar.AppBarLayout>
 
-                <pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyViewPager
+                <pl.szczodrzynski.edziennik.ui.base.lazypager.LazyViewPager
                     android:id="@+id/viewPager"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/grades_item_grade.xml b/app/src/main/res/layout/grades_item_grade.xml
index 1ff1f0b0..383d56d1 100644
--- a/app/src/main/res/layout/grades_item_grade.xml
+++ b/app/src/main/res/layout/grades_item_grade.xml
@@ -13,7 +13,7 @@
         android:orientation="horizontal"
         android:paddingVertical="8dp">
 
-        <pl.szczodrzynski.edziennik.ui.modules.grades.GradeView
+        <pl.szczodrzynski.edziennik.ui.grades.GradeView
             android:id="@+id/gradeName"
             android:layout_width="40dp"
             android:layout_height="40dp"
diff --git a/app/src/main/res/layout/grades_item_semester.xml b/app/src/main/res/layout/grades_item_semester.xml
index 939e4c1f..8419adf0 100644
--- a/app/src/main/res/layout/grades_item_semester.xml
+++ b/app/src/main/res/layout/grades_item_semester.xml
@@ -60,7 +60,7 @@
             tools:text1="suma: 175 pkt"
             tools:text2="średnia: 4,78" />
 
-        <pl.szczodrzynski.edziennik.ui.modules.grades.GradeView
+        <pl.szczodrzynski.edziennik.ui.grades.GradeView
             android:id="@+id/proposedGrade"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -68,7 +68,7 @@
             tools:layout_marginRight="5dp"
             tools:visibility="visible" />
 
-        <pl.szczodrzynski.edziennik.ui.modules.grades.GradeView
+        <pl.szczodrzynski.edziennik.ui.grades.GradeView
             android:id="@+id/finalGrade"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/homework_fragment.xml b/app/src/main/res/layout/homework_fragment.xml
index 9a015c15..d80df010 100644
--- a/app/src/main/res/layout/homework_fragment.xml
+++ b/app/src/main/res/layout/homework_fragment.xml
@@ -26,7 +26,7 @@
                 app:tabSelectedTextColor="?colorPrimary"
                 app:tabTextColor="?android:textColorPrimary" />
 
-            <pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyViewPager
+            <pl.szczodrzynski.edziennik.ui.base.lazypager.LazyViewPager
                 android:id="@+id/viewPager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/lab_fragment.xml b/app/src/main/res/layout/lab_fragment.xml
index d0756d7f..f1dd0188 100644
--- a/app/src/main/res/layout/lab_fragment.xml
+++ b/app/src/main/res/layout/lab_fragment.xml
@@ -35,7 +35,7 @@
                 app:tabSelectedTextColor="?colorPrimary"
                 app:tabTextColor="?android:textColorPrimary" />-->
 
-            <!--<pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyViewPager
+            <!--<pl.szczodrzynski.edziennik.ui.base.lazypager.LazyViewPager
                 android:id="@+id/viewPager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/message_fragment.xml b/app/src/main/res/layout/message_fragment.xml
index 7687cc4c..d80bd546 100644
--- a/app/src/main/res/layout/message_fragment.xml
+++ b/app/src/main/res/layout/message_fragment.xml
@@ -188,7 +188,7 @@
                     android:text="Załączniki:"
                     android:textAppearance="@style/NavView.TextView.Subtitle" />
 
-                <pl.szczodrzynski.edziennik.ui.modules.views.AttachmentsView
+                <pl.szczodrzynski.edziennik.ui.views.AttachmentsView
                     android:id="@+id/attachmentsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/messages_fragment.xml b/app/src/main/res/layout/messages_fragment.xml
index b09dc1f5..b7d7cbe8 100644
--- a/app/src/main/res/layout/messages_fragment.xml
+++ b/app/src/main/res/layout/messages_fragment.xml
@@ -26,7 +26,7 @@
                 app:tabSelectedTextColor="?colorPrimary"
                 app:tabTextColor="?android:textColorPrimary" />
 
-            <pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyViewPager
+            <pl.szczodrzynski.edziennik.ui.base.lazypager.LazyViewPager
                 android:id="@+id/viewPager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/template_fragment.xml b/app/src/main/res/layout/template_fragment.xml
index 9a015c15..d80df010 100644
--- a/app/src/main/res/layout/template_fragment.xml
+++ b/app/src/main/res/layout/template_fragment.xml
@@ -26,7 +26,7 @@
                 app:tabSelectedTextColor="?colorPrimary"
                 app:tabTextColor="?android:textColorPrimary" />
 
-            <pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyViewPager
+            <pl.szczodrzynski.edziennik.ui.base.lazypager.LazyViewPager
                 android:id="@+id/viewPager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/navigation/nav_login.xml b/app/src/main/res/navigation/nav_login.xml
index 6fb5e503..abf27d73 100644
--- a/app/src/main/res/navigation/nav_login.xml
+++ b/app/src/main/res/navigation/nav_login.xml
@@ -10,7 +10,7 @@
 
     <fragment
         android:id="@+id/loginChooserFragment"
-        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginChooserFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.login.LoginChooserFragment"
         android:label="LoginChooserFragment">
         <action
             android:id="@+id/action_loginChooserFragment_to_loginPlatformListFragment"
@@ -26,7 +26,7 @@
     <!-- eggs -->
     <fragment
         android:id="@+id/loginEggsFragment"
-        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginEggsFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.login.LoginEggsFragment"
         android:label="LoginEggsFragment">
         <action
             android:id="@+id/action_loginEggsFragment_to_loginPrizeFragment"
@@ -34,12 +34,12 @@
     </fragment>
     <fragment
         android:id="@+id/loginPrizeFragment"
-        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginPrizeFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.login.LoginPrizeFragment"
         android:label="LoginPrizeFragment">
     </fragment>
     <fragment
         android:id="@+id/loginPlatformListFragment"
-        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginPlatformListFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.login.LoginPlatformListFragment"
         android:label="LoginPlatformListFragment">
         <action
             android:id="@+id/action_loginPlatformListFragment_to_loginFormFragment"
@@ -47,7 +47,7 @@
     </fragment>
     <fragment
         android:id="@+id/loginFormFragment"
-        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginFormFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.login.LoginFormFragment"
         android:label="LoginFormFragment">
         <action
             android:id="@+id/action_loginFormFragment_to_loginProgressFragment"
@@ -55,7 +55,7 @@
     </fragment>
     <fragment
         android:id="@+id/loginProgressFragment"
-        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginProgressFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.login.LoginProgressFragment"
         android:label="LoginProgressFragment">
         <action
             android:id="@+id/action_loginProgressFragment_to_loginSummaryFragment2"
@@ -63,7 +63,7 @@
     </fragment>
     <fragment
         android:id="@+id/loginSummaryFragment"
-        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginSummaryFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.login.LoginSummaryFragment"
         android:label="LoginSummaryFragment">
         <action
             android:id="@+id/action_loginSummaryFragment_to_loginChooserFragment"
@@ -74,7 +74,7 @@
     </fragment>
     <fragment
         android:id="@+id/loginSyncFragment"
-        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginSyncFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.login.LoginSyncFragment"
         android:label="LoginSyncFragment">
         <action
             android:id="@+id/action_loginSyncFragment_to_loginSyncErrorFragment2"
@@ -85,7 +85,7 @@
     </fragment>
     <fragment
         android:id="@+id/loginSyncErrorFragment"
-        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginSyncErrorFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.login.LoginSyncErrorFragment"
         android:label="LoginSyncErrorFragment">
         <action
             android:id="@+id/action_loginSyncErrorFragment_to_loginFinishFragment2"
@@ -93,6 +93,6 @@
     </fragment>
     <fragment
         android:id="@+id/loginFinishFragment"
-        android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginFinishFragment"
+        android:name="pl.szczodrzynski.edziennik.ui.login.LoginFinishFragment"
         android:label="LoginFinishFragment" />
 </navigation>