diff --git a/DevelopmentEnvironment/Lab1_DevelopmentEnvironment/Lab1-DevelopmentEnvironment_AndroidStudioUsers.pdf b/Lab1/DevelopmentEnvironment/Lab1_DevelopmentEnvironment/Lab1-DevelopmentEnvironment_AndroidStudioUsers.pdf
similarity index 100%
rename from DevelopmentEnvironment/Lab1_DevelopmentEnvironment/Lab1-DevelopmentEnvironment_AndroidStudioUsers.pdf
rename to Lab1/DevelopmentEnvironment/Lab1_DevelopmentEnvironment/Lab1-DevelopmentEnvironment_AndroidStudioUsers.pdf
diff --git a/DevelopmentEnvironment/Lab1_DevelopmentEnvironment/Lab1-DevelopmentEnvironment_EclipseUsers.pdf b/Lab1/DevelopmentEnvironment/Lab1_DevelopmentEnvironment/Lab1-DevelopmentEnvironment_EclipseUsers.pdf
similarity index 100%
rename from DevelopmentEnvironment/Lab1_DevelopmentEnvironment/Lab1-DevelopmentEnvironment_EclipseUsers.pdf
rename to Lab1/DevelopmentEnvironment/Lab1_DevelopmentEnvironment/Lab1-DevelopmentEnvironment_EclipseUsers.pdf
diff --git a/AsyncTask/Lab5-AsyncTaskLab/.classpath b/Lab2/Lab2_ActivityLab/.classpath
old mode 100644
new mode 100755
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/.classpath
rename to Lab2/Lab2_ActivityLab/.classpath
diff --git a/TheActivityClass/Lab2_ActivityLab/.project b/Lab2/Lab2_ActivityLab/.project
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/.project
rename to Lab2/Lab2_ActivityLab/.project
diff --git a/AsyncTask/Lab5-AsyncTaskLab/.settings/org.eclipse.jdt.core.prefs b/Lab2/Lab2_ActivityLab/.settings/org.eclipse.jdt.core.prefs
old mode 100644
new mode 100755
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/.settings/org.eclipse.jdt.core.prefs
rename to Lab2/Lab2_ActivityLab/.settings/org.eclipse.jdt.core.prefs
diff --git a/TheActivityClass/Lab2_ActivityLab/ActivityLifecycleWalkthrough.pdf b/Lab2/Lab2_ActivityLab/ActivityLifecycleWalkthrough.pdf
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/ActivityLifecycleWalkthrough.pdf
rename to Lab2/Lab2_ActivityLab/ActivityLifecycleWalkthrough.pdf
diff --git a/TheActivityClass/Lab2_ActivityLab/ActivityNoReconfig.mp4 b/Lab2/Lab2_ActivityLab/ActivityNoReconfig.mp4
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/ActivityNoReconfig.mp4
rename to Lab2/Lab2_ActivityLab/ActivityNoReconfig.mp4
diff --git a/TheActivityClass/Lab2_ActivityLab/ActivityReconfig.mp4 b/Lab2/Lab2_ActivityLab/ActivityReconfig.mp4
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/ActivityReconfig.mp4
rename to Lab2/Lab2_ActivityLab/ActivityReconfig.mp4
diff --git a/TheActivityClass/Lab2_ActivityLab/AndroidManifest.xml b/Lab2/Lab2_ActivityLab/AndroidManifest.xml
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/AndroidManifest.xml
rename to Lab2/Lab2_ActivityLab/AndroidManifest.xml
diff --git a/TheActivityClass/Lab2_ActivityLab/Lab-Activity.pdf b/Lab2/Lab2_ActivityLab/Lab-Activity.pdf
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/Lab-Activity.pdf
rename to Lab2/Lab2_ActivityLab/Lab-Activity.pdf
diff --git a/TheActivityClass/Lab2_ActivityLab/Test1_StartActivityOneTest.txt b/Lab2/Lab2_ActivityLab/Test1_StartActivityOneTest.txt
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/Test1_StartActivityOneTest.txt
rename to Lab2/Lab2_ActivityLab/Test1_StartActivityOneTest.txt
diff --git a/TheActivityClass/Lab2_ActivityLab/Test2_DoubleRotateActivityOneTest.txt b/Lab2/Lab2_ActivityLab/Test2_DoubleRotateActivityOneTest.txt
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/Test2_DoubleRotateActivityOneTest.txt
rename to Lab2/Lab2_ActivityLab/Test2_DoubleRotateActivityOneTest.txt
diff --git a/TheActivityClass/Lab2_ActivityLab/Test3_StartActivityTwoTest.txt b/Lab2/Lab2_ActivityLab/Test3_StartActivityTwoTest.txt
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/Test3_StartActivityTwoTest.txt
rename to Lab2/Lab2_ActivityLab/Test3_StartActivityTwoTest.txt
diff --git a/TheActivityClass/Lab2_ActivityLab/Test4_DoubleRotateActivityTwoTest.txt b/Lab2/Lab2_ActivityLab/Test4_DoubleRotateActivityTwoTest.txt
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/Test4_DoubleRotateActivityTwoTest.txt
rename to Lab2/Lab2_ActivityLab/Test4_DoubleRotateActivityTwoTest.txt
diff --git a/TheActivityClass/Lab2_ActivityLab/Test5_CloseActivityTwoTest.txt b/Lab2/Lab2_ActivityLab/Test5_CloseActivityTwoTest.txt
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/Test5_CloseActivityTwoTest.txt
rename to Lab2/Lab2_ActivityLab/Test5_CloseActivityTwoTest.txt
diff --git a/TheActivityClass/Lab2_ActivityLab/Test6_ReopenActivityTwoTest.txt b/Lab2/Lab2_ActivityLab/Test6_ReopenActivityTwoTest.txt
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/Test6_ReopenActivityTwoTest.txt
rename to Lab2/Lab2_ActivityLab/Test6_ReopenActivityTwoTest.txt
diff --git a/AsyncTask/Lab5-AsyncTaskLab/ic_launcher-web.png b/Lab2/Lab2_ActivityLab/ic_launcher-web.png
old mode 100644
new mode 100755
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/ic_launcher-web.png
rename to Lab2/Lab2_ActivityLab/ic_launcher-web.png
diff --git a/AsyncTask/Lab5-AsyncTaskLab/proguard-project.txt b/Lab2/Lab2_ActivityLab/proguard-project.txt
old mode 100644
new mode 100755
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/proguard-project.txt
rename to Lab2/Lab2_ActivityLab/proguard-project.txt
diff --git a/AsyncTask/Lab5-AsyncTaskLab/project.properties b/Lab2/Lab2_ActivityLab/project.properties
old mode 100644
new mode 100755
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/project.properties
rename to Lab2/Lab2_ActivityLab/project.properties
diff --git a/AsyncTask/Lab5-AsyncTaskLab/res/drawable-hdpi/ic_launcher.png b/Lab2/Lab2_ActivityLab/res/drawable-hdpi/ic_launcher.png
old mode 100644
new mode 100755
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/res/drawable-hdpi/ic_launcher.png
rename to Lab2/Lab2_ActivityLab/res/drawable-hdpi/ic_launcher.png
diff --git a/AsyncTask/Lab5-AsyncTaskLab/res/drawable-ldpi/ic_launcher.png b/Lab2/Lab2_ActivityLab/res/drawable-ldpi/ic_launcher.png
old mode 100644
new mode 100755
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/res/drawable-ldpi/ic_launcher.png
rename to Lab2/Lab2_ActivityLab/res/drawable-ldpi/ic_launcher.png
diff --git a/AsyncTask/Lab5-AsyncTaskLab/res/drawable-mdpi/ic_launcher.png b/Lab2/Lab2_ActivityLab/res/drawable-mdpi/ic_launcher.png
old mode 100644
new mode 100755
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/res/drawable-mdpi/ic_launcher.png
rename to Lab2/Lab2_ActivityLab/res/drawable-mdpi/ic_launcher.png
diff --git a/AsyncTask/Lab5-AsyncTaskLab/res/drawable-xhdpi/ic_launcher.png b/Lab2/Lab2_ActivityLab/res/drawable-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/res/drawable-xhdpi/ic_launcher.png
rename to Lab2/Lab2_ActivityLab/res/drawable-xhdpi/ic_launcher.png
diff --git a/TheActivityClass/Lab2_ActivityLab/res/layout/activity_one.xml b/Lab2/Lab2_ActivityLab/res/layout/activity_one.xml
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/res/layout/activity_one.xml
rename to Lab2/Lab2_ActivityLab/res/layout/activity_one.xml
diff --git a/TheActivityClass/Lab2_ActivityLab/res/layout/activity_two.xml b/Lab2/Lab2_ActivityLab/res/layout/activity_two.xml
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/res/layout/activity_two.xml
rename to Lab2/Lab2_ActivityLab/res/layout/activity_two.xml
diff --git a/AsyncTask/Lab5-AsyncTaskLab/res/values-v11/styles.xml b/Lab2/Lab2_ActivityLab/res/values-v11/styles.xml
old mode 100644
new mode 100755
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/res/values-v11/styles.xml
rename to Lab2/Lab2_ActivityLab/res/values-v11/styles.xml
diff --git a/AsyncTask/Lab5-AsyncTaskLab/res/values-v14/styles.xml b/Lab2/Lab2_ActivityLab/res/values-v14/styles.xml
old mode 100644
new mode 100755
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/res/values-v14/styles.xml
rename to Lab2/Lab2_ActivityLab/res/values-v14/styles.xml
diff --git a/TheActivityClass/Lab2_ActivityLab/res/values/strings.xml b/Lab2/Lab2_ActivityLab/res/values/strings.xml
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/res/values/strings.xml
rename to Lab2/Lab2_ActivityLab/res/values/strings.xml
diff --git a/AsyncTask/Lab5-AsyncTaskLab/res/values/styles.xml b/Lab2/Lab2_ActivityLab/res/values/styles.xml
old mode 100644
new mode 100755
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/res/values/styles.xml
rename to Lab2/Lab2_ActivityLab/res/values/styles.xml
diff --git a/TheActivityClass/Lab2_ActivityLab/src/course/labs/activitylab/ActivityOne.java b/Lab2/Lab2_ActivityLab/src/course/labs/activitylab/ActivityOne.java
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/src/course/labs/activitylab/ActivityOne.java
rename to Lab2/Lab2_ActivityLab/src/course/labs/activitylab/ActivityOne.java
diff --git a/TheActivityClass/Lab2_ActivityLab/src/course/labs/activitylab/ActivityTwo.java b/Lab2/Lab2_ActivityLab/src/course/labs/activitylab/ActivityTwo.java
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/src/course/labs/activitylab/ActivityTwo.java
rename to Lab2/Lab2_ActivityLab/src/course/labs/activitylab/ActivityTwo.java
diff --git a/TheActivityClass/Lab2_ActivityLab/warmupSolution.txt b/Lab2/Lab2_ActivityLab/warmupSolution.txt
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/warmupSolution.txt
rename to Lab2/Lab2_ActivityLab/warmupSolution.txt
diff --git a/TheActivityClass/Lab2_ActivityLabTest/.classpath b/Lab2/Lab2_ActivityLabTest/.classpath
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLabTest/.classpath
rename to Lab2/Lab2_ActivityLabTest/.classpath
diff --git a/TheActivityClass/Lab2_ActivityLabTest/.project b/Lab2/Lab2_ActivityLabTest/.project
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLabTest/.project
rename to Lab2/Lab2_ActivityLabTest/.project
diff --git a/AsyncTask/Lab5-AsyncTaskLabTest/.settings/org.eclipse.jdt.core.prefs b/Lab2/Lab2_ActivityLabTest/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLabTest/.settings/org.eclipse.jdt.core.prefs
rename to Lab2/Lab2_ActivityLabTest/.settings/org.eclipse.jdt.core.prefs
diff --git a/TheActivityClass/Lab2_ActivityLabTest/AndroidManifest.xml b/Lab2/Lab2_ActivityLabTest/AndroidManifest.xml
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLabTest/AndroidManifest.xml
rename to Lab2/Lab2_ActivityLabTest/AndroidManifest.xml
diff --git a/AsyncTask/Lab5-AsyncTaskLabTest/libs/robotium-solo-5.3.1.jar b/Lab2/Lab2_ActivityLabTest/libs/robotium-solo-5.3.1.jar
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLabTest/libs/robotium-solo-5.3.1.jar
rename to Lab2/Lab2_ActivityLabTest/libs/robotium-solo-5.3.1.jar
diff --git a/AsyncTask/Lab5-AsyncTaskLabTest/project.properties b/Lab2/Lab2_ActivityLabTest/project.properties
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLabTest/project.properties
rename to Lab2/Lab2_ActivityLabTest/project.properties
diff --git a/TheActivityClass/Lab2_ActivityLabTest/res/.gitkeep b/Lab2/Lab2_ActivityLabTest/res/.gitkeep
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLabTest/res/.gitkeep
rename to Lab2/Lab2_ActivityLabTest/res/.gitkeep
diff --git a/TheActivityClass/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test1_StartActivityOneTest.java b/Lab2/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test1_StartActivityOneTest.java
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test1_StartActivityOneTest.java
rename to Lab2/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test1_StartActivityOneTest.java
diff --git a/TheActivityClass/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test2_DoubleRotateActivityOneTest.java b/Lab2/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test2_DoubleRotateActivityOneTest.java
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test2_DoubleRotateActivityOneTest.java
rename to Lab2/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test2_DoubleRotateActivityOneTest.java
diff --git a/TheActivityClass/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test2_DoubleRotateActivtyOneTest.java b/Lab2/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test2_DoubleRotateActivtyOneTest.java
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test2_DoubleRotateActivtyOneTest.java
rename to Lab2/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test2_DoubleRotateActivtyOneTest.java
diff --git a/TheActivityClass/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test3_StartActivityTwoTest.java b/Lab2/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test3_StartActivityTwoTest.java
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test3_StartActivityTwoTest.java
rename to Lab2/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test3_StartActivityTwoTest.java
diff --git a/TheActivityClass/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test4_DoubleRotateActivityTwoTest.java b/Lab2/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test4_DoubleRotateActivityTwoTest.java
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test4_DoubleRotateActivityTwoTest.java
rename to Lab2/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test4_DoubleRotateActivityTwoTest.java
diff --git a/TheActivityClass/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test5_CloseActivityTwoTest.java b/Lab2/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test5_CloseActivityTwoTest.java
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test5_CloseActivityTwoTest.java
rename to Lab2/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test5_CloseActivityTwoTest.java
diff --git a/TheActivityClass/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test6_ReopenActivityTwoTest.java b/Lab2/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test6_ReopenActivityTwoTest.java
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test6_ReopenActivityTwoTest.java
rename to Lab2/Lab2_ActivityLabTest/src/course/labs/activitylab/tests/Test6_ReopenActivityTwoTest.java
diff --git a/GraphicsAndTouch/Lab7_GraphicsLab/.classpath b/Lab3/Lab3a_IntentsLab/.classpath
old mode 100644
new mode 100755
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLab/.classpath
rename to Lab3/Lab3a_IntentsLab/.classpath
diff --git a/Intents/Lab3a_IntentsLab/.project b/Lab3/Lab3a_IntentsLab/.project
similarity index 100%
rename from Intents/Lab3a_IntentsLab/.project
rename to Lab3/Lab3a_IntentsLab/.project
diff --git a/Fragments/Lab3c_FragmentsLab/.settings/org.eclipse.jdt.core.prefs b/Lab3/Lab3a_IntentsLab/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/.settings/org.eclipse.jdt.core.prefs
rename to Lab3/Lab3a_IntentsLab/.settings/org.eclipse.jdt.core.prefs
diff --git a/Intents/Lab3a_IntentsLab/AndroidManifest.xml b/Lab3/Lab3a_IntentsLab/AndroidManifest.xml
similarity index 100%
rename from Intents/Lab3a_IntentsLab/AndroidManifest.xml
rename to Lab3/Lab3a_IntentsLab/AndroidManifest.xml
diff --git a/Intents/Lab3a_IntentsLab/Lab-Intents.pdf b/Lab3/Lab3a_IntentsLab/Lab-Intents.pdf
similarity index 100%
rename from Intents/Lab3a_IntentsLab/Lab-Intents.pdf
rename to Lab3/Lab3a_IntentsLab/Lab-Intents.pdf
diff --git a/Fragments/Lab3c_FragmentsLab/ic_launcher-web.png b/Lab3/Lab3a_IntentsLab/ic_launcher-web.png
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/ic_launcher-web.png
rename to Lab3/Lab3a_IntentsLab/ic_launcher-web.png
diff --git a/Intents/Lab3a_IntentsLab/intentlab.mp4 b/Lab3/Lab3a_IntentsLab/intentlab.mp4
similarity index 100%
rename from Intents/Lab3a_IntentsLab/intentlab.mp4
rename to Lab3/Lab3a_IntentsLab/intentlab.mp4
diff --git a/Fragments/Lab3c_FragmentsLab/proguard-project.txt b/Lab3/Lab3a_IntentsLab/proguard-project.txt
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/proguard-project.txt
rename to Lab3/Lab3a_IntentsLab/proguard-project.txt
diff --git a/Fragments/Lab3c_FragmentsLab/project.properties b/Lab3/Lab3a_IntentsLab/project.properties
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/project.properties
rename to Lab3/Lab3a_IntentsLab/project.properties
diff --git a/Fragments/Lab3c_FragmentsLab/res/drawable-hdpi/ic_launcher.png b/Lab3/Lab3a_IntentsLab/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/res/drawable-hdpi/ic_launcher.png
rename to Lab3/Lab3a_IntentsLab/res/drawable-hdpi/ic_launcher.png
diff --git a/Fragments/Lab3c_FragmentsLab/res/drawable-ldpi/ic_launcher.png b/Lab3/Lab3a_IntentsLab/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/res/drawable-ldpi/ic_launcher.png
rename to Lab3/Lab3a_IntentsLab/res/drawable-ldpi/ic_launcher.png
diff --git a/Fragments/Lab3c_FragmentsLab/res/drawable-mdpi/ic_launcher.png b/Lab3/Lab3a_IntentsLab/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/res/drawable-mdpi/ic_launcher.png
rename to Lab3/Lab3a_IntentsLab/res/drawable-mdpi/ic_launcher.png
diff --git a/Fragments/Lab3c_FragmentsLab/res/drawable-xhdpi/ic_launcher.png b/Lab3/Lab3a_IntentsLab/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/res/drawable-xhdpi/ic_launcher.png
rename to Lab3/Lab3a_IntentsLab/res/drawable-xhdpi/ic_launcher.png
diff --git a/Intents/Lab3a_IntentsLab/res/layout/activity_loader_activity.xml b/Lab3/Lab3a_IntentsLab/res/layout/activity_loader_activity.xml
similarity index 100%
rename from Intents/Lab3a_IntentsLab/res/layout/activity_loader_activity.xml
rename to Lab3/Lab3a_IntentsLab/res/layout/activity_loader_activity.xml
diff --git a/Intents/Lab3a_IntentsLab/res/layout/explicitly_loaded_activity.xml b/Lab3/Lab3a_IntentsLab/res/layout/explicitly_loaded_activity.xml
similarity index 100%
rename from Intents/Lab3a_IntentsLab/res/layout/explicitly_loaded_activity.xml
rename to Lab3/Lab3a_IntentsLab/res/layout/explicitly_loaded_activity.xml
diff --git a/Fragments/Lab3c_FragmentsLab/res/values-v11/styles.xml b/Lab3/Lab3a_IntentsLab/res/values-v11/styles.xml
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/res/values-v11/styles.xml
rename to Lab3/Lab3a_IntentsLab/res/values-v11/styles.xml
diff --git a/Fragments/Lab3c_FragmentsLab/res/values-v14/styles.xml b/Lab3/Lab3a_IntentsLab/res/values-v14/styles.xml
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/res/values-v14/styles.xml
rename to Lab3/Lab3a_IntentsLab/res/values-v14/styles.xml
diff --git a/Intents/Lab3a_IntentsLab/res/values/strings.xml b/Lab3/Lab3a_IntentsLab/res/values/strings.xml
similarity index 100%
rename from Intents/Lab3a_IntentsLab/res/values/strings.xml
rename to Lab3/Lab3a_IntentsLab/res/values/strings.xml
diff --git a/Fragments/Lab3c_FragmentsLab/res/values/styles.xml b/Lab3/Lab3a_IntentsLab/res/values/styles.xml
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/res/values/styles.xml
rename to Lab3/Lab3a_IntentsLab/res/values/styles.xml
diff --git a/Intents/Lab3a_IntentsLab/src/course/labs/intentslab/ActivityLoaderActivity.java b/Lab3/Lab3a_IntentsLab/src/course/labs/intentslab/ActivityLoaderActivity.java
similarity index 100%
rename from Intents/Lab3a_IntentsLab/src/course/labs/intentslab/ActivityLoaderActivity.java
rename to Lab3/Lab3a_IntentsLab/src/course/labs/intentslab/ActivityLoaderActivity.java
diff --git a/Intents/Lab3a_IntentsLab/src/course/labs/intentslab/ExplicitlyLoadedActivity.java b/Lab3/Lab3a_IntentsLab/src/course/labs/intentslab/ExplicitlyLoadedActivity.java
similarity index 100%
rename from Intents/Lab3a_IntentsLab/src/course/labs/intentslab/ExplicitlyLoadedActivity.java
rename to Lab3/Lab3a_IntentsLab/src/course/labs/intentslab/ExplicitlyLoadedActivity.java
diff --git a/Intents/Lab3a_IntentsLabTest/.classpath b/Lab3/Lab3a_IntentsLabTest/.classpath
similarity index 100%
rename from Intents/Lab3a_IntentsLabTest/.classpath
rename to Lab3/Lab3a_IntentsLabTest/.classpath
diff --git a/Intents/Lab3a_IntentsLabTest/.project b/Lab3/Lab3a_IntentsLabTest/.project
similarity index 100%
rename from Intents/Lab3a_IntentsLabTest/.project
rename to Lab3/Lab3a_IntentsLabTest/.project
diff --git a/Fragments/Lab3c_FragmentsLabTestPhone/.settings/org.eclipse.jdt.core.prefs b/Lab3/Lab3a_IntentsLabTest/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Fragments/Lab3c_FragmentsLabTestPhone/.settings/org.eclipse.jdt.core.prefs
rename to Lab3/Lab3a_IntentsLabTest/.settings/org.eclipse.jdt.core.prefs
diff --git a/Intents/Lab3a_IntentsLabTest/AndroidManifest.xml b/Lab3/Lab3a_IntentsLabTest/AndroidManifest.xml
similarity index 100%
rename from Intents/Lab3a_IntentsLabTest/AndroidManifest.xml
rename to Lab3/Lab3a_IntentsLabTest/AndroidManifest.xml
diff --git a/Fragments/Lab3c_FragmentsLabTestPhone/libs/robotium-solo-5.3.1.jar b/Lab3/Lab3a_IntentsLabTest/libs/robotium-solo-5.3.1.jar
similarity index 100%
rename from Fragments/Lab3c_FragmentsLabTestPhone/libs/robotium-solo-5.3.1.jar
rename to Lab3/Lab3a_IntentsLabTest/libs/robotium-solo-5.3.1.jar
diff --git a/Fragments/Lab3c_FragmentsLabTestPhone/project.properties b/Lab3/Lab3a_IntentsLabTest/project.properties
old mode 100644
new mode 100755
similarity index 100%
rename from Fragments/Lab3c_FragmentsLabTestPhone/project.properties
rename to Lab3/Lab3a_IntentsLabTest/project.properties
diff --git a/AsyncTask/Lab5-AsyncTaskLabTest/res/.gitignore b/Lab3/Lab3a_IntentsLabTest/res/.gitignore
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLabTest/res/.gitignore
rename to Lab3/Lab3a_IntentsLabTest/res/.gitignore
diff --git a/Intents/Lab3a_IntentsLabTest/src/course/labs/intentslab/tests/ExplicitTest.java b/Lab3/Lab3a_IntentsLabTest/src/course/labs/intentslab/tests/ExplicitTest.java
similarity index 100%
rename from Intents/Lab3a_IntentsLabTest/src/course/labs/intentslab/tests/ExplicitTest.java
rename to Lab3/Lab3a_IntentsLabTest/src/course/labs/intentslab/tests/ExplicitTest.java
diff --git a/Intents/Lab3a_IntentsLabTest/src/course/labs/intentslab/tests/ImplicitTest.java b/Lab3/Lab3a_IntentsLabTest/src/course/labs/intentslab/tests/ImplicitTest.java
similarity index 100%
rename from Intents/Lab3a_IntentsLabTest/src/course/labs/intentslab/tests/ImplicitTest.java
rename to Lab3/Lab3a_IntentsLabTest/src/course/labs/intentslab/tests/ImplicitTest.java
diff --git a/Intents/Lab3a_IntentsLab/.classpath b/Lab3/Lab3a_MyBrowser/.classpath
similarity index 100%
rename from Intents/Lab3a_IntentsLab/.classpath
rename to Lab3/Lab3a_MyBrowser/.classpath
diff --git a/Intents/Lab3a_MyBrowser/.project b/Lab3/Lab3a_MyBrowser/.project
similarity index 100%
rename from Intents/Lab3a_MyBrowser/.project
rename to Lab3/Lab3a_MyBrowser/.project
diff --git a/Fragments/Lab3c_FragmentsLabTestTablet/.settings/org.eclipse.jdt.core.prefs b/Lab3/Lab3a_MyBrowser/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Fragments/Lab3c_FragmentsLabTestTablet/.settings/org.eclipse.jdt.core.prefs
rename to Lab3/Lab3a_MyBrowser/.settings/org.eclipse.jdt.core.prefs
diff --git a/Intents/Lab3a_MyBrowser/AndroidManifest.xml b/Lab3/Lab3a_MyBrowser/AndroidManifest.xml
similarity index 100%
rename from Intents/Lab3a_MyBrowser/AndroidManifest.xml
rename to Lab3/Lab3a_MyBrowser/AndroidManifest.xml
diff --git a/Intents/Lab3a_IntentsLab/proguard-project.txt b/Lab3/Lab3a_MyBrowser/proguard-project.txt
similarity index 100%
rename from Intents/Lab3a_IntentsLab/proguard-project.txt
rename to Lab3/Lab3a_MyBrowser/proguard-project.txt
diff --git a/Fragments/Lab3c_FragmentsLabTestTablet/project.properties b/Lab3/Lab3a_MyBrowser/project.properties
old mode 100644
new mode 100755
similarity index 100%
rename from Fragments/Lab3c_FragmentsLabTestTablet/project.properties
rename to Lab3/Lab3a_MyBrowser/project.properties
diff --git a/Intents/Lab3a_MyBrowser/res/drawable-hdpi/ic_launcher.png b/Lab3/Lab3a_MyBrowser/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from Intents/Lab3a_MyBrowser/res/drawable-hdpi/ic_launcher.png
rename to Lab3/Lab3a_MyBrowser/res/drawable-hdpi/ic_launcher.png
diff --git a/Intents/Lab3a_MyBrowser/res/drawable-mdpi/ic_launcher.png b/Lab3/Lab3a_MyBrowser/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from Intents/Lab3a_MyBrowser/res/drawable-mdpi/ic_launcher.png
rename to Lab3/Lab3a_MyBrowser/res/drawable-mdpi/ic_launcher.png
diff --git a/Intents/Lab3a_MyBrowser/res/drawable-xhdpi/ic_launcher.png b/Lab3/Lab3a_MyBrowser/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from Intents/Lab3a_MyBrowser/res/drawable-xhdpi/ic_launcher.png
rename to Lab3/Lab3a_MyBrowser/res/drawable-xhdpi/ic_launcher.png
diff --git a/Intents/Lab3a_MyBrowser/res/layout/my_browser_activity.xml b/Lab3/Lab3a_MyBrowser/res/layout/my_browser_activity.xml
similarity index 100%
rename from Intents/Lab3a_MyBrowser/res/layout/my_browser_activity.xml
rename to Lab3/Lab3a_MyBrowser/res/layout/my_browser_activity.xml
diff --git a/Intents/Lab3a_MyBrowser/res/values/strings.xml b/Lab3/Lab3a_MyBrowser/res/values/strings.xml
similarity index 100%
rename from Intents/Lab3a_MyBrowser/res/values/strings.xml
rename to Lab3/Lab3a_MyBrowser/res/values/strings.xml
diff --git a/Intents/Lab3a_MyBrowser/res/values/styles.xml b/Lab3/Lab3a_MyBrowser/res/values/styles.xml
similarity index 100%
rename from Intents/Lab3a_MyBrowser/res/values/styles.xml
rename to Lab3/Lab3a_MyBrowser/res/values/styles.xml
diff --git a/Intents/Lab3a_MyBrowser/src/course/labs/intentslab/mybrowser/MyBrowserActivity.java b/Lab3/Lab3a_MyBrowser/src/course/labs/intentslab/mybrowser/MyBrowserActivity.java
similarity index 100%
rename from Intents/Lab3a_MyBrowser/src/course/labs/intentslab/mybrowser/MyBrowserActivity.java
rename to Lab3/Lab3a_MyBrowser/src/course/labs/intentslab/mybrowser/MyBrowserActivity.java
diff --git a/Fragments/Lab3c_FragmentsLab/.classpath b/Lab3/Lab3b_DangerousApp/.classpath
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/.classpath
rename to Lab3/Lab3b_DangerousApp/.classpath
diff --git a/Permissions/Lab3b_DangerousApp/.project b/Lab3/Lab3b_DangerousApp/.project
similarity index 100%
rename from Permissions/Lab3b_DangerousApp/.project
rename to Lab3/Lab3b_DangerousApp/.project
diff --git a/GraphicsAndTouch/Lab7_GraphicsLab/.settings/org.eclipse.jdt.core.prefs b/Lab3/Lab3b_DangerousApp/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLab/.settings/org.eclipse.jdt.core.prefs
rename to Lab3/Lab3b_DangerousApp/.settings/org.eclipse.jdt.core.prefs
diff --git a/Permissions/Lab3b_DangerousApp/AndroidManifest.xml b/Lab3/Lab3b_DangerousApp/AndroidManifest.xml
similarity index 100%
rename from Permissions/Lab3b_DangerousApp/AndroidManifest.xml
rename to Lab3/Lab3b_DangerousApp/AndroidManifest.xml
diff --git a/Location/Lab8_LocationLab/ic_launcher-web.png b/Lab3/Lab3b_DangerousApp/ic_launcher-web.png
old mode 100644
new mode 100755
similarity index 100%
rename from Location/Lab8_LocationLab/ic_launcher-web.png
rename to Lab3/Lab3b_DangerousApp/ic_launcher-web.png
diff --git a/Permissions/Lab3b_DangerousApp/libs/android-support-v4.jar b/Lab3/Lab3b_DangerousApp/libs/android-support-v4.jar
similarity index 100%
rename from Permissions/Lab3b_DangerousApp/libs/android-support-v4.jar
rename to Lab3/Lab3b_DangerousApp/libs/android-support-v4.jar
diff --git a/Intents/Lab3a_MyBrowser/proguard-project.txt b/Lab3/Lab3b_DangerousApp/proguard-project.txt
similarity index 100%
rename from Intents/Lab3a_MyBrowser/proguard-project.txt
rename to Lab3/Lab3b_DangerousApp/proguard-project.txt
diff --git a/GraphicsAndTouch/Lab7_GraphicsLab/project.properties b/Lab3/Lab3b_DangerousApp/project.properties
old mode 100644
new mode 100755
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLab/project.properties
rename to Lab3/Lab3b_DangerousApp/project.properties
diff --git a/Location/Lab8_LocationLab/res/drawable-hdpi/ic_launcher.png b/Lab3/Lab3b_DangerousApp/res/drawable-hdpi/ic_launcher.png
old mode 100644
new mode 100755
similarity index 100%
rename from Location/Lab8_LocationLab/res/drawable-hdpi/ic_launcher.png
rename to Lab3/Lab3b_DangerousApp/res/drawable-hdpi/ic_launcher.png
diff --git a/Location/Lab8_LocationLab/res/drawable-mdpi/ic_launcher.png b/Lab3/Lab3b_DangerousApp/res/drawable-mdpi/ic_launcher.png
old mode 100644
new mode 100755
similarity index 100%
rename from Location/Lab8_LocationLab/res/drawable-mdpi/ic_launcher.png
rename to Lab3/Lab3b_DangerousApp/res/drawable-mdpi/ic_launcher.png
diff --git a/Location/Lab8_LocationLab/res/drawable-xhdpi/ic_launcher.png b/Lab3/Lab3b_DangerousApp/res/drawable-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
similarity index 100%
rename from Location/Lab8_LocationLab/res/drawable-xhdpi/ic_launcher.png
rename to Lab3/Lab3b_DangerousApp/res/drawable-xhdpi/ic_launcher.png
diff --git a/Permissions/Lab3b_DangerousApp/res/drawable-xxhdpi/ic_launcher.png b/Lab3/Lab3b_DangerousApp/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from Permissions/Lab3b_DangerousApp/res/drawable-xxhdpi/ic_launcher.png
rename to Lab3/Lab3b_DangerousApp/res/drawable-xxhdpi/ic_launcher.png
diff --git a/Permissions/Lab3b_DangerousApp/res/layout/activity_main.xml b/Lab3/Lab3b_DangerousApp/res/layout/activity_main.xml
similarity index 100%
rename from Permissions/Lab3b_DangerousApp/res/layout/activity_main.xml
rename to Lab3/Lab3b_DangerousApp/res/layout/activity_main.xml
diff --git a/AsyncTask/Lab5-AsyncTaskLab/res/values/dimens.xml b/Lab3/Lab3b_DangerousApp/res/values/dimens.xml
old mode 100644
new mode 100755
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/res/values/dimens.xml
rename to Lab3/Lab3b_DangerousApp/res/values/dimens.xml
diff --git a/Permissions/Lab3b_DangerousApp/res/values/strings.xml b/Lab3/Lab3b_DangerousApp/res/values/strings.xml
similarity index 100%
rename from Permissions/Lab3b_DangerousApp/res/values/strings.xml
rename to Lab3/Lab3b_DangerousApp/res/values/strings.xml
diff --git a/Location/Lab8_LocationLab/res/values/styles.xml b/Lab3/Lab3b_DangerousApp/res/values/styles.xml
old mode 100644
new mode 100755
similarity index 100%
rename from Location/Lab8_LocationLab/res/values/styles.xml
rename to Lab3/Lab3b_DangerousApp/res/values/styles.xml
diff --git a/Permissions/Lab3b_DangerousApp/src/course/labs/dangerousapp/DangerousActivity.java b/Lab3/Lab3b_DangerousApp/src/course/labs/dangerousapp/DangerousActivity.java
similarity index 100%
rename from Permissions/Lab3b_DangerousApp/src/course/labs/dangerousapp/DangerousActivity.java
rename to Lab3/Lab3b_DangerousApp/src/course/labs/dangerousapp/DangerousActivity.java
diff --git a/Permissions/Lab3b_PermissionsLab/.classpath b/Lab3/Lab3b_PermissionsLab/.classpath
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/.classpath
rename to Lab3/Lab3b_PermissionsLab/.classpath
diff --git a/Permissions/Lab3b_PermissionsLab/.project b/Lab3/Lab3b_PermissionsLab/.project
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/.project
rename to Lab3/Lab3b_PermissionsLab/.project
diff --git a/GraphicsAndTouch/Lab7_GraphicsLabTest/.settings/org.eclipse.jdt.core.prefs b/Lab3/Lab3b_PermissionsLab/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLabTest/.settings/org.eclipse.jdt.core.prefs
rename to Lab3/Lab3b_PermissionsLab/.settings/org.eclipse.jdt.core.prefs
diff --git a/Permissions/Lab3b_PermissionsLab/AndroidManifest.xml b/Lab3/Lab3b_PermissionsLab/AndroidManifest.xml
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/AndroidManifest.xml
rename to Lab3/Lab3b_PermissionsLab/AndroidManifest.xml
diff --git a/Permissions/Lab3b_PermissionsLab/Lab-Permissions.pdf b/Lab3/Lab3b_PermissionsLab/Lab-Permissions.pdf
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/Lab-Permissions.pdf
rename to Lab3/Lab3b_PermissionsLab/Lab-Permissions.pdf
diff --git a/Permissions/Lab3b_PermissionsLab/PermissionsLabPhone.mp4 b/Lab3/Lab3b_PermissionsLab/PermissionsLabPhone.mp4
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/PermissionsLabPhone.mp4
rename to Lab3/Lab3b_PermissionsLab/PermissionsLabPhone.mp4
diff --git a/Intents/Lab3a_IntentsLab/ic_launcher-web.png b/Lab3/Lab3b_PermissionsLab/ic_launcher-web.png
similarity index 100%
rename from Intents/Lab3a_IntentsLab/ic_launcher-web.png
rename to Lab3/Lab3b_PermissionsLab/ic_launcher-web.png
diff --git a/Permissions/Lab3b_PermissionsLab/libs/android-support-v4.jar b/Lab3/Lab3b_PermissionsLab/libs/android-support-v4.jar
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/libs/android-support-v4.jar
rename to Lab3/Lab3b_PermissionsLab/libs/android-support-v4.jar
diff --git a/Location/Lab8_LocationLab/proguard-project.txt b/Lab3/Lab3b_PermissionsLab/proguard-project.txt
old mode 100644
new mode 100755
similarity index 100%
rename from Location/Lab8_LocationLab/proguard-project.txt
rename to Lab3/Lab3b_PermissionsLab/proguard-project.txt
diff --git a/GraphicsAndTouch/Lab7_GraphicsLabTest/project.properties b/Lab3/Lab3b_PermissionsLab/project.properties
old mode 100644
new mode 100755
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLabTest/project.properties
rename to Lab3/Lab3b_PermissionsLab/project.properties
diff --git a/GraphicsAndTouch/Lab7_GraphicsLab/res/drawable-hdpi/ic_launcher.png b/Lab3/Lab3b_PermissionsLab/res/drawable-hdpi/ic_launcher.png
old mode 100644
new mode 100755
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLab/res/drawable-hdpi/ic_launcher.png
rename to Lab3/Lab3b_PermissionsLab/res/drawable-hdpi/ic_launcher.png
diff --git a/GraphicsAndTouch/Lab7_GraphicsLab/res/drawable-ldpi/ic_launcher.png b/Lab3/Lab3b_PermissionsLab/res/drawable-ldpi/ic_launcher.png
old mode 100644
new mode 100755
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLab/res/drawable-ldpi/ic_launcher.png
rename to Lab3/Lab3b_PermissionsLab/res/drawable-ldpi/ic_launcher.png
diff --git a/GraphicsAndTouch/Lab7_GraphicsLab/res/drawable-mdpi/ic_launcher.png b/Lab3/Lab3b_PermissionsLab/res/drawable-mdpi/ic_launcher.png
old mode 100644
new mode 100755
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLab/res/drawable-mdpi/ic_launcher.png
rename to Lab3/Lab3b_PermissionsLab/res/drawable-mdpi/ic_launcher.png
diff --git a/GraphicsAndTouch/Lab7_GraphicsLab/res/drawable-xhdpi/ic_launcher.png b/Lab3/Lab3b_PermissionsLab/res/drawable-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLab/res/drawable-xhdpi/ic_launcher.png
rename to Lab3/Lab3b_PermissionsLab/res/drawable-xhdpi/ic_launcher.png
diff --git a/Permissions/Lab3b_PermissionsLab/res/layout/activity_loader_activity.xml b/Lab3/Lab3b_PermissionsLab/res/layout/activity_loader_activity.xml
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/res/layout/activity_loader_activity.xml
rename to Lab3/Lab3b_PermissionsLab/res/layout/activity_loader_activity.xml
diff --git a/Permissions/Lab3b_PermissionsLab/res/layout/bookmarks_activity.xml b/Lab3/Lab3b_PermissionsLab/res/layout/bookmarks_activity.xml
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/res/layout/bookmarks_activity.xml
rename to Lab3/Lab3b_PermissionsLab/res/layout/bookmarks_activity.xml
diff --git a/Permissions/Lab3b_PermissionsLab/res/layout/go_to_dangerous_activity.xml b/Lab3/Lab3b_PermissionsLab/res/layout/go_to_dangerous_activity.xml
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/res/layout/go_to_dangerous_activity.xml
rename to Lab3/Lab3b_PermissionsLab/res/layout/go_to_dangerous_activity.xml
diff --git a/Intents/Lab3a_IntentsLab/res/values-v11/styles.xml b/Lab3/Lab3b_PermissionsLab/res/values-v11/styles.xml
similarity index 100%
rename from Intents/Lab3a_IntentsLab/res/values-v11/styles.xml
rename to Lab3/Lab3b_PermissionsLab/res/values-v11/styles.xml
diff --git a/Intents/Lab3a_IntentsLab/res/values-v14/styles.xml b/Lab3/Lab3b_PermissionsLab/res/values-v14/styles.xml
similarity index 100%
rename from Intents/Lab3a_IntentsLab/res/values-v14/styles.xml
rename to Lab3/Lab3b_PermissionsLab/res/values-v14/styles.xml
diff --git a/Permissions/Lab3b_PermissionsLab/res/values/strings.xml b/Lab3/Lab3b_PermissionsLab/res/values/strings.xml
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/res/values/strings.xml
rename to Lab3/Lab3b_PermissionsLab/res/values/strings.xml
diff --git a/Intents/Lab3a_IntentsLab/res/values/styles.xml b/Lab3/Lab3b_PermissionsLab/res/values/styles.xml
similarity index 100%
rename from Intents/Lab3a_IntentsLab/res/values/styles.xml
rename to Lab3/Lab3b_PermissionsLab/res/values/styles.xml
diff --git a/Permissions/Lab3b_PermissionsLab/src/course/labs/permissionslab/ActivityLoaderActivity.java b/Lab3/Lab3b_PermissionsLab/src/course/labs/permissionslab/ActivityLoaderActivity.java
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/src/course/labs/permissionslab/ActivityLoaderActivity.java
rename to Lab3/Lab3b_PermissionsLab/src/course/labs/permissionslab/ActivityLoaderActivity.java
diff --git a/Permissions/Lab3b_PermissionsLab/src/course/labs/permissionslab/BookmarksActivity.java b/Lab3/Lab3b_PermissionsLab/src/course/labs/permissionslab/BookmarksActivity.java
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/src/course/labs/permissionslab/BookmarksActivity.java
rename to Lab3/Lab3b_PermissionsLab/src/course/labs/permissionslab/BookmarksActivity.java
diff --git a/Permissions/Lab3b_PermissionsLab/src/course/labs/permissionslab/GoToDangerousActivity.java b/Lab3/Lab3b_PermissionsLab/src/course/labs/permissionslab/GoToDangerousActivity.java
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/src/course/labs/permissionslab/GoToDangerousActivity.java
rename to Lab3/Lab3b_PermissionsLab/src/course/labs/permissionslab/GoToDangerousActivity.java
diff --git a/Permissions/Lab3b_PermissionsLabTest/.classpath b/Lab3/Lab3b_PermissionsLabTest/.classpath
similarity index 100%
rename from Permissions/Lab3b_PermissionsLabTest/.classpath
rename to Lab3/Lab3b_PermissionsLabTest/.classpath
diff --git a/Permissions/Lab3b_PermissionsLabTest/.project b/Lab3/Lab3b_PermissionsLabTest/.project
similarity index 100%
rename from Permissions/Lab3b_PermissionsLabTest/.project
rename to Lab3/Lab3b_PermissionsLabTest/.project
diff --git a/Intents/Lab3a_IntentsLab/.settings/org.eclipse.jdt.core.prefs b/Lab3/Lab3b_PermissionsLabTest/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Intents/Lab3a_IntentsLab/.settings/org.eclipse.jdt.core.prefs
rename to Lab3/Lab3b_PermissionsLabTest/.settings/org.eclipse.jdt.core.prefs
diff --git a/Permissions/Lab3b_PermissionsLabTest/AndroidManifest.xml b/Lab3/Lab3b_PermissionsLabTest/AndroidManifest.xml
similarity index 100%
rename from Permissions/Lab3b_PermissionsLabTest/AndroidManifest.xml
rename to Lab3/Lab3b_PermissionsLabTest/AndroidManifest.xml
diff --git a/Fragments/Lab3c_FragmentsLabTestTablet/libs/robotium-solo-5.3.1.jar b/Lab3/Lab3b_PermissionsLabTest/libs/robotium-solo-5.3.1.jar
similarity index 100%
rename from Fragments/Lab3c_FragmentsLabTestTablet/libs/robotium-solo-5.3.1.jar
rename to Lab3/Lab3b_PermissionsLabTest/libs/robotium-solo-5.3.1.jar
diff --git a/Intents/Lab3a_IntentsLab/project.properties b/Lab3/Lab3b_PermissionsLabTest/project.properties
old mode 100755
new mode 100644
similarity index 100%
rename from Intents/Lab3a_IntentsLab/project.properties
rename to Lab3/Lab3b_PermissionsLabTest/project.properties
diff --git a/Fragments/Lab3c_FragmentsLabTestPhone/res/drawable/.gitignore b/Lab3/Lab3b_PermissionsLabTest/res/drawable/.gitignore
similarity index 100%
rename from Fragments/Lab3c_FragmentsLabTestPhone/res/drawable/.gitignore
rename to Lab3/Lab3b_PermissionsLabTest/res/drawable/.gitignore
diff --git a/Permissions/Lab3b_PermissionsLabTest/src/course/labs/permissionslab/tests/PermissionEnforcementTest.java b/Lab3/Lab3b_PermissionsLabTest/src/course/labs/permissionslab/tests/PermissionEnforcementTest.java
similarity index 100%
rename from Permissions/Lab3b_PermissionsLabTest/src/course/labs/permissionslab/tests/PermissionEnforcementTest.java
rename to Lab3/Lab3b_PermissionsLabTest/src/course/labs/permissionslab/tests/PermissionEnforcementTest.java
diff --git a/Permissions/Lab3b_PermissionsLabTest/src/course/labs/permissionslab/tests/TestBookmarks.java b/Lab3/Lab3b_PermissionsLabTest/src/course/labs/permissionslab/tests/TestBookmarks.java
similarity index 100%
rename from Permissions/Lab3b_PermissionsLabTest/src/course/labs/permissionslab/tests/TestBookmarks.java
rename to Lab3/Lab3b_PermissionsLabTest/src/course/labs/permissionslab/tests/TestBookmarks.java
diff --git a/Permissions/Lab3b_PermissionsLabTest/src/course/labs/permissionslab/tests/TestDangerousApp.java b/Lab3/Lab3b_PermissionsLabTest/src/course/labs/permissionslab/tests/TestDangerousApp.java
similarity index 100%
rename from Permissions/Lab3b_PermissionsLabTest/src/course/labs/permissionslab/tests/TestDangerousApp.java
rename to Lab3/Lab3b_PermissionsLabTest/src/course/labs/permissionslab/tests/TestDangerousApp.java
diff --git a/Permissions/Lab3b_DangerousApp/.classpath b/Lab3/Lab3c_FragmentsLab/.classpath
similarity index 100%
rename from Permissions/Lab3b_DangerousApp/.classpath
rename to Lab3/Lab3c_FragmentsLab/.classpath
diff --git a/Fragments/Lab3c_FragmentsLab/.project b/Lab3/Lab3c_FragmentsLab/.project
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/.project
rename to Lab3/Lab3c_FragmentsLab/.project
diff --git a/Intents/Lab3a_IntentsLabTest/.settings/org.eclipse.jdt.core.prefs b/Lab3/Lab3c_FragmentsLab/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Intents/Lab3a_IntentsLabTest/.settings/org.eclipse.jdt.core.prefs
rename to Lab3/Lab3c_FragmentsLab/.settings/org.eclipse.jdt.core.prefs
diff --git a/Fragments/Lab3c_FragmentsLab/AndroidManifest.xml b/Lab3/Lab3c_FragmentsLab/AndroidManifest.xml
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/AndroidManifest.xml
rename to Lab3/Lab3c_FragmentsLab/AndroidManifest.xml
diff --git a/Fragments/Lab3c_FragmentsLab/FragmentsLabPhone.mp4 b/Lab3/Lab3c_FragmentsLab/FragmentsLabPhone.mp4
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/FragmentsLabPhone.mp4
rename to Lab3/Lab3c_FragmentsLab/FragmentsLabPhone.mp4
diff --git a/Fragments/Lab3c_FragmentsLab/FragmentsLabTablet.mp4 b/Lab3/Lab3c_FragmentsLab/FragmentsLabTablet.mp4
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/FragmentsLabTablet.mp4
rename to Lab3/Lab3c_FragmentsLab/FragmentsLabTablet.mp4
diff --git a/Fragments/Lab3c_FragmentsLab/Lab-Fragments.pdf b/Lab3/Lab3c_FragmentsLab/Lab-Fragments.pdf
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/Lab-Fragments.pdf
rename to Lab3/Lab3c_FragmentsLab/Lab-Fragments.pdf
diff --git a/Notifications/Lab6_NotificationsLab/ic_launcher-web.png b/Lab3/Lab3c_FragmentsLab/ic_launcher-web.png
old mode 100644
new mode 100755
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/ic_launcher-web.png
rename to Lab3/Lab3c_FragmentsLab/ic_launcher-web.png
diff --git a/Notifications/Lab6_NotificationsLab/proguard-project.txt b/Lab3/Lab3c_FragmentsLab/proguard-project.txt
old mode 100644
new mode 100755
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/proguard-project.txt
rename to Lab3/Lab3c_FragmentsLab/proguard-project.txt
diff --git a/Intents/Lab3a_IntentsLabTest/project.properties b/Lab3/Lab3c_FragmentsLab/project.properties
similarity index 100%
rename from Intents/Lab3a_IntentsLabTest/project.properties
rename to Lab3/Lab3c_FragmentsLab/project.properties
diff --git a/Intents/Lab3a_IntentsLab/res/drawable-hdpi/ic_launcher.png b/Lab3/Lab3c_FragmentsLab/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from Intents/Lab3a_IntentsLab/res/drawable-hdpi/ic_launcher.png
rename to Lab3/Lab3c_FragmentsLab/res/drawable-hdpi/ic_launcher.png
diff --git a/Intents/Lab3a_IntentsLab/res/drawable-ldpi/ic_launcher.png b/Lab3/Lab3c_FragmentsLab/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from Intents/Lab3a_IntentsLab/res/drawable-ldpi/ic_launcher.png
rename to Lab3/Lab3c_FragmentsLab/res/drawable-ldpi/ic_launcher.png
diff --git a/Intents/Lab3a_IntentsLab/res/drawable-mdpi/ic_launcher.png b/Lab3/Lab3c_FragmentsLab/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from Intents/Lab3a_IntentsLab/res/drawable-mdpi/ic_launcher.png
rename to Lab3/Lab3c_FragmentsLab/res/drawable-mdpi/ic_launcher.png
diff --git a/Intents/Lab3a_IntentsLab/res/drawable-xhdpi/ic_launcher.png b/Lab3/Lab3c_FragmentsLab/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from Intents/Lab3a_IntentsLab/res/drawable-xhdpi/ic_launcher.png
rename to Lab3/Lab3c_FragmentsLab/res/drawable-xhdpi/ic_launcher.png
diff --git a/Fragments/Lab3c_FragmentsLab/res/layout-large/main_activity.xml b/Lab3/Lab3c_FragmentsLab/res/layout-large/main_activity.xml
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/res/layout-large/main_activity.xml
rename to Lab3/Lab3c_FragmentsLab/res/layout-large/main_activity.xml
diff --git a/Fragments/Lab3c_FragmentsLab/res/layout/feed.xml b/Lab3/Lab3c_FragmentsLab/res/layout/feed.xml
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/res/layout/feed.xml
rename to Lab3/Lab3c_FragmentsLab/res/layout/feed.xml
diff --git a/Fragments/Lab3c_FragmentsLab/res/layout/main_activity.xml b/Lab3/Lab3c_FragmentsLab/res/layout/main_activity.xml
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/res/layout/main_activity.xml
rename to Lab3/Lab3c_FragmentsLab/res/layout/main_activity.xml
diff --git a/Fragments/Lab3c_FragmentsLab/res/raw/ladygaga.txt b/Lab3/Lab3c_FragmentsLab/res/raw/ladygaga.txt
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/res/raw/ladygaga.txt
rename to Lab3/Lab3c_FragmentsLab/res/raw/ladygaga.txt
diff --git a/Fragments/Lab3c_FragmentsLab/res/raw/rebeccablack.txt b/Lab3/Lab3c_FragmentsLab/res/raw/rebeccablack.txt
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/res/raw/rebeccablack.txt
rename to Lab3/Lab3c_FragmentsLab/res/raw/rebeccablack.txt
diff --git a/Fragments/Lab3c_FragmentsLab/res/raw/taylorswift.txt b/Lab3/Lab3c_FragmentsLab/res/raw/taylorswift.txt
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/res/raw/taylorswift.txt
rename to Lab3/Lab3c_FragmentsLab/res/raw/taylorswift.txt
diff --git a/Notifications/Lab6_NotificationsLab/res/values-v11/styles.xml b/Lab3/Lab3c_FragmentsLab/res/values-v11/styles.xml
old mode 100644
new mode 100755
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/res/values-v11/styles.xml
rename to Lab3/Lab3c_FragmentsLab/res/values-v11/styles.xml
diff --git a/Notifications/Lab6_NotificationsLab/res/values-v14/styles.xml b/Lab3/Lab3c_FragmentsLab/res/values-v14/styles.xml
old mode 100644
new mode 100755
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/res/values-v14/styles.xml
rename to Lab3/Lab3c_FragmentsLab/res/values-v14/styles.xml
diff --git a/Fragments/Lab3c_FragmentsLab/res/values/strings.xml b/Lab3/Lab3c_FragmentsLab/res/values/strings.xml
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/res/values/strings.xml
rename to Lab3/Lab3c_FragmentsLab/res/values/strings.xml
diff --git a/Notifications/Lab6_NotificationsLab/res/values/styles.xml b/Lab3/Lab3c_FragmentsLab/res/values/styles.xml
old mode 100644
new mode 100755
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/res/values/styles.xml
rename to Lab3/Lab3c_FragmentsLab/res/values/styles.xml
diff --git a/Fragments/Lab3c_FragmentsLab/src/course/labs/fragmentslab/FeedFragment.java b/Lab3/Lab3c_FragmentsLab/src/course/labs/fragmentslab/FeedFragment.java
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/src/course/labs/fragmentslab/FeedFragment.java
rename to Lab3/Lab3c_FragmentsLab/src/course/labs/fragmentslab/FeedFragment.java
diff --git a/Fragments/Lab3c_FragmentsLab/src/course/labs/fragmentslab/FeedFragmentData.java b/Lab3/Lab3c_FragmentsLab/src/course/labs/fragmentslab/FeedFragmentData.java
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/src/course/labs/fragmentslab/FeedFragmentData.java
rename to Lab3/Lab3c_FragmentsLab/src/course/labs/fragmentslab/FeedFragmentData.java
diff --git a/Fragments/Lab3c_FragmentsLab/src/course/labs/fragmentslab/FriendsFragment.java b/Lab3/Lab3c_FragmentsLab/src/course/labs/fragmentslab/FriendsFragment.java
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/src/course/labs/fragmentslab/FriendsFragment.java
rename to Lab3/Lab3c_FragmentsLab/src/course/labs/fragmentslab/FriendsFragment.java
diff --git a/Fragments/Lab3c_FragmentsLab/src/course/labs/fragmentslab/MainActivity.java b/Lab3/Lab3c_FragmentsLab/src/course/labs/fragmentslab/MainActivity.java
similarity index 100%
rename from Fragments/Lab3c_FragmentsLab/src/course/labs/fragmentslab/MainActivity.java
rename to Lab3/Lab3c_FragmentsLab/src/course/labs/fragmentslab/MainActivity.java
diff --git a/Fragments/Lab3c_FragmentsLabTestPhone/.classpath b/Lab3/Lab3c_FragmentsLabTestPhone/.classpath
similarity index 100%
rename from Fragments/Lab3c_FragmentsLabTestPhone/.classpath
rename to Lab3/Lab3c_FragmentsLabTestPhone/.classpath
diff --git a/Fragments/Lab3c_FragmentsLabTestPhone/.project b/Lab3/Lab3c_FragmentsLabTestPhone/.project
similarity index 100%
rename from Fragments/Lab3c_FragmentsLabTestPhone/.project
rename to Lab3/Lab3c_FragmentsLabTestPhone/.project
diff --git a/Intents/Lab3a_MyBrowser/.settings/org.eclipse.jdt.core.prefs b/Lab3/Lab3c_FragmentsLabTestPhone/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Intents/Lab3a_MyBrowser/.settings/org.eclipse.jdt.core.prefs
rename to Lab3/Lab3c_FragmentsLabTestPhone/.settings/org.eclipse.jdt.core.prefs
diff --git a/Fragments/Lab3c_FragmentsLabTestPhone/AndroidManifest.xml b/Lab3/Lab3c_FragmentsLabTestPhone/AndroidManifest.xml
similarity index 100%
rename from Fragments/Lab3c_FragmentsLabTestPhone/AndroidManifest.xml
rename to Lab3/Lab3c_FragmentsLabTestPhone/AndroidManifest.xml
diff --git a/GraphicsAndTouch/Lab7_GraphicsLabTest/libs/robotium-solo-5.3.1.jar b/Lab3/Lab3c_FragmentsLabTestPhone/libs/robotium-solo-5.3.1.jar
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLabTest/libs/robotium-solo-5.3.1.jar
rename to Lab3/Lab3c_FragmentsLabTestPhone/libs/robotium-solo-5.3.1.jar
diff --git a/Intents/Lab3a_MyBrowser/project.properties b/Lab3/Lab3c_FragmentsLabTestPhone/project.properties
old mode 100755
new mode 100644
similarity index 100%
rename from Intents/Lab3a_MyBrowser/project.properties
rename to Lab3/Lab3c_FragmentsLabTestPhone/project.properties
diff --git a/Fragments/Lab3c_FragmentsLabTestTablet/res/drawable/.gitignore b/Lab3/Lab3c_FragmentsLabTestPhone/res/drawable/.gitignore
similarity index 100%
rename from Fragments/Lab3c_FragmentsLabTestTablet/res/drawable/.gitignore
rename to Lab3/Lab3c_FragmentsLabTestPhone/res/drawable/.gitignore
diff --git a/Fragments/Lab3c_FragmentsLabTestPhone/src/course/labs/fragmentslab/test/PhoneTest.java b/Lab3/Lab3c_FragmentsLabTestPhone/src/course/labs/fragmentslab/test/PhoneTest.java
similarity index 100%
rename from Fragments/Lab3c_FragmentsLabTestPhone/src/course/labs/fragmentslab/test/PhoneTest.java
rename to Lab3/Lab3c_FragmentsLabTestPhone/src/course/labs/fragmentslab/test/PhoneTest.java
diff --git a/Fragments/Lab3c_FragmentsLabTestTablet/.classpath b/Lab3/Lab3c_FragmentsLabTestTablet/.classpath
similarity index 100%
rename from Fragments/Lab3c_FragmentsLabTestTablet/.classpath
rename to Lab3/Lab3c_FragmentsLabTestTablet/.classpath
diff --git a/Fragments/Lab3c_FragmentsLabTestTablet/.project b/Lab3/Lab3c_FragmentsLabTestTablet/.project
similarity index 100%
rename from Fragments/Lab3c_FragmentsLabTestTablet/.project
rename to Lab3/Lab3c_FragmentsLabTestTablet/.project
diff --git a/Location/Lab8_LocationLab/.settings/org.eclipse.jdt.core.prefs b/Lab3/Lab3c_FragmentsLabTestTablet/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Location/Lab8_LocationLab/.settings/org.eclipse.jdt.core.prefs
rename to Lab3/Lab3c_FragmentsLabTestTablet/.settings/org.eclipse.jdt.core.prefs
diff --git a/Fragments/Lab3c_FragmentsLabTestTablet/AndroidManifest.xml b/Lab3/Lab3c_FragmentsLabTestTablet/AndroidManifest.xml
similarity index 100%
rename from Fragments/Lab3c_FragmentsLabTestTablet/AndroidManifest.xml
rename to Lab3/Lab3c_FragmentsLabTestTablet/AndroidManifest.xml
diff --git a/Intents/Lab3a_IntentsLabTest/libs/robotium-solo-5.3.1.jar b/Lab3/Lab3c_FragmentsLabTestTablet/libs/robotium-solo-5.3.1.jar
similarity index 100%
rename from Intents/Lab3a_IntentsLabTest/libs/robotium-solo-5.3.1.jar
rename to Lab3/Lab3c_FragmentsLabTestTablet/libs/robotium-solo-5.3.1.jar
diff --git a/Location/Lab8_LocationLab/project.properties b/Lab3/Lab3c_FragmentsLabTestTablet/project.properties
similarity index 100%
rename from Location/Lab8_LocationLab/project.properties
rename to Lab3/Lab3c_FragmentsLabTestTablet/project.properties
diff --git a/GraphicsAndTouch/Lab7_GraphicsLabTest/res/.gitignore b/Lab3/Lab3c_FragmentsLabTestTablet/res/drawable/.gitignore
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLabTest/res/.gitignore
rename to Lab3/Lab3c_FragmentsLabTestTablet/res/drawable/.gitignore
diff --git a/Fragments/Lab3c_FragmentsLabTestTablet/src/course/labs/fragmentslab/test/TabletTest.java b/Lab3/Lab3c_FragmentsLabTestTablet/src/course/labs/fragmentslab/test/TabletTest.java
similarity index 100%
rename from Fragments/Lab3c_FragmentsLabTestTablet/src/course/labs/fragmentslab/test/TabletTest.java
rename to Lab3/Lab3c_FragmentsLabTestTablet/src/course/labs/fragmentslab/test/TabletTest.java
diff --git a/Intents/Lab3a_MyBrowser/.classpath b/Lab4/Lab4_UILabs/.classpath
old mode 100755
new mode 100644
similarity index 100%
rename from Intents/Lab3a_MyBrowser/.classpath
rename to Lab4/Lab4_UILabs/.classpath
diff --git a/UserInterface/Lab4_UILabs/.project b/Lab4/Lab4_UILabs/.project
similarity index 100%
rename from UserInterface/Lab4_UILabs/.project
rename to Lab4/Lab4_UILabs/.project
diff --git a/Location/Lab8_LocationLabTest/.settings/org.eclipse.jdt.core.prefs b/Lab4/Lab4_UILabs/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Location/Lab8_LocationLabTest/.settings/org.eclipse.jdt.core.prefs
rename to Lab4/Lab4_UILabs/.settings/org.eclipse.jdt.core.prefs
diff --git a/UserInterface/Lab4_UILabs/AndroidManifest.xml b/Lab4/Lab4_UILabs/AndroidManifest.xml
similarity index 100%
rename from UserInterface/Lab4_UILabs/AndroidManifest.xml
rename to Lab4/Lab4_UILabs/AndroidManifest.xml
diff --git a/UserInterface/Lab4_UILabs/Lab-UserInterface.pdf b/Lab4/Lab4_UILabs/Lab-UserInterface.pdf
similarity index 100%
rename from UserInterface/Lab4_UILabs/Lab-UserInterface.pdf
rename to Lab4/Lab4_UILabs/Lab-UserInterface.pdf
diff --git a/UserInterface/Lab4_UILabs/UILabs.mp4 b/Lab4/Lab4_UILabs/UILabs.mp4
similarity index 100%
rename from UserInterface/Lab4_UILabs/UILabs.mp4
rename to Lab4/Lab4_UILabs/UILabs.mp4
diff --git a/UserInterface/Lab4_UILabs/proguard.cfg b/Lab4/Lab4_UILabs/proguard.cfg
similarity index 100%
rename from UserInterface/Lab4_UILabs/proguard.cfg
rename to Lab4/Lab4_UILabs/proguard.cfg
diff --git a/Location/Lab8_LocationLabTest/project.properties b/Lab4/Lab4_UILabs/project.properties
similarity index 100%
rename from Location/Lab8_LocationLabTest/project.properties
rename to Lab4/Lab4_UILabs/project.properties
diff --git a/Notifications/Lab6_NotificationsLab/res/drawable-hdpi/ic_launcher.png b/Lab4/Lab4_UILabs/res/drawable-hdpi/ic_launcher.png
old mode 100644
new mode 100755
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/res/drawable-hdpi/ic_launcher.png
rename to Lab4/Lab4_UILabs/res/drawable-hdpi/ic_launcher.png
diff --git a/Notifications/Lab6_NotificationsLab/res/drawable-ldpi/ic_launcher.png b/Lab4/Lab4_UILabs/res/drawable-ldpi/ic_launcher.png
old mode 100644
new mode 100755
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/res/drawable-ldpi/ic_launcher.png
rename to Lab4/Lab4_UILabs/res/drawable-ldpi/ic_launcher.png
diff --git a/Notifications/Lab6_NotificationsLab/res/drawable-mdpi/ic_launcher.png b/Lab4/Lab4_UILabs/res/drawable-mdpi/ic_launcher.png
old mode 100644
new mode 100755
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/res/drawable-mdpi/ic_launcher.png
rename to Lab4/Lab4_UILabs/res/drawable-mdpi/ic_launcher.png
diff --git a/Notifications/Lab6_NotificationsLab/res/drawable-xhdpi/ic_launcher.png b/Lab4/Lab4_UILabs/res/drawable-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/res/drawable-xhdpi/ic_launcher.png
rename to Lab4/Lab4_UILabs/res/drawable-xhdpi/ic_launcher.png
diff --git a/UserInterface/Lab4_UILabs/res/layout/add_todo.xml b/Lab4/Lab4_UILabs/res/layout/add_todo.xml
similarity index 100%
rename from UserInterface/Lab4_UILabs/res/layout/add_todo.xml
rename to Lab4/Lab4_UILabs/res/layout/add_todo.xml
diff --git a/UserInterface/Lab4_UILabs/res/layout/footer_view.xml b/Lab4/Lab4_UILabs/res/layout/footer_view.xml
similarity index 100%
rename from UserInterface/Lab4_UILabs/res/layout/footer_view.xml
rename to Lab4/Lab4_UILabs/res/layout/footer_view.xml
diff --git a/UserInterface/Lab4_UILabs/res/layout/todo_item.xml b/Lab4/Lab4_UILabs/res/layout/todo_item.xml
similarity index 100%
rename from UserInterface/Lab4_UILabs/res/layout/todo_item.xml
rename to Lab4/Lab4_UILabs/res/layout/todo_item.xml
diff --git a/AsyncTask/Lab5-AsyncTaskLab/res/values-sw600dp/dimens.xml b/Lab4/Lab4_UILabs/res/values-sw600dp/dimens.xml
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/res/values-sw600dp/dimens.xml
rename to Lab4/Lab4_UILabs/res/values-sw600dp/dimens.xml
diff --git a/UserInterface/Lab4_UILabs/res/values-sw720dp-land/dimens.xml b/Lab4/Lab4_UILabs/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from UserInterface/Lab4_UILabs/res/values-sw720dp-land/dimens.xml
rename to Lab4/Lab4_UILabs/res/values-sw720dp-land/dimens.xml
diff --git a/UserInterface/Lab4_UILabs/res/values/dimens.xml b/Lab4/Lab4_UILabs/res/values/dimens.xml
similarity index 100%
rename from UserInterface/Lab4_UILabs/res/values/dimens.xml
rename to Lab4/Lab4_UILabs/res/values/dimens.xml
diff --git a/UserInterface/Lab4_UILabs/res/values/strings.xml b/Lab4/Lab4_UILabs/res/values/strings.xml
similarity index 100%
rename from UserInterface/Lab4_UILabs/res/values/strings.xml
rename to Lab4/Lab4_UILabs/res/values/strings.xml
diff --git a/UserInterface/Lab4_UILabs/src/course/labs/todomanager/AddToDoActivity.java b/Lab4/Lab4_UILabs/src/course/labs/todomanager/AddToDoActivity.java
similarity index 100%
rename from UserInterface/Lab4_UILabs/src/course/labs/todomanager/AddToDoActivity.java
rename to Lab4/Lab4_UILabs/src/course/labs/todomanager/AddToDoActivity.java
diff --git a/UserInterface/Lab4_UILabs/src/course/labs/todomanager/ToDoItem.java b/Lab4/Lab4_UILabs/src/course/labs/todomanager/ToDoItem.java
similarity index 100%
rename from UserInterface/Lab4_UILabs/src/course/labs/todomanager/ToDoItem.java
rename to Lab4/Lab4_UILabs/src/course/labs/todomanager/ToDoItem.java
diff --git a/UserInterface/Lab4_UILabs/src/course/labs/todomanager/ToDoListAdapter.java b/Lab4/Lab4_UILabs/src/course/labs/todomanager/ToDoListAdapter.java
similarity index 100%
rename from UserInterface/Lab4_UILabs/src/course/labs/todomanager/ToDoListAdapter.java
rename to Lab4/Lab4_UILabs/src/course/labs/todomanager/ToDoListAdapter.java
diff --git a/UserInterface/Lab4_UILabs/src/course/labs/todomanager/ToDoManagerActivity.java b/Lab4/Lab4_UILabs/src/course/labs/todomanager/ToDoManagerActivity.java
similarity index 100%
rename from UserInterface/Lab4_UILabs/src/course/labs/todomanager/ToDoManagerActivity.java
rename to Lab4/Lab4_UILabs/src/course/labs/todomanager/ToDoManagerActivity.java
diff --git a/UserInterface/Lab4_UILabsTest/.classpath b/Lab4/Lab4_UILabsTest/.classpath
similarity index 100%
rename from UserInterface/Lab4_UILabsTest/.classpath
rename to Lab4/Lab4_UILabsTest/.classpath
diff --git a/UserInterface/Lab4_UILabsTest/.project b/Lab4/Lab4_UILabsTest/.project
similarity index 100%
rename from UserInterface/Lab4_UILabsTest/.project
rename to Lab4/Lab4_UILabsTest/.project
diff --git a/Notifications/Lab6_NotificationsLab/.settings/org.eclipse.jdt.core.prefs b/Lab4/Lab4_UILabsTest/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/.settings/org.eclipse.jdt.core.prefs
rename to Lab4/Lab4_UILabsTest/.settings/org.eclipse.jdt.core.prefs
diff --git a/UserInterface/Lab4_UILabsTest/AndroidManifest.xml b/Lab4/Lab4_UILabsTest/AndroidManifest.xml
similarity index 100%
rename from UserInterface/Lab4_UILabsTest/AndroidManifest.xml
rename to Lab4/Lab4_UILabsTest/AndroidManifest.xml
diff --git a/Location/Lab8_LocationLabTest/libs/robotium-solo-5.3.1.jar b/Lab4/Lab4_UILabsTest/libs/robotium-solo-5.3.1.jar
similarity index 100%
rename from Location/Lab8_LocationLabTest/libs/robotium-solo-5.3.1.jar
rename to Lab4/Lab4_UILabsTest/libs/robotium-solo-5.3.1.jar
diff --git a/UserInterface/Lab4_UILabsTest/lint.xml b/Lab4/Lab4_UILabsTest/lint.xml
similarity index 100%
rename from UserInterface/Lab4_UILabsTest/lint.xml
rename to Lab4/Lab4_UILabsTest/lint.xml
diff --git a/Notifications/Lab6_NotificationsLab/project.properties b/Lab4/Lab4_UILabsTest/project.properties
old mode 100644
new mode 100755
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/project.properties
rename to Lab4/Lab4_UILabsTest/project.properties
diff --git a/Intents/Lab3a_IntentsLabTest/res/.gitignore b/Lab4/Lab4_UILabsTest/res/drawable/.gitignore
similarity index 100%
rename from Intents/Lab3a_IntentsLabTest/res/.gitignore
rename to Lab4/Lab4_UILabsTest/res/drawable/.gitignore
diff --git a/UserInterface/Lab4_UILabsTest/src/course/labs/todomanager/tests/Test1_SubmitTest.java b/Lab4/Lab4_UILabsTest/src/course/labs/todomanager/tests/Test1_SubmitTest.java
similarity index 100%
rename from UserInterface/Lab4_UILabsTest/src/course/labs/todomanager/tests/Test1_SubmitTest.java
rename to Lab4/Lab4_UILabsTest/src/course/labs/todomanager/tests/Test1_SubmitTest.java
diff --git a/UserInterface/Lab4_UILabsTest/src/course/labs/todomanager/tests/Test2_DateTimeTest.java b/Lab4/Lab4_UILabsTest/src/course/labs/todomanager/tests/Test2_DateTimeTest.java
similarity index 100%
rename from UserInterface/Lab4_UILabsTest/src/course/labs/todomanager/tests/Test2_DateTimeTest.java
rename to Lab4/Lab4_UILabsTest/src/course/labs/todomanager/tests/Test2_DateTimeTest.java
diff --git a/UserInterface/Lab4_UILabsTest/src/course/labs/todomanager/tests/Test3_CancelTest.java b/Lab4/Lab4_UILabsTest/src/course/labs/todomanager/tests/Test3_CancelTest.java
similarity index 100%
rename from UserInterface/Lab4_UILabsTest/src/course/labs/todomanager/tests/Test3_CancelTest.java
rename to Lab4/Lab4_UILabsTest/src/course/labs/todomanager/tests/Test3_CancelTest.java
diff --git a/UserInterface/Lab4_UILabsTest/src/course/labs/todomanager/tests/Test4_ResetTest.java b/Lab4/Lab4_UILabsTest/src/course/labs/todomanager/tests/Test4_ResetTest.java
similarity index 100%
rename from UserInterface/Lab4_UILabsTest/src/course/labs/todomanager/tests/Test4_ResetTest.java
rename to Lab4/Lab4_UILabsTest/src/course/labs/todomanager/tests/Test4_ResetTest.java
diff --git a/ModernArtUI/Lab4b_ModernArtUI/Lab-ModernArtUI.pdf b/Lab4/Lab4b_ModernArtUI/Lab-ModernArtUI.pdf
similarity index 100%
rename from ModernArtUI/Lab4b_ModernArtUI/Lab-ModernArtUI.pdf
rename to Lab4/Lab4b_ModernArtUI/Lab-ModernArtUI.pdf
diff --git a/ModernArtUI/Lab4b_ModernArtUI/ModernArtUI.mp4 b/Lab4/Lab4b_ModernArtUI/ModernArtUI.mp4
similarity index 100%
rename from ModernArtUI/Lab4b_ModernArtUI/ModernArtUI.mp4
rename to Lab4/Lab4b_ModernArtUI/ModernArtUI.mp4
diff --git a/Notifications/Lab6_NotificationsLab/.classpath b/Lab5/Lab5-AsyncTaskLab/.classpath
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/.classpath
rename to Lab5/Lab5-AsyncTaskLab/.classpath
diff --git a/AsyncTask/Lab5-AsyncTaskLab/.project b/Lab5/Lab5-AsyncTaskLab/.project
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/.project
rename to Lab5/Lab5-AsyncTaskLab/.project
diff --git a/TheActivityClass/Lab2_ActivityLab/.settings/org.eclipse.jdt.core.prefs b/Lab5/Lab5-AsyncTaskLab/.settings/org.eclipse.jdt.core.prefs
old mode 100755
new mode 100644
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/.settings/org.eclipse.jdt.core.prefs
rename to Lab5/Lab5-AsyncTaskLab/.settings/org.eclipse.jdt.core.prefs
diff --git a/AsyncTask/Lab5-AsyncTaskLab/AndroidManifest.xml b/Lab5/Lab5-AsyncTaskLab/AndroidManifest.xml
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/AndroidManifest.xml
rename to Lab5/Lab5-AsyncTaskLab/AndroidManifest.xml
diff --git a/AsyncTask/Lab5-AsyncTaskLab/AsyncTaskLab.mp4 b/Lab5/Lab5-AsyncTaskLab/AsyncTaskLab.mp4
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/AsyncTaskLab.mp4
rename to Lab5/Lab5-AsyncTaskLab/AsyncTaskLab.mp4
diff --git a/AsyncTask/Lab5-AsyncTaskLab/Lab-AsyncTask.pdf b/Lab5/Lab5-AsyncTaskLab/Lab-AsyncTask.pdf
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/Lab-AsyncTask.pdf
rename to Lab5/Lab5-AsyncTaskLab/Lab-AsyncTask.pdf
diff --git a/Permissions/Lab3b_PermissionsLab/ic_launcher-web.png b/Lab5/Lab5-AsyncTaskLab/ic_launcher-web.png
old mode 100755
new mode 100644
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/ic_launcher-web.png
rename to Lab5/Lab5-AsyncTaskLab/ic_launcher-web.png
diff --git a/AsyncTask/Lab5-AsyncTaskLab/lint.xml b/Lab5/Lab5-AsyncTaskLab/lint.xml
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/lint.xml
rename to Lab5/Lab5-AsyncTaskLab/lint.xml
diff --git a/Permissions/Lab3b_DangerousApp/proguard-project.txt b/Lab5/Lab5-AsyncTaskLab/proguard-project.txt
old mode 100755
new mode 100644
similarity index 100%
rename from Permissions/Lab3b_DangerousApp/proguard-project.txt
rename to Lab5/Lab5-AsyncTaskLab/proguard-project.txt
diff --git a/Notifications/Lab6_NotificationsLabTest/project.properties b/Lab5/Lab5-AsyncTaskLab/project.properties
similarity index 100%
rename from Notifications/Lab6_NotificationsLabTest/project.properties
rename to Lab5/Lab5-AsyncTaskLab/project.properties
diff --git a/Permissions/Lab3b_PermissionsLab/res/drawable-hdpi/ic_launcher.png b/Lab5/Lab5-AsyncTaskLab/res/drawable-hdpi/ic_launcher.png
old mode 100755
new mode 100644
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/res/drawable-hdpi/ic_launcher.png
rename to Lab5/Lab5-AsyncTaskLab/res/drawable-hdpi/ic_launcher.png
diff --git a/Permissions/Lab3b_PermissionsLab/res/drawable-ldpi/ic_launcher.png b/Lab5/Lab5-AsyncTaskLab/res/drawable-ldpi/ic_launcher.png
old mode 100755
new mode 100644
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/res/drawable-ldpi/ic_launcher.png
rename to Lab5/Lab5-AsyncTaskLab/res/drawable-ldpi/ic_launcher.png
diff --git a/Permissions/Lab3b_PermissionsLab/res/drawable-mdpi/ic_launcher.png b/Lab5/Lab5-AsyncTaskLab/res/drawable-mdpi/ic_launcher.png
old mode 100755
new mode 100644
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/res/drawable-mdpi/ic_launcher.png
rename to Lab5/Lab5-AsyncTaskLab/res/drawable-mdpi/ic_launcher.png
diff --git a/Permissions/Lab3b_PermissionsLab/res/drawable-xhdpi/ic_launcher.png b/Lab5/Lab5-AsyncTaskLab/res/drawable-xhdpi/ic_launcher.png
old mode 100755
new mode 100644
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/res/drawable-xhdpi/ic_launcher.png
rename to Lab5/Lab5-AsyncTaskLab/res/drawable-xhdpi/ic_launcher.png
diff --git a/AsyncTask/Lab5-AsyncTaskLab/res/layout/activity_main.xml b/Lab5/Lab5-AsyncTaskLab/res/layout/activity_main.xml
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/res/layout/activity_main.xml
rename to Lab5/Lab5-AsyncTaskLab/res/layout/activity_main.xml
diff --git a/AsyncTask/Lab5-AsyncTaskLab/res/layout/feed.xml b/Lab5/Lab5-AsyncTaskLab/res/layout/feed.xml
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/res/layout/feed.xml
rename to Lab5/Lab5-AsyncTaskLab/res/layout/feed.xml
diff --git a/AsyncTask/Lab5-AsyncTaskLab/res/raw/lgaga.txt b/Lab5/Lab5-AsyncTaskLab/res/raw/lgaga.txt
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/res/raw/lgaga.txt
rename to Lab5/Lab5-AsyncTaskLab/res/raw/lgaga.txt
diff --git a/AsyncTask/Lab5-AsyncTaskLab/res/raw/rblack.txt b/Lab5/Lab5-AsyncTaskLab/res/raw/rblack.txt
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/res/raw/rblack.txt
rename to Lab5/Lab5-AsyncTaskLab/res/raw/rblack.txt
diff --git a/AsyncTask/Lab5-AsyncTaskLab/res/raw/tswift.txt b/Lab5/Lab5-AsyncTaskLab/res/raw/tswift.txt
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/res/raw/tswift.txt
rename to Lab5/Lab5-AsyncTaskLab/res/raw/tswift.txt
diff --git a/Location/Lab8_LocationLab/res/values-sw600dp/dimens.xml b/Lab5/Lab5-AsyncTaskLab/res/values-sw600dp/dimens.xml
similarity index 100%
rename from Location/Lab8_LocationLab/res/values-sw600dp/dimens.xml
rename to Lab5/Lab5-AsyncTaskLab/res/values-sw600dp/dimens.xml
diff --git a/AsyncTask/Lab5-AsyncTaskLab/res/values-sw720dp-land/dimens.xml b/Lab5/Lab5-AsyncTaskLab/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/res/values-sw720dp-land/dimens.xml
rename to Lab5/Lab5-AsyncTaskLab/res/values-sw720dp-land/dimens.xml
diff --git a/Permissions/Lab3b_PermissionsLab/res/values-v11/styles.xml b/Lab5/Lab5-AsyncTaskLab/res/values-v11/styles.xml
old mode 100755
new mode 100644
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/res/values-v11/styles.xml
rename to Lab5/Lab5-AsyncTaskLab/res/values-v11/styles.xml
diff --git a/Permissions/Lab3b_PermissionsLab/res/values-v14/styles.xml b/Lab5/Lab5-AsyncTaskLab/res/values-v14/styles.xml
old mode 100755
new mode 100644
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/res/values-v14/styles.xml
rename to Lab5/Lab5-AsyncTaskLab/res/values-v14/styles.xml
diff --git a/Permissions/Lab3b_DangerousApp/res/values/dimens.xml b/Lab5/Lab5-AsyncTaskLab/res/values/dimens.xml
old mode 100755
new mode 100644
similarity index 100%
rename from Permissions/Lab3b_DangerousApp/res/values/dimens.xml
rename to Lab5/Lab5-AsyncTaskLab/res/values/dimens.xml
diff --git a/AsyncTask/Lab5-AsyncTaskLab/res/values/strings.xml b/Lab5/Lab5-AsyncTaskLab/res/values/strings.xml
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/res/values/strings.xml
rename to Lab5/Lab5-AsyncTaskLab/res/values/strings.xml
diff --git a/Permissions/Lab3b_PermissionsLab/res/values/styles.xml b/Lab5/Lab5-AsyncTaskLab/res/values/styles.xml
old mode 100755
new mode 100644
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/res/values/styles.xml
rename to Lab5/Lab5-AsyncTaskLab/res/values/styles.xml
diff --git a/AsyncTask/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/DownloadFinishedListener.java b/Lab5/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/DownloadFinishedListener.java
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/DownloadFinishedListener.java
rename to Lab5/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/DownloadFinishedListener.java
diff --git a/AsyncTask/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/DownloaderTaskFragment.java b/Lab5/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/DownloaderTaskFragment.java
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/DownloaderTaskFragment.java
rename to Lab5/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/DownloaderTaskFragment.java
diff --git a/AsyncTask/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/FeedFragment.java b/Lab5/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/FeedFragment.java
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/FeedFragment.java
rename to Lab5/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/FeedFragment.java
diff --git a/AsyncTask/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/FriendsFragment.java b/Lab5/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/FriendsFragment.java
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/FriendsFragment.java
rename to Lab5/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/FriendsFragment.java
diff --git a/AsyncTask/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/MainActivity.java b/Lab5/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/MainActivity.java
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/MainActivity.java
rename to Lab5/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/MainActivity.java
diff --git a/AsyncTask/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/SelectionListener.java b/Lab5/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/SelectionListener.java
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/SelectionListener.java
rename to Lab5/Lab5-AsyncTaskLab/src/course/labs/asynctasklab/SelectionListener.java
diff --git a/AsyncTask/Lab5-AsyncTaskLabTest/.classpath b/Lab5/Lab5-AsyncTaskLabTest/.classpath
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLabTest/.classpath
rename to Lab5/Lab5-AsyncTaskLabTest/.classpath
diff --git a/AsyncTask/Lab5-AsyncTaskLabTest/.project b/Lab5/Lab5-AsyncTaskLabTest/.project
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLabTest/.project
rename to Lab5/Lab5-AsyncTaskLabTest/.project
diff --git a/TheActivityClass/Lab2_ActivityLabTest/.settings/org.eclipse.jdt.core.prefs b/Lab5/Lab5-AsyncTaskLabTest/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLabTest/.settings/org.eclipse.jdt.core.prefs
rename to Lab5/Lab5-AsyncTaskLabTest/.settings/org.eclipse.jdt.core.prefs
diff --git a/AsyncTask/Lab5-AsyncTaskLabTest/AndroidManifest.xml b/Lab5/Lab5-AsyncTaskLabTest/AndroidManifest.xml
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLabTest/AndroidManifest.xml
rename to Lab5/Lab5-AsyncTaskLabTest/AndroidManifest.xml
diff --git a/Notifications/Lab6_NotificationsLabTest/libs/robotium-solo-5.3.1.jar b/Lab5/Lab5-AsyncTaskLabTest/libs/robotium-solo-5.3.1.jar
similarity index 100%
rename from Notifications/Lab6_NotificationsLabTest/libs/robotium-solo-5.3.1.jar
rename to Lab5/Lab5-AsyncTaskLabTest/libs/robotium-solo-5.3.1.jar
diff --git a/Permissions/Lab3b_DangerousApp/project.properties b/Lab5/Lab5-AsyncTaskLabTest/project.properties
old mode 100755
new mode 100644
similarity index 100%
rename from Permissions/Lab3b_DangerousApp/project.properties
rename to Lab5/Lab5-AsyncTaskLabTest/project.properties
diff --git a/Location/Lab8_LocationLabTest/res/drawable/.gitignore b/Lab5/Lab5-AsyncTaskLabTest/res/.gitignore
similarity index 100%
rename from Location/Lab8_LocationLabTest/res/drawable/.gitignore
rename to Lab5/Lab5-AsyncTaskLabTest/res/.gitignore
diff --git a/AsyncTask/Lab5-AsyncTaskLabTest/src/course/labs/asynctasklab/tests/FeedTest.java b/Lab5/Lab5-AsyncTaskLabTest/src/course/labs/asynctasklab/tests/FeedTest.java
similarity index 100%
rename from AsyncTask/Lab5-AsyncTaskLabTest/src/course/labs/asynctasklab/tests/FeedTest.java
rename to Lab5/Lab5-AsyncTaskLabTest/src/course/labs/asynctasklab/tests/FeedTest.java
diff --git a/TheActivityClass/Lab2_ActivityLab/.classpath b/Lab6/Lab6_NotificationsLab/.classpath
old mode 100755
new mode 100644
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/.classpath
rename to Lab6/Lab6_NotificationsLab/.classpath
diff --git a/Notifications/Lab6_NotificationsLab/.project b/Lab6/Lab6_NotificationsLab/.project
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/.project
rename to Lab6/Lab6_NotificationsLab/.project
diff --git a/Notifications/Lab6_NotificationsLabTest/.settings/org.eclipse.jdt.core.prefs b/Lab6/Lab6_NotificationsLab/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Notifications/Lab6_NotificationsLabTest/.settings/org.eclipse.jdt.core.prefs
rename to Lab6/Lab6_NotificationsLab/.settings/org.eclipse.jdt.core.prefs
diff --git a/Notifications/Lab6_NotificationsLab/AndroidManifest.xml b/Lab6/Lab6_NotificationsLab/AndroidManifest.xml
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/AndroidManifest.xml
rename to Lab6/Lab6_NotificationsLab/AndroidManifest.xml
diff --git a/Notifications/Lab6_NotificationsLab/Lab-Notifications.pdf b/Lab6/Lab6_NotificationsLab/Lab-Notifications.pdf
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/Lab-Notifications.pdf
rename to Lab6/Lab6_NotificationsLab/Lab-Notifications.pdf
diff --git a/Notifications/Lab6_NotificationsLab/NotificationsLab.mp4 b/Lab6/Lab6_NotificationsLab/NotificationsLab.mp4
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/NotificationsLab.mp4
rename to Lab6/Lab6_NotificationsLab/NotificationsLab.mp4
diff --git a/TheActivityClass/Lab2_ActivityLab/ic_launcher-web.png b/Lab6/Lab6_NotificationsLab/ic_launcher-web.png
old mode 100755
new mode 100644
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/ic_launcher-web.png
rename to Lab6/Lab6_NotificationsLab/ic_launcher-web.png
diff --git a/Notifications/Lab6_NotificationsLab/lint.xml b/Lab6/Lab6_NotificationsLab/lint.xml
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/lint.xml
rename to Lab6/Lab6_NotificationsLab/lint.xml
diff --git a/Permissions/Lab3b_PermissionsLab/proguard-project.txt b/Lab6/Lab6_NotificationsLab/proguard-project.txt
old mode 100755
new mode 100644
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/proguard-project.txt
rename to Lab6/Lab6_NotificationsLab/proguard-project.txt
diff --git a/Permissions/Lab3b_PermissionsLab/project.properties b/Lab6/Lab6_NotificationsLab/project.properties
old mode 100755
new mode 100644
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/project.properties
rename to Lab6/Lab6_NotificationsLab/project.properties
diff --git a/TheActivityClass/Lab2_ActivityLab/res/drawable-hdpi/ic_launcher.png b/Lab6/Lab6_NotificationsLab/res/drawable-hdpi/ic_launcher.png
old mode 100755
new mode 100644
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/res/drawable-hdpi/ic_launcher.png
rename to Lab6/Lab6_NotificationsLab/res/drawable-hdpi/ic_launcher.png
diff --git a/TheActivityClass/Lab2_ActivityLab/res/drawable-ldpi/ic_launcher.png b/Lab6/Lab6_NotificationsLab/res/drawable-ldpi/ic_launcher.png
old mode 100755
new mode 100644
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/res/drawable-ldpi/ic_launcher.png
rename to Lab6/Lab6_NotificationsLab/res/drawable-ldpi/ic_launcher.png
diff --git a/TheActivityClass/Lab2_ActivityLab/res/drawable-mdpi/ic_launcher.png b/Lab6/Lab6_NotificationsLab/res/drawable-mdpi/ic_launcher.png
old mode 100755
new mode 100644
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/res/drawable-mdpi/ic_launcher.png
rename to Lab6/Lab6_NotificationsLab/res/drawable-mdpi/ic_launcher.png
diff --git a/TheActivityClass/Lab2_ActivityLab/res/drawable-xhdpi/ic_launcher.png b/Lab6/Lab6_NotificationsLab/res/drawable-xhdpi/ic_launcher.png
old mode 100755
new mode 100644
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/res/drawable-xhdpi/ic_launcher.png
rename to Lab6/Lab6_NotificationsLab/res/drawable-xhdpi/ic_launcher.png
diff --git a/Notifications/Lab6_NotificationsLab/res/layout/activity_main.xml b/Lab6/Lab6_NotificationsLab/res/layout/activity_main.xml
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/res/layout/activity_main.xml
rename to Lab6/Lab6_NotificationsLab/res/layout/activity_main.xml
diff --git a/Notifications/Lab6_NotificationsLab/res/layout/activity_test_front_end.xml b/Lab6/Lab6_NotificationsLab/res/layout/activity_test_front_end.xml
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/res/layout/activity_test_front_end.xml
rename to Lab6/Lab6_NotificationsLab/res/layout/activity_test_front_end.xml
diff --git a/Notifications/Lab6_NotificationsLab/res/layout/custom_notification.xml b/Lab6/Lab6_NotificationsLab/res/layout/custom_notification.xml
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/res/layout/custom_notification.xml
rename to Lab6/Lab6_NotificationsLab/res/layout/custom_notification.xml
diff --git a/Notifications/Lab6_NotificationsLab/res/layout/feed.xml b/Lab6/Lab6_NotificationsLab/res/layout/feed.xml
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/res/layout/feed.xml
rename to Lab6/Lab6_NotificationsLab/res/layout/feed.xml
diff --git a/Notifications/Lab6_NotificationsLab/res/raw/lgaga.txt b/Lab6/Lab6_NotificationsLab/res/raw/lgaga.txt
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/res/raw/lgaga.txt
rename to Lab6/Lab6_NotificationsLab/res/raw/lgaga.txt
diff --git a/Notifications/Lab6_NotificationsLab/res/raw/rblack.txt b/Lab6/Lab6_NotificationsLab/res/raw/rblack.txt
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/res/raw/rblack.txt
rename to Lab6/Lab6_NotificationsLab/res/raw/rblack.txt
diff --git a/Notifications/Lab6_NotificationsLab/res/raw/tswift.txt b/Lab6/Lab6_NotificationsLab/res/raw/tswift.txt
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/res/raw/tswift.txt
rename to Lab6/Lab6_NotificationsLab/res/raw/tswift.txt
diff --git a/Notifications/Lab6_NotificationsLab/res/values-sw600dp/dimens.xml b/Lab6/Lab6_NotificationsLab/res/values-sw600dp/dimens.xml
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/res/values-sw600dp/dimens.xml
rename to Lab6/Lab6_NotificationsLab/res/values-sw600dp/dimens.xml
diff --git a/Notifications/Lab6_NotificationsLab/res/values-sw720dp-land/dimens.xml b/Lab6/Lab6_NotificationsLab/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/res/values-sw720dp-land/dimens.xml
rename to Lab6/Lab6_NotificationsLab/res/values-sw720dp-land/dimens.xml
diff --git a/TheActivityClass/Lab2_ActivityLab/res/values-v11/styles.xml b/Lab6/Lab6_NotificationsLab/res/values-v11/styles.xml
old mode 100755
new mode 100644
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/res/values-v11/styles.xml
rename to Lab6/Lab6_NotificationsLab/res/values-v11/styles.xml
diff --git a/TheActivityClass/Lab2_ActivityLab/res/values-v14/styles.xml b/Lab6/Lab6_NotificationsLab/res/values-v14/styles.xml
old mode 100755
new mode 100644
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/res/values-v14/styles.xml
rename to Lab6/Lab6_NotificationsLab/res/values-v14/styles.xml
diff --git a/Notifications/Lab6_NotificationsLab/res/values/dimens.xml b/Lab6/Lab6_NotificationsLab/res/values/dimens.xml
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/res/values/dimens.xml
rename to Lab6/Lab6_NotificationsLab/res/values/dimens.xml
diff --git a/Notifications/Lab6_NotificationsLab/res/values/strings.xml b/Lab6/Lab6_NotificationsLab/res/values/strings.xml
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/res/values/strings.xml
rename to Lab6/Lab6_NotificationsLab/res/values/strings.xml
diff --git a/TheActivityClass/Lab2_ActivityLab/res/values/styles.xml b/Lab6/Lab6_NotificationsLab/res/values/styles.xml
old mode 100755
new mode 100644
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/res/values/styles.xml
rename to Lab6/Lab6_NotificationsLab/res/values/styles.xml
diff --git a/Notifications/Lab6_NotificationsLab/src/course/labs/notificationslab/DownloadFinishedListener.java b/Lab6/Lab6_NotificationsLab/src/course/labs/notificationslab/DownloadFinishedListener.java
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/src/course/labs/notificationslab/DownloadFinishedListener.java
rename to Lab6/Lab6_NotificationsLab/src/course/labs/notificationslab/DownloadFinishedListener.java
diff --git a/Notifications/Lab6_NotificationsLab/src/course/labs/notificationslab/DownloaderTaskFragment.java b/Lab6/Lab6_NotificationsLab/src/course/labs/notificationslab/DownloaderTaskFragment.java
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/src/course/labs/notificationslab/DownloaderTaskFragment.java
rename to Lab6/Lab6_NotificationsLab/src/course/labs/notificationslab/DownloaderTaskFragment.java
diff --git a/Notifications/Lab6_NotificationsLab/src/course/labs/notificationslab/FeedFragment.java b/Lab6/Lab6_NotificationsLab/src/course/labs/notificationslab/FeedFragment.java
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/src/course/labs/notificationslab/FeedFragment.java
rename to Lab6/Lab6_NotificationsLab/src/course/labs/notificationslab/FeedFragment.java
diff --git a/Notifications/Lab6_NotificationsLab/src/course/labs/notificationslab/FriendsFragment.java b/Lab6/Lab6_NotificationsLab/src/course/labs/notificationslab/FriendsFragment.java
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/src/course/labs/notificationslab/FriendsFragment.java
rename to Lab6/Lab6_NotificationsLab/src/course/labs/notificationslab/FriendsFragment.java
diff --git a/Notifications/Lab6_NotificationsLab/src/course/labs/notificationslab/MainActivity.java b/Lab6/Lab6_NotificationsLab/src/course/labs/notificationslab/MainActivity.java
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/src/course/labs/notificationslab/MainActivity.java
rename to Lab6/Lab6_NotificationsLab/src/course/labs/notificationslab/MainActivity.java
diff --git a/Notifications/Lab6_NotificationsLab/src/course/labs/notificationslab/SelectionListener.java b/Lab6/Lab6_NotificationsLab/src/course/labs/notificationslab/SelectionListener.java
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/src/course/labs/notificationslab/SelectionListener.java
rename to Lab6/Lab6_NotificationsLab/src/course/labs/notificationslab/SelectionListener.java
diff --git a/Notifications/Lab6_NotificationsLab/src/course/labs/notificationslab/TestFrontEndActivity.java b/Lab6/Lab6_NotificationsLab/src/course/labs/notificationslab/TestFrontEndActivity.java
similarity index 100%
rename from Notifications/Lab6_NotificationsLab/src/course/labs/notificationslab/TestFrontEndActivity.java
rename to Lab6/Lab6_NotificationsLab/src/course/labs/notificationslab/TestFrontEndActivity.java
diff --git a/Notifications/Lab6_NotificationsLabTest/.classpath b/Lab6/Lab6_NotificationsLabTest/.classpath
similarity index 100%
rename from Notifications/Lab6_NotificationsLabTest/.classpath
rename to Lab6/Lab6_NotificationsLabTest/.classpath
diff --git a/Notifications/Lab6_NotificationsLabTest/.project b/Lab6/Lab6_NotificationsLabTest/.project
similarity index 100%
rename from Notifications/Lab6_NotificationsLabTest/.project
rename to Lab6/Lab6_NotificationsLabTest/.project
diff --git a/Permissions/Lab3b_DangerousApp/.settings/org.eclipse.jdt.core.prefs b/Lab6/Lab6_NotificationsLabTest/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Permissions/Lab3b_DangerousApp/.settings/org.eclipse.jdt.core.prefs
rename to Lab6/Lab6_NotificationsLabTest/.settings/org.eclipse.jdt.core.prefs
diff --git a/Notifications/Lab6_NotificationsLabTest/AndroidManifest.xml b/Lab6/Lab6_NotificationsLabTest/AndroidManifest.xml
similarity index 100%
rename from Notifications/Lab6_NotificationsLabTest/AndroidManifest.xml
rename to Lab6/Lab6_NotificationsLabTest/AndroidManifest.xml
diff --git a/Permissions/Lab3b_PermissionsLabTest/libs/robotium-solo-5.3.1.jar b/Lab6/Lab6_NotificationsLabTest/libs/robotium-solo-5.3.1.jar
similarity index 100%
rename from Permissions/Lab3b_PermissionsLabTest/libs/robotium-solo-5.3.1.jar
rename to Lab6/Lab6_NotificationsLabTest/libs/robotium-solo-5.3.1.jar
diff --git a/Permissions/Lab3b_PermissionsLabTest/project.properties b/Lab6/Lab6_NotificationsLabTest/project.properties
similarity index 100%
rename from Permissions/Lab3b_PermissionsLabTest/project.properties
rename to Lab6/Lab6_NotificationsLabTest/project.properties
diff --git a/Notifications/Lab6_NotificationsLabTest/res/.gitignore b/Lab6/Lab6_NotificationsLabTest/res/.gitignore
similarity index 100%
rename from Notifications/Lab6_NotificationsLabTest/res/.gitignore
rename to Lab6/Lab6_NotificationsLabTest/res/.gitignore
diff --git a/Notifications/Lab6_NotificationsLabTest/src/course/labs/notificationslab/tests/NewFeedTest.java b/Lab6/Lab6_NotificationsLabTest/src/course/labs/notificationslab/tests/NewFeedTest.java
similarity index 100%
rename from Notifications/Lab6_NotificationsLabTest/src/course/labs/notificationslab/tests/NewFeedTest.java
rename to Lab6/Lab6_NotificationsLabTest/src/course/labs/notificationslab/tests/NewFeedTest.java
diff --git a/Notifications/Lab6_NotificationsLabTest/src/course/labs/notificationslab/tests/OldFeedNoNotificationTest.java b/Lab6/Lab6_NotificationsLabTest/src/course/labs/notificationslab/tests/OldFeedNoNotificationTest.java
similarity index 100%
rename from Notifications/Lab6_NotificationsLabTest/src/course/labs/notificationslab/tests/OldFeedNoNotificationTest.java
rename to Lab6/Lab6_NotificationsLabTest/src/course/labs/notificationslab/tests/OldFeedNoNotificationTest.java
diff --git a/Notifications/Lab6_NotificationsLabTest/src/course/labs/notificationslab/tests/OldFeedWithNotificationTest.java b/Lab6/Lab6_NotificationsLabTest/src/course/labs/notificationslab/tests/OldFeedWithNotificationTest.java
similarity index 100%
rename from Notifications/Lab6_NotificationsLabTest/src/course/labs/notificationslab/tests/OldFeedWithNotificationTest.java
rename to Lab6/Lab6_NotificationsLabTest/src/course/labs/notificationslab/tests/OldFeedWithNotificationTest.java
diff --git a/UserInterface/Lab4_UILabs/.classpath b/Lab7/Lab7_GraphicsLab/.classpath
similarity index 100%
rename from UserInterface/Lab4_UILabs/.classpath
rename to Lab7/Lab7_GraphicsLab/.classpath
diff --git a/GraphicsAndTouch/Lab7_GraphicsLab/.project b/Lab7/Lab7_GraphicsLab/.project
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLab/.project
rename to Lab7/Lab7_GraphicsLab/.project
diff --git a/Permissions/Lab3b_PermissionsLab/.settings/org.eclipse.jdt.core.prefs b/Lab7/Lab7_GraphicsLab/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Permissions/Lab3b_PermissionsLab/.settings/org.eclipse.jdt.core.prefs
rename to Lab7/Lab7_GraphicsLab/.settings/org.eclipse.jdt.core.prefs
diff --git a/GraphicsAndTouch/Lab7_GraphicsLab/AndroidManifest.xml b/Lab7/Lab7_GraphicsLab/AndroidManifest.xml
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLab/AndroidManifest.xml
rename to Lab7/Lab7_GraphicsLab/AndroidManifest.xml
diff --git a/GraphicsAndTouch/Lab7_GraphicsLab/GraphicsLab.mp4 b/Lab7/Lab7_GraphicsLab/GraphicsLab.mp4
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLab/GraphicsLab.mp4
rename to Lab7/Lab7_GraphicsLab/GraphicsLab.mp4
diff --git a/GraphicsAndTouch/Lab7_GraphicsLab/Lab-Graphics.pdf b/Lab7/Lab7_GraphicsLab/Lab-Graphics.pdf
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLab/Lab-Graphics.pdf
rename to Lab7/Lab7_GraphicsLab/Lab-Graphics.pdf
diff --git a/GraphicsAndTouch/Lab7_GraphicsLab/proguard.cfg b/Lab7/Lab7_GraphicsLab/proguard.cfg
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLab/proguard.cfg
rename to Lab7/Lab7_GraphicsLab/proguard.cfg
diff --git a/TheActivityClass/Lab2_ActivityLab/project.properties b/Lab7/Lab7_GraphicsLab/project.properties
old mode 100755
new mode 100644
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/project.properties
rename to Lab7/Lab7_GraphicsLab/project.properties
diff --git a/UserInterface/Lab4_UILabs/res/drawable-hdpi/ic_launcher.png b/Lab7/Lab7_GraphicsLab/res/drawable-hdpi/ic_launcher.png
old mode 100755
new mode 100644
similarity index 100%
rename from UserInterface/Lab4_UILabs/res/drawable-hdpi/ic_launcher.png
rename to Lab7/Lab7_GraphicsLab/res/drawable-hdpi/ic_launcher.png
diff --git a/UserInterface/Lab4_UILabs/res/drawable-ldpi/ic_launcher.png b/Lab7/Lab7_GraphicsLab/res/drawable-ldpi/ic_launcher.png
old mode 100755
new mode 100644
similarity index 100%
rename from UserInterface/Lab4_UILabs/res/drawable-ldpi/ic_launcher.png
rename to Lab7/Lab7_GraphicsLab/res/drawable-ldpi/ic_launcher.png
diff --git a/UserInterface/Lab4_UILabs/res/drawable-mdpi/ic_launcher.png b/Lab7/Lab7_GraphicsLab/res/drawable-mdpi/ic_launcher.png
old mode 100755
new mode 100644
similarity index 100%
rename from UserInterface/Lab4_UILabs/res/drawable-mdpi/ic_launcher.png
rename to Lab7/Lab7_GraphicsLab/res/drawable-mdpi/ic_launcher.png
diff --git a/GraphicsAndTouch/Lab7_GraphicsLab/res/drawable-nodpi/b64.png b/Lab7/Lab7_GraphicsLab/res/drawable-nodpi/b64.png
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLab/res/drawable-nodpi/b64.png
rename to Lab7/Lab7_GraphicsLab/res/drawable-nodpi/b64.png
diff --git a/UserInterface/Lab4_UILabs/res/drawable-xhdpi/ic_launcher.png b/Lab7/Lab7_GraphicsLab/res/drawable-xhdpi/ic_launcher.png
old mode 100755
new mode 100644
similarity index 100%
rename from UserInterface/Lab4_UILabs/res/drawable-xhdpi/ic_launcher.png
rename to Lab7/Lab7_GraphicsLab/res/drawable-xhdpi/ic_launcher.png
diff --git a/GraphicsAndTouch/Lab7_GraphicsLab/res/layout/main.xml b/Lab7/Lab7_GraphicsLab/res/layout/main.xml
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLab/res/layout/main.xml
rename to Lab7/Lab7_GraphicsLab/res/layout/main.xml
diff --git a/GraphicsAndTouch/Lab7_GraphicsLab/res/menu/menu.xml b/Lab7/Lab7_GraphicsLab/res/menu/menu.xml
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLab/res/menu/menu.xml
rename to Lab7/Lab7_GraphicsLab/res/menu/menu.xml
diff --git a/GraphicsAndTouch/Lab7_GraphicsLab/res/raw/bubble_pop.wav b/Lab7/Lab7_GraphicsLab/res/raw/bubble_pop.wav
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLab/res/raw/bubble_pop.wav
rename to Lab7/Lab7_GraphicsLab/res/raw/bubble_pop.wav
diff --git a/GraphicsAndTouch/Lab7_GraphicsLab/res/values/strings.xml b/Lab7/Lab7_GraphicsLab/res/values/strings.xml
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLab/res/values/strings.xml
rename to Lab7/Lab7_GraphicsLab/res/values/strings.xml
diff --git a/GraphicsAndTouch/Lab7_GraphicsLab/src/course/labs/graphicslab/BubbleActivity.java b/Lab7/Lab7_GraphicsLab/src/course/labs/graphicslab/BubbleActivity.java
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLab/src/course/labs/graphicslab/BubbleActivity.java
rename to Lab7/Lab7_GraphicsLab/src/course/labs/graphicslab/BubbleActivity.java
diff --git a/GraphicsAndTouch/Lab7_GraphicsLabTest/.classpath b/Lab7/Lab7_GraphicsLabTest/.classpath
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLabTest/.classpath
rename to Lab7/Lab7_GraphicsLabTest/.classpath
diff --git a/GraphicsAndTouch/Lab7_GraphicsLabTest/.project b/Lab7/Lab7_GraphicsLabTest/.project
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLabTest/.project
rename to Lab7/Lab7_GraphicsLabTest/.project
diff --git a/Permissions/Lab3b_PermissionsLabTest/.settings/org.eclipse.jdt.core.prefs b/Lab7/Lab7_GraphicsLabTest/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Permissions/Lab3b_PermissionsLabTest/.settings/org.eclipse.jdt.core.prefs
rename to Lab7/Lab7_GraphicsLabTest/.settings/org.eclipse.jdt.core.prefs
diff --git a/GraphicsAndTouch/Lab7_GraphicsLabTest/AndroidManifest.xml b/Lab7/Lab7_GraphicsLabTest/AndroidManifest.xml
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLabTest/AndroidManifest.xml
rename to Lab7/Lab7_GraphicsLabTest/AndroidManifest.xml
diff --git a/TheActivityClass/Lab2_ActivityLabTest/libs/robotium-solo-5.3.1.jar b/Lab7/Lab7_GraphicsLabTest/libs/robotium-solo-5.3.1.jar
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLabTest/libs/robotium-solo-5.3.1.jar
rename to Lab7/Lab7_GraphicsLabTest/libs/robotium-solo-5.3.1.jar
diff --git a/TheActivityClass/Lab2_ActivityLabTest/project.properties b/Lab7/Lab7_GraphicsLabTest/project.properties
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLabTest/project.properties
rename to Lab7/Lab7_GraphicsLabTest/project.properties
diff --git a/Permissions/Lab3b_PermissionsLabTest/res/drawable/.gitignore b/Lab7/Lab7_GraphicsLabTest/res/.gitignore
similarity index 100%
rename from Permissions/Lab3b_PermissionsLabTest/res/drawable/.gitignore
rename to Lab7/Lab7_GraphicsLabTest/res/.gitignore
diff --git a/GraphicsAndTouch/Lab7_GraphicsLabTest/src/course/labs/graphicslab/tests/BubbleActivityFling.java b/Lab7/Lab7_GraphicsLabTest/src/course/labs/graphicslab/tests/BubbleActivityFling.java
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLabTest/src/course/labs/graphicslab/tests/BubbleActivityFling.java
rename to Lab7/Lab7_GraphicsLabTest/src/course/labs/graphicslab/tests/BubbleActivityFling.java
diff --git a/GraphicsAndTouch/Lab7_GraphicsLabTest/src/course/labs/graphicslab/tests/BubbleActivityFloatOffScreen.java b/Lab7/Lab7_GraphicsLabTest/src/course/labs/graphicslab/tests/BubbleActivityFloatOffScreen.java
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLabTest/src/course/labs/graphicslab/tests/BubbleActivityFloatOffScreen.java
rename to Lab7/Lab7_GraphicsLabTest/src/course/labs/graphicslab/tests/BubbleActivityFloatOffScreen.java
diff --git a/GraphicsAndTouch/Lab7_GraphicsLabTest/src/course/labs/graphicslab/tests/BubbleActivityMultiple.java b/Lab7/Lab7_GraphicsLabTest/src/course/labs/graphicslab/tests/BubbleActivityMultiple.java
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLabTest/src/course/labs/graphicslab/tests/BubbleActivityMultiple.java
rename to Lab7/Lab7_GraphicsLabTest/src/course/labs/graphicslab/tests/BubbleActivityMultiple.java
diff --git a/GraphicsAndTouch/Lab7_GraphicsLabTest/src/course/labs/graphicslab/tests/BubbleActivityPop.java b/Lab7/Lab7_GraphicsLabTest/src/course/labs/graphicslab/tests/BubbleActivityPop.java
similarity index 100%
rename from GraphicsAndTouch/Lab7_GraphicsLabTest/src/course/labs/graphicslab/tests/BubbleActivityPop.java
rename to Lab7/Lab7_GraphicsLabTest/src/course/labs/graphicslab/tests/BubbleActivityPop.java
diff --git a/Location/Lab8_LocationLab/.classpath b/Lab8/Lab8_LocationLab/.classpath
similarity index 100%
rename from Location/Lab8_LocationLab/.classpath
rename to Lab8/Lab8_LocationLab/.classpath
diff --git a/Location/Lab8_LocationLab/.project b/Lab8/Lab8_LocationLab/.project
similarity index 100%
rename from Location/Lab8_LocationLab/.project
rename to Lab8/Lab8_LocationLab/.project
diff --git a/UserInterface/Lab4_UILabs/.settings/org.eclipse.jdt.core.prefs b/Lab8/Lab8_LocationLab/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from UserInterface/Lab4_UILabs/.settings/org.eclipse.jdt.core.prefs
rename to Lab8/Lab8_LocationLab/.settings/org.eclipse.jdt.core.prefs
diff --git a/Location/Lab8_LocationLab/AndroidManifest.xml b/Lab8/Lab8_LocationLab/AndroidManifest.xml
similarity index 100%
rename from Location/Lab8_LocationLab/AndroidManifest.xml
rename to Lab8/Lab8_LocationLab/AndroidManifest.xml
diff --git a/Location/Lab8_LocationLab/Lab-Location.pdf b/Lab8/Lab8_LocationLab/Lab-Location.pdf
similarity index 100%
rename from Location/Lab8_LocationLab/Lab-Location.pdf
rename to Lab8/Lab8_LocationLab/Lab-Location.pdf
diff --git a/Location/Lab8_LocationLab/LocationLabScreencast.mp4 b/Lab8/Lab8_LocationLab/LocationLabScreencast.mp4
similarity index 100%
rename from Location/Lab8_LocationLab/LocationLabScreencast.mp4
rename to Lab8/Lab8_LocationLab/LocationLabScreencast.mp4
diff --git a/Permissions/Lab3b_DangerousApp/ic_launcher-web.png b/Lab8/Lab8_LocationLab/ic_launcher-web.png
old mode 100755
new mode 100644
similarity index 100%
rename from Permissions/Lab3b_DangerousApp/ic_launcher-web.png
rename to Lab8/Lab8_LocationLab/ic_launcher-web.png
diff --git a/TheActivityClass/Lab2_ActivityLab/proguard-project.txt b/Lab8/Lab8_LocationLab/proguard-project.txt
old mode 100755
new mode 100644
similarity index 100%
rename from TheActivityClass/Lab2_ActivityLab/proguard-project.txt
rename to Lab8/Lab8_LocationLab/proguard-project.txt
diff --git a/UserInterface/Lab4_UILabs/project.properties b/Lab8/Lab8_LocationLab/project.properties
similarity index 100%
rename from UserInterface/Lab4_UILabs/project.properties
rename to Lab8/Lab8_LocationLab/project.properties
diff --git a/Permissions/Lab3b_DangerousApp/res/drawable-hdpi/ic_launcher.png b/Lab8/Lab8_LocationLab/res/drawable-hdpi/ic_launcher.png
old mode 100755
new mode 100644
similarity index 100%
rename from Permissions/Lab3b_DangerousApp/res/drawable-hdpi/ic_launcher.png
rename to Lab8/Lab8_LocationLab/res/drawable-hdpi/ic_launcher.png
diff --git a/Permissions/Lab3b_DangerousApp/res/drawable-mdpi/ic_launcher.png b/Lab8/Lab8_LocationLab/res/drawable-mdpi/ic_launcher.png
old mode 100755
new mode 100644
similarity index 100%
rename from Permissions/Lab3b_DangerousApp/res/drawable-mdpi/ic_launcher.png
rename to Lab8/Lab8_LocationLab/res/drawable-mdpi/ic_launcher.png
diff --git a/Location/Lab8_LocationLab/res/drawable-nodpi/stub.jpg b/Lab8/Lab8_LocationLab/res/drawable-nodpi/stub.jpg
similarity index 100%
rename from Location/Lab8_LocationLab/res/drawable-nodpi/stub.jpg
rename to Lab8/Lab8_LocationLab/res/drawable-nodpi/stub.jpg
diff --git a/Permissions/Lab3b_DangerousApp/res/drawable-xhdpi/ic_launcher.png b/Lab8/Lab8_LocationLab/res/drawable-xhdpi/ic_launcher.png
old mode 100755
new mode 100644
similarity index 100%
rename from Permissions/Lab3b_DangerousApp/res/drawable-xhdpi/ic_launcher.png
rename to Lab8/Lab8_LocationLab/res/drawable-xhdpi/ic_launcher.png
diff --git a/Location/Lab8_LocationLab/res/layout/footer_view.xml b/Lab8/Lab8_LocationLab/res/layout/footer_view.xml
similarity index 100%
rename from Location/Lab8_LocationLab/res/layout/footer_view.xml
rename to Lab8/Lab8_LocationLab/res/layout/footer_view.xml
diff --git a/Location/Lab8_LocationLab/res/layout/place_badge_view.xml b/Lab8/Lab8_LocationLab/res/layout/place_badge_view.xml
similarity index 100%
rename from Location/Lab8_LocationLab/res/layout/place_badge_view.xml
rename to Lab8/Lab8_LocationLab/res/layout/place_badge_view.xml
diff --git a/Location/Lab8_LocationLab/res/menu/main.xml b/Lab8/Lab8_LocationLab/res/menu/main.xml
similarity index 100%
rename from Location/Lab8_LocationLab/res/menu/main.xml
rename to Lab8/Lab8_LocationLab/res/menu/main.xml
diff --git a/UserInterface/Lab4_UILabs/res/values-sw600dp/dimens.xml b/Lab8/Lab8_LocationLab/res/values-sw600dp/dimens.xml
similarity index 100%
rename from UserInterface/Lab4_UILabs/res/values-sw600dp/dimens.xml
rename to Lab8/Lab8_LocationLab/res/values-sw600dp/dimens.xml
diff --git a/Location/Lab8_LocationLab/res/values-sw720dp-land/dimens.xml b/Lab8/Lab8_LocationLab/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from Location/Lab8_LocationLab/res/values-sw720dp-land/dimens.xml
rename to Lab8/Lab8_LocationLab/res/values-sw720dp-land/dimens.xml
diff --git a/Location/Lab8_LocationLab/res/values-v11/styles.xml b/Lab8/Lab8_LocationLab/res/values-v11/styles.xml
similarity index 100%
rename from Location/Lab8_LocationLab/res/values-v11/styles.xml
rename to Lab8/Lab8_LocationLab/res/values-v11/styles.xml
diff --git a/Location/Lab8_LocationLab/res/values-v14/styles.xml b/Lab8/Lab8_LocationLab/res/values-v14/styles.xml
similarity index 100%
rename from Location/Lab8_LocationLab/res/values-v14/styles.xml
rename to Lab8/Lab8_LocationLab/res/values-v14/styles.xml
diff --git a/Location/Lab8_LocationLab/res/values/dimens.xml b/Lab8/Lab8_LocationLab/res/values/dimens.xml
similarity index 100%
rename from Location/Lab8_LocationLab/res/values/dimens.xml
rename to Lab8/Lab8_LocationLab/res/values/dimens.xml
diff --git a/Location/Lab8_LocationLab/res/values/strings.xml b/Lab8/Lab8_LocationLab/res/values/strings.xml
similarity index 100%
rename from Location/Lab8_LocationLab/res/values/strings.xml
rename to Lab8/Lab8_LocationLab/res/values/strings.xml
diff --git a/Permissions/Lab3b_DangerousApp/res/values/styles.xml b/Lab8/Lab8_LocationLab/res/values/styles.xml
old mode 100755
new mode 100644
similarity index 100%
rename from Permissions/Lab3b_DangerousApp/res/values/styles.xml
rename to Lab8/Lab8_LocationLab/res/values/styles.xml
diff --git a/Location/Lab8_LocationLab/src/course/labs/locationlab/MockLocationProvider.java b/Lab8/Lab8_LocationLab/src/course/labs/locationlab/MockLocationProvider.java
similarity index 100%
rename from Location/Lab8_LocationLab/src/course/labs/locationlab/MockLocationProvider.java
rename to Lab8/Lab8_LocationLab/src/course/labs/locationlab/MockLocationProvider.java
diff --git a/Location/Lab8_LocationLab/src/course/labs/locationlab/PlaceDownloaderTask.java b/Lab8/Lab8_LocationLab/src/course/labs/locationlab/PlaceDownloaderTask.java
similarity index 100%
rename from Location/Lab8_LocationLab/src/course/labs/locationlab/PlaceDownloaderTask.java
rename to Lab8/Lab8_LocationLab/src/course/labs/locationlab/PlaceDownloaderTask.java
diff --git a/Location/Lab8_LocationLab/src/course/labs/locationlab/PlaceRecord.java b/Lab8/Lab8_LocationLab/src/course/labs/locationlab/PlaceRecord.java
similarity index 100%
rename from Location/Lab8_LocationLab/src/course/labs/locationlab/PlaceRecord.java
rename to Lab8/Lab8_LocationLab/src/course/labs/locationlab/PlaceRecord.java
diff --git a/Location/Lab8_LocationLab/src/course/labs/locationlab/PlaceViewActivity.java b/Lab8/Lab8_LocationLab/src/course/labs/locationlab/PlaceViewActivity.java
similarity index 100%
rename from Location/Lab8_LocationLab/src/course/labs/locationlab/PlaceViewActivity.java
rename to Lab8/Lab8_LocationLab/src/course/labs/locationlab/PlaceViewActivity.java
diff --git a/Location/Lab8_LocationLab/src/course/labs/locationlab/PlaceViewAdapter.java b/Lab8/Lab8_LocationLab/src/course/labs/locationlab/PlaceViewAdapter.java
similarity index 100%
rename from Location/Lab8_LocationLab/src/course/labs/locationlab/PlaceViewAdapter.java
rename to Lab8/Lab8_LocationLab/src/course/labs/locationlab/PlaceViewAdapter.java
diff --git a/Location/Lab8_LocationLabTest/.classpath b/Lab8/Lab8_LocationLabTest/.classpath
similarity index 100%
rename from Location/Lab8_LocationLabTest/.classpath
rename to Lab8/Lab8_LocationLabTest/.classpath
diff --git a/Location/Lab8_LocationLabTest/.project b/Lab8/Lab8_LocationLabTest/.project
similarity index 100%
rename from Location/Lab8_LocationLabTest/.project
rename to Lab8/Lab8_LocationLabTest/.project
diff --git a/UserInterface/Lab4_UILabsTest/.settings/org.eclipse.jdt.core.prefs b/Lab8/Lab8_LocationLabTest/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from UserInterface/Lab4_UILabsTest/.settings/org.eclipse.jdt.core.prefs
rename to Lab8/Lab8_LocationLabTest/.settings/org.eclipse.jdt.core.prefs
diff --git a/Location/Lab8_LocationLabTest/AndroidManifest.xml b/Lab8/Lab8_LocationLabTest/AndroidManifest.xml
similarity index 100%
rename from Location/Lab8_LocationLabTest/AndroidManifest.xml
rename to Lab8/Lab8_LocationLabTest/AndroidManifest.xml
diff --git a/UserInterface/Lab4_UILabsTest/libs/robotium-solo-5.3.1.jar b/Lab8/Lab8_LocationLabTest/libs/robotium-solo-5.3.1.jar
similarity index 100%
rename from UserInterface/Lab4_UILabsTest/libs/robotium-solo-5.3.1.jar
rename to Lab8/Lab8_LocationLabTest/libs/robotium-solo-5.3.1.jar
diff --git a/UserInterface/Lab4_UILabsTest/project.properties b/Lab8/Lab8_LocationLabTest/project.properties
old mode 100755
new mode 100644
similarity index 100%
rename from UserInterface/Lab4_UILabsTest/project.properties
rename to Lab8/Lab8_LocationLabTest/project.properties
diff --git a/UserInterface/Lab4_UILabsTest/res/drawable/.gitignore b/Lab8/Lab8_LocationLabTest/res/drawable/.gitignore
similarity index 100%
rename from UserInterface/Lab4_UILabsTest/res/drawable/.gitignore
rename to Lab8/Lab8_LocationLabTest/res/drawable/.gitignore
diff --git a/Location/Lab8_LocationLabTest/src/course/labs/locationlab/tests/TestNoCountryLocation.java b/Lab8/Lab8_LocationLabTest/src/course/labs/locationlab/tests/TestNoCountryLocation.java
similarity index 100%
rename from Location/Lab8_LocationLabTest/src/course/labs/locationlab/tests/TestNoCountryLocation.java
rename to Lab8/Lab8_LocationLabTest/src/course/labs/locationlab/tests/TestNoCountryLocation.java
diff --git a/Location/Lab8_LocationLabTest/src/course/labs/locationlab/tests/TestOneValidLocation.java b/Lab8/Lab8_LocationLabTest/src/course/labs/locationlab/tests/TestOneValidLocation.java
similarity index 100%
rename from Location/Lab8_LocationLabTest/src/course/labs/locationlab/tests/TestOneValidLocation.java
rename to Lab8/Lab8_LocationLabTest/src/course/labs/locationlab/tests/TestOneValidLocation.java
diff --git a/Location/Lab8_LocationLabTest/src/course/labs/locationlab/tests/TestSameLocation.java b/Lab8/Lab8_LocationLabTest/src/course/labs/locationlab/tests/TestSameLocation.java
similarity index 100%
rename from Location/Lab8_LocationLabTest/src/course/labs/locationlab/tests/TestSameLocation.java
rename to Lab8/Lab8_LocationLabTest/src/course/labs/locationlab/tests/TestSameLocation.java
diff --git a/Location/Lab8_LocationLabTest/src/course/labs/locationlab/tests/TestTwoValidLocations.java b/Lab8/Lab8_LocationLabTest/src/course/labs/locationlab/tests/TestTwoValidLocations.java
similarity index 100%
rename from Location/Lab8_LocationLabTest/src/course/labs/locationlab/tests/TestTwoValidLocations.java
rename to Lab8/Lab8_LocationLabTest/src/course/labs/locationlab/tests/TestTwoValidLocations.java
diff --git a/DailySelfie/Lab8b-DailySelfie/Lab-DailySelfie.pdf b/Lab8/Lab8b-DailySelfie/Lab-DailySelfie.pdf
similarity index 100%
rename from DailySelfie/Lab8b-DailySelfie/Lab-DailySelfie.pdf
rename to Lab8/Lab8b-DailySelfie/Lab-DailySelfie.pdf
diff --git a/DailySelfie/Lab8b-DailySelfie/dailyselfie.mp4 b/Lab8/Lab8b-DailySelfie/dailyselfie.mp4
similarity index 100%
rename from DailySelfie/Lab8b-DailySelfie/dailyselfie.mp4
rename to Lab8/Lab8b-DailySelfie/dailyselfie.mp4
diff --git a/README.md b/README.md
index 6284c879..bf2cbc97 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,6 @@
-# coursera-android-labs
-Skeletons and Tests - Programming Mobile Applications for Android Handheld Systems
+# Programming Mobile Applications for Android Handheld Systems: Lab Work
+
+This repository contains skeletons and tests referenced in the Coursera courses listed below:
+
+* [Programming Mobile Applications for Android Handheld Systems: Part 1](https://www.coursera.org/course/androidpart1)
+* [Programming Mobile Applications for Android Handheld Systems: Part 2](https://www.coursera.org/course/androidpart2)
\ No newline at end of file