diff --git a/.classpath b/.classpath
deleted file mode 100644
index 9dc973c..0000000
--- a/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.factorypath b/.factorypath
deleted file mode 100644
index 0ac515b..0000000
--- a/.factorypath
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/.gitignore b/.gitignore
index e80a6d4..7fa0bd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
/bin
-/gen
\ No newline at end of file
+/gen
+build
+*~
+.gradle
+.idea
+*.iml
+local.properties
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/.settings/org.eclipse.jdt.apt.core.prefs b/.settings/org.eclipse.jdt.apt.core.prefs
deleted file mode 100644
index 7d52ece..0000000
--- a/.settings/org.eclipse.jdt.apt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.apt.aptEnabled=true
-org.eclipse.jdt.apt.genSrcDir=.apt_generated
-org.eclipse.jdt.apt.reconcileEnabled=true
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9dec5db..0000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.processAnnotations=enabled
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 0000000..20ef765
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,37 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 22
+ buildToolsVersion "22.0.1"
+
+ defaultConfig {
+ minSdkVersion 10
+ targetSdkVersion 22
+ versionCode 1
+ versionName "1.0"
+ }
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_7
+ targetCompatibility JavaVersion.VERSION_1_7
+ }
+
+ sourceSets {
+ main {
+ java.srcDirs += ["../drag-sort-listview/library/src"]
+ res.srcDirs += ["../drag-sort-listview/library/res"]
+ }
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ }
+ }
+}
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+ compile 'com.android.support:appcompat-v7:22.2.1'
+ compile 'com.android.support:support-v4:22.2.1'
+}
diff --git a/compile-libs/androidannotations-2.7.jar b/app/compile-libs/androidannotations-2.7.jar
similarity index 100%
rename from compile-libs/androidannotations-2.7.jar
rename to app/compile-libs/androidannotations-2.7.jar
diff --git a/libs/androidannotations-api-2.7.jar b/app/libs/androidannotations-api-2.7.jar
similarity index 100%
rename from libs/androidannotations-api-2.7.jar
rename to app/libs/androidannotations-api-2.7.jar
diff --git a/libs/commons-io-2.0.1.jar b/app/libs/commons-io-2.0.1.jar
similarity index 100%
rename from libs/commons-io-2.0.1.jar
rename to app/libs/commons-io-2.0.1.jar
diff --git a/libs/commons-lang3-3.1.jar b/app/libs/commons-lang3-3.1.jar
similarity index 100%
rename from libs/commons-lang3-3.1.jar
rename to app/libs/commons-lang3-3.1.jar
diff --git a/libs/jackson-annotations-2.1.1.jar b/app/libs/jackson-annotations-2.1.1.jar
similarity index 100%
rename from libs/jackson-annotations-2.1.1.jar
rename to app/libs/jackson-annotations-2.1.1.jar
diff --git a/libs/jackson-core-2.1.2.jar b/app/libs/jackson-core-2.1.2.jar
similarity index 100%
rename from libs/jackson-core-2.1.2.jar
rename to app/libs/jackson-core-2.1.2.jar
diff --git a/libs/jackson-databind-2.1.0.jar b/app/libs/jackson-databind-2.1.0.jar
similarity index 100%
rename from libs/jackson-databind-2.1.0.jar
rename to app/libs/jackson-databind-2.1.0.jar
diff --git a/libs/spring-android-core-1.0.1.RELEASE.jar b/app/libs/spring-android-core-1.0.1.RELEASE.jar
similarity index 100%
rename from libs/spring-android-core-1.0.1.RELEASE.jar
rename to app/libs/spring-android-core-1.0.1.RELEASE.jar
diff --git a/libs/spring-android-rest-template-1.0.1.RELEASE.jar b/app/libs/spring-android-rest-template-1.0.1.RELEASE.jar
similarity index 100%
rename from libs/spring-android-rest-template-1.0.1.RELEASE.jar
rename to app/libs/spring-android-rest-template-1.0.1.RELEASE.jar
diff --git a/lint.xml b/app/lint.xml
similarity index 100%
rename from lint.xml
rename to app/lint.xml
diff --git a/board.svg b/app/raw_svg_to_generate_res/board.svg
similarity index 100%
rename from board.svg
rename to app/raw_svg_to_generate_res/board.svg
diff --git a/cancelAlarm.svg b/app/raw_svg_to_generate_res/cancelAlarm.svg
similarity index 100%
rename from cancelAlarm.svg
rename to app/raw_svg_to_generate_res/cancelAlarm.svg
diff --git a/departure.svg b/app/raw_svg_to_generate_res/departure.svg
similarity index 100%
rename from departure.svg
rename to app/raw_svg_to_generate_res/departure.svg
diff --git a/icon.svg b/app/raw_svg_to_generate_res/icon.svg
similarity index 100%
rename from icon.svg
rename to app/raw_svg_to_generate_res/icon.svg
diff --git a/iconMonochrome.svg b/app/raw_svg_to_generate_res/iconMonochrome.svg
similarity index 100%
rename from iconMonochrome.svg
rename to app/raw_svg_to_generate_res/iconMonochrome.svg
diff --git a/xfer.svg b/app/raw_svg_to_generate_res/xfer.svg
similarity index 100%
rename from xfer.svg
rename to app/raw_svg_to_generate_res/xfer.svg
diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
similarity index 100%
rename from AndroidManifest.xml
rename to app/src/main/AndroidManifest.xml
diff --git a/src/com/dougkeen/bart/BartRunnerApplication.java b/app/src/main/java/com/dougkeen/bart/BartRunnerApplication.java
similarity index 99%
rename from src/com/dougkeen/bart/BartRunnerApplication.java
rename to app/src/main/java/com/dougkeen/bart/BartRunnerApplication.java
index 112b8c2..bd092c8 100644
--- a/src/com/dougkeen/bart/BartRunnerApplication.java
+++ b/app/src/main/java/com/dougkeen/bart/BartRunnerApplication.java
@@ -222,4 +222,4 @@ public class BartRunnerApplication extends Application {
public void setAlarmMediaPlayer(MediaPlayer alarmMediaPlayer) {
this.mAlarmMediaPlayer = alarmMediaPlayer;
}
-}
\ No newline at end of file
+}
diff --git a/src/com/dougkeen/bart/activities/AbstractRouteSelectionFragment.java b/app/src/main/java/com/dougkeen/bart/activities/AbstractRouteSelectionFragment.java
similarity index 99%
rename from src/com/dougkeen/bart/activities/AbstractRouteSelectionFragment.java
rename to app/src/main/java/com/dougkeen/bart/activities/AbstractRouteSelectionFragment.java
index 3a3cc92..445e44e 100644
--- a/src/com/dougkeen/bart/activities/AbstractRouteSelectionFragment.java
+++ b/app/src/main/java/com/dougkeen/bart/activities/AbstractRouteSelectionFragment.java
@@ -149,4 +149,4 @@ public abstract class AbstractRouteSelectionFragment extends DialogFragment {
}
abstract protected void onOkButtonClick(Station origin, Station destination);
-}
\ No newline at end of file
+}
diff --git a/src/com/dougkeen/bart/activities/AddRouteDialogFragment.java b/app/src/main/java/com/dougkeen/bart/activities/AddRouteDialogFragment.java
similarity index 100%
rename from src/com/dougkeen/bart/activities/AddRouteDialogFragment.java
rename to app/src/main/java/com/dougkeen/bart/activities/AddRouteDialogFragment.java
diff --git a/src/com/dougkeen/bart/activities/QuickRouteDialogFragment.java b/app/src/main/java/com/dougkeen/bart/activities/QuickRouteDialogFragment.java
similarity index 100%
rename from src/com/dougkeen/bart/activities/QuickRouteDialogFragment.java
rename to app/src/main/java/com/dougkeen/bart/activities/QuickRouteDialogFragment.java
diff --git a/src/com/dougkeen/bart/activities/RoutesListActivity.java b/app/src/main/java/com/dougkeen/bart/activities/RoutesListActivity.java
similarity index 100%
rename from src/com/dougkeen/bart/activities/RoutesListActivity.java
rename to app/src/main/java/com/dougkeen/bart/activities/RoutesListActivity.java
diff --git a/src/com/dougkeen/bart/activities/TrainAlarmDialogFragment.java b/app/src/main/java/com/dougkeen/bart/activities/TrainAlarmDialogFragment.java
similarity index 100%
rename from src/com/dougkeen/bart/activities/TrainAlarmDialogFragment.java
rename to app/src/main/java/com/dougkeen/bart/activities/TrainAlarmDialogFragment.java
diff --git a/src/com/dougkeen/bart/activities/ViewDeparturesActivity.java b/app/src/main/java/com/dougkeen/bart/activities/ViewDeparturesActivity.java
similarity index 100%
rename from src/com/dougkeen/bart/activities/ViewDeparturesActivity.java
rename to app/src/main/java/com/dougkeen/bart/activities/ViewDeparturesActivity.java
diff --git a/src/com/dougkeen/bart/activities/ViewMapActivity.java b/app/src/main/java/com/dougkeen/bart/activities/ViewMapActivity.java
similarity index 100%
rename from src/com/dougkeen/bart/activities/ViewMapActivity.java
rename to app/src/main/java/com/dougkeen/bart/activities/ViewMapActivity.java
diff --git a/src/com/dougkeen/bart/controls/CountdownTextView.java b/app/src/main/java/com/dougkeen/bart/controls/CountdownTextView.java
similarity index 100%
rename from src/com/dougkeen/bart/controls/CountdownTextView.java
rename to app/src/main/java/com/dougkeen/bart/controls/CountdownTextView.java
diff --git a/src/com/dougkeen/bart/controls/DepartureListItemLayout.java b/app/src/main/java/com/dougkeen/bart/controls/DepartureListItemLayout.java
similarity index 100%
rename from src/com/dougkeen/bart/controls/DepartureListItemLayout.java
rename to app/src/main/java/com/dougkeen/bart/controls/DepartureListItemLayout.java
diff --git a/src/com/dougkeen/bart/controls/SwipeHelper.java b/app/src/main/java/com/dougkeen/bart/controls/SwipeHelper.java
similarity index 100%
rename from src/com/dougkeen/bart/controls/SwipeHelper.java
rename to app/src/main/java/com/dougkeen/bart/controls/SwipeHelper.java
diff --git a/src/com/dougkeen/bart/controls/Ticker.java b/app/src/main/java/com/dougkeen/bart/controls/Ticker.java
similarity index 100%
rename from src/com/dougkeen/bart/controls/Ticker.java
rename to app/src/main/java/com/dougkeen/bart/controls/Ticker.java
diff --git a/src/com/dougkeen/bart/controls/TimedTextSwitcher.java b/app/src/main/java/com/dougkeen/bart/controls/TimedTextSwitcher.java
similarity index 100%
rename from src/com/dougkeen/bart/controls/TimedTextSwitcher.java
rename to app/src/main/java/com/dougkeen/bart/controls/TimedTextSwitcher.java
diff --git a/src/com/dougkeen/bart/controls/YourTrainLayout.java b/app/src/main/java/com/dougkeen/bart/controls/YourTrainLayout.java
similarity index 100%
rename from src/com/dougkeen/bart/controls/YourTrainLayout.java
rename to app/src/main/java/com/dougkeen/bart/controls/YourTrainLayout.java
diff --git a/src/com/dougkeen/bart/data/CursorUtils.java b/app/src/main/java/com/dougkeen/bart/data/CursorUtils.java
similarity index 100%
rename from src/com/dougkeen/bart/data/CursorUtils.java
rename to app/src/main/java/com/dougkeen/bart/data/CursorUtils.java
diff --git a/src/com/dougkeen/bart/data/DatabaseHelper.java b/app/src/main/java/com/dougkeen/bart/data/DatabaseHelper.java
similarity index 100%
rename from src/com/dougkeen/bart/data/DatabaseHelper.java
rename to app/src/main/java/com/dougkeen/bart/data/DatabaseHelper.java
diff --git a/src/com/dougkeen/bart/data/DepartureArrayAdapter.java b/app/src/main/java/com/dougkeen/bart/data/DepartureArrayAdapter.java
similarity index 100%
rename from src/com/dougkeen/bart/data/DepartureArrayAdapter.java
rename to app/src/main/java/com/dougkeen/bart/data/DepartureArrayAdapter.java
diff --git a/src/com/dougkeen/bart/data/FavoritesArrayAdapter.java b/app/src/main/java/com/dougkeen/bart/data/FavoritesArrayAdapter.java
similarity index 100%
rename from src/com/dougkeen/bart/data/FavoritesArrayAdapter.java
rename to app/src/main/java/com/dougkeen/bart/data/FavoritesArrayAdapter.java
diff --git a/src/com/dougkeen/bart/data/FavoritesPersistence.java b/app/src/main/java/com/dougkeen/bart/data/FavoritesPersistence.java
similarity index 100%
rename from src/com/dougkeen/bart/data/FavoritesPersistence.java
rename to app/src/main/java/com/dougkeen/bart/data/FavoritesPersistence.java
diff --git a/src/com/dougkeen/bart/data/RoutesColumns.java b/app/src/main/java/com/dougkeen/bart/data/RoutesColumns.java
similarity index 100%
rename from src/com/dougkeen/bart/data/RoutesColumns.java
rename to app/src/main/java/com/dougkeen/bart/data/RoutesColumns.java
diff --git a/src/com/dougkeen/bart/model/Alert.java b/app/src/main/java/com/dougkeen/bart/model/Alert.java
similarity index 100%
rename from src/com/dougkeen/bart/model/Alert.java
rename to app/src/main/java/com/dougkeen/bart/model/Alert.java
diff --git a/src/com/dougkeen/bart/model/Constants.java b/app/src/main/java/com/dougkeen/bart/model/Constants.java
similarity index 100%
rename from src/com/dougkeen/bart/model/Constants.java
rename to app/src/main/java/com/dougkeen/bart/model/Constants.java
diff --git a/src/com/dougkeen/bart/model/Departure.java b/app/src/main/java/com/dougkeen/bart/model/Departure.java
similarity index 100%
rename from src/com/dougkeen/bart/model/Departure.java
rename to app/src/main/java/com/dougkeen/bart/model/Departure.java
diff --git a/src/com/dougkeen/bart/model/Line.java b/app/src/main/java/com/dougkeen/bart/model/Line.java
similarity index 100%
rename from src/com/dougkeen/bart/model/Line.java
rename to app/src/main/java/com/dougkeen/bart/model/Line.java
diff --git a/src/com/dougkeen/bart/model/RealTimeDepartures.java b/app/src/main/java/com/dougkeen/bart/model/RealTimeDepartures.java
similarity index 100%
rename from src/com/dougkeen/bart/model/RealTimeDepartures.java
rename to app/src/main/java/com/dougkeen/bart/model/RealTimeDepartures.java
diff --git a/src/com/dougkeen/bart/model/Route.java b/app/src/main/java/com/dougkeen/bart/model/Route.java
similarity index 100%
rename from src/com/dougkeen/bart/model/Route.java
rename to app/src/main/java/com/dougkeen/bart/model/Route.java
diff --git a/src/com/dougkeen/bart/model/ScheduleInformation.java b/app/src/main/java/com/dougkeen/bart/model/ScheduleInformation.java
similarity index 100%
rename from src/com/dougkeen/bart/model/ScheduleInformation.java
rename to app/src/main/java/com/dougkeen/bart/model/ScheduleInformation.java
diff --git a/src/com/dougkeen/bart/model/ScheduleItem.java b/app/src/main/java/com/dougkeen/bart/model/ScheduleItem.java
similarity index 100%
rename from src/com/dougkeen/bart/model/ScheduleItem.java
rename to app/src/main/java/com/dougkeen/bart/model/ScheduleItem.java
diff --git a/src/com/dougkeen/bart/model/Station.java b/app/src/main/java/com/dougkeen/bart/model/Station.java
similarity index 100%
rename from src/com/dougkeen/bart/model/Station.java
rename to app/src/main/java/com/dougkeen/bart/model/Station.java
diff --git a/src/com/dougkeen/bart/model/StationPair.java b/app/src/main/java/com/dougkeen/bart/model/StationPair.java
similarity index 100%
rename from src/com/dougkeen/bart/model/StationPair.java
rename to app/src/main/java/com/dougkeen/bart/model/StationPair.java
diff --git a/src/com/dougkeen/bart/model/TextProvider.java b/app/src/main/java/com/dougkeen/bart/model/TextProvider.java
similarity index 100%
rename from src/com/dougkeen/bart/model/TextProvider.java
rename to app/src/main/java/com/dougkeen/bart/model/TextProvider.java
diff --git a/src/com/dougkeen/bart/networktasks/AlertListConverter.java b/app/src/main/java/com/dougkeen/bart/networktasks/AlertListConverter.java
similarity index 100%
rename from src/com/dougkeen/bart/networktasks/AlertListConverter.java
rename to app/src/main/java/com/dougkeen/bart/networktasks/AlertListConverter.java
diff --git a/src/com/dougkeen/bart/networktasks/AlertsClient.java b/app/src/main/java/com/dougkeen/bart/networktasks/AlertsClient.java
similarity index 100%
rename from src/com/dougkeen/bart/networktasks/AlertsClient.java
rename to app/src/main/java/com/dougkeen/bart/networktasks/AlertsClient.java
diff --git a/src/com/dougkeen/bart/networktasks/ElevatorClient.java b/app/src/main/java/com/dougkeen/bart/networktasks/ElevatorClient.java
similarity index 100%
rename from src/com/dougkeen/bart/networktasks/ElevatorClient.java
rename to app/src/main/java/com/dougkeen/bart/networktasks/ElevatorClient.java
diff --git a/src/com/dougkeen/bart/networktasks/ElevatorMessageConverter.java b/app/src/main/java/com/dougkeen/bart/networktasks/ElevatorMessageConverter.java
similarity index 100%
rename from src/com/dougkeen/bart/networktasks/ElevatorMessageConverter.java
rename to app/src/main/java/com/dougkeen/bart/networktasks/ElevatorMessageConverter.java
diff --git a/src/com/dougkeen/bart/networktasks/EtdContentHandler.java b/app/src/main/java/com/dougkeen/bart/networktasks/EtdContentHandler.java
similarity index 100%
rename from src/com/dougkeen/bart/networktasks/EtdContentHandler.java
rename to app/src/main/java/com/dougkeen/bart/networktasks/EtdContentHandler.java
diff --git a/src/com/dougkeen/bart/networktasks/FareContentHandler.java b/app/src/main/java/com/dougkeen/bart/networktasks/FareContentHandler.java
similarity index 100%
rename from src/com/dougkeen/bart/networktasks/FareContentHandler.java
rename to app/src/main/java/com/dougkeen/bart/networktasks/FareContentHandler.java
diff --git a/src/com/dougkeen/bart/networktasks/GetRealTimeDeparturesTask.java b/app/src/main/java/com/dougkeen/bart/networktasks/GetRealTimeDeparturesTask.java
similarity index 100%
rename from src/com/dougkeen/bart/networktasks/GetRealTimeDeparturesTask.java
rename to app/src/main/java/com/dougkeen/bart/networktasks/GetRealTimeDeparturesTask.java
diff --git a/src/com/dougkeen/bart/networktasks/GetRouteFareTask.java b/app/src/main/java/com/dougkeen/bart/networktasks/GetRouteFareTask.java
similarity index 100%
rename from src/com/dougkeen/bart/networktasks/GetRouteFareTask.java
rename to app/src/main/java/com/dougkeen/bart/networktasks/GetRouteFareTask.java
diff --git a/src/com/dougkeen/bart/networktasks/GetScheduleInformationTask.java b/app/src/main/java/com/dougkeen/bart/networktasks/GetScheduleInformationTask.java
similarity index 100%
rename from src/com/dougkeen/bart/networktasks/GetScheduleInformationTask.java
rename to app/src/main/java/com/dougkeen/bart/networktasks/GetScheduleInformationTask.java
diff --git a/src/com/dougkeen/bart/networktasks/NetworkUtils.java b/app/src/main/java/com/dougkeen/bart/networktasks/NetworkUtils.java
similarity index 100%
rename from src/com/dougkeen/bart/networktasks/NetworkUtils.java
rename to app/src/main/java/com/dougkeen/bart/networktasks/NetworkUtils.java
diff --git a/src/com/dougkeen/bart/networktasks/ScheduleContentHandler.java b/app/src/main/java/com/dougkeen/bart/networktasks/ScheduleContentHandler.java
similarity index 100%
rename from src/com/dougkeen/bart/networktasks/ScheduleContentHandler.java
rename to app/src/main/java/com/dougkeen/bart/networktasks/ScheduleContentHandler.java
diff --git a/src/com/dougkeen/bart/receivers/AlarmBroadcastReceiver.java b/app/src/main/java/com/dougkeen/bart/receivers/AlarmBroadcastReceiver.java
similarity index 100%
rename from src/com/dougkeen/bart/receivers/AlarmBroadcastReceiver.java
rename to app/src/main/java/com/dougkeen/bart/receivers/AlarmBroadcastReceiver.java
diff --git a/src/com/dougkeen/bart/services/BoardedDepartureService.java b/app/src/main/java/com/dougkeen/bart/services/BoardedDepartureService.java
similarity index 100%
rename from src/com/dougkeen/bart/services/BoardedDepartureService.java
rename to app/src/main/java/com/dougkeen/bart/services/BoardedDepartureService.java
diff --git a/src/com/dougkeen/bart/services/EtdService.java b/app/src/main/java/com/dougkeen/bart/services/EtdService.java
similarity index 100%
rename from src/com/dougkeen/bart/services/EtdService.java
rename to app/src/main/java/com/dougkeen/bart/services/EtdService.java
diff --git a/src/com/dougkeen/util/Observable.java b/app/src/main/java/com/dougkeen/util/Observable.java
similarity index 100%
rename from src/com/dougkeen/util/Observable.java
rename to app/src/main/java/com/dougkeen/util/Observable.java
diff --git a/src/com/dougkeen/util/Observer.java b/app/src/main/java/com/dougkeen/util/Observer.java
similarity index 100%
rename from src/com/dougkeen/util/Observer.java
rename to app/src/main/java/com/dougkeen/util/Observer.java
diff --git a/src/com/dougkeen/util/WakeLocker.java b/app/src/main/java/com/dougkeen/util/WakeLocker.java
similarity index 100%
rename from src/com/dougkeen/util/WakeLocker.java
rename to app/src/main/java/com/dougkeen/util/WakeLocker.java
diff --git a/res/drawable-hdpi-v11/ic_stat_notification.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_notification.png
similarity index 100%
rename from res/drawable-hdpi-v11/ic_stat_notification.png
rename to app/src/main/res/drawable-hdpi-v11/ic_stat_notification.png
diff --git a/res/drawable-hdpi-v9/ic_stat_notification.png b/app/src/main/res/drawable-hdpi-v9/ic_stat_notification.png
similarity index 100%
rename from res/drawable-hdpi-v9/ic_stat_notification.png
rename to app/src/main/res/drawable-hdpi-v9/ic_stat_notification.png
diff --git a/res/drawable-hdpi/drag_handle.png b/app/src/main/res/drawable-hdpi/drag_handle.png
similarity index 100%
rename from res/drawable-hdpi/drag_handle.png
rename to app/src/main/res/drawable-hdpi/drag_handle.png
diff --git a/res/drawable-hdpi/ic_action_add_alarm.png b/app/src/main/res/drawable-hdpi/ic_action_add_alarm.png
similarity index 100%
rename from res/drawable-hdpi/ic_action_add_alarm.png
rename to app/src/main/res/drawable-hdpi/ic_action_add_alarm.png
diff --git a/res/drawable-hdpi/ic_action_alarm.png b/app/src/main/res/drawable-hdpi/ic_action_alarm.png
similarity index 100%
rename from res/drawable-hdpi/ic_action_alarm.png
rename to app/src/main/res/drawable-hdpi/ic_action_alarm.png
diff --git a/res/drawable-hdpi/ic_action_boarding.png b/app/src/main/res/drawable-hdpi/ic_action_boarding.png
similarity index 100%
rename from res/drawable-hdpi/ic_action_boarding.png
rename to app/src/main/res/drawable-hdpi/ic_action_boarding.png
diff --git a/res/drawable-hdpi/ic_action_cancel_alarm.png b/app/src/main/res/drawable-hdpi/ic_action_cancel_alarm.png
similarity index 100%
rename from res/drawable-hdpi/ic_action_cancel_alarm.png
rename to app/src/main/res/drawable-hdpi/ic_action_cancel_alarm.png
diff --git a/res/drawable-hdpi/ic_action_delete.png b/app/src/main/res/drawable-hdpi/ic_action_delete.png
similarity index 100%
rename from res/drawable-hdpi/ic_action_delete.png
rename to app/src/main/res/drawable-hdpi/ic_action_delete.png
diff --git a/res/drawable-hdpi/ic_action_departure.png b/app/src/main/res/drawable-hdpi/ic_action_departure.png
similarity index 100%
rename from res/drawable-hdpi/ic_action_departure.png
rename to app/src/main/res/drawable-hdpi/ic_action_departure.png
diff --git a/res/drawable-hdpi/ic_action_elevator.png b/app/src/main/res/drawable-hdpi/ic_action_elevator.png
similarity index 100%
rename from res/drawable-hdpi/ic_action_elevator.png
rename to app/src/main/res/drawable-hdpi/ic_action_elevator.png
diff --git a/res/drawable-hdpi/ic_action_mail.png b/app/src/main/res/drawable-hdpi/ic_action_mail.png
similarity index 100%
rename from res/drawable-hdpi/ic_action_mail.png
rename to app/src/main/res/drawable-hdpi/ic_action_mail.png
diff --git a/res/drawable-hdpi/ic_action_map.png b/app/src/main/res/drawable-hdpi/ic_action_map.png
similarity index 100%
rename from res/drawable-hdpi/ic_action_map.png
rename to app/src/main/res/drawable-hdpi/ic_action_map.png
diff --git a/res/drawable-hdpi/ic_action_new.png b/app/src/main/res/drawable-hdpi/ic_action_new.png
similarity index 100%
rename from res/drawable-hdpi/ic_action_new.png
rename to app/src/main/res/drawable-hdpi/ic_action_new.png
diff --git a/res/drawable-hdpi/ic_action_web.png b/app/src/main/res/drawable-hdpi/ic_action_web.png
similarity index 100%
rename from res/drawable-hdpi/ic_action_web.png
rename to app/src/main/res/drawable-hdpi/ic_action_web.png
diff --git a/res/drawable-hdpi/ic_allgood.png b/app/src/main/res/drawable-hdpi/ic_allgood.png
similarity index 100%
rename from res/drawable-hdpi/ic_allgood.png
rename to app/src/main/res/drawable-hdpi/ic_allgood.png
diff --git a/res/drawable-hdpi/ic_stat_notification.png b/app/src/main/res/drawable-hdpi/ic_stat_notification.png
similarity index 100%
rename from res/drawable-hdpi/ic_stat_notification.png
rename to app/src/main/res/drawable-hdpi/ic_stat_notification.png
diff --git a/res/drawable-hdpi/ic_warn.png b/app/src/main/res/drawable-hdpi/ic_warn.png
similarity index 100%
rename from res/drawable-hdpi/ic_warn.png
rename to app/src/main/res/drawable-hdpi/ic_warn.png
diff --git a/res/drawable-hdpi/icon.png b/app/src/main/res/drawable-hdpi/icon.png
similarity index 100%
rename from res/drawable-hdpi/icon.png
rename to app/src/main/res/drawable-hdpi/icon.png
diff --git a/res/drawable-ldpi-v11/ic_stat_notification.png b/app/src/main/res/drawable-ldpi-v11/ic_stat_notification.png
similarity index 100%
rename from res/drawable-ldpi-v11/ic_stat_notification.png
rename to app/src/main/res/drawable-ldpi-v11/ic_stat_notification.png
diff --git a/res/drawable-ldpi-v9/ic_stat_notification.png b/app/src/main/res/drawable-ldpi-v9/ic_stat_notification.png
similarity index 100%
rename from res/drawable-ldpi-v9/ic_stat_notification.png
rename to app/src/main/res/drawable-ldpi-v9/ic_stat_notification.png
diff --git a/res/drawable-ldpi/ic_action_add_alarm.png b/app/src/main/res/drawable-ldpi/ic_action_add_alarm.png
similarity index 100%
rename from res/drawable-ldpi/ic_action_add_alarm.png
rename to app/src/main/res/drawable-ldpi/ic_action_add_alarm.png
diff --git a/res/drawable-ldpi/ic_action_alarm.png b/app/src/main/res/drawable-ldpi/ic_action_alarm.png
similarity index 100%
rename from res/drawable-ldpi/ic_action_alarm.png
rename to app/src/main/res/drawable-ldpi/ic_action_alarm.png
diff --git a/res/drawable-ldpi/ic_action_boarding.png b/app/src/main/res/drawable-ldpi/ic_action_boarding.png
similarity index 100%
rename from res/drawable-ldpi/ic_action_boarding.png
rename to app/src/main/res/drawable-ldpi/ic_action_boarding.png
diff --git a/res/drawable-ldpi/ic_action_cancel_alarm.png b/app/src/main/res/drawable-ldpi/ic_action_cancel_alarm.png
similarity index 100%
rename from res/drawable-ldpi/ic_action_cancel_alarm.png
rename to app/src/main/res/drawable-ldpi/ic_action_cancel_alarm.png
diff --git a/res/drawable-ldpi/ic_action_delete.png b/app/src/main/res/drawable-ldpi/ic_action_delete.png
similarity index 100%
rename from res/drawable-ldpi/ic_action_delete.png
rename to app/src/main/res/drawable-ldpi/ic_action_delete.png
diff --git a/res/drawable-ldpi/ic_action_departure.png b/app/src/main/res/drawable-ldpi/ic_action_departure.png
similarity index 100%
rename from res/drawable-ldpi/ic_action_departure.png
rename to app/src/main/res/drawable-ldpi/ic_action_departure.png
diff --git a/res/drawable-ldpi/ic_action_mail.png b/app/src/main/res/drawable-ldpi/ic_action_mail.png
similarity index 100%
rename from res/drawable-ldpi/ic_action_mail.png
rename to app/src/main/res/drawable-ldpi/ic_action_mail.png
diff --git a/res/drawable-ldpi/ic_action_map.png b/app/src/main/res/drawable-ldpi/ic_action_map.png
similarity index 100%
rename from res/drawable-ldpi/ic_action_map.png
rename to app/src/main/res/drawable-ldpi/ic_action_map.png
diff --git a/res/drawable-ldpi/ic_action_new.png b/app/src/main/res/drawable-ldpi/ic_action_new.png
similarity index 100%
rename from res/drawable-ldpi/ic_action_new.png
rename to app/src/main/res/drawable-ldpi/ic_action_new.png
diff --git a/res/drawable-ldpi/ic_action_web.png b/app/src/main/res/drawable-ldpi/ic_action_web.png
similarity index 100%
rename from res/drawable-ldpi/ic_action_web.png
rename to app/src/main/res/drawable-ldpi/ic_action_web.png
diff --git a/res/drawable-ldpi/ic_stat_notification.png b/app/src/main/res/drawable-ldpi/ic_stat_notification.png
similarity index 100%
rename from res/drawable-ldpi/ic_stat_notification.png
rename to app/src/main/res/drawable-ldpi/ic_stat_notification.png
diff --git a/res/drawable-ldpi/icon.png b/app/src/main/res/drawable-ldpi/icon.png
similarity index 100%
rename from res/drawable-ldpi/icon.png
rename to app/src/main/res/drawable-ldpi/icon.png
diff --git a/res/drawable-mdpi-v11/ic_stat_notification.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_notification.png
similarity index 100%
rename from res/drawable-mdpi-v11/ic_stat_notification.png
rename to app/src/main/res/drawable-mdpi-v11/ic_stat_notification.png
diff --git a/res/drawable-mdpi-v9/ic_stat_notification.png b/app/src/main/res/drawable-mdpi-v9/ic_stat_notification.png
similarity index 100%
rename from res/drawable-mdpi-v9/ic_stat_notification.png
rename to app/src/main/res/drawable-mdpi-v9/ic_stat_notification.png
diff --git a/res/drawable-mdpi/drag_handle.png b/app/src/main/res/drawable-mdpi/drag_handle.png
similarity index 100%
rename from res/drawable-mdpi/drag_handle.png
rename to app/src/main/res/drawable-mdpi/drag_handle.png
diff --git a/res/drawable-mdpi/ic_action_add_alarm.png b/app/src/main/res/drawable-mdpi/ic_action_add_alarm.png
similarity index 100%
rename from res/drawable-mdpi/ic_action_add_alarm.png
rename to app/src/main/res/drawable-mdpi/ic_action_add_alarm.png
diff --git a/res/drawable-mdpi/ic_action_alarm.png b/app/src/main/res/drawable-mdpi/ic_action_alarm.png
similarity index 100%
rename from res/drawable-mdpi/ic_action_alarm.png
rename to app/src/main/res/drawable-mdpi/ic_action_alarm.png
diff --git a/res/drawable-mdpi/ic_action_boarding.png b/app/src/main/res/drawable-mdpi/ic_action_boarding.png
similarity index 100%
rename from res/drawable-mdpi/ic_action_boarding.png
rename to app/src/main/res/drawable-mdpi/ic_action_boarding.png
diff --git a/res/drawable-mdpi/ic_action_cancel_alarm.png b/app/src/main/res/drawable-mdpi/ic_action_cancel_alarm.png
similarity index 100%
rename from res/drawable-mdpi/ic_action_cancel_alarm.png
rename to app/src/main/res/drawable-mdpi/ic_action_cancel_alarm.png
diff --git a/res/drawable-mdpi/ic_action_delete.png b/app/src/main/res/drawable-mdpi/ic_action_delete.png
similarity index 100%
rename from res/drawable-mdpi/ic_action_delete.png
rename to app/src/main/res/drawable-mdpi/ic_action_delete.png
diff --git a/res/drawable-mdpi/ic_action_departure.png b/app/src/main/res/drawable-mdpi/ic_action_departure.png
similarity index 100%
rename from res/drawable-mdpi/ic_action_departure.png
rename to app/src/main/res/drawable-mdpi/ic_action_departure.png
diff --git a/res/drawable-mdpi/ic_action_elevator.png b/app/src/main/res/drawable-mdpi/ic_action_elevator.png
similarity index 100%
rename from res/drawable-mdpi/ic_action_elevator.png
rename to app/src/main/res/drawable-mdpi/ic_action_elevator.png
diff --git a/res/drawable-mdpi/ic_action_mail.png b/app/src/main/res/drawable-mdpi/ic_action_mail.png
similarity index 100%
rename from res/drawable-mdpi/ic_action_mail.png
rename to app/src/main/res/drawable-mdpi/ic_action_mail.png
diff --git a/res/drawable-mdpi/ic_action_map.png b/app/src/main/res/drawable-mdpi/ic_action_map.png
similarity index 100%
rename from res/drawable-mdpi/ic_action_map.png
rename to app/src/main/res/drawable-mdpi/ic_action_map.png
diff --git a/res/drawable-mdpi/ic_action_new.png b/app/src/main/res/drawable-mdpi/ic_action_new.png
similarity index 100%
rename from res/drawable-mdpi/ic_action_new.png
rename to app/src/main/res/drawable-mdpi/ic_action_new.png
diff --git a/res/drawable-mdpi/ic_action_web.png b/app/src/main/res/drawable-mdpi/ic_action_web.png
similarity index 100%
rename from res/drawable-mdpi/ic_action_web.png
rename to app/src/main/res/drawable-mdpi/ic_action_web.png
diff --git a/res/drawable-mdpi/ic_allgood.png b/app/src/main/res/drawable-mdpi/ic_allgood.png
similarity index 100%
rename from res/drawable-mdpi/ic_allgood.png
rename to app/src/main/res/drawable-mdpi/ic_allgood.png
diff --git a/res/drawable-mdpi/ic_stat_notification.png b/app/src/main/res/drawable-mdpi/ic_stat_notification.png
similarity index 100%
rename from res/drawable-mdpi/ic_stat_notification.png
rename to app/src/main/res/drawable-mdpi/ic_stat_notification.png
diff --git a/res/drawable-mdpi/ic_warn.png b/app/src/main/res/drawable-mdpi/ic_warn.png
similarity index 100%
rename from res/drawable-mdpi/ic_warn.png
rename to app/src/main/res/drawable-mdpi/ic_warn.png
diff --git a/res/drawable-mdpi/icon.png b/app/src/main/res/drawable-mdpi/icon.png
similarity index 100%
rename from res/drawable-mdpi/icon.png
rename to app/src/main/res/drawable-mdpi/icon.png
diff --git a/res/drawable-xhdpi-v11/ic_stat_notification.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_notification.png
similarity index 100%
rename from res/drawable-xhdpi-v11/ic_stat_notification.png
rename to app/src/main/res/drawable-xhdpi-v11/ic_stat_notification.png
diff --git a/res/drawable-xhdpi-v9/ic_stat_notification.png b/app/src/main/res/drawable-xhdpi-v9/ic_stat_notification.png
similarity index 100%
rename from res/drawable-xhdpi-v9/ic_stat_notification.png
rename to app/src/main/res/drawable-xhdpi-v9/ic_stat_notification.png
diff --git a/res/drawable-xhdpi/drag_handle.png b/app/src/main/res/drawable-xhdpi/drag_handle.png
similarity index 100%
rename from res/drawable-xhdpi/drag_handle.png
rename to app/src/main/res/drawable-xhdpi/drag_handle.png
diff --git a/res/drawable-xhdpi/ic_action_add_alarm.png b/app/src/main/res/drawable-xhdpi/ic_action_add_alarm.png
similarity index 100%
rename from res/drawable-xhdpi/ic_action_add_alarm.png
rename to app/src/main/res/drawable-xhdpi/ic_action_add_alarm.png
diff --git a/res/drawable-xhdpi/ic_action_alarm.png b/app/src/main/res/drawable-xhdpi/ic_action_alarm.png
similarity index 100%
rename from res/drawable-xhdpi/ic_action_alarm.png
rename to app/src/main/res/drawable-xhdpi/ic_action_alarm.png
diff --git a/res/drawable-xhdpi/ic_action_boarding.png b/app/src/main/res/drawable-xhdpi/ic_action_boarding.png
similarity index 100%
rename from res/drawable-xhdpi/ic_action_boarding.png
rename to app/src/main/res/drawable-xhdpi/ic_action_boarding.png
diff --git a/res/drawable-xhdpi/ic_action_cancel_alarm.png b/app/src/main/res/drawable-xhdpi/ic_action_cancel_alarm.png
similarity index 100%
rename from res/drawable-xhdpi/ic_action_cancel_alarm.png
rename to app/src/main/res/drawable-xhdpi/ic_action_cancel_alarm.png
diff --git a/res/drawable-xhdpi/ic_action_delete.png b/app/src/main/res/drawable-xhdpi/ic_action_delete.png
similarity index 100%
rename from res/drawable-xhdpi/ic_action_delete.png
rename to app/src/main/res/drawable-xhdpi/ic_action_delete.png
diff --git a/res/drawable-xhdpi/ic_action_departure.png b/app/src/main/res/drawable-xhdpi/ic_action_departure.png
similarity index 100%
rename from res/drawable-xhdpi/ic_action_departure.png
rename to app/src/main/res/drawable-xhdpi/ic_action_departure.png
diff --git a/res/drawable-xhdpi/ic_action_elevator.png b/app/src/main/res/drawable-xhdpi/ic_action_elevator.png
similarity index 100%
rename from res/drawable-xhdpi/ic_action_elevator.png
rename to app/src/main/res/drawable-xhdpi/ic_action_elevator.png
diff --git a/res/drawable-xhdpi/ic_action_mail.png b/app/src/main/res/drawable-xhdpi/ic_action_mail.png
similarity index 100%
rename from res/drawable-xhdpi/ic_action_mail.png
rename to app/src/main/res/drawable-xhdpi/ic_action_mail.png
diff --git a/res/drawable-xhdpi/ic_action_map.png b/app/src/main/res/drawable-xhdpi/ic_action_map.png
similarity index 100%
rename from res/drawable-xhdpi/ic_action_map.png
rename to app/src/main/res/drawable-xhdpi/ic_action_map.png
diff --git a/res/drawable-xhdpi/ic_action_new.png b/app/src/main/res/drawable-xhdpi/ic_action_new.png
similarity index 100%
rename from res/drawable-xhdpi/ic_action_new.png
rename to app/src/main/res/drawable-xhdpi/ic_action_new.png
diff --git a/res/drawable-xhdpi/ic_action_web.png b/app/src/main/res/drawable-xhdpi/ic_action_web.png
similarity index 100%
rename from res/drawable-xhdpi/ic_action_web.png
rename to app/src/main/res/drawable-xhdpi/ic_action_web.png
diff --git a/res/drawable-xhdpi/ic_allgood.png b/app/src/main/res/drawable-xhdpi/ic_allgood.png
similarity index 100%
rename from res/drawable-xhdpi/ic_allgood.png
rename to app/src/main/res/drawable-xhdpi/ic_allgood.png
diff --git a/res/drawable-xhdpi/ic_stat_notification.png b/app/src/main/res/drawable-xhdpi/ic_stat_notification.png
similarity index 100%
rename from res/drawable-xhdpi/ic_stat_notification.png
rename to app/src/main/res/drawable-xhdpi/ic_stat_notification.png
diff --git a/res/drawable-xhdpi/ic_warn.png b/app/src/main/res/drawable-xhdpi/ic_warn.png
similarity index 100%
rename from res/drawable-xhdpi/ic_warn.png
rename to app/src/main/res/drawable-xhdpi/ic_warn.png
diff --git a/res/drawable/basic_rectangle.xml b/app/src/main/res/drawable/basic_rectangle.xml
similarity index 92%
rename from res/drawable/basic_rectangle.xml
rename to app/src/main/res/drawable/basic_rectangle.xml
index 57c7709..ebef236 100644
--- a/res/drawable/basic_rectangle.xml
+++ b/app/src/main/res/drawable/basic_rectangle.xml
@@ -1,7 +1,7 @@
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/bike.png b/app/src/main/res/drawable/bike.png
similarity index 100%
rename from res/drawable/bike.png
rename to app/src/main/res/drawable/bike.png
diff --git a/res/drawable/map.png b/app/src/main/res/drawable/map.png
similarity index 100%
rename from res/drawable/map.png
rename to app/src/main/res/drawable/map.png
diff --git a/res/drawable/nobike.png b/app/src/main/res/drawable/nobike.png
similarity index 100%
rename from res/drawable/nobike.png
rename to app/src/main/res/drawable/nobike.png
diff --git a/res/drawable/xfer.png b/app/src/main/res/drawable/xfer.png
similarity index 100%
rename from res/drawable/xfer.png
rename to app/src/main/res/drawable/xfer.png
diff --git a/res/layout-h480dp/departure_listing.xml b/app/src/main/res/layout-h480dp/departure_listing.xml
similarity index 100%
rename from res/layout-h480dp/departure_listing.xml
rename to app/src/main/res/layout-h480dp/departure_listing.xml
diff --git a/res/layout/departure_listing.xml b/app/src/main/res/layout/departure_listing.xml
similarity index 100%
rename from res/layout/departure_listing.xml
rename to app/src/main/res/layout/departure_listing.xml
diff --git a/res/layout/departures.xml b/app/src/main/res/layout/departures.xml
similarity index 95%
rename from res/layout/departures.xml
rename to app/src/main/res/layout/departures.xml
index 2feace7..e46cb16 100644
--- a/res/layout/departures.xml
+++ b/app/src/main/res/layout/departures.xml
@@ -1,53 +1,54 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/layout/favorite_listing.xml b/app/src/main/res/layout/favorite_listing.xml
similarity index 100%
rename from res/layout/favorite_listing.xml
rename to app/src/main/res/layout/favorite_listing.xml
diff --git a/res/layout/main.xml b/app/src/main/res/layout/main.xml
similarity index 99%
rename from res/layout/main.xml
rename to app/src/main/res/layout/main.xml
index aa2918c..e766c4a 100644
--- a/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -53,4 +53,4 @@
android:text="@string/quick_departure_lookup" />
-
\ No newline at end of file
+
diff --git a/res/layout/progress_spinner.xml b/app/src/main/res/layout/progress_spinner.xml
similarity index 100%
rename from res/layout/progress_spinner.xml
rename to app/src/main/res/layout/progress_spinner.xml
diff --git a/res/layout/route_form.xml b/app/src/main/res/layout/route_form.xml
similarity index 100%
rename from res/layout/route_form.xml
rename to app/src/main/res/layout/route_form.xml
diff --git a/res/layout/train_alarm_dialog.xml b/app/src/main/res/layout/train_alarm_dialog.xml
similarity index 100%
rename from res/layout/train_alarm_dialog.xml
rename to app/src/main/res/layout/train_alarm_dialog.xml
diff --git a/res/layout/train_length_arrival_textview.xml b/app/src/main/res/layout/train_length_arrival_textview.xml
similarity index 98%
rename from res/layout/train_length_arrival_textview.xml
rename to app/src/main/res/layout/train_length_arrival_textview.xml
index a580980..c7b9d47 100644
--- a/res/layout/train_length_arrival_textview.xml
+++ b/app/src/main/res/layout/train_length_arrival_textview.xml
@@ -1,3 +1,3 @@
-
-
+
+
diff --git a/res/layout/uncertainty_textview.xml b/app/src/main/res/layout/uncertainty_textview.xml
similarity index 100%
rename from res/layout/uncertainty_textview.xml
rename to app/src/main/res/layout/uncertainty_textview.xml
diff --git a/res/layout/your_train.xml b/app/src/main/res/layout/your_train.xml
similarity index 100%
rename from res/layout/your_train.xml
rename to app/src/main/res/layout/your_train.xml
diff --git a/res/menu/departure_context_menu.xml b/app/src/main/res/menu/departure_context_menu.xml
similarity index 95%
rename from res/menu/departure_context_menu.xml
rename to app/src/main/res/menu/departure_context_menu.xml
index a027f9e..c512c36 100644
--- a/res/menu/departure_context_menu.xml
+++ b/app/src/main/res/menu/departure_context_menu.xml
@@ -1,9 +1,9 @@
-
-