diff --git a/PennMobile/src/main/AndroidManifest.xml b/PennMobile/src/main/AndroidManifest.xml
index d7f45971c..49f18f9cc 100644
--- a/PennMobile/src/main/AndroidManifest.xml
+++ b/PennMobile/src/main/AndroidManifest.xml
@@ -41,7 +41,7 @@
         </receiver>
 
         <receiver
-            android:name="com.pennapps.labs.pennmobile.GsrReservationWidget"
+            android:name="com.pennapps.labs.pennmobile.gsr.widget.GsrReservationWidget"
             android:exported="false">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -69,7 +69,7 @@
         </activity>
         <service android:name=".dining.widget.DiningHallWidgetAdapter"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
-        <service android:name=".adapters.GsrReservationWidgetAdapter"
+        <service android:name=".gsr.widget.GsrReservationWidgetAdapter"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
 
         <meta-data
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrReservationWidget.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/widget/GsrReservationWidget.kt
similarity index 96%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrReservationWidget.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/widget/GsrReservationWidget.kt
index 09fc95806..463a11f21 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrReservationWidget.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/widget/GsrReservationWidget.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.gsr.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.GsrReservationWidgetAdapter
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.api.GsrReservationsRequest
 import com.pennapps.labs.pennmobile.api.Serializer
-import com.pennapps.labs.pennmobile.classes.GSRReservation
+import com.pennapps.labs.pennmobile.gsr.classes.GSRReservation
 import com.squareup.okhttp.OkHttpClient
 import retrofit.RestAdapter
 import retrofit.client.OkClient
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/GsrReservationWidgetAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/widget/GsrReservationWidgetAdapter.kt
similarity index 97%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/GsrReservationWidgetAdapter.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/widget/GsrReservationWidgetAdapter.kt
index 8d2e2039b..75382f39a 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/GsrReservationWidgetAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/widget/GsrReservationWidgetAdapter.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile.gsr.widget
 
 import android.appwidget.AppWidgetManager
 import android.content.Context
@@ -9,10 +9,9 @@ import android.widget.RemoteViews
 import android.widget.RemoteViewsService
 import androidx.preference.PreferenceManager
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.pennapps.labs.pennmobile.GsrReservationWidget
 import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.api.GsrReservationsRequest
-import com.pennapps.labs.pennmobile.classes.GSRReservation
+import com.pennapps.labs.pennmobile.gsr.classes.GSRReservation
 import org.joda.time.format.DateTimeFormat
 import org.joda.time.format.DateTimeFormatter
 import rx.Observable