diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/.DS_Store differ
diff --git a/DinDag/.classpath b/.classpath
similarity index 100%
rename from DinDag/.classpath
rename to .classpath
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c142e61
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+bin/
+gen/
+
diff --git a/DinDag/.project b/.project
similarity index 100%
rename from DinDag/.project
rename to .project
diff --git a/DinDag/AndroidManifest.xml b/AndroidManifest.xml
similarity index 100%
rename from DinDag/AndroidManifest.xml
rename to AndroidManifest.xml
diff --git a/DinDag/bin/AndroidManifest.xml b/DinDag/bin/AndroidManifest.xml
deleted file mode 100644
index 021477f..0000000
--- a/DinDag/bin/AndroidManifest.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="se.hv.dindag"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="9"
-        android:targetSdkVersion="17" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
-    <application
-        android:allowBackup="true"
-        android:clearTaskOnLaunch="true"
-        android:icon="@drawable/icon_gubben"
-        android:label="@string/app_name"
-        android:theme="@style/hvTheme" >
-        <activity
-            android:name="se.hv.dindag.Start"
-            android:clearTaskOnLaunch="true"
-            android:label="@string/app_name" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="se.hv.dindag.WebReader"
-            android:clearTaskOnLaunch="true"
-            android:label="@string/app_name" >
-            <intent-filter>
-                <action android:name="android.intent.action.WEBREADER" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="se.hv.dindag.Login"
-            android:clearTaskOnLaunch="true"
-            android:label="@string/app_name" >
-        </activity>
-        <activity
-            android:name="se.hv.dindag.MyDay"
-            android:clearTaskOnLaunch="true"
-            android:label="@string/app_name" >
-        </activity>
-        <activity
-            android:name="se.hv.dindag.DinDagMenu"
-            android:clearTaskOnLaunch="true"
-            android:label="@string/app_name" >
-        </activity>
-        <activity
-            android:name="se.hv.dindag.AboutUs"
-            android:clearTaskOnLaunch="true"
-            android:label="Om appen"
-            android:theme="@android:style/Theme.Dialog" >
-            <intent-filter>
-                <action android:name="se.hv.dindag.ABOUT" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="se.hv.dindag.TwitterFeed"
-            android:clearTaskOnLaunch="true"
-            android:label="@string/twitterTitle" >
-            <intent-filter>
-                <action android:name="se.hv.dindag.TWITTER" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/DinDag/bin/DinDag.apk b/DinDag/bin/DinDag.apk
deleted file mode 100644
index 083a450..0000000
Binary files a/DinDag/bin/DinDag.apk and /dev/null differ
diff --git a/DinDag/bin/classes.dex b/DinDag/bin/classes.dex
deleted file mode 100644
index e039d6a..0000000
Binary files a/DinDag/bin/classes.dex and /dev/null differ
diff --git a/DinDag/bin/res/drawable-hdpi/bg_gubben.png b/DinDag/bin/res/drawable-hdpi/bg_gubben.png
deleted file mode 100644
index 3310b60..0000000
Binary files a/DinDag/bin/res/drawable-hdpi/bg_gubben.png and /dev/null differ
diff --git a/DinDag/bin/res/drawable-hdpi/icon_about.png b/DinDag/bin/res/drawable-hdpi/icon_about.png
deleted file mode 100644
index 25a2d54..0000000
Binary files a/DinDag/bin/res/drawable-hdpi/icon_about.png and /dev/null differ
diff --git a/DinDag/bin/res/drawable-hdpi/icon_gubben.png b/DinDag/bin/res/drawable-hdpi/icon_gubben.png
deleted file mode 100644
index 1b5d98f..0000000
Binary files a/DinDag/bin/res/drawable-hdpi/icon_gubben.png and /dev/null differ
diff --git a/DinDag/bin/res/drawable-hdpi/icon_htu.png b/DinDag/bin/res/drawable-hdpi/icon_htu.png
deleted file mode 100644
index 25b6c5e..0000000
Binary files a/DinDag/bin/res/drawable-hdpi/icon_htu.png and /dev/null differ
diff --git a/DinDag/bin/res/drawable-hdpi/icon_launcher.png b/DinDag/bin/res/drawable-hdpi/icon_launcher.png
deleted file mode 100644
index 7bd959e..0000000
Binary files a/DinDag/bin/res/drawable-hdpi/icon_launcher.png and /dev/null differ
diff --git a/DinDag/bin/res/drawable-hdpi/icon_mail.png b/DinDag/bin/res/drawable-hdpi/icon_mail.png
deleted file mode 100644
index b01f8cb..0000000
Binary files a/DinDag/bin/res/drawable-hdpi/icon_mail.png and /dev/null differ
diff --git a/DinDag/bin/res/drawable-hdpi/icon_save.png b/DinDag/bin/res/drawable-hdpi/icon_save.png
deleted file mode 100644
index 487e7e2..0000000
Binary files a/DinDag/bin/res/drawable-hdpi/icon_save.png and /dev/null differ
diff --git a/DinDag/bin/res/drawable-hdpi/icon_settings.png b/DinDag/bin/res/drawable-hdpi/icon_settings.png
deleted file mode 100644
index 79caf48..0000000
Binary files a/DinDag/bin/res/drawable-hdpi/icon_settings.png and /dev/null differ
diff --git a/DinDag/bin/res/drawable-hdpi/icon_twitter.png b/DinDag/bin/res/drawable-hdpi/icon_twitter.png
deleted file mode 100644
index 17c733b..0000000
Binary files a/DinDag/bin/res/drawable-hdpi/icon_twitter.png and /dev/null differ
diff --git a/DinDag/bin/resources.ap_ b/DinDag/bin/resources.ap_
deleted file mode 100644
index e86f4e2..0000000
Binary files a/DinDag/bin/resources.ap_ and /dev/null differ
diff --git a/DinDag/libs/android-support-v4.jar b/DinDag/libs/android-support-v4.jar
deleted file mode 100644
index af90a7f..0000000
Binary files a/DinDag/libs/android-support-v4.jar and /dev/null differ
diff --git a/README.md b/README.md
deleted file mode 100644
index 5a46443..0000000
--- a/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-DinDag
-======
-Detta är en Android-app som utvecklas för studenterna vid Högskolan Väst.
-Med denna app kan studenterna se sitt schema, få nyheter om kurser, schema och betygsrapportering. 
-Man kan även se saker som twittras om Högskolan Väst och lite annat.
-
-Utvecklat av:
-Crille, Malin, Viktor och Johan
diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar
new file mode 100644
index 0000000..6080877
Binary files /dev/null and b/libs/android-support-v4.jar differ
diff --git a/DinDag/libs/jsoup-1.7.1.jar b/libs/jsoup-1.7.1.jar
similarity index 100%
rename from DinDag/libs/jsoup-1.7.1.jar
rename to libs/jsoup-1.7.1.jar
diff --git a/DinDag/project.properties b/project.properties
similarity index 100%
rename from DinDag/project.properties
rename to project.properties
diff --git a/DinDag/res/drawable-hdpi/bg_gubben.png b/res/drawable-hdpi/bg_gubben.png
similarity index 100%
rename from DinDag/res/drawable-hdpi/bg_gubben.png
rename to res/drawable-hdpi/bg_gubben.png
diff --git a/DinDag/res/drawable-hdpi/icon_about.png b/res/drawable-hdpi/icon_about.png
similarity index 100%
rename from DinDag/res/drawable-hdpi/icon_about.png
rename to res/drawable-hdpi/icon_about.png
diff --git a/DinDag/res/drawable-hdpi/icon_gubben.png b/res/drawable-hdpi/icon_gubben.png
similarity index 100%
rename from DinDag/res/drawable-hdpi/icon_gubben.png
rename to res/drawable-hdpi/icon_gubben.png
diff --git a/DinDag/res/drawable-hdpi/icon_htu.png b/res/drawable-hdpi/icon_htu.png
similarity index 100%
rename from DinDag/res/drawable-hdpi/icon_htu.png
rename to res/drawable-hdpi/icon_htu.png
diff --git a/DinDag/res/drawable-hdpi/icon_launcher.png b/res/drawable-hdpi/icon_launcher.png
similarity index 100%
rename from DinDag/res/drawable-hdpi/icon_launcher.png
rename to res/drawable-hdpi/icon_launcher.png
diff --git a/DinDag/res/drawable-hdpi/icon_mail.png b/res/drawable-hdpi/icon_mail.png
similarity index 100%
rename from DinDag/res/drawable-hdpi/icon_mail.png
rename to res/drawable-hdpi/icon_mail.png
diff --git a/DinDag/res/drawable-hdpi/icon_save.png b/res/drawable-hdpi/icon_save.png
similarity index 100%
rename from DinDag/res/drawable-hdpi/icon_save.png
rename to res/drawable-hdpi/icon_save.png
diff --git a/DinDag/res/drawable-hdpi/icon_settings.png b/res/drawable-hdpi/icon_settings.png
similarity index 100%
rename from DinDag/res/drawable-hdpi/icon_settings.png
rename to res/drawable-hdpi/icon_settings.png
diff --git a/DinDag/res/drawable-hdpi/icon_twitter.png b/res/drawable-hdpi/icon_twitter.png
similarity index 100%
rename from DinDag/res/drawable-hdpi/icon_twitter.png
rename to res/drawable-hdpi/icon_twitter.png
diff --git a/DinDag/res/layout/activity_generic.xml b/res/layout/activity_generic.xml
similarity index 100%
rename from DinDag/res/layout/activity_generic.xml
rename to res/layout/activity_generic.xml
diff --git a/DinDag/res/layout/activity_login.xml b/res/layout/activity_login.xml
similarity index 100%
rename from DinDag/res/layout/activity_login.xml
rename to res/layout/activity_login.xml
diff --git a/DinDag/res/layout/activity_myday.xml b/res/layout/activity_myday.xml
similarity index 100%
rename from DinDag/res/layout/activity_myday.xml
rename to res/layout/activity_myday.xml
diff --git a/DinDag/res/layout/activity_myday_list.xml b/res/layout/activity_myday_list.xml
similarity index 100%
rename from DinDag/res/layout/activity_myday_list.xml
rename to res/layout/activity_myday_list.xml
diff --git a/DinDag/res/layout/activity_start.xml b/res/layout/activity_start.xml
similarity index 100%
rename from DinDag/res/layout/activity_start.xml
rename to res/layout/activity_start.xml
diff --git a/DinDag/res/layout/activity_tweet_list.xml b/res/layout/activity_tweet_list.xml
similarity index 100%
rename from DinDag/res/layout/activity_tweet_list.xml
rename to res/layout/activity_tweet_list.xml
diff --git a/DinDag/res/layout/activity_webreader.xml b/res/layout/activity_webreader.xml
similarity index 100%
rename from DinDag/res/layout/activity_webreader.xml
rename to res/layout/activity_webreader.xml
diff --git a/DinDag/res/layout/menu_about.xml b/res/layout/menu_about.xml
similarity index 100%
rename from DinDag/res/layout/menu_about.xml
rename to res/layout/menu_about.xml
diff --git a/DinDag/res/menu/menu_loggedin.xml b/res/menu/menu_loggedin.xml
similarity index 100%
rename from DinDag/res/menu/menu_loggedin.xml
rename to res/menu/menu_loggedin.xml
diff --git a/DinDag/res/menu/menu_start.xml b/res/menu/menu_start.xml
similarity index 100%
rename from DinDag/res/menu/menu_start.xml
rename to res/menu/menu_start.xml
diff --git a/DinDag/res/values/colors.xml b/res/values/colors.xml
similarity index 100%
rename from DinDag/res/values/colors.xml
rename to res/values/colors.xml
diff --git a/DinDag/res/values/strings.xml b/res/values/strings.xml
similarity index 100%
rename from DinDag/res/values/strings.xml
rename to res/values/strings.xml
diff --git a/DinDag/res/values/styles.xml b/res/values/styles.xml
similarity index 100%
rename from DinDag/res/values/styles.xml
rename to res/values/styles.xml
diff --git a/DinDag/res/values/themes.xml b/res/values/themes.xml
similarity index 100%
rename from DinDag/res/values/themes.xml
rename to res/values/themes.xml
diff --git a/DinDag/src/se/hv/dindag/AboutUs.java b/src/se/hv/dindag/AboutUs.java
similarity index 100%
rename from DinDag/src/se/hv/dindag/AboutUs.java
rename to src/se/hv/dindag/AboutUs.java
diff --git a/DinDag/src/se/hv/dindag/DinDagMenu.java b/src/se/hv/dindag/DinDagMenu.java
similarity index 100%
rename from DinDag/src/se/hv/dindag/DinDagMenu.java
rename to src/se/hv/dindag/DinDagMenu.java
diff --git a/DinDag/src/se/hv/dindag/Login.java b/src/se/hv/dindag/Login.java
similarity index 100%
rename from DinDag/src/se/hv/dindag/Login.java
rename to src/se/hv/dindag/Login.java
diff --git a/DinDag/src/se/hv/dindag/LoginData.java b/src/se/hv/dindag/LoginData.java
similarity index 100%
rename from DinDag/src/se/hv/dindag/LoginData.java
rename to src/se/hv/dindag/LoginData.java
diff --git a/DinDag/src/se/hv/dindag/MyDay.java b/src/se/hv/dindag/MyDay.java
similarity index 100%
rename from DinDag/src/se/hv/dindag/MyDay.java
rename to src/se/hv/dindag/MyDay.java
diff --git a/DinDag/src/se/hv/dindag/MyDayHandler.java b/src/se/hv/dindag/MyDayHandler.java
similarity index 100%
rename from DinDag/src/se/hv/dindag/MyDayHandler.java
rename to src/se/hv/dindag/MyDayHandler.java
diff --git a/DinDag/src/se/hv/dindag/Start.java b/src/se/hv/dindag/Start.java
similarity index 100%
rename from DinDag/src/se/hv/dindag/Start.java
rename to src/se/hv/dindag/Start.java
diff --git a/DinDag/src/se/hv/dindag/Tweet.java b/src/se/hv/dindag/Tweet.java
similarity index 100%
rename from DinDag/src/se/hv/dindag/Tweet.java
rename to src/se/hv/dindag/Tweet.java
diff --git a/DinDag/src/se/hv/dindag/TwitterFeed.java b/src/se/hv/dindag/TwitterFeed.java
similarity index 100%
rename from DinDag/src/se/hv/dindag/TwitterFeed.java
rename to src/se/hv/dindag/TwitterFeed.java
diff --git a/DinDag/src/se/hv/dindag/WebReader.java b/src/se/hv/dindag/WebReader.java
similarity index 100%
rename from DinDag/src/se/hv/dindag/WebReader.java
rename to src/se/hv/dindag/WebReader.java
diff --git a/DinDag/src/se/hv/dindag/WebSinglePost.java b/src/se/hv/dindag/WebSinglePost.java
similarity index 100%
rename from DinDag/src/se/hv/dindag/WebSinglePost.java
rename to src/se/hv/dindag/WebSinglePost.java
diff --git a/DinDag/src/se/hv/dindag/XMLDataHandler.java b/src/se/hv/dindag/XMLDataHandler.java
similarity index 100%
rename from DinDag/src/se/hv/dindag/XMLDataHandler.java
rename to src/se/hv/dindag/XMLDataHandler.java
diff --git a/DinDag/src/se/hv/dindag/XMLParser.java b/src/se/hv/dindag/XMLParser.java
similarity index 100%
rename from DinDag/src/se/hv/dindag/XMLParser.java
rename to src/se/hv/dindag/XMLParser.java