diff --git a/.idea/.name b/.idea/.name
index 47da7fc..2cb8997 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-Attendance Scanner Application
\ No newline at end of file
+masa-mobile
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af47..9a8b7e5 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -19,5 +19,4 @@
       </profile>
     </annotationProcessing>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index e206d70..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 325b0a4..1bbc21d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,6 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1" />
         <option name="gradleJvm" value="1.7" />
         <option name="modules">
           <set>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index fc2d64b..dae7a60 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -27,7 +27,36 @@
       </value>
     </option>
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.7</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 06c50d7..89d4e1e 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,9 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/AttendanceScannerApplication.iml" filepath="$PROJECT_DIR$/AttendanceScannerApplication.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/masa-mobile.iml" filepath="$PROJECT_DIR$/masa-mobile.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index f3710d7..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/app/build" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 67fb37b..4667ff9 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="AttendanceScannerApplication" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="masa-mobile" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
diff --git a/app/src/androidTest/java/com/example/masa/massiveattendancescannerapplication/ApplicationTest.java b/app/src/androidTest/java/com/example/masa/massiveattendancescannerapplication/ApplicationTest.java
deleted file mode 100644
index e9be797..0000000
--- a/app/src/androidTest/java/com/example/masa/massiveattendancescannerapplication/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.example.masa.massiveattendancescannerapplication;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 27d542a..7d844b2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.masa.massiveattendancescannerapplication" >
+    package="massiveattendancescannerapplication" >
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -12,7 +12,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name="com.example.masa.massiveattendancescannerapplication.MainActivity"
+            android:name="massiveattendancescannerapplication.MainActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -23,26 +23,26 @@
         <activity
             android:name=".CourseActivity"
             android:label="@string/title_course_activity"
-            android:parentActivityName="com.example.masa.massiveattendancescannerapplication.MainActivity" >
+            android:parentActivityName="massiveattendancescannerapplication.MainActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.example.masa.massiveattendancescannerapplication.MainActivity" />
+                android:value="massiveattendancescannerapplication.MainActivity" />
         </activity>
         <activity
             android:name=".SectionActivity"
             android:label="@string/title_section_activity"
-            android:parentActivityName="com.example.masa.massiveattendancescannerapplication.CourseActivity" >
+            android:parentActivityName="massiveattendancescannerapplication.CourseActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.example.masa.massiveattendancescannerapplication.CourseActivity" />
+                android:value="massiveattendancescannerapplication.CourseActivity" />
         </activity>
         <activity
             android:name=".StudentActivity"
             android:label="@string/title_student_activity"
-            android:parentActivityName="com.example.masa.massiveattendancescannerapplication.CourseActivity" >
+            android:parentActivityName="massiveattendancescannerapplication.CourseActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.example.masa.massiveattendancescannerapplication.CourseActivity" />
+                android:value="massiveattendancescannerapplication.CourseActivity" />
         </activity>
     </application>
 
diff --git a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/CourseActivity.java b/app/src/main/java/massiveattendancescannerapplication/CourseActivity.java
similarity index 95%
rename from app/src/main/java/com/example/masa/massiveattendancescannerapplication/CourseActivity.java
rename to app/src/main/java/massiveattendancescannerapplication/CourseActivity.java
index a62d52b..8ae8fc9 100644
--- a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/CourseActivity.java
+++ b/app/src/main/java/massiveattendancescannerapplication/CourseActivity.java
@@ -1,4 +1,4 @@
-package com.example.masa.massiveattendancescannerapplication;
+package massiveattendancescannerapplication;
 
 
 import java.io.IOException;
@@ -24,8 +24,8 @@ import android.widget.ListView;
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
 
