From 69afdac7eb02116ffe2aecc22a5431d030ef5efc Mon Sep 17 00:00:00 2001
From: vavali08 <vavali@seas.upenn.edu>
Date: Sun, 27 Oct 2024 13:59:52 -0400
Subject: [PATCH] reorganized files

---
 .../debug/bundle-manifest/AndroidManifest.xml |  2 +-
 .../debug/AndroidManifest.xml                 |  2 +-
 .../manifest-merger-blame-debug-report.txt    |  2 +-
 .../debug/AndroidManifest.xml                 |  2 +-
 PennMobile/src/main/AndroidManifest.xml       |  6 +-
 .../pennapps/labs/pennmobile/MainActivity.kt  | 21 ++++---
 .../{adapters => }/MainPagerAdapter.kt        | 12 ++--
 .../labs/pennmobile/api/CampusExpress.kt      |  6 +-
 .../labs/pennmobile/api/DiningRequest.java    |  2 +-
 .../pennmobile/{ => api}/HuntsmanGSRLogin.kt  |  8 ++-
 .../pennmobile/api/OAuth2NetworkManager.kt    |  2 +-
 .../api/PennCourseAlertApiService.kt          | 14 ++---
 .../labs/pennmobile/api/Platform.java         |  3 +-
 .../labs/pennmobile/api/Serializer.java       | 18 +++---
 .../labs/pennmobile/api/StudentLife.java      | 42 ++++++-------
 .../labs/pennmobile/api/StudentLifeRf2.kt     | 10 +--
 .../{ => api}/classes/AccessTokenResponse.kt  |  2 +-
 .../pennmobile/{ => api}/classes/Account.kt   |  2 +-
 .../CampusExpressAccessTokenResponse.kt       |  2 +-
 .../{ => api}/classes/GetUserResponse.kt      |  2 +-
 .../pennmobile/{ => api}/classes/OAuthUser.kt |  2 +-
 .../{ => api}/classes/SaveAccountResponse.kt  |  2 +-
 .../fragments}/CampusExpressLoginFragment.kt  | 25 ++++----
 .../{ => api/fragments}/LoginFragment.kt      |  4 +-
 .../fragments}/LoginWebviewFragment.kt        | 11 ++--
 .../pennmobile/classes/DollarsSpentCell.kt    |  3 -
 .../labs/pennmobile/classes/LaundryCell.kt    |  9 ---
 .../PennCourseAlertViewModel.kt               | 16 ++---
 .../adapters/PennCourseAlertPagerAdapter.kt   |  6 +-
 .../adapters/RegistrationsAdapter.kt          |  4 +-
 .../{ => coursealert}/classes/Course.kt       |  2 +-
 .../classes/PCARegistrationBody.kt            |  2 +-
 .../classes/PennCourseAlertRegistration.kt    |  2 +-
 .../classes/PennCourseAlertUpdateBody.kt      |  2 +-
 .../{ => coursealert}/classes/Profile.kt      |  2 +-
 .../{ => coursealert}/classes/Section.kt      |  2 +-
 .../{ => coursealert}/classes/UserInfo.kt     |  2 +-
 .../PennCourseAlertCreateAlertFragment.kt     | 11 ++--
 .../PennCourseAlertHolderFragment.kt          |  6 +-
 .../PennCourseAlertManageAlertsFragment.kt    |  9 ++-
 .../{ => dining}/adapters/DiningAdapter.kt    |  6 +-
 .../adapters/DiningCardAdapter.kt             |  6 +-
 .../adapters/DiningInsightsCardAdapter.kt     | 12 ++--
 .../adapters/DiningPagerAdapter.kt            |  6 +-
 .../adapters/DiningSettingsAdapter.kt         |  4 +-
 .../{ => dining}/adapters/MenuAdapter.java    |  2 +-
 .../{ => dining}/classes/DiningBalances.kt    |  2 +-
 .../classes/DiningBalancesList.kt             |  2 +-
 .../{ => dining}/classes/DiningCell.kt        |  4 +-
 .../{ => dining}/classes/DiningHall.kt        |  2 +-
 .../classes/DiningHallPreference.kt           |  2 +-
 .../{ => dining}/classes/DiningInsightCell.kt |  2 +-
 .../{ => dining}/classes/DiningMarkerView.kt  |  4 +-
 .../{ => dining}/classes/DiningPreferences.kt |  2 +-
 .../{ => dining}/classes/DiningRequest.kt     |  2 +-
 .../dining/classes/DollarsSpentCell.kt        |  3 +
 .../pennmobile/{ => dining}/classes/Venue.kt  |  2 +-
 .../{ => dining}/classes/VenueInterval.kt     |  2 +-
 .../{ => dining/fragments}/DiningFragment.kt  | 11 ++--
 .../fragments}/DiningHolderFragment.kt        |  6 +-
 .../fragments}/DiningInfoFragment.kt          |  8 ++-
 .../fragments}/DiningInsightsFragment.kt      | 21 ++++---
 .../fragments}/DiningSettingsFragment.kt      | 12 ++--
 .../{ => dining/fragments}/MenuFragment.kt    |  6 +-
 .../{ => dining/fragments}/MenuTab.kt         | 13 +++-
 .../viewholders/DiningBalancesCardHolder.kt   |  2 +-
 .../viewholders/DiningPredictionsHolder.kt    |  2 +-
 .../viewholders/DiningSpentHolder.kt          |  2 +-
 .../widget}/AppWidgetAlarm.kt                 |  3 +-
 .../{ => dining/widget}/DiningHallWidget.kt   |  7 ++-
 .../widget}/DiningHallWidgetAdapter.kt        |  7 +--
 .../FitnessPreferenceViewModel.kt             |  5 +-
 .../{ => fitness}/adapters/FitnessAdapter.kt  | 10 +--
 .../adapters/FitnessHeaderAdapter.kt          |  2 +-
 .../adapters/FitnessPagerAdapter.kt           |  4 +-
 .../adapters/FitnessPreferenceAdapter.kt      |  4 +-
 .../classes/FitnessAdapterDataModel.kt        |  2 +-
 .../{ => fitness}/classes/FitnessRequest.kt   |  2 +-
 .../{ => fitness}/classes/FitnessRoom.kt      |  2 +-
 .../{ => fitness}/classes/FitnessRoomUsage.kt |  2 +-
 .../pennmobile/{ => fitness}/classes/Gym.kt   |  2 +-
 .../{ => fitness}/classes/GymHours.kt         |  2 +-
 .../classes/RoundedBarChartRenderer.kt        |  2 +-
 .../fragments}/FitnessHolderFragment.kt       |  6 +-
 .../fragments}/FitnessPreferencesFragment.kt  |  8 ++-
 .../adapters/FlingRecyclerViewAdapter.kt      |  4 +-
 .../{ => fling}/classes/FlingEvent.kt         |  2 +-
 .../{ => fling/fragments}/FlingFragment.kt    |  6 +-
 .../{ => gsr}/adapters/GsrBuildingAdapter.kt  |  6 +-
 .../adapters/GsrReservationsAdapter.kt        |  4 +-
 .../{ => gsr}/adapters/GsrRoomAdapter.kt      |  6 +-
 .../labs/pennmobile/{ => gsr}/classes/GSR.kt  |  2 +-
 .../{ => gsr}/classes/GSRBookingResult.kt     |  2 +-
 .../pennmobile/{ => gsr}/classes/GSRCell.kt   |  4 +-
 .../{ => gsr}/classes/GSRContainer.kt         |  2 +-
 .../{ => gsr}/classes/GSRContainerSlot.kt     |  2 +-
 .../{ => gsr}/classes/GSRLocation.kt          |  2 +-
 .../{ => gsr}/classes/GSRReservation.kt       |  2 +-
 .../pennmobile/{ => gsr}/classes/GSRRoom.kt   |  2 +-
 .../pennmobile/{ => gsr}/classes/GSRSlot.kt   |  2 +-
 .../{ => gsr}/classes/WhartonStatus.kt        |  2 +-
 .../{ => gsr/fragments}/BookGsrFragment.kt    |  6 +-
 .../{ => gsr/fragments}/GsrFragment.kt        | 13 ++--
 .../{ => gsr/fragments}/GsrPagerAdapter.kt    |  2 +-
 .../fragments}/GsrReservationsFragment.kt     | 12 +++-
 .../{ => gsr/fragments}/GsrTabbedFragment.kt  |  5 +-
 .../{ => gsr/fragments}/PottruckFragment.kt   | 13 ++--
 .../viewholders/GsrBuildingHolder.kt          |  2 +-
 .../{ => gsr}/viewholders/GsrRoomHolder.kt    |  2 +-
 .../{classes => home}/HomepageViewModel.kt    | 11 +++-
 .../{ => home}/adapters/HomeAdapter.kt        | 61 +++++++++++--------
 .../adapters/HomeGsrBuildingAdapter.kt        |  4 +-
 .../adapters/HomeGsrReservationAdapter.kt     |  6 +-
 .../{ => home}/adapters/PollOptionAdapter.kt  |  6 +-
 .../adapters/UniversityEventAdapter.kt        |  4 +-
 .../pennmobile/{ => home}/classes/Article.kt  |  2 +-
 .../{ => home}/classes/CalendarCell.kt        |  2 +-
 .../{ => home}/classes/CalendarEvent.kt       |  2 +-
 .../pennmobile/{ => home}/classes/HomeCell.kt |  2 +-
 .../{ => home}/classes/HomeCourse.kt          |  2 +-
 .../{ => home}/classes/HomepageDataModel.kt   |  2 +-
 .../pennmobile/{ => home}/classes/NewsCell.kt |  2 +-
 .../pennmobile/{ => home}/classes/Poll.kt     |  2 +-
 .../pennmobile/{ => home}/classes/PollCell.kt |  2 +-
 .../{ => home}/classes/PollOption.kt          |  2 +-
 .../pennmobile/{ => home}/classes/Post.kt     |  2 +-
 .../pennmobile/{ => home}/classes/PostCell.kt |  2 +-
 .../{ => home/fragments}/HomeFragment.kt      |  9 ++-
 .../{ => home/fragments}/NewsFragment.kt      |  5 +-
 .../{ => home}/viewholders/HomeBaseHolder.kt  |  2 +-
 .../viewholders/HomeCalendarHolder.kt         |  2 +-
 .../viewholders/HomeDiningHolder.kt           |  2 +-
 .../{ => home}/viewholders/HomeGSRHolder.kt   |  2 +-
 .../viewholders/HomeLaundryHolder.kt          |  2 +-
 .../viewholders/HomeNewsCardHolder.kt         |  2 +-
 .../{ => home}/viewholders/HomePollHolder.kt  |  2 +-
 .../{ => home}/viewholders/HomePostHolder.kt  |  2 +-
 .../{ => laundry}/LaundryBroadcastReceiver.kt |  4 +-
 .../LaundryViewModel.kt                       | 12 ++--
 .../adapters/LaundryMachineAdapter.kt         |  6 +-
 .../adapters/LaundryRoomAdapter.java          | 12 ++--
 .../adapters/LaundrySettingsAdapter.kt        |  6 +-
 .../adapters/TimeXAxisValueFormatter.kt       |  2 +-
 .../pennmobile/laundry/classes/LaundryCell.kt | 11 ++++
 .../classes/LaundryPreferences.kt             |  2 +-
 .../{ => laundry}/classes/LaundryRequest.java |  2 +-
 .../{ => laundry}/classes/LaundryRoom.kt      |  2 +-
 .../classes/LaundryRoomFavorites.kt           |  2 +-
 .../classes/LaundryRoomSimple.kt              |  2 +-
 .../{ => laundry}/classes/LaundryUsage.kt     |  2 +-
 .../{ => laundry}/classes/MachineData.kt      |  2 +-
 .../{ => laundry}/classes/MachineDetail.kt    |  2 +-
 .../{ => laundry}/classes/MachineList.kt      |  2 +-
 .../{ => laundry}/classes/Machines.kt         |  2 +-
 .../fragments}/LaundryFragment.kt             | 26 +++++---
 .../fragments}/LaundrySettingsFragment.kt     |  8 ++-
 .../{ => more}/adapters/AboutAdapter.kt       |  2 +-
 .../{ => more}/adapters/PhoneSaveAdapter.kt   |  4 +-
 .../{ => more}/adapters/SupportAdapter.kt     |  4 +-
 .../pennmobile/{ => more}/classes/Contact.kt  |  2 +-
 .../{ => more/fragments}/AboutFragment.kt     |  6 +-
 .../fragments}/MoreFragment.kt                |  2 +-
 .../fragments}/PreferenceFragment.kt          |  8 +--
 .../fragments}/SaveContactsFragment.kt        |  8 ++-
 .../{ => more/fragments}/SettingsFragment.kt  |  4 +-
 .../{ => more/fragments}/SupportFragment.kt   |  8 ++-
 .../layout/fragment_campus_express_login.xml  |  2 +-
 .../res/layout/fragment_dining_insights.xml   |  2 +-
 .../src/main/res/layout/fragment_fling.xml    |  2 +-
 .../res/layout/fragment_huntsman_gsrlogin.xml |  2 +-
 .../res/layout/fragment_login_webview.xml     |  2 +-
 .../fragment_penn_course_alert_holder.xml     |  2 +-
 ...agment_penn_course_alert_manage_alerts.xml |  2 +-
 .../res/layout/fragment_save_contacts.xml     |  2 +-
 .../src/main/res/layout/fragment_support.xml  |  2 +-
 PennMobile/src/test/java/GymHoursTest.kt      |  1 +
 build.gradle                                  |  4 +-
 177 files changed, 524 insertions(+), 405 deletions(-)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{adapters => }/MainPagerAdapter.kt (74%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => api}/HuntsmanGSRLogin.kt (96%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => api}/classes/AccessTokenResponse.kt (88%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => api}/classes/Account.kt (86%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => api}/classes/CampusExpressAccessTokenResponse.kt (85%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => api}/classes/GetUserResponse.kt (79%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => api}/classes/OAuthUser.kt (93%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => api}/classes/SaveAccountResponse.kt (80%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => api/fragments}/CampusExpressLoginFragment.kt (92%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => api/fragments}/LoginFragment.kt (96%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => api/fragments}/LoginWebviewFragment.kt (96%)
 delete mode 100644 PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DollarsSpentCell.kt
 delete mode 100644 PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryCell.kt
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{viewmodels => coursealert}/PennCourseAlertViewModel.kt (96%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => coursealert}/adapters/PennCourseAlertPagerAdapter.kt (72%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => coursealert}/adapters/RegistrationsAdapter.kt (97%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => coursealert}/classes/Course.kt (93%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => coursealert}/classes/PCARegistrationBody.kt (85%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => coursealert}/classes/PennCourseAlertRegistration.kt (96%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => coursealert}/classes/PennCourseAlertUpdateBody.kt (89%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => coursealert}/classes/Profile.kt (82%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => coursealert}/classes/Section.kt (94%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => coursealert}/classes/UserInfo.kt (85%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => coursealert/fragments}/PennCourseAlertCreateAlertFragment.kt (97%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => coursealert/fragments}/PennCourseAlertHolderFragment.kt (91%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => coursealert/fragments}/PennCourseAlertManageAlertsFragment.kt (95%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/adapters/DiningAdapter.kt (97%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/adapters/DiningCardAdapter.kt (96%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/adapters/DiningInsightsCardAdapter.kt (98%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/adapters/DiningPagerAdapter.kt (83%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/adapters/DiningSettingsAdapter.kt (94%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/adapters/MenuAdapter.java (98%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/classes/DiningBalances.kt (89%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/classes/DiningBalancesList.kt (81%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/classes/DiningCell.kt (50%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/classes/DiningHall.kt (99%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/classes/DiningHallPreference.kt (78%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/classes/DiningInsightCell.kt (85%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/classes/DiningMarkerView.kt (94%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/classes/DiningPreferences.kt (81%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/classes/DiningRequest.kt (70%)
 create mode 100644 PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DollarsSpentCell.kt
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/classes/Venue.kt (97%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/classes/VenueInterval.kt (98%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining/fragments}/DiningFragment.kt (97%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining/fragments}/DiningHolderFragment.kt (92%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining/fragments}/DiningInfoFragment.kt (94%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining/fragments}/DiningInsightsFragment.kt (90%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining/fragments}/DiningSettingsFragment.kt (93%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining/fragments}/MenuFragment.kt (96%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining/fragments}/MenuTab.kt (81%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/viewholders/DiningBalancesCardHolder.kt (88%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/viewholders/DiningPredictionsHolder.kt (90%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining}/viewholders/DiningSpentHolder.kt (80%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{classes => dining/widget}/AppWidgetAlarm.kt (94%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => dining/widget}/DiningHallWidget.kt (96%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{adapters => dining/widget}/DiningHallWidgetAdapter.kt (98%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{classes => fitness}/FitnessPreferenceViewModel.kt (93%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => fitness}/adapters/FitnessAdapter.kt (97%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => fitness}/adapters/FitnessHeaderAdapter.kt (95%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => fitness}/adapters/FitnessPagerAdapter.kt (76%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => fitness}/adapters/FitnessPreferenceAdapter.kt (92%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => fitness}/classes/FitnessAdapterDataModel.kt (85%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => fitness}/classes/FitnessRequest.kt (70%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => fitness}/classes/FitnessRoom.kt (93%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => fitness}/classes/FitnessRoomUsage.kt (89%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => fitness}/classes/Gym.kt (96%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => fitness}/classes/GymHours.kt (95%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => fitness}/classes/RoundedBarChartRenderer.kt (99%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => fitness/fragments}/FitnessHolderFragment.kt (92%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => fitness/fragments}/FitnessPreferencesFragment.kt (87%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => fling}/adapters/FlingRecyclerViewAdapter.kt (95%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => fling}/classes/FlingEvent.kt (97%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => fling/fragments}/FlingFragment.kt (94%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr}/adapters/GsrBuildingAdapter.kt (95%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr}/adapters/GsrReservationsAdapter.kt (98%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr}/adapters/GsrRoomAdapter.kt (94%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr}/classes/GSR.kt (89%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr}/classes/GSRBookingResult.kt (90%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr}/classes/GSRCell.kt (54%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr}/classes/GSRContainer.kt (96%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr}/classes/GSRContainerSlot.kt (85%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr}/classes/GSRLocation.kt (90%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr}/classes/GSRReservation.kt (96%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr}/classes/GSRRoom.kt (93%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr}/classes/GSRSlot.kt (90%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr}/classes/WhartonStatus.kt (81%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr/fragments}/BookGsrFragment.kt (97%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr/fragments}/GsrFragment.kt (98%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr/fragments}/GsrPagerAdapter.kt (93%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr/fragments}/GsrReservationsFragment.kt (94%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr/fragments}/GsrTabbedFragment.kt (92%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr/fragments}/PottruckFragment.kt (93%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr}/viewholders/GsrBuildingHolder.kt (88%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => gsr}/viewholders/GsrRoomHolder.kt (91%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{classes => home}/HomepageViewModel.kt (96%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/adapters/HomeAdapter.kt (92%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/adapters/HomeGsrBuildingAdapter.kt (95%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/adapters/HomeGsrReservationAdapter.kt (94%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/adapters/PollOptionAdapter.kt (96%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/adapters/UniversityEventAdapter.kt (95%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/classes/Article.kt (97%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/classes/CalendarCell.kt (71%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/classes/CalendarEvent.kt (93%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/classes/HomeCell.kt (77%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/classes/HomeCourse.kt (93%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/classes/HomepageDataModel.kt (82%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/classes/NewsCell.kt (67%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/classes/Poll.kt (98%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/classes/PollCell.kt (73%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/classes/PollOption.kt (95%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/classes/Post.kt (98%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/classes/PostCell.kt (66%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home/fragments}/HomeFragment.kt (96%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home/fragments}/NewsFragment.kt (98%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/viewholders/HomeBaseHolder.kt (88%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/viewholders/HomeCalendarHolder.kt (75%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/viewholders/HomeDiningHolder.kt (75%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/viewholders/HomeGSRHolder.kt (88%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/viewholders/HomeLaundryHolder.kt (75%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/viewholders/HomeNewsCardHolder.kt (93%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/viewholders/HomePollHolder.kt (89%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => home}/viewholders/HomePostHolder.kt (92%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => laundry}/LaundryBroadcastReceiver.kt (95%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{viewmodels => laundry}/LaundryViewModel.kt (96%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => laundry}/adapters/LaundryMachineAdapter.kt (98%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => laundry}/adapters/LaundryRoomAdapter.java (96%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => laundry}/adapters/LaundrySettingsAdapter.kt (96%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => laundry}/adapters/TimeXAxisValueFormatter.kt (95%)
 create mode 100644 PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryCell.kt
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => laundry}/classes/LaundryPreferences.kt (78%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => laundry}/classes/LaundryRequest.java (77%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => laundry}/classes/LaundryRoom.kt (84%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => laundry}/classes/LaundryRoomFavorites.kt (72%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => laundry}/classes/LaundryRoomSimple.kt (88%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => laundry}/classes/LaundryUsage.kt (95%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => laundry}/classes/MachineData.kt (98%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => laundry}/classes/MachineDetail.kt (93%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => laundry}/classes/MachineList.kt (91%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => laundry}/classes/Machines.kt (87%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => laundry/fragments}/LaundryFragment.kt (87%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => laundry/fragments}/LaundrySettingsFragment.kt (93%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => more}/adapters/AboutAdapter.kt (97%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => more}/adapters/PhoneSaveAdapter.kt (95%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => more}/adapters/SupportAdapter.kt (94%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => more}/classes/Contact.kt (91%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => more/fragments}/AboutFragment.kt (96%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{morefragments => more/fragments}/MoreFragment.kt (98%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{morefragments => more/fragments}/PreferenceFragment.kt (97%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => more/fragments}/SaveContactsFragment.kt (96%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => more/fragments}/SettingsFragment.kt (97%)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => more/fragments}/SupportFragment.kt (93%)

diff --git a/PennMobile/build 2/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml b/PennMobile/build 2/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml
index 07383d0da..37685ef45 100644
--- a/PennMobile/build 2/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml	
+++ b/PennMobile/build 2/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml	
@@ -64,7 +64,7 @@
             android:resource="@array/preloaded_fonts" />
 
         <receiver
-            android:name="com.pennapps.labs.pennmobile.LaundryBroadcastReceiver"
+            android:name="com.pennapps.labs.pennmobile.laundry.LaundryBroadcastReceiver"
             android:enabled="true"
             android:exported="true" /> <!-- receiver for laundry -->
         <uses-library
diff --git a/PennMobile/build 2/intermediates/instant_app_manifest/debug/AndroidManifest.xml b/PennMobile/build 2/intermediates/instant_app_manifest/debug/AndroidManifest.xml
index 4e653eaab..0430b078b 100644
--- a/PennMobile/build 2/intermediates/instant_app_manifest/debug/AndroidManifest.xml	
+++ b/PennMobile/build 2/intermediates/instant_app_manifest/debug/AndroidManifest.xml	
@@ -65,7 +65,7 @@
             android:resource="@array/preloaded_fonts" />
 
         <receiver
-            android:name="com.pennapps.labs.pennmobile.LaundryBroadcastReceiver"
+            android:name="com.pennapps.labs.pennmobile.laundry.LaundryBroadcastReceiver"
             android:enabled="true"
             android:exported="true" /> <!-- receiver for laundry -->
         <uses-library
diff --git a/PennMobile/build 2/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/PennMobile/build 2/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
index f475c328e..f09e1911f 100644
--- a/PennMobile/build 2/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt	
+++ b/PennMobile/build 2/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt	
@@ -125,7 +125,7 @@
 65
 66        <receiver
 66-->/Users/lumumba/Desktop/penn-mobile-android/PennMobile/src/main/AndroidManifest.xml:39:7-42:39
-67            android:name="com.pennapps.labs.pennmobile.LaundryBroadcastReceiver"
+67            android:name="com.pennapps.labs.pennmobile.laundry.LaundryBroadcastReceiver"
 67-->/Users/lumumba/Desktop/penn-mobile-android/PennMobile/src/main/AndroidManifest.xml:40:13-53
 68            android:enabled="true"
 68-->/Users/lumumba/Desktop/penn-mobile-android/PennMobile/src/main/AndroidManifest.xml:41:13-35
diff --git a/PennMobile/build 2/intermediates/merged_manifests/debug/AndroidManifest.xml b/PennMobile/build 2/intermediates/merged_manifests/debug/AndroidManifest.xml
index 07383d0da..37685ef45 100644
--- a/PennMobile/build 2/intermediates/merged_manifests/debug/AndroidManifest.xml	
+++ b/PennMobile/build 2/intermediates/merged_manifests/debug/AndroidManifest.xml	
@@ -64,7 +64,7 @@
             android:resource="@array/preloaded_fonts" />
 
         <receiver
-            android:name="com.pennapps.labs.pennmobile.LaundryBroadcastReceiver"
+            android:name="com.pennapps.labs.pennmobile.laundry.LaundryBroadcastReceiver"
             android:enabled="true"
             android:exported="true" /> <!-- receiver for laundry -->
         <uses-library
diff --git a/PennMobile/src/main/AndroidManifest.xml b/PennMobile/src/main/AndroidManifest.xml
index c510c0cf8..27cc004da 100644
--- a/PennMobile/src/main/AndroidManifest.xml
+++ b/PennMobile/src/main/AndroidManifest.xml
@@ -28,7 +28,7 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="m">
         <receiver
-            android:name="com.pennapps.labs.pennmobile.DiningHallWidget"
+            android:name="com.pennapps.labs.pennmobile.dining.widget.DiningHallWidget"
             android:exported="false">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -53,7 +53,7 @@
                 <action android:name="android.intent.action.VIEW" />
             </intent-filter>
         </activity>
-        <service android:name=".adapters.DiningHallWidgetAdapter"
+        <service android:name=".dining.widget.DiningHallWidgetAdapter"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
 
         <meta-data
@@ -67,7 +67,7 @@
             android:resource="@array/preloaded_fonts" />
 
         <receiver
-            android:name=".LaundryBroadcastReceiver"
+            android:name=".laundry.LaundryBroadcastReceiver"
             android:enabled="true"
             android:exported="true" /> <!-- receiver for laundry -->
         <uses-library
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/MainActivity.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/MainActivity.kt
index 9d05d7eed..1a2f882c3 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/MainActivity.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/MainActivity.kt
@@ -34,23 +34,24 @@ import com.google.android.material.tabs.TabLayout
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
-import com.pennapps.labs.pennmobile.adapters.MainPagerAdapter
 import com.pennapps.labs.pennmobile.api.CampusExpress
 import com.pennapps.labs.pennmobile.api.OAuth2NetworkManager
 import com.pennapps.labs.pennmobile.api.Platform
 import com.pennapps.labs.pennmobile.api.Serializer
 import com.pennapps.labs.pennmobile.api.StudentLife
-import com.pennapps.labs.pennmobile.classes.Account
-import com.pennapps.labs.pennmobile.classes.Contact
-import com.pennapps.labs.pennmobile.classes.DiningHall
-import com.pennapps.labs.pennmobile.classes.FlingEvent
-import com.pennapps.labs.pennmobile.classes.GSRLocation
-import com.pennapps.labs.pennmobile.classes.GSRReservation
-import com.pennapps.labs.pennmobile.classes.LaundryRoom
-import com.pennapps.labs.pennmobile.classes.Post
-import com.pennapps.labs.pennmobile.classes.Venue
+import com.pennapps.labs.pennmobile.api.classes.Account
+import com.pennapps.labs.pennmobile.api.fragments.LoginFragment
+import com.pennapps.labs.pennmobile.more.classes.Contact
+import com.pennapps.labs.pennmobile.dining.classes.DiningHall
+import com.pennapps.labs.pennmobile.fling.classes.FlingEvent
+import com.pennapps.labs.pennmobile.gsr.classes.GSRLocation
+import com.pennapps.labs.pennmobile.gsr.classes.GSRReservation
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRoom
+import com.pennapps.labs.pennmobile.home.classes.Post
+import com.pennapps.labs.pennmobile.dining.classes.Venue
 import com.pennapps.labs.pennmobile.components.sneaker.Sneaker
 import com.pennapps.labs.pennmobile.databinding.ActivityMainBinding
+import com.pennapps.labs.pennmobile.more.fragments.SaveContactsFragment
 import com.pennapps.labs.pennmobile.utils.Utils
 import eightbitlab.com.blurview.BlurView
 import kotlinx.coroutines.sync.Mutex
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/MainPagerAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/MainPagerAdapter.kt
similarity index 74%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/MainPagerAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/MainPagerAdapter.kt
index d90d8bacc..c4763b510 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/MainPagerAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/MainPagerAdapter.kt
@@ -1,14 +1,14 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile
 
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
 import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.pennapps.labs.pennmobile.DiningHolderFragment
-import com.pennapps.labs.pennmobile.GsrTabbedFragment
-import com.pennapps.labs.pennmobile.HomeFragment
-import com.pennapps.labs.pennmobile.LaundryFragment
-import com.pennapps.labs.pennmobile.morefragments.MoreFragment
+import com.pennapps.labs.pennmobile.dining.fragments.DiningHolderFragment
+import com.pennapps.labs.pennmobile.gsr.fragments.GsrTabbedFragment
+import com.pennapps.labs.pennmobile.home.fragments.HomeFragment
+import com.pennapps.labs.pennmobile.laundry.fragments.LaundryFragment
+import com.pennapps.labs.pennmobile.more.fragments.MoreFragment
 
 class MainPagerAdapter(
     fragmentManager: FragmentManager,
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/CampusExpress.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/CampusExpress.kt
index dea94653e..2663b6fad 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/CampusExpress.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/CampusExpress.kt
@@ -1,8 +1,8 @@
 package com.pennapps.labs.pennmobile.api
 
-import com.pennapps.labs.pennmobile.classes.CampusExpressAccessTokenResponse
-import com.pennapps.labs.pennmobile.classes.DiningBalances
-import com.pennapps.labs.pennmobile.classes.DiningBalancesList
+import com.pennapps.labs.pennmobile.api.classes.CampusExpressAccessTokenResponse
+import com.pennapps.labs.pennmobile.dining.classes.DiningBalances
+import com.pennapps.labs.pennmobile.dining.classes.DiningBalancesList
 import retrofit.Callback
 import retrofit.http.GET
 import retrofit.http.Header
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/DiningRequest.java b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/DiningRequest.java
index 4ac8bcc08..7ed191563 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/DiningRequest.java
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/DiningRequest.java
@@ -1,6 +1,6 @@
 package com.pennapps.labs.pennmobile.api;
 
-import com.pennapps.labs.pennmobile.classes.Venue;
+import com.pennapps.labs.pennmobile.dining.classes.Venue;
 
 import java.util.List;
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HuntsmanGSRLogin.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/HuntsmanGSRLogin.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/HuntsmanGSRLogin.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/HuntsmanGSRLogin.kt
index da77f8a26..36bab49cb 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HuntsmanGSRLogin.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/HuntsmanGSRLogin.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.api
 
 import android.os.Bundle
 import android.util.Log
@@ -12,9 +12,11 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import androidx.preference.PreferenceManager
-import com.pennapps.labs.pennmobile.api.StudentLife
-import com.pennapps.labs.pennmobile.classes.GSRBookingResult
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.gsr.classes.GSRBookingResult
 import com.pennapps.labs.pennmobile.databinding.FragmentHuntsmanGsrloginBinding
+import com.pennapps.labs.pennmobile.gsr.fragments.GsrTabbedFragment
 import retrofit.Callback
 import retrofit.RetrofitError
 import retrofit.client.Response
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/OAuth2NetworkManager.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/OAuth2NetworkManager.kt
index 6690a1c1e..9d8428be0 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/OAuth2NetworkManager.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/OAuth2NetworkManager.kt
@@ -8,7 +8,7 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.pennapps.labs.pennmobile.BuildConfig
 import com.pennapps.labs.pennmobile.MainActivity
 import com.pennapps.labs.pennmobile.R
-import com.pennapps.labs.pennmobile.classes.AccessTokenResponse
+import com.pennapps.labs.pennmobile.api.classes.AccessTokenResponse
 import kotlinx.coroutines.launch
 import retrofit.Callback
 import retrofit.RetrofitError
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/PennCourseAlertApiService.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/PennCourseAlertApiService.kt
index b06b5dc58..c84660e68 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/PennCourseAlertApiService.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/PennCourseAlertApiService.kt
@@ -1,12 +1,12 @@
 package com.pennapps.labs.pennmobile.api
 
-import com.pennapps.labs.pennmobile.classes.Course
-import com.pennapps.labs.pennmobile.classes.PCARegistrationBody
-import com.pennapps.labs.pennmobile.classes.PennCourseAlertRegistration
-import com.pennapps.labs.pennmobile.classes.PennCourseAlertUpdateBody
-import com.pennapps.labs.pennmobile.classes.Profile
-import com.pennapps.labs.pennmobile.classes.Section
-import com.pennapps.labs.pennmobile.classes.UserInfo
+import com.pennapps.labs.pennmobile.coursealert.classes.Course
+import com.pennapps.labs.pennmobile.coursealert.classes.PCARegistrationBody
+import com.pennapps.labs.pennmobile.coursealert.classes.PennCourseAlertRegistration
+import com.pennapps.labs.pennmobile.coursealert.classes.PennCourseAlertUpdateBody
+import com.pennapps.labs.pennmobile.coursealert.classes.Profile
+import com.pennapps.labs.pennmobile.coursealert.classes.Section
+import com.pennapps.labs.pennmobile.coursealert.classes.UserInfo
 import okhttp3.OkHttpClient
 import retrofit2.Call
 import retrofit2.Retrofit
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/Platform.java b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/Platform.java
index d12b9702b..ec921b049 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/Platform.java
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/Platform.java
@@ -1,7 +1,6 @@
 package com.pennapps.labs.pennmobile.api;
 
-import com.pennapps.labs.pennmobile.classes.AccessTokenResponse;
-import com.pennapps.labs.pennmobile.classes.GetUserResponse;
+import com.pennapps.labs.pennmobile.api.classes.GetUserResponse;
 
 import retrofit.Callback;
 import retrofit.http.Field;
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/Serializer.java b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/Serializer.java
index c23605500..8d24bcf6c 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/Serializer.java
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/Serializer.java
@@ -8,15 +8,15 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
-import com.pennapps.labs.pennmobile.classes.Account;
-import com.pennapps.labs.pennmobile.classes.DiningHall;
-import com.pennapps.labs.pennmobile.classes.FlingEvent;
-import com.pennapps.labs.pennmobile.classes.GSRLocation;
-import com.pennapps.labs.pennmobile.classes.GSRReservation;
-import com.pennapps.labs.pennmobile.classes.LaundryRoom;
-import com.pennapps.labs.pennmobile.classes.Post;
-import com.pennapps.labs.pennmobile.classes.Venue;
-import com.pennapps.labs.pennmobile.classes.VenueInterval;
+import com.pennapps.labs.pennmobile.api.classes.Account;
+import com.pennapps.labs.pennmobile.dining.classes.DiningHall;
+import com.pennapps.labs.pennmobile.fling.classes.FlingEvent;
+import com.pennapps.labs.pennmobile.gsr.classes.GSRLocation;
+import com.pennapps.labs.pennmobile.gsr.classes.GSRReservation;
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRoom;
+import com.pennapps.labs.pennmobile.home.classes.Post;
+import com.pennapps.labs.pennmobile.dining.classes.Venue;
+import com.pennapps.labs.pennmobile.dining.classes.VenueInterval;
 
 import java.lang.reflect.Type;
 import java.text.Format;
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.java b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.java
index aa3449218..aa4380b48 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.java
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.java
@@ -1,26 +1,26 @@
 package com.pennapps.labs.pennmobile.api;
 
-import com.pennapps.labs.pennmobile.classes.AccessTokenResponse;
-import com.pennapps.labs.pennmobile.classes.Account;
-import com.pennapps.labs.pennmobile.classes.Article;
-import com.pennapps.labs.pennmobile.classes.CalendarEvent;
-import com.pennapps.labs.pennmobile.classes.DiningHall;
-import com.pennapps.labs.pennmobile.classes.DiningPreferences;
-import com.pennapps.labs.pennmobile.classes.DiningRequest;
-import com.pennapps.labs.pennmobile.classes.FitnessRequest;
-import com.pennapps.labs.pennmobile.classes.FitnessRoom;
-import com.pennapps.labs.pennmobile.classes.FitnessRoomUsage;
-import com.pennapps.labs.pennmobile.classes.FlingEvent;
-import com.pennapps.labs.pennmobile.classes.GSR;
-import com.pennapps.labs.pennmobile.classes.GSRBookingResult;
-import com.pennapps.labs.pennmobile.classes.GSRLocation;
-import com.pennapps.labs.pennmobile.classes.GSRReservation;
-import com.pennapps.labs.pennmobile.classes.LaundryRoom;
-import com.pennapps.labs.pennmobile.classes.Poll;
-import com.pennapps.labs.pennmobile.classes.Post;
-import com.pennapps.labs.pennmobile.classes.SaveAccountResponse;
-import com.pennapps.labs.pennmobile.classes.Venue;
-import com.pennapps.labs.pennmobile.classes.WhartonStatus;
+import com.pennapps.labs.pennmobile.api.classes.AccessTokenResponse;
+import com.pennapps.labs.pennmobile.api.classes.Account;
+import com.pennapps.labs.pennmobile.home.classes.Article;
+import com.pennapps.labs.pennmobile.home.classes.CalendarEvent;
+import com.pennapps.labs.pennmobile.dining.classes.DiningHall;
+import com.pennapps.labs.pennmobile.dining.classes.DiningPreferences;
+import com.pennapps.labs.pennmobile.dining.classes.DiningRequest;
+import com.pennapps.labs.pennmobile.fitness.classes.FitnessRequest;
+import com.pennapps.labs.pennmobile.fitness.classes.FitnessRoom;
+import com.pennapps.labs.pennmobile.fitness.classes.FitnessRoomUsage;
+import com.pennapps.labs.pennmobile.fling.classes.FlingEvent;
+import com.pennapps.labs.pennmobile.gsr.classes.GSR;
+import com.pennapps.labs.pennmobile.gsr.classes.GSRBookingResult;
+import com.pennapps.labs.pennmobile.gsr.classes.GSRLocation;
+import com.pennapps.labs.pennmobile.gsr.classes.GSRReservation;
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRoom;
+import com.pennapps.labs.pennmobile.home.classes.Poll;
+import com.pennapps.labs.pennmobile.home.classes.Post;
+import com.pennapps.labs.pennmobile.api.classes.SaveAccountResponse;
+import com.pennapps.labs.pennmobile.dining.classes.Venue;
+import com.pennapps.labs.pennmobile.gsr.classes.WhartonStatus;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLifeRf2.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLifeRf2.kt
index 67bbd213d..c3168effa 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLifeRf2.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLifeRf2.kt
@@ -1,8 +1,8 @@
-import com.pennapps.labs.pennmobile.classes.LaundryPreferences
-import com.pennapps.labs.pennmobile.classes.LaundryRequest
-import com.pennapps.labs.pennmobile.classes.LaundryRoom
-import com.pennapps.labs.pennmobile.classes.LaundryRoomSimple
-import com.pennapps.labs.pennmobile.classes.LaundryUsage
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryPreferences
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRequest
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRoom
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRoomSimple
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryUsage
 import okhttp3.ResponseBody
 import retrofit2.Response
 import retrofit2.http.Body
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/AccessTokenResponse.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/AccessTokenResponse.kt
similarity index 88%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/AccessTokenResponse.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/AccessTokenResponse.kt
index 1c9f7a62e..1c938cd62 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/AccessTokenResponse.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/AccessTokenResponse.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.api.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Account.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/Account.kt
similarity index 86%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Account.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/Account.kt
index 4ce682fcc..dc052b335 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Account.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/Account.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.api.classes
 
 class Account(
     firstName: String?,
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/CampusExpressAccessTokenResponse.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/CampusExpressAccessTokenResponse.kt
similarity index 85%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/CampusExpressAccessTokenResponse.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/CampusExpressAccessTokenResponse.kt
index 84e91bdbd..97d514661 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/CampusExpressAccessTokenResponse.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/CampusExpressAccessTokenResponse.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.api.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GetUserResponse.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/GetUserResponse.kt
similarity index 79%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GetUserResponse.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/GetUserResponse.kt
index 3f9bfe362..1d2c505a8 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GetUserResponse.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/GetUserResponse.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.api.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/OAuthUser.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/OAuthUser.kt
similarity index 93%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/OAuthUser.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/OAuthUser.kt
index 53c5bb59d..04a500306 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/OAuthUser.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/OAuthUser.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.api.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/SaveAccountResponse.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/SaveAccountResponse.kt
similarity index 80%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/SaveAccountResponse.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/SaveAccountResponse.kt
index cdd19f5d3..c5c111f15 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/SaveAccountResponse.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/SaveAccountResponse.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.api.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/CampusExpressLoginFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/fragments/CampusExpressLoginFragment.kt
similarity index 92%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/CampusExpressLoginFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/fragments/CampusExpressLoginFragment.kt
index 165d0ebcc..3c7ff5f53 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/CampusExpressLoginFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/fragments/CampusExpressLoginFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.api.fragments
 
 import android.content.SharedPreferences
 import android.net.Uri
@@ -17,9 +17,12 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import androidx.preference.PreferenceManager
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.api.CampusExpress
-import com.pennapps.labs.pennmobile.classes.Account
-import com.pennapps.labs.pennmobile.classes.CampusExpressAccessTokenResponse
+import com.pennapps.labs.pennmobile.api.classes.Account
+import com.pennapps.labs.pennmobile.api.classes.CampusExpressAccessTokenResponse
+import com.pennapps.labs.pennmobile.dining.fragments.DiningInsightsFragment
 import org.apache.commons.lang3.RandomStringUtils
 import retrofit.Callback
 import retrofit.RetrofitError
@@ -28,11 +31,6 @@ import java.security.MessageDigest
 import java.util.Base64
 import java.util.Date
 
-// TODO: Rename parameter arguments, choose names that match
-// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-private const val ARG_PARAM1 = "param1"
-private const val ARG_PARAM2 = "param2"
-
 /**
  * A simple [Fragment] subclass.
  * Use the [CampusExpressLoginFragment.newInstance] factory method to
@@ -84,8 +82,7 @@ class CampusExpressLoginFragment : Fragment() {
         headerLayout = view.findViewById(R.id.linear_layout)
         cancelButton = view.findViewById(R.id.cancel_button)
         val uri =
-            Uri
-                .parse(campusExpressAuthUrl)
+            Uri.parse(campusExpressAuthUrl)
                 .buildUpon()
                 .appendQueryParameter("response_type", "code")
                 .appendQueryParameter("client_id", clientID)
@@ -177,7 +174,11 @@ class CampusExpressLoginFragment : Fragment() {
 
                 override fun failure(error: RetrofitError) {
                     Log.e("Campus Webview", "Error fetching access token $error")
-                    Toast.makeText(context, "Error getting campus express authorization", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(
+                        context,
+                        "Error getting campus express authorization",
+                        Toast.LENGTH_SHORT
+                    ).show()
                     goToDiningInsights(false)
                 }
             },
@@ -211,4 +212,4 @@ class CampusExpressLoginFragment : Fragment() {
 
         return stateString
     }
-}
+}
\ No newline at end of file
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/LoginFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/fragments/LoginFragment.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/LoginFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/fragments/LoginFragment.kt
index b526f3a42..d3939bd8f 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/LoginFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/fragments/LoginFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.api.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -12,6 +12,8 @@ import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.load.resource.gif.GifDrawable
 import com.bumptech.glide.request.RequestListener
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.databinding.FragmentLoginBinding
 
 class LoginFragment : Fragment() {
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/LoginWebviewFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/fragments/LoginWebviewFragment.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/LoginWebviewFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/fragments/LoginWebviewFragment.kt
index fb9f82695..904c49cb3 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/LoginWebviewFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/fragments/LoginWebviewFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.api.fragments
 
 import android.content.SharedPreferences
 import android.os.Bundle
@@ -20,12 +20,15 @@ import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.pennapps.labs.pennmobile.BuildConfig
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.api.Platform
 import com.pennapps.labs.pennmobile.api.Platform.platformBaseUrl
 import com.pennapps.labs.pennmobile.api.StudentLife
-import com.pennapps.labs.pennmobile.classes.AccessTokenResponse
-import com.pennapps.labs.pennmobile.classes.Account
-import com.pennapps.labs.pennmobile.classes.GetUserResponse
+import com.pennapps.labs.pennmobile.api.classes.AccessTokenResponse
+import com.pennapps.labs.pennmobile.api.classes.Account
+import com.pennapps.labs.pennmobile.api.classes.GetUserResponse
 import org.apache.commons.lang3.RandomStringUtils
 import retrofit.Callback
 import retrofit.RetrofitError
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DollarsSpentCell.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DollarsSpentCell.kt
deleted file mode 100644
index c8398b5c4..000000000
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DollarsSpentCell.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.pennapps.labs.pennmobile.classes
-
-class DollarsSpentCell : DiningInsightCell()
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryCell.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryCell.kt
deleted file mode 100644
index f44690b9f..000000000
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryCell.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.pennapps.labs.pennmobile.classes
-
-data class LaundryCell(
-    val roomId: Int,
-) : HomeCell() {
-    init {
-        type = "laundry"
-    }
-}
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewmodels/PennCourseAlertViewModel.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/PennCourseAlertViewModel.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewmodels/PennCourseAlertViewModel.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/PennCourseAlertViewModel.kt
index 2ac54c1ed..b999034c0 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewmodels/PennCourseAlertViewModel.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/PennCourseAlertViewModel.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.viewmodels
+package com.pennapps.labs.pennmobile.coursealert
 
 import android.util.Log
 import android.widget.ArrayAdapter
@@ -6,13 +6,13 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.pennapps.labs.pennmobile.api.PennCourseAlertApi
-import com.pennapps.labs.pennmobile.classes.Course
-import com.pennapps.labs.pennmobile.classes.PCARegistrationBody
-import com.pennapps.labs.pennmobile.classes.PennCourseAlertRegistration
-import com.pennapps.labs.pennmobile.classes.PennCourseAlertUpdateBody
-import com.pennapps.labs.pennmobile.classes.Profile
-import com.pennapps.labs.pennmobile.classes.Section
-import com.pennapps.labs.pennmobile.classes.UserInfo
+import com.pennapps.labs.pennmobile.coursealert.classes.Course
+import com.pennapps.labs.pennmobile.coursealert.classes.PCARegistrationBody
+import com.pennapps.labs.pennmobile.coursealert.classes.PennCourseAlertRegistration
+import com.pennapps.labs.pennmobile.coursealert.classes.PennCourseAlertUpdateBody
+import com.pennapps.labs.pennmobile.coursealert.classes.Profile
+import com.pennapps.labs.pennmobile.coursealert.classes.Section
+import com.pennapps.labs.pennmobile.coursealert.classes.UserInfo
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PennCourseAlertPagerAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/adapters/PennCourseAlertPagerAdapter.kt
similarity index 72%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PennCourseAlertPagerAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/adapters/PennCourseAlertPagerAdapter.kt
index 8055c1545..89ccb5916 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PennCourseAlertPagerAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/adapters/PennCourseAlertPagerAdapter.kt
@@ -1,9 +1,9 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.coursealert.adapters
 
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.pennapps.labs.pennmobile.PennCourseAlertCreateAlertFragment
-import com.pennapps.labs.pennmobile.PennCourseAlertManageAlertsFragment
+import com.pennapps.labs.pennmobile.coursealert.fragments.PennCourseAlertCreateAlertFragment
+import com.pennapps.labs.pennmobile.coursealert.fragments.PennCourseAlertManageAlertsFragment
 
 class PennCourseAlertPagerAdapter(
     fragment: Fragment,
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/RegistrationsAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/adapters/RegistrationsAdapter.kt
similarity index 97%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/RegistrationsAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/adapters/RegistrationsAdapter.kt
index 22f27a5dc..752090df3 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/RegistrationsAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/adapters/RegistrationsAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.coursealert.adapters
 
 import android.util.Log
 import android.view.LayoutInflater
@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.pennapps.labs.pennmobile.R
-import com.pennapps.labs.pennmobile.classes.PennCourseAlertRegistration
+import com.pennapps.labs.pennmobile.coursealert.classes.PennCourseAlertRegistration
 
 class RegistrationsAdapter(
     private val listener: OnItemClickListener,
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Course.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/Course.kt
similarity index 93%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Course.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/Course.kt
index 86882475d..51da264c5 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Course.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/Course.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.coursealert.classes
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/PCARegistrationBody.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/PCARegistrationBody.kt
similarity index 85%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/PCARegistrationBody.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/PCARegistrationBody.kt
index 54d752eac..8e66d85f4 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/PCARegistrationBody.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/PCARegistrationBody.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.coursealert.classes
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/PennCourseAlertRegistration.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/PennCourseAlertRegistration.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/PennCourseAlertRegistration.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/PennCourseAlertRegistration.kt
index c6a293ffb..550fd831d 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/PennCourseAlertRegistration.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/PennCourseAlertRegistration.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.coursealert.classes
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/PennCourseAlertUpdateBody.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/PennCourseAlertUpdateBody.kt
similarity index 89%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/PennCourseAlertUpdateBody.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/PennCourseAlertUpdateBody.kt
index 0a6b66af8..9ecb347eb 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/PennCourseAlertUpdateBody.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/PennCourseAlertUpdateBody.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.coursealert.classes
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Profile.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/Profile.kt
similarity index 82%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Profile.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/Profile.kt
index 36426adaa..e5c0bc3fd 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Profile.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/Profile.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.coursealert.classes
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Section.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/Section.kt
similarity index 94%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Section.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/Section.kt
index 2119cee69..38b9709c5 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Section.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/Section.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.coursealert.classes
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/UserInfo.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/UserInfo.kt
similarity index 85%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/UserInfo.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/UserInfo.kt
index fd6bcc268..39b47084f 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/UserInfo.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/classes/UserInfo.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.coursealert.classes
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennCourseAlertCreateAlertFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/fragments/PennCourseAlertCreateAlertFragment.kt
similarity index 97%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennCourseAlertCreateAlertFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/fragments/PennCourseAlertCreateAlertFragment.kt
index 36d5d3863..ea7e9f888 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennCourseAlertCreateAlertFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/fragments/PennCourseAlertCreateAlertFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.coursealert.fragments
 
 import android.app.Dialog
 import android.graphics.Color
@@ -24,10 +24,13 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Observer
 import androidx.preference.PreferenceManager
-import com.pennapps.labs.pennmobile.classes.Course
-import com.pennapps.labs.pennmobile.classes.Section
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.coursealert.classes.Course
+import com.pennapps.labs.pennmobile.coursealert.classes.Section
 import com.pennapps.labs.pennmobile.databinding.FragmentPennCourseAlertCreateAlertBinding
-import com.pennapps.labs.pennmobile.viewmodels.PennCourseAlertViewModel
+import com.pennapps.labs.pennmobile.isOnline
+import com.pennapps.labs.pennmobile.coursealert.PennCourseAlertViewModel
 import java.util.regex.Pattern
 
 class PennCourseAlertCreateAlertFragment : Fragment() {
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennCourseAlertHolderFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/fragments/PennCourseAlertHolderFragment.kt
similarity index 91%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennCourseAlertHolderFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/fragments/PennCourseAlertHolderFragment.kt
index 9b1396dc7..74363fc55 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennCourseAlertHolderFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/fragments/PennCourseAlertHolderFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.coursealert.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -8,7 +8,9 @@ import androidx.fragment.app.Fragment
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
-import com.pennapps.labs.pennmobile.adapters.PennCourseAlertPagerAdapter
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.coursealert.adapters.PennCourseAlertPagerAdapter
 import com.pennapps.labs.pennmobile.databinding.FragmentPennCourseAlertHolderBinding
 import com.pennapps.labs.pennmobile.utils.Utils
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennCourseAlertManageAlertsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/fragments/PennCourseAlertManageAlertsFragment.kt
similarity index 95%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennCourseAlertManageAlertsFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/fragments/PennCourseAlertManageAlertsFragment.kt
index af71510dc..dbcda47e8 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PennCourseAlertManageAlertsFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/coursealert/fragments/PennCourseAlertManageAlertsFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.coursealert.fragments
 
 import android.annotation.SuppressLint
 import android.app.AlertDialog
@@ -19,8 +19,11 @@ import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import com.pennapps.labs.pennmobile.adapters.RegistrationsAdapter
-import com.pennapps.labs.pennmobile.viewmodels.PennCourseAlertViewModel
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.coursealert.adapters.RegistrationsAdapter
+import com.pennapps.labs.pennmobile.isOnline
+import com.pennapps.labs.pennmobile.coursealert.PennCourseAlertViewModel
 
 class PennCourseAlertManageAlertsFragment :
     Fragment(),
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningAdapter.kt
similarity index 97%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningAdapter.kt
index cbdc52743..feb3bfb6f 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.dining.adapters
 
 import android.content.Context
 import android.os.Bundle
@@ -14,10 +14,10 @@ import androidx.fragment.app.FragmentTransaction
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
 import com.pennapps.labs.pennmobile.MainActivity
-import com.pennapps.labs.pennmobile.MenuFragment
+import com.pennapps.labs.pennmobile.dining.fragments.MenuFragment
 import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.api.StudentLife
-import com.pennapps.labs.pennmobile.classes.DiningHall
+import com.pennapps.labs.pennmobile.dining.classes.DiningHall
 import com.pennapps.labs.pennmobile.databinding.DiningListItemBinding
 import com.squareup.picasso.Picasso
 import rx.android.schedulers.AndroidSchedulers
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningCardAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningCardAdapter.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningCardAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningCardAdapter.kt
index 1a0f6c629..94a17231a 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningCardAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningCardAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.dining.adapters
 
 import android.content.Context
 import android.os.Bundle
@@ -14,10 +14,10 @@ import androidx.fragment.app.FragmentTransaction
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.pennapps.labs.pennmobile.MainActivity
-import com.pennapps.labs.pennmobile.MenuFragment
+import com.pennapps.labs.pennmobile.dining.fragments.MenuFragment
 import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.api.StudentLife
-import com.pennapps.labs.pennmobile.classes.DiningHall
+import com.pennapps.labs.pennmobile.dining.classes.DiningHall
 import com.pennapps.labs.pennmobile.databinding.DiningListItemBinding
 import rx.android.schedulers.AndroidSchedulers
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningInsightsCardAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningInsightsCardAdapter.kt
similarity index 98%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningInsightsCardAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningInsightsCardAdapter.kt
index 46cf7fdd0..32a9f5e9d 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningInsightsCardAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningInsightsCardAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.dining.adapters
 
 import android.content.Context
 import android.util.Log
@@ -22,14 +22,14 @@ import com.github.mikephil.charting.interfaces.datasets.ILineDataSet
 import com.github.mikephil.charting.listener.OnChartValueSelectedListener
 import com.pennapps.labs.pennmobile.MainActivity
 import com.pennapps.labs.pennmobile.R
-import com.pennapps.labs.pennmobile.classes.DiningInsightCell
-import com.pennapps.labs.pennmobile.classes.DiningMarkerView
+import com.pennapps.labs.pennmobile.dining.classes.DiningInsightCell
+import com.pennapps.labs.pennmobile.dining.classes.DiningMarkerView
 import com.pennapps.labs.pennmobile.databinding.DiningBalancesCardBinding
 import com.pennapps.labs.pennmobile.databinding.DiningPredictionsCardBinding
 import com.pennapps.labs.pennmobile.databinding.DiningSpentCardBinding
-import com.pennapps.labs.pennmobile.viewholders.DiningBalancesCardHolder
-import com.pennapps.labs.pennmobile.viewholders.DiningPredictionsHolder
-import com.pennapps.labs.pennmobile.viewholders.DiningSpentHolder
+import com.pennapps.labs.pennmobile.dining.viewholders.DiningBalancesCardHolder
+import com.pennapps.labs.pennmobile.dining.viewholders.DiningPredictionsHolder
+import com.pennapps.labs.pennmobile.dining.viewholders.DiningSpentHolder
 import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.Calendar
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningPagerAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningPagerAdapter.kt
similarity index 83%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningPagerAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningPagerAdapter.kt
index d220b0c3a..85640b394 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningPagerAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningPagerAdapter.kt
@@ -1,11 +1,11 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.dining.adapters
 
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
 import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.pennapps.labs.pennmobile.DiningFragment
-import com.pennapps.labs.pennmobile.DiningInsightsFragment
+import com.pennapps.labs.pennmobile.dining.fragments.DiningFragment
+import com.pennapps.labs.pennmobile.dining.fragments.DiningInsightsFragment
 
 class DiningPagerAdapter(
     fragmentManager: FragmentManager,
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningSettingsAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningSettingsAdapter.kt
similarity index 94%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningSettingsAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningSettingsAdapter.kt
index 4f50603e9..8cbc6a882 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningSettingsAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningSettingsAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.dining.adapters
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -7,7 +7,7 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
-import com.pennapps.labs.pennmobile.classes.DiningHall
+import com.pennapps.labs.pennmobile.dining.classes.DiningHall
 import com.pennapps.labs.pennmobile.databinding.LaundrySettingsChildItemBinding
 
 class DiningSettingsAdapter(
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/MenuAdapter.java b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/MenuAdapter.java
similarity index 98%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/MenuAdapter.java
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/MenuAdapter.java
index baca0bc8e..f995bee09 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/MenuAdapter.java
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/MenuAdapter.java
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters;
+package com.pennapps.labs.pennmobile.dining.adapters;
 
 import android.content.Context;
 import android.graphics.Typeface;
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningBalances.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningBalances.kt
similarity index 89%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningBalances.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningBalances.kt
index 7e48fcc46..1d5c26e9c 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningBalances.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningBalances.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.dining.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningBalancesList.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningBalancesList.kt
similarity index 81%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningBalancesList.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningBalancesList.kt
index 8a042fe85..92a832517 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningBalancesList.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningBalancesList.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.dining.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningCell.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningCell.kt
similarity index 50%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningCell.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningCell.kt
index c40259f98..c4321d131 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningCell.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningCell.kt
@@ -1,4 +1,6 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.dining.classes
+
+import com.pennapps.labs.pennmobile.home.classes.HomeCell
 
 data class DiningCell(
     val venues: List<Int>,
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningHall.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningHall.kt
similarity index 99%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningHall.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningHall.kt
index d669caa0b..0cec19d8a 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningHall.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningHall.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.dining.classes
 
 import android.os.Parcel
 import android.os.Parcelable
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningHallPreference.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningHallPreference.kt
similarity index 78%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningHallPreference.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningHallPreference.kt
index e96e1101a..b6d76636b 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningHallPreference.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningHallPreference.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.dining.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningInsightCell.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningInsightCell.kt
similarity index 85%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningInsightCell.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningInsightCell.kt
index de114853a..b346efc1d 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningInsightCell.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningInsightCell.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.dining.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningMarkerView.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningMarkerView.kt
similarity index 94%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningMarkerView.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningMarkerView.kt
index 5e07d974f..1a144be47 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningMarkerView.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningMarkerView.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.dining.classes
 
 import android.content.Context
 import android.widget.ImageView
@@ -8,7 +8,7 @@ import com.github.mikephil.charting.data.Entry
 import com.github.mikephil.charting.highlight.Highlight
 import com.github.mikephil.charting.utils.MPPointF
 import com.pennapps.labs.pennmobile.R
-import com.pennapps.labs.pennmobile.adapters.DiningInsightsCardAdapter
+import com.pennapps.labs.pennmobile.dining.adapters.DiningInsightsCardAdapter
 import java.text.SimpleDateFormat
 import kotlin.math.roundToInt
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningPreferences.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningPreferences.kt
similarity index 81%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningPreferences.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningPreferences.kt
index 138a4a163..591aecc46 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningPreferences.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningPreferences.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.dining.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningRequest.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningRequest.kt
similarity index 70%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningRequest.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningRequest.kt
index 91f12192b..c9dc5fb8a 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningRequest.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DiningRequest.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.dining.classes
 
 class DiningRequest(
     favoriteDiningHalls: ArrayList<Int>,
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DollarsSpentCell.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DollarsSpentCell.kt
new file mode 100644
index 000000000..93196c912
--- /dev/null
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/DollarsSpentCell.kt
@@ -0,0 +1,3 @@
+package com.pennapps.labs.pennmobile.dining.classes
+
+class DollarsSpentCell : DiningInsightCell()
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Venue.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/Venue.kt
similarity index 97%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Venue.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/Venue.kt
index e7d7767ad..0e89ef18f 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Venue.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/Venue.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.dining.classes
 
 import org.joda.time.DateTime
 import org.joda.time.Interval
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/VenueInterval.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/VenueInterval.kt
similarity index 98%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/VenueInterval.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/VenueInterval.kt
index bdedb2a77..be2f3e925 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/VenueInterval.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/classes/VenueInterval.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.dining.classes
 
 import android.util.Log
 import org.joda.time.DateTime
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningFragment.kt
similarity index 97%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningFragment.kt
index 06fd4a0e5..5bd3e59aa 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.dining.fragments
 
 import android.annotation.SuppressLint
 import android.os.Bundle
@@ -15,11 +15,14 @@ import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.pennapps.labs.pennmobile.adapters.DiningAdapter
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.dining.adapters.DiningAdapter
 import com.pennapps.labs.pennmobile.api.StudentLife
-import com.pennapps.labs.pennmobile.classes.DiningHall
-import com.pennapps.labs.pennmobile.classes.Venue
+import com.pennapps.labs.pennmobile.dining.classes.DiningHall
+import com.pennapps.labs.pennmobile.dining.classes.Venue
 import com.pennapps.labs.pennmobile.databinding.FragmentDiningBinding
+import com.pennapps.labs.pennmobile.isOnline
 import rx.Observable
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningHolderFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningHolderFragment.kt
similarity index 92%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningHolderFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningHolderFragment.kt
index 7197b7c46..48e67ca28 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningHolderFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningHolderFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.dining.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -7,7 +7,9 @@ import android.view.ViewGroup
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.fragment.app.Fragment
 import com.google.android.material.tabs.TabLayoutMediator
-import com.pennapps.labs.pennmobile.adapters.DiningPagerAdapter
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.dining.adapters.DiningPagerAdapter
 import com.pennapps.labs.pennmobile.components.collapsingtoolbar.ToolbarBehavior
 import com.pennapps.labs.pennmobile.databinding.FragmentDiningHolderBinding
 import com.pennapps.labs.pennmobile.utils.Utils
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningInfoFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningInfoFragment.kt
similarity index 94%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningInfoFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningInfoFragment.kt
index b08ece100..8c188f9ff 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningInfoFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningInfoFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.dining.fragments
 
 import android.graphics.Color
 import android.os.Bundle
@@ -8,9 +8,11 @@ import android.view.ViewGroup
 import android.widget.RelativeLayout
 import android.widget.TextView
 import androidx.fragment.app.Fragment
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.api.StudentLife
-import com.pennapps.labs.pennmobile.classes.DiningHall
-import com.pennapps.labs.pennmobile.classes.VenueInterval
+import com.pennapps.labs.pennmobile.dining.classes.DiningHall
+import com.pennapps.labs.pennmobile.dining.classes.VenueInterval
 import org.joda.time.format.DateTimeFormat
 
 /**
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningInsightsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningInsightsFragment.kt
similarity index 90%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningInsightsFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningInsightsFragment.kt
index 4f9a3dea6..cbda3cd80 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningInsightsFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningInsightsFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.dining.fragments
 
 import android.os.Bundle
 import android.util.Log
@@ -9,14 +9,18 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.pennapps.labs.pennmobile.adapters.DiningInsightsCardAdapter
+import com.pennapps.labs.pennmobile.api.fragments.CampusExpressLoginFragment
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.dining.adapters.DiningInsightsCardAdapter
 import com.pennapps.labs.pennmobile.api.CampusExpress
 import com.pennapps.labs.pennmobile.api.CampusExpressNetworkManager
-import com.pennapps.labs.pennmobile.classes.DiningBalances
-import com.pennapps.labs.pennmobile.classes.DiningBalancesList
-import com.pennapps.labs.pennmobile.classes.DiningInsightCell
-import com.pennapps.labs.pennmobile.classes.DollarsSpentCell
+import com.pennapps.labs.pennmobile.dining.classes.DiningBalances
+import com.pennapps.labs.pennmobile.dining.classes.DiningBalancesList
+import com.pennapps.labs.pennmobile.dining.classes.DiningInsightCell
+import com.pennapps.labs.pennmobile.dining.classes.DollarsSpentCell
 import com.pennapps.labs.pennmobile.databinding.FragmentDiningInsightsBinding
+import com.pennapps.labs.pennmobile.isOnline
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import kotlin.collections.ArrayList
@@ -51,7 +55,10 @@ class DiningInsightsFragment : Fragment() {
         val view = binding.root
 
         binding.diningInsightsRefresh.setOnRefreshListener { refresh() }
-        binding.diningInsightsRefresh.setColorSchemeResources(R.color.color_accent, R.color.color_primary)
+        binding.diningInsightsRefresh.setColorSchemeResources(
+            R.color.color_accent,
+            R.color.color_primary
+        )
         binding.insightsrv.layoutManager =
             LinearLayoutManager(
                 context,
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningSettingsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningSettingsFragment.kt
similarity index 93%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningSettingsFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningSettingsFragment.kt
index 104506be9..acc138537 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningSettingsFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningSettingsFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.dining.fragments
 
 import android.os.Bundle
 import android.util.Log
@@ -14,11 +14,13 @@ import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.pennapps.labs.pennmobile.adapters.DiningSettingsAdapter
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.dining.adapters.DiningSettingsAdapter
 import com.pennapps.labs.pennmobile.api.StudentLife
-import com.pennapps.labs.pennmobile.classes.DiningHall
-import com.pennapps.labs.pennmobile.classes.DiningRequest
-import com.pennapps.labs.pennmobile.classes.HomepageDataModel
+import com.pennapps.labs.pennmobile.dining.classes.DiningHall
+import com.pennapps.labs.pennmobile.dining.classes.DiningRequest
+import com.pennapps.labs.pennmobile.home.classes.HomepageDataModel
 import com.pennapps.labs.pennmobile.databinding.FragmentDiningPreferencesBinding
 import retrofit.ResponseCallback
 import retrofit.RetrofitError
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/MenuFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/MenuFragment.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/MenuFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/MenuFragment.kt
index c0026a7cd..2ad3ac388 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/MenuFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/MenuFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.dining.fragments
 
 import android.graphics.Color
 import android.os.Bundle
@@ -14,7 +14,9 @@ import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentStatePagerAdapter
 import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
-import com.pennapps.labs.pennmobile.classes.DiningHall
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.dining.classes.DiningHall
 import org.apache.commons.lang3.StringUtils
 
 class MenuFragment : Fragment() {
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/MenuTab.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/MenuTab.kt
similarity index 81%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/MenuTab.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/MenuTab.kt
index d88e7321b..07a01dc1b 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/MenuTab.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/MenuTab.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.dining.fragments
 
 import android.graphics.Color
 import android.os.Bundle
@@ -7,7 +7,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ExpandableListView
 import androidx.fragment.app.Fragment
-import com.pennapps.labs.pennmobile.adapters.MenuAdapter
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.dining.adapters.MenuAdapter
 
 class MenuTab : Fragment() {
     var meal: String? = null
@@ -35,7 +36,13 @@ class MenuTab : Fragment() {
         val elv: ExpandableListView = v.findViewById(R.id.station_list)
         elv.setFooterDividersEnabled(true)
         elv.addFooterView(View(elv.context))
-        elv.setAdapter(activity?.let { MenuAdapter(it, stations, stationInfo) })
+        elv.setAdapter(activity?.let {
+            MenuAdapter(
+                it,
+                stations,
+                stationInfo
+            )
+        })
         v.setBackgroundColor(Color.WHITE)
         return v
     }
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/DiningBalancesCardHolder.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/viewholders/DiningBalancesCardHolder.kt
similarity index 88%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/DiningBalancesCardHolder.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/viewholders/DiningBalancesCardHolder.kt
index bf7360f4a..c12ce654e 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/DiningBalancesCardHolder.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/viewholders/DiningBalancesCardHolder.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.viewholders
+package com.pennapps.labs.pennmobile.dining.viewholders
 
 import androidx.recyclerview.widget.RecyclerView
 import com.pennapps.labs.pennmobile.databinding.DiningBalancesCardBinding
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/DiningPredictionsHolder.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/viewholders/DiningPredictionsHolder.kt
similarity index 90%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/DiningPredictionsHolder.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/viewholders/DiningPredictionsHolder.kt
index ae0af7387..7f3854b72 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/DiningPredictionsHolder.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/viewholders/DiningPredictionsHolder.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.viewholders
+package com.pennapps.labs.pennmobile.dining.viewholders
 
 import androidx.recyclerview.widget.RecyclerView
 import com.pennapps.labs.pennmobile.databinding.DiningPredictionsCardBinding
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/DiningSpentHolder.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/viewholders/DiningSpentHolder.kt
similarity index 80%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/DiningSpentHolder.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/viewholders/DiningSpentHolder.kt
index d9cdb8969..e27a5cb02 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/DiningSpentHolder.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/viewholders/DiningSpentHolder.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.viewholders
+package com.pennapps.labs.pennmobile.dining.viewholders
 
 import androidx.recyclerview.widget.RecyclerView
 import com.pennapps.labs.pennmobile.databinding.DiningSpentCardBinding
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/AppWidgetAlarm.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/widget/AppWidgetAlarm.kt
similarity index 94%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/AppWidgetAlarm.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/widget/AppWidgetAlarm.kt
index 053db9559..3172c26bd 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/AppWidgetAlarm.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/widget/AppWidgetAlarm.kt
@@ -1,10 +1,9 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.dining.widget
 
 import android.app.AlarmManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import com.pennapps.labs.pennmobile.DiningHallWidget
 import java.util.Calendar
 
 // An AlarmManager for app widget testing (Shortens the update time)
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningHallWidget.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/widget/DiningHallWidget.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningHallWidget.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/widget/DiningHallWidget.kt
index eb3bee62e..70d4be34b 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningHallWidget.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/widget/DiningHallWidget.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.dining.widget
 
 import android.app.PendingIntent
 import android.appwidget.AppWidgetManager
@@ -9,10 +9,11 @@ import android.net.Uri
 import android.widget.RemoteViews
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
-import com.pennapps.labs.pennmobile.adapters.DiningHallWidgetAdapter
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.api.DiningRequest
 import com.pennapps.labs.pennmobile.api.Serializer
-import com.pennapps.labs.pennmobile.classes.Venue
+import com.pennapps.labs.pennmobile.dining.classes.Venue
 import com.squareup.okhttp.OkHttpClient
 import retrofit.RestAdapter
 import retrofit.client.OkClient
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningHallWidgetAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/widget/DiningHallWidgetAdapter.kt
similarity index 98%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningHallWidgetAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/widget/DiningHallWidgetAdapter.kt
index 4dd10a38d..712d711c2 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningHallWidgetAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/widget/DiningHallWidgetAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.dining.widget
 
 import android.appwidget.AppWidgetManager
 import android.content.Context
@@ -8,11 +8,10 @@ import android.os.Bundle
 import android.widget.RemoteViews
 import android.widget.RemoteViewsService
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.pennapps.labs.pennmobile.DiningHallWidget
 import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.api.DiningRequest
-import com.pennapps.labs.pennmobile.classes.DiningHall
-import com.pennapps.labs.pennmobile.classes.Venue
+import com.pennapps.labs.pennmobile.dining.classes.DiningHall
+import com.pennapps.labs.pennmobile.dining.classes.Venue
 import rx.Observable
 
 // For detailed documentation about app widgets using xml layout, check out this link below:
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessPreferenceViewModel.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/FitnessPreferenceViewModel.kt
similarity index 93%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessPreferenceViewModel.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/FitnessPreferenceViewModel.kt
index e22117fa7..26fc92b35 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessPreferenceViewModel.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/FitnessPreferenceViewModel.kt
@@ -1,10 +1,13 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.fitness
 
 import android.util.Log
 import androidx.preference.PreferenceManager
 import com.pennapps.labs.pennmobile.MainActivity
 import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.api.StudentLife
+import com.pennapps.labs.pennmobile.fitness.classes.FitnessAdapterDataModel
+import com.pennapps.labs.pennmobile.fitness.classes.FitnessRequest
+import com.pennapps.labs.pennmobile.fitness.classes.FitnessRoom
 import retrofit.ResponseCallback
 import retrofit.RetrofitError
 import retrofit.client.Response
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/adapters/FitnessAdapter.kt
similarity index 97%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/adapters/FitnessAdapter.kt
index c87b5c50c..319f7c50d 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/adapters/FitnessAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.fitness.adapters
 
 import android.app.Activity
 import android.content.Context
@@ -31,10 +31,10 @@ import com.github.mikephil.charting.formatter.IndexAxisValueFormatter
 import com.pennapps.labs.pennmobile.MainActivity
 import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.api.StudentLife
-import com.pennapps.labs.pennmobile.classes.FitnessAdapterDataModel
-import com.pennapps.labs.pennmobile.classes.FitnessRoom
-import com.pennapps.labs.pennmobile.classes.FitnessRoomUsage
-import com.pennapps.labs.pennmobile.classes.RoundedBarChartRenderer
+import com.pennapps.labs.pennmobile.fitness.classes.FitnessAdapterDataModel
+import com.pennapps.labs.pennmobile.fitness.classes.FitnessRoom
+import com.pennapps.labs.pennmobile.fitness.classes.FitnessRoomUsage
+import com.pennapps.labs.pennmobile.fitness.classes.RoundedBarChartRenderer
 import java.time.Duration
 import java.time.LocalDateTime
 import java.time.LocalTime
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessHeaderAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/adapters/FitnessHeaderAdapter.kt
similarity index 95%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessHeaderAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/adapters/FitnessHeaderAdapter.kt
index 428d6e0a7..cba916d42 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessHeaderAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/adapters/FitnessHeaderAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.fitness.adapters
 
 import android.view.LayoutInflater
 import android.view.View
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessPagerAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/adapters/FitnessPagerAdapter.kt
similarity index 76%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessPagerAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/adapters/FitnessPagerAdapter.kt
index 89aaaa154..90a4a03fd 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessPagerAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/adapters/FitnessPagerAdapter.kt
@@ -1,8 +1,8 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.fitness.adapters
 
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.pennapps.labs.pennmobile.PottruckFragment
+import com.pennapps.labs.pennmobile.gsr.fragments.PottruckFragment
 
 class FitnessPagerAdapter(
     fragment: Fragment,
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessPreferenceAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/adapters/FitnessPreferenceAdapter.kt
similarity index 92%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessPreferenceAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/adapters/FitnessPreferenceAdapter.kt
index a4618444a..e760bb517 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FitnessPreferenceAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/adapters/FitnessPreferenceAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.fitness.adapters
 
 import android.view.LayoutInflater
 import android.view.View
@@ -7,7 +7,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.pennapps.labs.pennmobile.R
-import com.pennapps.labs.pennmobile.classes.FitnessAdapterDataModel
+import com.pennapps.labs.pennmobile.fitness.classes.FitnessAdapterDataModel
 
 class FitnessPreferenceAdapter(
     private val dataModel: FitnessAdapterDataModel,
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessAdapterDataModel.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/FitnessAdapterDataModel.kt
similarity index 85%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessAdapterDataModel.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/FitnessAdapterDataModel.kt
index 92d3f2737..3ccb6b75d 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessAdapterDataModel.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/FitnessAdapterDataModel.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.fitness.classes
 
 interface FitnessAdapterDataModel {
     fun flipState(roomId: Int): Boolean
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessRequest.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/FitnessRequest.kt
similarity index 70%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessRequest.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/FitnessRequest.kt
index de1b9969e..2fbeb44ec 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessRequest.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/FitnessRequest.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.fitness.classes
 
 class FitnessRequest(
     favoriteFitnessRooms: ArrayList<Int>,
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessRoom.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/FitnessRoom.kt
similarity index 93%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessRoom.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/FitnessRoom.kt
index 950b03052..25e946b00 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessRoom.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/FitnessRoom.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.fitness.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessRoomUsage.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/FitnessRoomUsage.kt
similarity index 89%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessRoomUsage.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/FitnessRoomUsage.kt
index 4a0fc79ed..a49527d92 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessRoomUsage.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/FitnessRoomUsage.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.fitness.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Gym.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/Gym.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Gym.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/Gym.kt
index 9165a00a3..460c37b37 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Gym.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/Gym.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.fitness.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GymHours.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/GymHours.kt
similarity index 95%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GymHours.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/GymHours.kt
index 680c41eec..6c825f379 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GymHours.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/GymHours.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.fitness.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/RoundedBarChartRenderer.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/RoundedBarChartRenderer.kt
similarity index 99%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/RoundedBarChartRenderer.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/RoundedBarChartRenderer.kt
index 8c58de442..907a8244c 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/RoundedBarChartRenderer.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/classes/RoundedBarChartRenderer.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.fitness.classes
 
 import android.graphics.Canvas
 import com.github.mikephil.charting.animation.ChartAnimator
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/FitnessHolderFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/fragments/FitnessHolderFragment.kt
similarity index 92%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/FitnessHolderFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/fragments/FitnessHolderFragment.kt
index 9c67d01f3..b31953257 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/FitnessHolderFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/fragments/FitnessHolderFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.fitness.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -9,7 +9,9 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.fragment.app.Fragment
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.tabs.TabLayoutMediator
-import com.pennapps.labs.pennmobile.adapters.FitnessPagerAdapter
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.fitness.adapters.FitnessPagerAdapter
 import com.pennapps.labs.pennmobile.components.collapsingtoolbar.ToolbarBehavior
 import com.pennapps.labs.pennmobile.databinding.FragmentFitnessHolderBinding
 import com.pennapps.labs.pennmobile.utils.Utils
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/FitnessPreferencesFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/fragments/FitnessPreferencesFragment.kt
similarity index 87%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/FitnessPreferencesFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/fragments/FitnessPreferencesFragment.kt
index 71228362e..96e1b6f5d 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/FitnessPreferencesFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/fragments/FitnessPreferencesFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.fitness.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -7,8 +7,10 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.fragment.app.DialogFragment
 import androidx.recyclerview.widget.RecyclerView
-import com.pennapps.labs.pennmobile.adapters.FitnessPreferenceAdapter
-import com.pennapps.labs.pennmobile.classes.FitnessPreferenceViewModel
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.fitness.adapters.FitnessPreferenceAdapter
+import com.pennapps.labs.pennmobile.fitness.FitnessPreferenceViewModel
 
 interface CloseListener {
     fun updateAdapters()
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FlingRecyclerViewAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fling/adapters/FlingRecyclerViewAdapter.kt
similarity index 95%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FlingRecyclerViewAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/fling/adapters/FlingRecyclerViewAdapter.kt
index 892ae062f..dd14add90 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/FlingRecyclerViewAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fling/adapters/FlingRecyclerViewAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.fling.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -7,7 +7,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.pennapps.labs.pennmobile.R
-import com.pennapps.labs.pennmobile.classes.FlingEvent
+import com.pennapps.labs.pennmobile.fling.classes.FlingEvent
 import com.pennapps.labs.pennmobile.databinding.FlingPerformanceItemBinding
 import com.squareup.picasso.Picasso
 import org.joda.time.format.DateTimeFormat
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FlingEvent.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fling/classes/FlingEvent.kt
similarity index 97%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FlingEvent.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/fling/classes/FlingEvent.kt
index ab00002f3..69cddd785 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FlingEvent.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fling/classes/FlingEvent.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.fling.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/FlingFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fling/fragments/FlingFragment.kt
similarity index 94%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/FlingFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/fling/fragments/FlingFragment.kt
index 8a10c15e8..53595349a 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/FlingFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fling/fragments/FlingFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.fling.fragments
 
 import android.net.Uri
 import android.os.Bundle
@@ -12,7 +12,9 @@ import android.widget.Toast
 import androidx.browser.customtabs.CustomTabsIntent.Builder
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.pennapps.labs.pennmobile.adapters.FlingRecyclerViewAdapter
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.fling.adapters.FlingRecyclerViewAdapter
 import com.pennapps.labs.pennmobile.databinding.FragmentFlingBinding
 
 class FlingFragment : Fragment() {
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/GsrBuildingAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/adapters/GsrBuildingAdapter.kt
similarity index 95%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/GsrBuildingAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/adapters/GsrBuildingAdapter.kt
index 7ca4adf05..182971483 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/GsrBuildingAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/adapters/GsrBuildingAdapter.kt
@@ -1,13 +1,13 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.gsr.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.pennapps.labs.pennmobile.classes.GSRContainer
+import com.pennapps.labs.pennmobile.gsr.classes.GSRContainer
 import com.pennapps.labs.pennmobile.databinding.GsrBuildingBinding
-import com.pennapps.labs.pennmobile.viewholders.GsrBuildingHolder
+import com.pennapps.labs.pennmobile.gsr.viewholders.GsrBuildingHolder
 import org.joda.time.DateTime
 
 class GsrBuildingAdapter(
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/GsrReservationsAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/adapters/GsrReservationsAdapter.kt
similarity index 98%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/GsrReservationsAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/adapters/GsrReservationsAdapter.kt
index 12a86b8e1..34b51047c 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/GsrReservationsAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/adapters/GsrReservationsAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.gsr.adapters
 
 import android.content.Context
 import android.content.Intent
@@ -13,7 +13,7 @@ import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
 import com.pennapps.labs.pennmobile.MainActivity
 import com.pennapps.labs.pennmobile.R
-import com.pennapps.labs.pennmobile.classes.GSRReservation
+import com.pennapps.labs.pennmobile.gsr.classes.GSRReservation
 import com.pennapps.labs.pennmobile.databinding.GsrReservationBinding
 import com.squareup.picasso.Picasso
 import org.joda.time.format.DateTimeFormat
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/GsrRoomAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/adapters/GsrRoomAdapter.kt
similarity index 94%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/GsrRoomAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/adapters/GsrRoomAdapter.kt
index 02f804173..eec1959c8 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/GsrRoomAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/adapters/GsrRoomAdapter.kt
@@ -1,15 +1,15 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.gsr.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentTransaction
 import androidx.recyclerview.widget.RecyclerView
-import com.pennapps.labs.pennmobile.BookGsrFragment
+import com.pennapps.labs.pennmobile.gsr.fragments.BookGsrFragment
 import com.pennapps.labs.pennmobile.MainActivity
 import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.databinding.GsrRoomBinding
-import com.pennapps.labs.pennmobile.viewholders.GsrRoomHolder
+import com.pennapps.labs.pennmobile.gsr.viewholders.GsrRoomHolder
 import org.joda.time.DateTime
 
 class GsrRoomAdapter(
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSR.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSR.kt
similarity index 89%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSR.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSR.kt
index b9974093b..9c007f5f1 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSR.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSR.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.gsr.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRBookingResult.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRBookingResult.kt
similarity index 90%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRBookingResult.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRBookingResult.kt
index ed8efeb80..6cdaa2f9a 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRBookingResult.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRBookingResult.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.gsr.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRCell.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRCell.kt
similarity index 54%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRCell.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRCell.kt
index 69feba674..5a3929607 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRCell.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRCell.kt
@@ -1,4 +1,6 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.gsr.classes
+
+import com.pennapps.labs.pennmobile.home.classes.HomeCell
 
 data class GSRCell(
     val reservations: List<GSRReservation>,
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRContainer.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRContainer.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRContainer.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRContainer.kt
index 2c0d85fb4..ce2d3e5f5 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRContainer.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRContainer.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.gsr.classes
 
 import org.joda.time.DateTime
 import java.util.ArrayList
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRContainerSlot.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRContainerSlot.kt
similarity index 85%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRContainerSlot.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRContainerSlot.kt
index c1053ff31..cc9731cb7 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRContainerSlot.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRContainerSlot.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.gsr.classes
 
 import org.joda.time.DateTime
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRLocation.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRLocation.kt
similarity index 90%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRLocation.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRLocation.kt
index 330b2ff3a..92c9d13e2 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRLocation.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRLocation.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.gsr.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRReservation.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRReservation.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRReservation.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRReservation.kt
index 1f38faf71..1ede35b1b 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRReservation.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRReservation.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.gsr.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRRoom.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRRoom.kt
similarity index 93%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRRoom.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRRoom.kt
index f150e5e1d..f85cabddf 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRRoom.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRRoom.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.gsr.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRSlot.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRSlot.kt
similarity index 90%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRSlot.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRSlot.kt
index 820de48c6..dfe8ba309 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GSRSlot.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/GSRSlot.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.gsr.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/WhartonStatus.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/WhartonStatus.kt
similarity index 81%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/WhartonStatus.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/WhartonStatus.kt
index 4d75dd20d..9fb84a7a7 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/WhartonStatus.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/classes/WhartonStatus.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.gsr.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/BookGsrFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/BookGsrFragment.kt
similarity index 97%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/BookGsrFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/BookGsrFragment.kt
index c512372ae..e21f325c7 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/BookGsrFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/BookGsrFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.gsr.fragments
 
 import android.graphics.Color
 import android.graphics.PorterDuff
@@ -12,8 +12,10 @@ import android.widget.EditText
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.api.StudentLife
-import com.pennapps.labs.pennmobile.classes.GSRBookingResult
+import com.pennapps.labs.pennmobile.gsr.classes.GSRBookingResult
 import com.pennapps.labs.pennmobile.databinding.GsrDetailsBookBinding
 import retrofit.Callback
 import retrofit.RetrofitError
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrFragment.kt
similarity index 98%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrFragment.kt
index a447a0546..6f5dac161 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.gsr.fragments
 
 import android.app.DatePickerDialog
 import android.app.TimePickerDialog
@@ -20,12 +20,15 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.pennapps.labs.pennmobile.adapters.GsrBuildingAdapter
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.gsr.adapters.GsrBuildingAdapter
 import com.pennapps.labs.pennmobile.api.StudentLife
-import com.pennapps.labs.pennmobile.classes.GSRContainer
-import com.pennapps.labs.pennmobile.classes.GSRRoom
-import com.pennapps.labs.pennmobile.classes.GSRSlot
+import com.pennapps.labs.pennmobile.gsr.classes.GSRContainer
+import com.pennapps.labs.pennmobile.gsr.classes.GSRRoom
+import com.pennapps.labs.pennmobile.gsr.classes.GSRSlot
 import com.pennapps.labs.pennmobile.databinding.FragmentGsrBinding
+import com.pennapps.labs.pennmobile.isOnline
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
 import java.util.Calendar
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrPagerAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrPagerAdapter.kt
similarity index 93%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrPagerAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrPagerAdapter.kt
index c7f4d5887..912b1b1fe 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrPagerAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrPagerAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.gsr.fragments
 
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrReservationsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrReservationsFragment.kt
similarity index 94%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrReservationsFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrReservationsFragment.kt
index a0736ce71..cd2973de0 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrReservationsFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrReservationsFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.gsr.fragments
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -14,8 +14,11 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.pennapps.labs.pennmobile.adapters.GsrReservationsAdapter
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.gsr.adapters.GsrReservationsAdapter
 import com.pennapps.labs.pennmobile.databinding.FragmentGsrReservationsBinding
+import com.pennapps.labs.pennmobile.isOnline
 
 class GsrReservationsFragment : Fragment() {
     private lateinit var mActivity: MainActivity
@@ -46,7 +49,10 @@ class GsrReservationsFragment : Fragment() {
                 false,
             )
 
-        binding.gsrReservationsRefreshLayout.setColorSchemeResources(R.color.color_accent, R.color.color_primary)
+        binding.gsrReservationsRefreshLayout.setColorSchemeResources(
+            R.color.color_accent,
+            R.color.color_primary
+        )
         binding.gsrReservationsRefreshLayout.setOnRefreshListener { getReservations() }
 
         getReservations()
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrTabbedFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrTabbedFragment.kt
similarity index 92%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrTabbedFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrTabbedFragment.kt
index c14810f8b..31666cadb 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrTabbedFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrTabbedFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.gsr.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -8,8 +8,11 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.fragment.app.Fragment
 import androidx.viewpager.widget.ViewPager
 import com.google.android.material.tabs.TabLayout
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.components.collapsingtoolbar.ToolbarBehavior
 import com.pennapps.labs.pennmobile.databinding.FragmentGsrTabsBinding
+import com.pennapps.labs.pennmobile.isOnline
 import com.pennapps.labs.pennmobile.utils.Utils
 
 class GsrTabbedFragment : Fragment() {
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PottruckFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/PottruckFragment.kt
similarity index 93%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/PottruckFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/PottruckFragment.kt
index 441809315..aa092c322 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PottruckFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/PottruckFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.gsr.fragments
 
 import android.os.Bundle
 import android.util.Log
@@ -17,12 +17,17 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.google.android.material.appbar.AppBarLayout
-import com.pennapps.labs.pennmobile.adapters.FitnessAdapter
-import com.pennapps.labs.pennmobile.adapters.FitnessHeaderAdapter
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.fitness.adapters.FitnessAdapter
+import com.pennapps.labs.pennmobile.fitness.adapters.FitnessHeaderAdapter
 import com.pennapps.labs.pennmobile.api.StudentLife
-import com.pennapps.labs.pennmobile.classes.FitnessPreferenceViewModel
+import com.pennapps.labs.pennmobile.fitness.FitnessPreferenceViewModel
 import com.pennapps.labs.pennmobile.components.collapsingtoolbar.ToolbarBehavior
 import com.pennapps.labs.pennmobile.databinding.FragmentPottruckBinding
+import com.pennapps.labs.pennmobile.fitness.fragments.CloseListener
+import com.pennapps.labs.pennmobile.fitness.fragments.FitnessPreferencesFragment
+import com.pennapps.labs.pennmobile.isOnline
 import com.pennapps.labs.pennmobile.utils.Utils
 
 class PottruckFragment : Fragment() {
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/GsrBuildingHolder.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/viewholders/GsrBuildingHolder.kt
similarity index 88%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/GsrBuildingHolder.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/viewholders/GsrBuildingHolder.kt
index 482b4847e..3798401b5 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/GsrBuildingHolder.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/viewholders/GsrBuildingHolder.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.viewholders
+package com.pennapps.labs.pennmobile.gsr.viewholders
 
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/GsrRoomHolder.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/viewholders/GsrRoomHolder.kt
similarity index 91%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/GsrRoomHolder.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/viewholders/GsrRoomHolder.kt
index 95d9c5e7c..ab80b72e3 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/GsrRoomHolder.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/viewholders/GsrRoomHolder.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.viewholders
+package com.pennapps.labs.pennmobile.gsr.viewholders
 
 import android.widget.LinearLayout
 import android.widget.TextView
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/HomepageViewModel.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/HomepageViewModel.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/HomepageViewModel.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/HomepageViewModel.kt
index 8ac8515e9..ab5e58102 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/HomepageViewModel.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/HomepageViewModel.kt
@@ -1,11 +1,20 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.home
 
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.pennapps.labs.pennmobile.dining.classes.DiningCell
 import com.pennapps.labs.pennmobile.api.StudentLife
+import com.pennapps.labs.pennmobile.home.classes.NewsCell
+import com.pennapps.labs.pennmobile.home.classes.PollCell
+import com.pennapps.labs.pennmobile.home.classes.PostCell
+import com.pennapps.labs.pennmobile.gsr.classes.GSRCell
+import com.pennapps.labs.pennmobile.home.classes.CalendarCell
+import com.pennapps.labs.pennmobile.home.classes.HomeCell
+import com.pennapps.labs.pennmobile.home.classes.HomepageDataModel
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryCell
 import com.pennapps.labs.pennmobile.utils.Utils.getSha256Hash
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/HomeAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/HomeAdapter.kt
similarity index 92%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/HomeAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/HomeAdapter.kt
index 0f1da8769..bbbd97254 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/HomeAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/HomeAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.home.adapters
 
 import android.app.PendingIntent
 import android.content.ComponentName
@@ -31,42 +31,44 @@ import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.pennapps.labs.pennmobile.DiningFragment
-import com.pennapps.labs.pennmobile.DiningFragment.Companion.getMenus
-import com.pennapps.labs.pennmobile.DiningSettingsFragment
-import com.pennapps.labs.pennmobile.GsrTabbedFragment
+import com.pennapps.labs.pennmobile.dining.adapters.DiningCardAdapter
+import com.pennapps.labs.pennmobile.dining.fragments.DiningFragment
+import com.pennapps.labs.pennmobile.dining.fragments.DiningFragment.Companion.getMenus
+import com.pennapps.labs.pennmobile.dining.fragments.DiningSettingsFragment
+import com.pennapps.labs.pennmobile.gsr.fragments.GsrTabbedFragment
 import com.pennapps.labs.pennmobile.MainActivity
-import com.pennapps.labs.pennmobile.NewsFragment
+import com.pennapps.labs.pennmobile.home.fragments.NewsFragment
 import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.api.OAuth2NetworkManager
 import com.pennapps.labs.pennmobile.api.StudentLife
-import com.pennapps.labs.pennmobile.classes.CalendarCell
-import com.pennapps.labs.pennmobile.classes.CalendarEvent
-import com.pennapps.labs.pennmobile.classes.DiningCell
-import com.pennapps.labs.pennmobile.classes.DiningHall
-import com.pennapps.labs.pennmobile.classes.GSRCell
-import com.pennapps.labs.pennmobile.classes.HomepageDataModel
-import com.pennapps.labs.pennmobile.classes.LaundryCell
-import com.pennapps.labs.pennmobile.classes.NewsCell
-import com.pennapps.labs.pennmobile.classes.Poll
-import com.pennapps.labs.pennmobile.classes.PollCell
-import com.pennapps.labs.pennmobile.classes.Post
-import com.pennapps.labs.pennmobile.classes.PostCell
+import com.pennapps.labs.pennmobile.home.classes.CalendarCell
+import com.pennapps.labs.pennmobile.home.classes.CalendarEvent
+import com.pennapps.labs.pennmobile.dining.classes.DiningCell
+import com.pennapps.labs.pennmobile.dining.classes.DiningHall
+import com.pennapps.labs.pennmobile.gsr.classes.GSRCell
+import com.pennapps.labs.pennmobile.home.classes.HomepageDataModel
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryCell
+import com.pennapps.labs.pennmobile.home.classes.NewsCell
+import com.pennapps.labs.pennmobile.home.classes.Poll
+import com.pennapps.labs.pennmobile.home.classes.PollCell
+import com.pennapps.labs.pennmobile.home.classes.Post
+import com.pennapps.labs.pennmobile.home.classes.PostCell
 import com.pennapps.labs.pennmobile.components.sneaker.Utils.convertToDp
 import com.pennapps.labs.pennmobile.databinding.HomeBaseCardBinding
 import com.pennapps.labs.pennmobile.databinding.HomeGsrCardBinding
 import com.pennapps.labs.pennmobile.databinding.HomeNewsCardBinding
 import com.pennapps.labs.pennmobile.databinding.HomePostCardBinding
 import com.pennapps.labs.pennmobile.databinding.PollCardBinding
+import com.pennapps.labs.pennmobile.laundry.adapters.LaundryRoomAdapter
 import com.pennapps.labs.pennmobile.utils.Utils
-import com.pennapps.labs.pennmobile.viewholders.HomeBaseHolder
-import com.pennapps.labs.pennmobile.viewholders.HomeCalendarHolder
-import com.pennapps.labs.pennmobile.viewholders.HomeDiningHolder
-import com.pennapps.labs.pennmobile.viewholders.HomeGSRHolder
-import com.pennapps.labs.pennmobile.viewholders.HomeLaundryHolder
-import com.pennapps.labs.pennmobile.viewholders.HomeNewsCardHolder
-import com.pennapps.labs.pennmobile.viewholders.HomePollHolder
-import com.pennapps.labs.pennmobile.viewholders.HomePostHolder
+import com.pennapps.labs.pennmobile.home.viewholders.HomeBaseHolder
+import com.pennapps.labs.pennmobile.home.viewholders.HomeCalendarHolder
+import com.pennapps.labs.pennmobile.home.viewholders.HomeDiningHolder
+import com.pennapps.labs.pennmobile.home.viewholders.HomeGSRHolder
+import com.pennapps.labs.pennmobile.home.viewholders.HomeLaundryHolder
+import com.pennapps.labs.pennmobile.home.viewholders.HomeNewsCardHolder
+import com.pennapps.labs.pennmobile.home.viewholders.HomePollHolder
+import com.pennapps.labs.pennmobile.home.viewholders.HomePostHolder
 import eightbitlab.com.blurview.RenderScriptBlur
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -255,7 +257,12 @@ class HomeAdapter(
                     holder.homeTitle.text = room.name
                     val rooms = arrayListOf(room)
                     holder.homeRv.adapter =
-                        LaundryRoomAdapter(mContext, rooms, null, true)
+                        LaundryRoomAdapter(
+                            mContext,
+                            rooms,
+                            null,
+                            true
+                        )
                 }
             }, { throwable -> mActivity.runOnUiThread { throwable.printStackTrace() } })
         } catch (e: Exception) {
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/HomeGsrBuildingAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/HomeGsrBuildingAdapter.kt
similarity index 95%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/HomeGsrBuildingAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/HomeGsrBuildingAdapter.kt
index e278226d3..eb443f1e2 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/HomeGsrBuildingAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/HomeGsrBuildingAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.home.adapters
 
 import android.content.Context
 import android.util.Log
@@ -10,7 +10,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
-import com.pennapps.labs.pennmobile.GsrTabbedFragment
+import com.pennapps.labs.pennmobile.gsr.fragments.GsrTabbedFragment
 import com.pennapps.labs.pennmobile.MainActivity
 import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.databinding.HomeGsrBuildingBinding
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/HomeGsrReservationAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/HomeGsrReservationAdapter.kt
similarity index 94%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/HomeGsrReservationAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/HomeGsrReservationAdapter.kt
index 0b6ea4551..478a11259 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/HomeGsrReservationAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/HomeGsrReservationAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.home.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -6,10 +6,10 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.pennapps.labs.pennmobile.GsrTabbedFragment
+import com.pennapps.labs.pennmobile.gsr.fragments.GsrTabbedFragment
 import com.pennapps.labs.pennmobile.MainActivity
 import com.pennapps.labs.pennmobile.api.StudentLife
-import com.pennapps.labs.pennmobile.classes.GSRReservation
+import com.pennapps.labs.pennmobile.gsr.classes.GSRReservation
 import com.pennapps.labs.pennmobile.databinding.GsrListItemBinding
 import com.squareup.picasso.Picasso
 import org.joda.time.format.DateTimeFormat
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PollOptionAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/PollOptionAdapter.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PollOptionAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/PollOptionAdapter.kt
index 2b8bebbf8..e1aa9b8f0 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PollOptionAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/PollOptionAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.home.adapters
 
 import android.content.Context
 import android.graphics.Color
@@ -11,8 +11,8 @@ import android.widget.TextView
 import androidx.cardview.widget.CardView
 import androidx.recyclerview.widget.RecyclerView
 import com.pennapps.labs.pennmobile.R
-import com.pennapps.labs.pennmobile.classes.Poll
-import com.pennapps.labs.pennmobile.classes.PollOption
+import com.pennapps.labs.pennmobile.home.classes.Poll
+import com.pennapps.labs.pennmobile.home.classes.PollOption
 import com.pennapps.labs.pennmobile.databinding.PollListItemBinding
 import kotlin.math.abs
 import kotlin.math.round
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/UniversityEventAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/UniversityEventAdapter.kt
similarity index 95%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/UniversityEventAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/UniversityEventAdapter.kt
index 64bff5ab2..582b999a9 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/UniversityEventAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/UniversityEventAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.home.adapters
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -7,7 +7,7 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.pennapps.labs.pennmobile.classes.CalendarEvent
+import com.pennapps.labs.pennmobile.home.classes.CalendarEvent
 import com.pennapps.labs.pennmobile.databinding.UniversityEventBinding
 
 class UniversityEventAdapter(
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Article.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/Article.kt
similarity index 97%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Article.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/Article.kt
index 1f3e36414..732b0af57 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Article.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/Article.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.home.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/CalendarCell.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/CalendarCell.kt
similarity index 71%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/CalendarCell.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/CalendarCell.kt
index f4c62cf6a..05f86c2a2 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/CalendarCell.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/CalendarCell.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.home.classes
 
 data class CalendarCell(
     val events: List<CalendarEvent>,
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/CalendarEvent.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/CalendarEvent.kt
similarity index 93%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/CalendarEvent.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/CalendarEvent.kt
index 74220822c..130128b20 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/CalendarEvent.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/CalendarEvent.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.home.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/HomeCell.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/HomeCell.kt
similarity index 77%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/HomeCell.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/HomeCell.kt
index 3939bba00..bb8a121c6 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/HomeCell.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/HomeCell.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.home.classes
 
 /**
  * HomeCell is used in HomeAdapter and HomepageViewModel as the superclass that
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/HomeCourse.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/HomeCourse.kt
similarity index 93%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/HomeCourse.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/HomeCourse.kt
index e751b04da..f8d1951b6 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/HomeCourse.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/HomeCourse.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.home.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/HomepageDataModel.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/HomepageDataModel.kt
similarity index 82%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/HomepageDataModel.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/HomepageDataModel.kt
index e69116b3e..4ba5b146e 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/HomepageDataModel.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/HomepageDataModel.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.home.classes
 
 interface HomepageDataModel {
     fun getSize(): Int
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/NewsCell.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/NewsCell.kt
similarity index 67%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/NewsCell.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/NewsCell.kt
index 47c2bf7ca..2a5b740f4 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/NewsCell.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/NewsCell.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.home.classes
 
 data class NewsCell(
     val article: Article,
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Poll.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/Poll.kt
similarity index 98%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Poll.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/Poll.kt
index 17b52b14a..16500c45e 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Poll.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/Poll.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.home.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/PollCell.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/PollCell.kt
similarity index 73%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/PollCell.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/PollCell.kt
index c259874a1..8260b50f8 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/PollCell.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/PollCell.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.home.classes
 
 class PollCell(
     poll: Poll,
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/PollOption.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/PollOption.kt
similarity index 95%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/PollOption.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/PollOption.kt
index 755ad0299..e507b7f22 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/PollOption.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/PollOption.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.home.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Post.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/Post.kt
similarity index 98%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Post.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/Post.kt
index 323fcbc45..f355857a4 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Post.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/Post.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.home.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/PostCell.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/PostCell.kt
similarity index 66%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/PostCell.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/PostCell.kt
index 7ecab6eee..84ac68c91 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/PostCell.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/classes/PostCell.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.home.classes
 
 data class PostCell(
     val post: Post,
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/fragments/HomeFragment.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/fragments/HomeFragment.kt
index 9638ff0bb..6011efe86 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/fragments/HomeFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.home.fragments
 
 import android.content.SharedPreferences
 import android.os.Bundle
@@ -15,11 +15,14 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.pennapps.labs.pennmobile.adapters.HomeAdapter
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.home.adapters.HomeAdapter
 import com.pennapps.labs.pennmobile.api.OAuth2NetworkManager
-import com.pennapps.labs.pennmobile.classes.HomepageViewModel
 import com.pennapps.labs.pennmobile.components.collapsingtoolbar.ToolbarBehavior
 import com.pennapps.labs.pennmobile.databinding.FragmentHomeBinding
+import com.pennapps.labs.pennmobile.home.HomepageViewModel
+import com.pennapps.labs.pennmobile.isOnline
 import com.pennapps.labs.pennmobile.utils.Utils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/NewsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/fragments/NewsFragment.kt
similarity index 98%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/NewsFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/fragments/NewsFragment.kt
index ec8859e09..b02d214fb 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/NewsFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/fragments/NewsFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.home.fragments
 
 import android.app.PendingIntent
 import android.content.ComponentName
@@ -25,7 +25,10 @@ import androidx.browser.customtabs.CustomTabsServiceConnection
 import androidx.browser.customtabs.CustomTabsSession
 import androidx.fragment.app.ListFragment
 import androidx.preference.PreferenceManager
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.databinding.FragmentNewsBinding
+import com.pennapps.labs.pennmobile.isOnline
 import java.util.ArrayList
 
 class NewsFragment : ListFragment() {
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomeBaseHolder.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomeBaseHolder.kt
similarity index 88%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomeBaseHolder.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomeBaseHolder.kt
index 4b1a594c2..beb43ba4e 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomeBaseHolder.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomeBaseHolder.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.viewholders
+package com.pennapps.labs.pennmobile.home.viewholders
 
 import androidx.recyclerview.widget.RecyclerView
 import com.pennapps.labs.pennmobile.databinding.HomeBaseCardBinding
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomeCalendarHolder.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomeCalendarHolder.kt
similarity index 75%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomeCalendarHolder.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomeCalendarHolder.kt
index 9b710da41..007e76277 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomeCalendarHolder.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomeCalendarHolder.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.viewholders
+package com.pennapps.labs.pennmobile.home.viewholders
 
 import com.pennapps.labs.pennmobile.databinding.HomeBaseCardBinding
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomeDiningHolder.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomeDiningHolder.kt
similarity index 75%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomeDiningHolder.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomeDiningHolder.kt
index 857011d69..8ac2f26e8 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomeDiningHolder.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomeDiningHolder.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.viewholders
+package com.pennapps.labs.pennmobile.home.viewholders
 
 import com.pennapps.labs.pennmobile.databinding.HomeBaseCardBinding
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomeGSRHolder.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomeGSRHolder.kt
similarity index 88%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomeGSRHolder.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomeGSRHolder.kt
index b749a334c..8203e1db0 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomeGSRHolder.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomeGSRHolder.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.viewholders
+package com.pennapps.labs.pennmobile.home.viewholders
 
 import androidx.recyclerview.widget.RecyclerView
 import com.pennapps.labs.pennmobile.databinding.HomeGsrCardBinding
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomeLaundryHolder.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomeLaundryHolder.kt
similarity index 75%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomeLaundryHolder.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomeLaundryHolder.kt
index 259a10974..1fb529538 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomeLaundryHolder.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomeLaundryHolder.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.viewholders
+package com.pennapps.labs.pennmobile.home.viewholders
 
 import com.pennapps.labs.pennmobile.databinding.HomeBaseCardBinding
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomeNewsCardHolder.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomeNewsCardHolder.kt
similarity index 93%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomeNewsCardHolder.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomeNewsCardHolder.kt
index 91284f694..8a500c43c 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomeNewsCardHolder.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomeNewsCardHolder.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.viewholders
+package com.pennapps.labs.pennmobile.home.viewholders
 
 import androidx.recyclerview.widget.RecyclerView
 import com.pennapps.labs.pennmobile.databinding.HomeNewsCardBinding
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomePollHolder.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomePollHolder.kt
similarity index 89%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomePollHolder.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomePollHolder.kt
index 4bd1d735f..a800f8525 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomePollHolder.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomePollHolder.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.viewholders
+package com.pennapps.labs.pennmobile.home.viewholders
 
 import androidx.recyclerview.widget.RecyclerView
 import com.pennapps.labs.pennmobile.databinding.PollCardBinding
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomePostHolder.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomePostHolder.kt
similarity index 92%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomePostHolder.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomePostHolder.kt
index b248b82f1..42b3df8cb 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewholders/HomePostHolder.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/viewholders/HomePostHolder.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.viewholders
+package com.pennapps.labs.pennmobile.home.viewholders
 
 import androidx.recyclerview.widget.RecyclerView
 import com.pennapps.labs.pennmobile.databinding.HomePostCardBinding
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/LaundryBroadcastReceiver.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/LaundryBroadcastReceiver.kt
similarity index 95%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/LaundryBroadcastReceiver.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/LaundryBroadcastReceiver.kt
index 7df446cb8..897423364 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/LaundryBroadcastReceiver.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/LaundryBroadcastReceiver.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.laundry
 
 import android.app.Notification
 import android.app.NotificationChannel
@@ -9,6 +9,8 @@ import android.content.Context
 import android.content.Intent
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
 
 class LaundryBroadcastReceiver : BroadcastReceiver() {
     private var notificationID = 0
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewmodels/LaundryViewModel.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/LaundryViewModel.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewmodels/LaundryViewModel.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/LaundryViewModel.kt
index 1421d03d1..8b744ad65 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/viewmodels/LaundryViewModel.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/LaundryViewModel.kt
@@ -1,15 +1,15 @@
-package com.pennapps.labs.pennmobile.viewmodels
+package com.pennapps.labs.pennmobile.laundry
 
 import StudentLifeRf2
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.pennapps.labs.pennmobile.classes.LaundryRequest
-import com.pennapps.labs.pennmobile.classes.LaundryRoom
-import com.pennapps.labs.pennmobile.classes.LaundryRoomFavorites
-import com.pennapps.labs.pennmobile.classes.LaundryRoomSimple
-import com.pennapps.labs.pennmobile.classes.LaundryUsage
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRequest
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRoom
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRoomFavorites
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRoomSimple
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryUsage
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/LaundryMachineAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/adapters/LaundryMachineAdapter.kt
similarity index 98%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/LaundryMachineAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/adapters/LaundryMachineAdapter.kt
index e0832d4fd..507db91ff 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/LaundryMachineAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/adapters/LaundryMachineAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.laundry.adapters
 
 import android.app.Activity
 import android.app.AlarmManager
@@ -20,9 +20,9 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.airbnb.lottie.LottieAnimationView
-import com.pennapps.labs.pennmobile.LaundryBroadcastReceiver
+import com.pennapps.labs.pennmobile.laundry.LaundryBroadcastReceiver
 import com.pennapps.labs.pennmobile.R
-import com.pennapps.labs.pennmobile.classes.MachineDetail
+import com.pennapps.labs.pennmobile.laundry.classes.MachineDetail
 import com.pennapps.labs.pennmobile.databinding.LaundryDryerItemBinding
 import com.pennapps.labs.pennmobile.databinding.LaundryMachineItemBinding
 import com.pennapps.labs.pennmobile.showSneakerToast
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/LaundryRoomAdapter.java b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/adapters/LaundryRoomAdapter.java
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/LaundryRoomAdapter.java
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/adapters/LaundryRoomAdapter.java
index bf56c46d7..3d952d44c 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/LaundryRoomAdapter.java
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/adapters/LaundryRoomAdapter.java
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters;
+package com.pennapps.labs.pennmobile.laundry.adapters;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -22,11 +22,11 @@
 import com.github.mikephil.charting.data.LineData;
 import com.github.mikephil.charting.data.LineDataSet;
 import com.pennapps.labs.pennmobile.R;
-import com.pennapps.labs.pennmobile.classes.LaundryRoom;
-import com.pennapps.labs.pennmobile.classes.LaundryUsage;
-import com.pennapps.labs.pennmobile.classes.MachineDetail;
-import com.pennapps.labs.pennmobile.classes.MachineList;
-import com.pennapps.labs.pennmobile.classes.Machines;
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRoom;
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryUsage;
+import com.pennapps.labs.pennmobile.laundry.classes.MachineDetail;
+import com.pennapps.labs.pennmobile.laundry.classes.MachineList;
+import com.pennapps.labs.pennmobile.laundry.classes.Machines;
 
 import java.util.ArrayList;
 import java.util.Calendar;
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/LaundrySettingsAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/adapters/LaundrySettingsAdapter.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/LaundrySettingsAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/adapters/LaundrySettingsAdapter.kt
index 281844ed0..3a3288028 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/LaundrySettingsAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/adapters/LaundrySettingsAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.laundry.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -9,8 +9,8 @@ import android.widget.ImageView
 import android.widget.Switch
 import android.widget.TextView
 import com.pennapps.labs.pennmobile.R
-import com.pennapps.labs.pennmobile.classes.LaundryRoomSimple
-import com.pennapps.labs.pennmobile.viewmodels.LaundryViewModel
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRoomSimple
+import com.pennapps.labs.pennmobile.laundry.LaundryViewModel
 
 /**
  * Created by Jackie on 2017-10-13.
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/TimeXAxisValueFormatter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/adapters/TimeXAxisValueFormatter.kt
similarity index 95%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/TimeXAxisValueFormatter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/adapters/TimeXAxisValueFormatter.kt
index 57ed49c35..eee58ff2a 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/TimeXAxisValueFormatter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/adapters/TimeXAxisValueFormatter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.laundry.adapters
 
 import com.github.mikephil.charting.components.AxisBase
 import com.github.mikephil.charting.formatter.ValueFormatter
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryCell.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryCell.kt
new file mode 100644
index 000000000..7735ebb38
--- /dev/null
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryCell.kt
@@ -0,0 +1,11 @@
+package com.pennapps.labs.pennmobile.laundry.classes
+
+import com.pennapps.labs.pennmobile.home.classes.HomeCell
+
+data class LaundryCell(
+    val roomId: Int,
+) : HomeCell() {
+    init {
+        type = "laundry"
+    }
+}
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryPreferences.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryPreferences.kt
similarity index 78%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryPreferences.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryPreferences.kt
index c59e15edd..203190b72 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryPreferences.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryPreferences.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.laundry.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryRequest.java b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryRequest.java
similarity index 77%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryRequest.java
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryRequest.java
index b32d5f2b4..b9856608c 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryRequest.java
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryRequest.java
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes;
+package com.pennapps.labs.pennmobile.laundry.classes;
 
 import java.util.List;
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryRoom.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryRoom.kt
similarity index 84%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryRoom.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryRoom.kt
index ec2f7c1b7..6ee99b508 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryRoom.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryRoom.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.laundry.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryRoomFavorites.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryRoomFavorites.kt
similarity index 72%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryRoomFavorites.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryRoomFavorites.kt
index a95f79e66..35b96a237 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryRoomFavorites.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryRoomFavorites.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.laundry.classes
 
 class LaundryRoomFavorites {
     val favoriteRooms = ArrayList<LaundryRoom>()
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryRoomSimple.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryRoomSimple.kt
similarity index 88%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryRoomSimple.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryRoomSimple.kt
index cd4dfab89..a28c8a7d7 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryRoomSimple.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryRoomSimple.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.laundry.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryUsage.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryUsage.kt
similarity index 95%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryUsage.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryUsage.kt
index 2734e84fa..aca5186a9 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/LaundryUsage.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/LaundryUsage.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.laundry.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/MachineData.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/MachineData.kt
similarity index 98%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/MachineData.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/MachineData.kt
index f20f4c064..7ddb32ca4 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/MachineData.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/MachineData.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.laundry.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/MachineDetail.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/MachineDetail.kt
similarity index 93%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/MachineDetail.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/MachineDetail.kt
index 8bff87b64..a228ecad7 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/MachineDetail.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/MachineDetail.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.laundry.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/MachineList.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/MachineList.kt
similarity index 91%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/MachineList.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/MachineList.kt
index 2e05a78a8..6babdbc45 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/MachineList.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/MachineList.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.laundry.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Machines.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/Machines.kt
similarity index 87%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Machines.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/Machines.kt
index 33c28dfba..98a208c87 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Machines.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/classes/Machines.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.laundry.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/LaundryFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/fragments/LaundryFragment.kt
similarity index 87%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/LaundryFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/fragments/LaundryFragment.kt
index be27fb20a..f1121df56 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/LaundryFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/fragments/LaundryFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.laundry.fragments
 
 import StudentLifeRf2
 import android.content.Context
@@ -13,13 +13,16 @@ import androidx.fragment.app.FragmentTransaction
 import androidx.fragment.app.activityViewModels
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.pennapps.labs.pennmobile.adapters.LaundryRoomAdapter
-import com.pennapps.labs.pennmobile.classes.LaundryRoom
-import com.pennapps.labs.pennmobile.classes.LaundryUsage
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.laundry.adapters.LaundryRoomAdapter
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRoom
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryUsage
 import com.pennapps.labs.pennmobile.components.collapsingtoolbar.ToolbarBehavior
 import com.pennapps.labs.pennmobile.databinding.FragmentLaundryBinding
+import com.pennapps.labs.pennmobile.isOnline
 import com.pennapps.labs.pennmobile.utils.Utils
-import com.pennapps.labs.pennmobile.viewmodels.LaundryViewModel
+import com.pennapps.labs.pennmobile.laundry.LaundryViewModel
 
 class LaundryFragment : Fragment() {
     private lateinit var mActivity: MainActivity
@@ -65,7 +68,10 @@ class LaundryFragment : Fragment() {
         binding.laundryMachineRefresh.setOnRefreshListener {
             updateMachines()
         }
-        binding.laundryMachineRefresh.setColorSchemeResources(R.color.color_accent, R.color.color_primary)
+        binding.laundryMachineRefresh.setColorSchemeResources(
+            R.color.color_accent,
+            R.color.color_primary
+        )
 
         return view
     }
@@ -83,7 +89,13 @@ class LaundryFragment : Fragment() {
         mActivity.removeTabs()
         mActivity.setTitle(R.string.laundry)
 
-        mAdapter = LaundryRoomAdapter(mContext, laundryRooms, roomsData, false)
+        mAdapter =
+            LaundryRoomAdapter(
+                mContext,
+                laundryRooms,
+                roomsData,
+                false
+            )
         binding.favoriteLaundryList.adapter = mAdapter
 
         binding.loadingPanel.root.visibility = View.VISIBLE
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/LaundrySettingsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/fragments/LaundrySettingsFragment.kt
similarity index 93%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/LaundrySettingsFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/fragments/LaundrySettingsFragment.kt
index feedcadca..35d12050f 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/LaundrySettingsFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/fragments/LaundrySettingsFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.laundry.fragments
 
 import StudentLifeRf2
 import android.content.Context
@@ -12,9 +12,11 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.preference.PreferenceManager
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.pennapps.labs.pennmobile.adapters.LaundrySettingsAdapter
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.laundry.adapters.LaundrySettingsAdapter
 import com.pennapps.labs.pennmobile.databinding.FragmentLaundrySettingsBinding
-import com.pennapps.labs.pennmobile.viewmodels.LaundryViewModel
+import com.pennapps.labs.pennmobile.laundry.LaundryViewModel
 
 class LaundrySettingsFragment : Fragment() {
     private lateinit var mActivity: MainActivity
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/AboutAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/adapters/AboutAdapter.kt
similarity index 97%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/AboutAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/adapters/AboutAdapter.kt
index bd1331b04..00cca53ab 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/AboutAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/adapters/AboutAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.more.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PhoneSaveAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/adapters/PhoneSaveAdapter.kt
similarity index 95%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PhoneSaveAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/adapters/PhoneSaveAdapter.kt
index 91ffe6236..bed3be000 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PhoneSaveAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/adapters/PhoneSaveAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.more.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import com.pennapps.labs.pennmobile.R
-import com.pennapps.labs.pennmobile.classes.Contact
+import com.pennapps.labs.pennmobile.more.classes.Contact
 import com.pennapps.labs.pennmobile.databinding.PhoneSaveListItemBinding
 
 class PhoneSaveAdapter(
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/SupportAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/adapters/SupportAdapter.kt
similarity index 94%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/SupportAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/adapters/SupportAdapter.kt
index 704655075..ce394277b 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/SupportAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/adapters/SupportAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.more.adapters
 
 import android.content.Context
 import android.content.Intent
@@ -8,7 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import com.pennapps.labs.pennmobile.R
-import com.pennapps.labs.pennmobile.classes.Contact
+import com.pennapps.labs.pennmobile.more.classes.Contact
 import com.pennapps.labs.pennmobile.databinding.SupportListItemBinding
 
 class SupportAdapter(
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Contact.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/classes/Contact.kt
similarity index 91%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Contact.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/classes/Contact.kt
index a2f6e7ea0..b56418fda 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Contact.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/classes/Contact.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.more.classes
 
 /**
  * Created by Adel on 12/16/14.
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/AboutFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/AboutFragment.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/AboutFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/AboutFragment.kt
index 6f7a2209a..154fc9322 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/AboutFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/AboutFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.more.fragments
 
 import android.content.Intent
 import android.content.SharedPreferences
@@ -19,7 +19,9 @@ import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.load.resource.gif.GifDrawable
 import com.bumptech.glide.request.RequestListener
-import com.pennapps.labs.pennmobile.adapters.AboutAdapter
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.more.adapters.AboutAdapter
 import com.pennapps.labs.pennmobile.databinding.FragmentAboutBinding
 
 class AboutFragment : Fragment() {
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/morefragments/MoreFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/MoreFragment.kt
similarity index 98%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/morefragments/MoreFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/MoreFragment.kt
index 00cb67c7c..b530d1514 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/morefragments/MoreFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/MoreFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.morefragments
+package com.pennapps.labs.pennmobile.more.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/morefragments/PreferenceFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/PreferenceFragment.kt
similarity index 97%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/morefragments/PreferenceFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/PreferenceFragment.kt
index 6b45b6647..02aee8a8f 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/morefragments/PreferenceFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/PreferenceFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.morefragments
+package com.pennapps.labs.pennmobile.more.fragments
 
 import android.annotation.SuppressLint
 import android.app.AlertDialog
@@ -15,12 +15,10 @@ import androidx.fragment.app.FragmentTransaction
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
-import com.pennapps.labs.pennmobile.AboutFragment
 import com.pennapps.labs.pennmobile.MainActivity
-import com.pennapps.labs.pennmobile.NewsFragment
-import com.pennapps.labs.pennmobile.PottruckFragment
+import com.pennapps.labs.pennmobile.home.fragments.NewsFragment
+import com.pennapps.labs.pennmobile.gsr.fragments.PottruckFragment
 import com.pennapps.labs.pennmobile.R
-import com.pennapps.labs.pennmobile.SupportFragment
 import com.pennapps.labs.pennmobile.components.dialog.CustomAlertDialogue
 import com.pennapps.labs.pennmobile.showSneakerToast
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SaveContactsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/SaveContactsFragment.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/SaveContactsFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/SaveContactsFragment.kt
index d8ee65d94..d3579dcd2 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SaveContactsFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/SaveContactsFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.more.fragments
 
 import android.Manifest
 import android.content.ContentProviderOperation
@@ -18,8 +18,10 @@ import androidx.appcompat.widget.Toolbar
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.ListFragment
-import com.pennapps.labs.pennmobile.adapters.PhoneSaveAdapter
-import com.pennapps.labs.pennmobile.classes.Contact
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.more.adapters.PhoneSaveAdapter
+import com.pennapps.labs.pennmobile.more.classes.Contact
 
 class SaveContactsFragment : ListFragment() {
     private lateinit var mActivity: MainActivity
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SettingsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/SettingsFragment.kt
similarity index 97%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/SettingsFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/SettingsFragment.kt
index 3f0b583c6..0760ed6ec 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SettingsFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/SettingsFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.more.fragments
 
 import android.app.AlertDialog
 import android.app.Dialog
@@ -15,6 +15,8 @@ import androidx.appcompat.view.ContextThemeWrapper
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
 
 class SettingsFragment : PreferenceFragmentCompat() {
     private var accountSettings: Preference? = null
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SupportFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/SupportFragment.kt
similarity index 93%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/SupportFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/SupportFragment.kt
index 4062b0219..0b5b0dc9e 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SupportFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/SupportFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.more.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -10,8 +10,10 @@ import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.FragmentTransaction
 import androidx.fragment.app.ListFragment
-import com.pennapps.labs.pennmobile.adapters.SupportAdapter
-import com.pennapps.labs.pennmobile.classes.Contact
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
+import com.pennapps.labs.pennmobile.more.adapters.SupportAdapter
+import com.pennapps.labs.pennmobile.more.classes.Contact
 
 class SupportFragment : ListFragment() {
     private lateinit var mActivity: MainActivity
diff --git a/PennMobile/src/main/res/layout/fragment_campus_express_login.xml b/PennMobile/src/main/res/layout/fragment_campus_express_login.xml
index 89e72b720..04ebb3797 100644
--- a/PennMobile/src/main/res/layout/fragment_campus_express_login.xml
+++ b/PennMobile/src/main/res/layout/fragment_campus_express_login.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/campus_express_page"
-    tools:context=".CampusExpressLoginFragment">
+    tools:context=".api.fragments.CampusExpressLoginFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/PennMobile/src/main/res/layout/fragment_dining_insights.xml b/PennMobile/src/main/res/layout/fragment_dining_insights.xml
index 1553ce4a8..ba2646be4 100644
--- a/PennMobile/src/main/res/layout/fragment_dining_insights.xml
+++ b/PennMobile/src/main/res/layout/fragment_dining_insights.xml
@@ -5,7 +5,7 @@
     android:id="@+id/dining_insights_page"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".DiningInsightsFragment">
+    tools:context=".dining.fragments.DiningInsightsFragment">
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/dining_insights_refresh"
         android:layout_width="match_parent"
diff --git a/PennMobile/src/main/res/layout/fragment_fling.xml b/PennMobile/src/main/res/layout/fragment_fling.xml
index cebd37f57..2fc4e93e8 100644
--- a/PennMobile/src/main/res/layout/fragment_fling.xml
+++ b/PennMobile/src/main/res/layout/fragment_fling.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.pennapps.labs.pennmobile.FlingFragment"
+    tools:context="com.pennapps.labs.pennmobile.fling.fragments.FlingFragment"
     android:orientation="vertical">
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/PennMobile/src/main/res/layout/fragment_huntsman_gsrlogin.xml b/PennMobile/src/main/res/layout/fragment_huntsman_gsrlogin.xml
index a547cf0c2..a17397eee 100644
--- a/PennMobile/src/main/res/layout/fragment_huntsman_gsrlogin.xml
+++ b/PennMobile/src/main/res/layout/fragment_huntsman_gsrlogin.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".HuntsmanGSRLogin">
+    tools:context=".api.HuntsmanGSRLogin">
 
     <WebView
         android:id="@+id/webViewGSR"
diff --git a/PennMobile/src/main/res/layout/fragment_login_webview.xml b/PennMobile/src/main/res/layout/fragment_login_webview.xml
index 5064cfe03..7ce2c3516 100644
--- a/PennMobile/src/main/res/layout/fragment_login_webview.xml
+++ b/PennMobile/src/main/res/layout/fragment_login_webview.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:forceDarkAllowed="false"
-    tools:context=".LoginWebviewFragment">
+    tools:context=".api.fragments.LoginWebviewFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/PennMobile/src/main/res/layout/fragment_penn_course_alert_holder.xml b/PennMobile/src/main/res/layout/fragment_penn_course_alert_holder.xml
index 1df1f57b0..60adaee06 100644
--- a/PennMobile/src/main/res/layout/fragment_penn_course_alert_holder.xml
+++ b/PennMobile/src/main/res/layout/fragment_penn_course_alert_holder.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".PennCourseAlertHolderFragment">
+    tools:context=".coursealert.fragments.PennCourseAlertHolderFragment">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/pca_appbar_home"
diff --git a/PennMobile/src/main/res/layout/fragment_penn_course_alert_manage_alerts.xml b/PennMobile/src/main/res/layout/fragment_penn_course_alert_manage_alerts.xml
index 5e8048351..b488befa0 100644
--- a/PennMobile/src/main/res/layout/fragment_penn_course_alert_manage_alerts.xml
+++ b/PennMobile/src/main/res/layout/fragment_penn_course_alert_manage_alerts.xml
@@ -30,7 +30,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            tools:context=".PennCourseAlertManageAlertsFragment">
+            tools:context=".coursealert.fragments.PennCourseAlertManageAlertsFragment">
 
 
             <ImageView
diff --git a/PennMobile/src/main/res/layout/fragment_save_contacts.xml b/PennMobile/src/main/res/layout/fragment_save_contacts.xml
index 2b48fb663..5c4d849a6 100644
--- a/PennMobile/src/main/res/layout/fragment_save_contacts.xml
+++ b/PennMobile/src/main/res/layout/fragment_save_contacts.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"
-    tools:context="com.pennapps.labs.pennmobile.SaveContactsFragment"
+    tools:context="com.pennapps.labs.pennmobile.more.fragments.SaveContactsFragment"
     android:orientation="vertical">
 
         <androidx.appcompat.widget.Toolbar
diff --git a/PennMobile/src/main/res/layout/fragment_support.xml b/PennMobile/src/main/res/layout/fragment_support.xml
index b05b83d3c..c0921efdd 100644
--- a/PennMobile/src/main/res/layout/fragment_support.xml
+++ b/PennMobile/src/main/res/layout/fragment_support.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:background="@color/white"
     android:orientation="vertical"
-    tools:context="com.pennapps.labs.pennmobile.SupportFragment">
+    tools:context="com.pennapps.labs.pennmobile.more.fragments.SupportFragment">
 
     <androidx.appcompat.widget.Toolbar
         android:layout_width="match_parent"
diff --git a/PennMobile/src/test/java/GymHoursTest.kt b/PennMobile/src/test/java/GymHoursTest.kt
index 8942166e8..5d3131d33 100644
--- a/PennMobile/src/test/java/GymHoursTest.kt
+++ b/PennMobile/src/test/java/GymHoursTest.kt
@@ -1,5 +1,6 @@
 package com.pennapps.labs.pennmobile.classes
 
+import com.pennapps.labs.pennmobile.fitness.classes.GymHours
 import org.joda.time.Interval
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
diff --git a/build.gradle b/build.gradle
index fc2b26d76..fcc3e50d9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.6.1' apply false
-    id 'com.android.library' version '8.6.1' apply false
+    id 'com.android.application' version '8.0.2' apply false
+    id 'com.android.library' version '8.0.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.24' apply false
     id 'com.google.gms.google-services' version "4.4.0" apply false
     id("com.google.firebase.crashlytics") version "2.9.9" apply false