-import com.example.masa.massiveattendancescannerapplication.Services.JSONParser;
-import com.example.masa.massiveattendancescannerapplication.Services.ServiceHandler;
+import massiveattendancescannerapplication.Services.JSONParser;
+import massiveattendancescannerapplication.Services.ServiceHandler;
 
 public class CourseActivity extends ListActivity {
 
diff --git a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/Data/Course.java b/app/src/main/java/massiveattendancescannerapplication/Data/Course.java
similarity index 93%
rename from app/src/main/java/com/example/masa/massiveattendancescannerapplication/Data/Course.java
rename to app/src/main/java/massiveattendancescannerapplication/Data/Course.java
index 30fe742..9de0d80 100644
--- a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/Data/Course.java
+++ b/app/src/main/java/massiveattendancescannerapplication/Data/Course.java
@@ -1,4 +1,4 @@
-package com.example.masa.massiveattendancescannerapplication.Data;
+package massiveattendancescannerapplication.Data;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -7,6 +7,7 @@ import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.List;
 
+
 public class Course{
 
     public String name;
diff --git a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/Data/Section.java b/app/src/main/java/massiveattendancescannerapplication/Data/Section.java
similarity index 93%
rename from app/src/main/java/com/example/masa/massiveattendancescannerapplication/Data/Section.java
rename to app/src/main/java/massiveattendancescannerapplication/Data/Section.java
index ef231dd..35b363a 100644
--- a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/Data/Section.java
+++ b/app/src/main/java/massiveattendancescannerapplication/Data/Section.java
@@ -1,4 +1,4 @@
-package com.example.masa.massiveattendancescannerapplication.Data;
+package massiveattendancescannerapplication.Data;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/Data/Student.java b/app/src/main/java/massiveattendancescannerapplication/Data/Student.java
similarity index 91%
rename from app/src/main/java/com/example/masa/massiveattendancescannerapplication/Data/Student.java
rename to app/src/main/java/massiveattendancescannerapplication/Data/Student.java
index b9bf79f..43aba77 100644
--- a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/Data/Student.java
+++ b/app/src/main/java/massiveattendancescannerapplication/Data/Student.java
@@ -1,4 +1,4 @@
-package com.example.masa.massiveattendancescannerapplication.Data;
+package massiveattendancescannerapplication.Data;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/MainActivity.java b/app/src/main/java/massiveattendancescannerapplication/MainActivity.java
similarity index 96%
rename from app/src/main/java/com/example/masa/massiveattendancescannerapplication/MainActivity.java
rename to app/src/main/java/massiveattendancescannerapplication/MainActivity.java
index 563bdf9..8ae0628 100644
--- a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/MainActivity.java
+++ b/app/src/main/java/massiveattendancescannerapplication/MainActivity.java
@@ -1,4 +1,4 @@
-package com.example.masa.massiveattendancescannerapplication;
+package massiveattendancescannerapplication;
 
 import android.support.v7.app.ActionBarActivity;
 import android.os.Bundle;
diff --git a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/ScanActivity.java b/app/src/main/java/massiveattendancescannerapplication/ScanActivity.java
similarity index 98%
rename from app/src/main/java/com/example/masa/massiveattendancescannerapplication/ScanActivity.java
rename to app/src/main/java/massiveattendancescannerapplication/ScanActivity.java
index fbdd3d4..f275a9e 100644
--- a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/ScanActivity.java
+++ b/app/src/main/java/massiveattendancescannerapplication/ScanActivity.java
@@ -1,4 +1,4 @@
-package com.example.masa.massiveattendancescannerapplication;
+package massiveattendancescannerapplication;
 
 
 import android.app.Activity;
diff --git a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/SectionActivity.java b/app/src/main/java/massiveattendancescannerapplication/SectionActivity.java
similarity index 96%
rename from app/src/main/java/com/example/masa/massiveattendancescannerapplication/SectionActivity.java
rename to app/src/main/java/massiveattendancescannerapplication/SectionActivity.java
index 3e2bfc3..f2ca185 100644
--- a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/SectionActivity.java
+++ b/app/src/main/java/massiveattendancescannerapplication/SectionActivity.java
@@ -1,4 +1,4 @@
-package com.example.masa.massiveattendancescannerapplication;
+package massiveattendancescannerapplication;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,8 +23,8 @@ import android.widget.SimpleAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.example.masa.massiveattendancescannerapplication.Services.JSONParser;
-import com.example.masa.massiveattendancescannerapplication.Services.ServiceHandler;
+import massiveattendancescannerapplication.Services.JSONParser;
+import massiveattendancescannerapplication.Services.ServiceHandler;
 
 public class SectionActivity extends ListActivity {
 
diff --git a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/Services/CourseAdapter.java b/app/src/main/java/massiveattendancescannerapplication/Services/CourseAdapter.java
similarity index 85%
rename from app/src/main/java/com/example/masa/massiveattendancescannerapplication/Services/CourseAdapter.java
rename to app/src/main/java/massiveattendancescannerapplication/Services/CourseAdapter.java
index f09766e..67d6567 100644
--- a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/Services/CourseAdapter.java
+++ b/app/src/main/java/massiveattendancescannerapplication/Services/CourseAdapter.java
@@ -1,4 +1,4 @@
-package com.example.masa.massiveattendancescannerapplication.Services;
+package massiveattendancescannerapplication.Services;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -7,8 +7,8 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-import com.example.masa.massiveattendancescannerapplication.Data.Course;
-import com.example.masa.massiveattendancescannerapplication.R;
+import massiveattendancescannerapplication.Data.Course;
+import massiveattendancescannerapplication.R;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/Services/FileReader.java b/app/src/main/java/massiveattendancescannerapplication/Services/FileReader.java
similarity index 97%
rename from app/src/main/java/com/example/masa/massiveattendancescannerapplication/Services/FileReader.java
rename to app/src/main/java/massiveattendancescannerapplication/Services/FileReader.java
index 7921067..2a032f3 100644
--- a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/Services/FileReader.java
+++ b/app/src/main/java/massiveattendancescannerapplication/Services/FileReader.java
@@ -1,4 +1,4 @@
-package com.example.masa.massiveattendancescannerapplication.Services;
+package massiveattendancescannerapplication.Services;
 
 import android.content.Context;
 import android.os.Environment;
diff --git a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/Services/JSONParser.java b/app/src/main/java/massiveattendancescannerapplication/Services/JSONParser.java
similarity index 91%
rename from app/src/main/java/com/example/masa/massiveattendancescannerapplication/Services/JSONParser.java
rename to app/src/main/java/massiveattendancescannerapplication/Services/JSONParser.java
index 916a24c..bc934ec 100644
--- a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/Services/JSONParser.java
+++ b/app/src/main/java/massiveattendancescannerapplication/Services/JSONParser.java
@@ -1,7 +1,7 @@
-package com.example.masa.massiveattendancescannerapplication.Services;
+package massiveattendancescannerapplication.Services;
 
-import com.example.masa.massiveattendancescannerapplication.Data.Course;
-import com.example.masa.massiveattendancescannerapplication.Data.Section;
+import massiveattendancescannerapplication.Data.Course;
+import massiveattendancescannerapplication.Data.Section;
 
 import java.io.IOException;
 import java.util.*;
diff --git a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/Services/ServiceHandler.java b/app/src/main/java/massiveattendancescannerapplication/Services/ServiceHandler.java
similarity index 97%
rename from app/src/main/java/com/example/masa/massiveattendancescannerapplication/Services/ServiceHandler.java
rename to app/src/main/java/massiveattendancescannerapplication/Services/ServiceHandler.java
index 38cc5c2..3fe6d48 100644
--- a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/Services/ServiceHandler.java
+++ b/app/src/main/java/massiveattendancescannerapplication/Services/ServiceHandler.java
@@ -1,4 +1,5 @@
-package com.example.masa.massiveattendancescannerapplication.Services;
+package massiveattendancescannerapplication.Services;
+
 import android.util.Log;
 
 import org.apache.http.HttpResponse;
diff --git a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/StudentActivity.java b/app/src/main/java/massiveattendancescannerapplication/StudentActivity.java
similarity index 96%
rename from app/src/main/java/com/example/masa/massiveattendancescannerapplication/StudentActivity.java
rename to app/src/main/java/massiveattendancescannerapplication/StudentActivity.java
index 19e4dcc..7275d05 100644
--- a/app/src/main/java/com/example/masa/massiveattendancescannerapplication/StudentActivity.java
+++ b/app/src/main/java/massiveattendancescannerapplication/StudentActivity.java
@@ -1,4 +1,4 @@
-package com.example.masa.massiveattendancescannerapplication;
+package massiveattendancescannerapplication;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -16,7 +16,7 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.SimpleAdapter;
 
-import com.example.masa.massiveattendancescannerapplication.Services.ServiceHandler;
+import massiveattendancescannerapplication.Services.ServiceHandler;
 
 
 public class StudentActivity extends ListActivity {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4c94d85..3cb752d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -25,5 +25,4 @@
         android:layout_below="@+id/textView"
         android:layout_centerHorizontal="true" />
 
-
 </RelativeLayout>
diff --git a/masa-mobile.iml b/masa-mobile.iml
new file mode 100644
index 0000000..52e85b1
--- /dev/null
+++ b/masa-mobile.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="masa-mobile" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file