diff --git a/.gitignore b/.gitignore index 9f2a0788..5348c1c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ -build/ +.classpath +.project +.settings/ .gradle/ +bin/ +build/ diff --git a/enabler/COPYING b/COPYING similarity index 100% rename from enabler/COPYING rename to COPYING diff --git a/README.md b/README.md index e4b93ef2..49c2b7b8 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,31 @@ -Welcome to Public Transport Enabler, a Java library allowing you to get data from public transport providers. +Public Transport Enabler +======================== -This project contains several subprojects: +This is a Java library allowing you to get data from public transport providers. +Look into [NetworkProvider.java](https://github.com/schildbach/public-transport-enabler/blob/master/enabler/src/de/schildbach/pte/NetworkProvider.java) for an overview of the API. - * [__enabler__](enabler): - The library itself. This is probably what you're searching for. See the subproject's [README](enabler/README.md) for more information. +Using providers that require secrets +------------------------------------ -You can build all sub-projects at once using Gradle: +For some providers a secret like an API key is required to use their API. +Copy the `secrets.properties.template` file to `secrets.properties` like so: -`gradle clean build` + $ cp test/de/schildbach/pte/live/secrets.properties.template test/de/schildbach/pte/live/secrets.properties + +You need to request the secrets directly from the provider. For Navitia based providers, you can [request a secret here](http://www.navitia.io/register). + +How to run live tests? +---------------------- + +Make sure the test you want to run does not require a secret and if it does, see above for how to get one. +Once you have the secret or if your provider does not need one, you can run the tests in your IDE. +Both IntelliJ and Eclipse have excellent support for JUnit tests. + +If you prefer to run tests from the command line, you can comment out the test exclude at the end of +[build.gradle](https://github.com/schildbach/public-transport-enabler/blob/master/enabler/build.gradle#L30) +and use this command to only execute a test for a single provider: + + $ gradle -Dtest.single=ParisProviderLive test + +This uses the `ParisProvider` as an example. +Just replace it with the provider you want to test. diff --git a/build.gradle b/build.gradle index 912f4a8f..4a8bc160 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,43 @@ -allprojects { - repositories { - jcenter() +apply plugin: 'java' +apply plugin: 'eclipse' +apply plugin: 'maven' + +group = 'de.schildbach.pte' +archivesBaseName = 'public-transport-enabler' + +repositories { + jcenter() +} + +dependencies { + compile 'com.squareup.okhttp3:okhttp:3.12.3' + compile 'com.squareup.okhttp3:logging-interceptor:3.12.3' + compile 'com.google.guava:guava:28.0-android' + compile 'org.slf4j:slf4j-api:1.7.25' + compile 'com.google.code.findbugs:jsr305:3.0.0' + compile 'org.json:json:20090211' // provided by Android + compile 'net.sf.kxml:kxml2:2.3.0' // provided by Android + testCompile 'junit:junit:4.12' + testRuntime 'org.slf4j:slf4j-jdk14:1.7.25' +} + +sourceSets { + main { + java.srcDirs = ['src'] + resources.srcDirs = ['src'] + } + test { + java.srcDirs = ['test'] + resources.srcDirs = ['test'] } } + +compileJava { + sourceCompatibility '1.7' + targetCompatibility '1.7' + options.encoding = 'UTF-8' +} + +test { + exclude 'de/schildbach/pte/live/**' +} diff --git a/enabler/.gitignore b/enabler/.gitignore deleted file mode 100644 index b136e5e6..00000000 --- a/enabler/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/.classpath -/.project -/.settings/ -/bin/ diff --git a/enabler/README.md b/enabler/README.md deleted file mode 100644 index 49c2b7b8..00000000 --- a/enabler/README.md +++ /dev/null @@ -1,31 +0,0 @@ -Public Transport Enabler -======================== - -This is a Java library allowing you to get data from public transport providers. -Look into [NetworkProvider.java](https://github.com/schildbach/public-transport-enabler/blob/master/enabler/src/de/schildbach/pte/NetworkProvider.java) for an overview of the API. - -Using providers that require secrets ------------------------------------- - -For some providers a secret like an API key is required to use their API. -Copy the `secrets.properties.template` file to `secrets.properties` like so: - - $ cp test/de/schildbach/pte/live/secrets.properties.template test/de/schildbach/pte/live/secrets.properties - -You need to request the secrets directly from the provider. For Navitia based providers, you can [request a secret here](http://www.navitia.io/register). - -How to run live tests? ----------------------- - -Make sure the test you want to run does not require a secret and if it does, see above for how to get one. -Once you have the secret or if your provider does not need one, you can run the tests in your IDE. -Both IntelliJ and Eclipse have excellent support for JUnit tests. - -If you prefer to run tests from the command line, you can comment out the test exclude at the end of -[build.gradle](https://github.com/schildbach/public-transport-enabler/blob/master/enabler/build.gradle#L30) -and use this command to only execute a test for a single provider: - - $ gradle -Dtest.single=ParisProviderLive test - -This uses the `ParisProvider` as an example. -Just replace it with the provider you want to test. diff --git a/enabler/build.gradle b/enabler/build.gradle deleted file mode 100644 index d1dbdd9f..00000000 --- a/enabler/build.gradle +++ /dev/null @@ -1,39 +0,0 @@ -apply plugin: 'java' -apply plugin: 'eclipse' -apply plugin: 'maven' - -group = 'de.schildbach.pte' -archivesBaseName = 'public-transport-enabler' - -dependencies { - compile 'com.squareup.okhttp3:okhttp:3.12.3' - compile 'com.squareup.okhttp3:logging-interceptor:3.12.3' - compile 'com.google.guava:guava:28.0-android' - compile 'org.slf4j:slf4j-api:1.7.25' - compile 'com.google.code.findbugs:jsr305:3.0.0' - compile 'org.json:json:20090211' // provided by Android - compile 'net.sf.kxml:kxml2:2.3.0' // provided by Android - testCompile 'junit:junit:4.12' - testRuntime 'org.slf4j:slf4j-jdk14:1.7.25' -} - -sourceSets { - main { - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - } - test { - java.srcDirs = ['test'] - resources.srcDirs = ['test'] - } -} - -compileJava { - sourceCompatibility '1.7' - targetCompatibility '1.7' - options.encoding = 'UTF-8' -} - -test { - exclude 'de/schildbach/pte/live/**' -} diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 153c5406..00000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include 'enabler' diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/AbstractEfaProvider.java rename to src/de/schildbach/pte/AbstractEfaProvider.java diff --git a/enabler/src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java b/src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java rename to src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java diff --git a/enabler/src/de/schildbach/pte/AbstractHafasLegacyProvider.java b/src/de/schildbach/pte/AbstractHafasLegacyProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/AbstractHafasLegacyProvider.java rename to src/de/schildbach/pte/AbstractHafasLegacyProvider.java diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/AbstractHafasProvider.java rename to src/de/schildbach/pte/AbstractHafasProvider.java diff --git a/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java b/src/de/schildbach/pte/AbstractNavitiaProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java rename to src/de/schildbach/pte/AbstractNavitiaProvider.java diff --git a/enabler/src/de/schildbach/pte/AbstractNetworkProvider.java b/src/de/schildbach/pte/AbstractNetworkProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/AbstractNetworkProvider.java rename to src/de/schildbach/pte/AbstractNetworkProvider.java diff --git a/enabler/src/de/schildbach/pte/AustraliaProvider.java b/src/de/schildbach/pte/AustraliaProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/AustraliaProvider.java rename to src/de/schildbach/pte/AustraliaProvider.java diff --git a/enabler/src/de/schildbach/pte/AvvAachenProvider.java b/src/de/schildbach/pte/AvvAachenProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/AvvAachenProvider.java rename to src/de/schildbach/pte/AvvAachenProvider.java diff --git a/enabler/src/de/schildbach/pte/AvvAugsburgProvider.java b/src/de/schildbach/pte/AvvAugsburgProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/AvvAugsburgProvider.java rename to src/de/schildbach/pte/AvvAugsburgProvider.java diff --git a/enabler/src/de/schildbach/pte/AvvProvider.java b/src/de/schildbach/pte/AvvProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/AvvProvider.java rename to src/de/schildbach/pte/AvvProvider.java diff --git a/enabler/src/de/schildbach/pte/BayernProvider.java b/src/de/schildbach/pte/BayernProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/BayernProvider.java rename to src/de/schildbach/pte/BayernProvider.java diff --git a/enabler/src/de/schildbach/pte/BritishColumbiaProvider.java b/src/de/schildbach/pte/BritishColumbiaProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/BritishColumbiaProvider.java rename to src/de/schildbach/pte/BritishColumbiaProvider.java diff --git a/enabler/src/de/schildbach/pte/BsvagProvider.java b/src/de/schildbach/pte/BsvagProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/BsvagProvider.java rename to src/de/schildbach/pte/BsvagProvider.java diff --git a/enabler/src/de/schildbach/pte/BvgProvider.java b/src/de/schildbach/pte/BvgProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/BvgProvider.java rename to src/de/schildbach/pte/BvgProvider.java diff --git a/enabler/src/de/schildbach/pte/CmtaProvider.java b/src/de/schildbach/pte/CmtaProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/CmtaProvider.java rename to src/de/schildbach/pte/CmtaProvider.java diff --git a/enabler/src/de/schildbach/pte/DbProvider.java b/src/de/schildbach/pte/DbProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/DbProvider.java rename to src/de/schildbach/pte/DbProvider.java diff --git a/enabler/src/de/schildbach/pte/DingProvider.java b/src/de/schildbach/pte/DingProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/DingProvider.java rename to src/de/schildbach/pte/DingProvider.java diff --git a/enabler/src/de/schildbach/pte/DsbProvider.java b/src/de/schildbach/pte/DsbProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/DsbProvider.java rename to src/de/schildbach/pte/DsbProvider.java diff --git a/enabler/src/de/schildbach/pte/DubProvider.java b/src/de/schildbach/pte/DubProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/DubProvider.java rename to src/de/schildbach/pte/DubProvider.java diff --git a/enabler/src/de/schildbach/pte/EireannProvider.java b/src/de/schildbach/pte/EireannProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/EireannProvider.java rename to src/de/schildbach/pte/EireannProvider.java diff --git a/enabler/src/de/schildbach/pte/FinlandProvider.java b/src/de/schildbach/pte/FinlandProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/FinlandProvider.java rename to src/de/schildbach/pte/FinlandProvider.java diff --git a/enabler/src/de/schildbach/pte/FranceNorthEastProvider.java b/src/de/schildbach/pte/FranceNorthEastProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/FranceNorthEastProvider.java rename to src/de/schildbach/pte/FranceNorthEastProvider.java diff --git a/enabler/src/de/schildbach/pte/FranceNorthWestProvider.java b/src/de/schildbach/pte/FranceNorthWestProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/FranceNorthWestProvider.java rename to src/de/schildbach/pte/FranceNorthWestProvider.java diff --git a/enabler/src/de/schildbach/pte/FranceSouthEastProvider.java b/src/de/schildbach/pte/FranceSouthEastProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/FranceSouthEastProvider.java rename to src/de/schildbach/pte/FranceSouthEastProvider.java diff --git a/enabler/src/de/schildbach/pte/FranceSouthWestProvider.java b/src/de/schildbach/pte/FranceSouthWestProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/FranceSouthWestProvider.java rename to src/de/schildbach/pte/FranceSouthWestProvider.java diff --git a/enabler/src/de/schildbach/pte/GhanaProvider.java b/src/de/schildbach/pte/GhanaProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/GhanaProvider.java rename to src/de/schildbach/pte/GhanaProvider.java diff --git a/enabler/src/de/schildbach/pte/GvhProvider.java b/src/de/schildbach/pte/GvhProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/GvhProvider.java rename to src/de/schildbach/pte/GvhProvider.java diff --git a/enabler/src/de/schildbach/pte/InvgProvider.java b/src/de/schildbach/pte/InvgProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/InvgProvider.java rename to src/de/schildbach/pte/InvgProvider.java diff --git a/enabler/src/de/schildbach/pte/ItalyProvider.java b/src/de/schildbach/pte/ItalyProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/ItalyProvider.java rename to src/de/schildbach/pte/ItalyProvider.java diff --git a/enabler/src/de/schildbach/pte/KvvProvider.java b/src/de/schildbach/pte/KvvProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/KvvProvider.java rename to src/de/schildbach/pte/KvvProvider.java diff --git a/enabler/src/de/schildbach/pte/LinzProvider.java b/src/de/schildbach/pte/LinzProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/LinzProvider.java rename to src/de/schildbach/pte/LinzProvider.java diff --git a/enabler/src/de/schildbach/pte/LocationUtils.java b/src/de/schildbach/pte/LocationUtils.java similarity index 100% rename from enabler/src/de/schildbach/pte/LocationUtils.java rename to src/de/schildbach/pte/LocationUtils.java diff --git a/enabler/src/de/schildbach/pte/LuProvider.java b/src/de/schildbach/pte/LuProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/LuProvider.java rename to src/de/schildbach/pte/LuProvider.java diff --git a/enabler/src/de/schildbach/pte/MassachusettsProvider.java b/src/de/schildbach/pte/MassachusettsProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/MassachusettsProvider.java rename to src/de/schildbach/pte/MassachusettsProvider.java diff --git a/enabler/src/de/schildbach/pte/MerseyProvider.java b/src/de/schildbach/pte/MerseyProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/MerseyProvider.java rename to src/de/schildbach/pte/MerseyProvider.java diff --git a/enabler/src/de/schildbach/pte/MvgProvider.java b/src/de/schildbach/pte/MvgProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/MvgProvider.java rename to src/de/schildbach/pte/MvgProvider.java diff --git a/enabler/src/de/schildbach/pte/MvvProvider.java b/src/de/schildbach/pte/MvvProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/MvvProvider.java rename to src/de/schildbach/pte/MvvProvider.java diff --git a/enabler/src/de/schildbach/pte/NasaProvider.java b/src/de/schildbach/pte/NasaProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/NasaProvider.java rename to src/de/schildbach/pte/NasaProvider.java diff --git a/enabler/src/de/schildbach/pte/NegentweeProvider.java b/src/de/schildbach/pte/NegentweeProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/NegentweeProvider.java rename to src/de/schildbach/pte/NegentweeProvider.java diff --git a/enabler/src/de/schildbach/pte/NetworkId.java b/src/de/schildbach/pte/NetworkId.java similarity index 100% rename from enabler/src/de/schildbach/pte/NetworkId.java rename to src/de/schildbach/pte/NetworkId.java diff --git a/enabler/src/de/schildbach/pte/NetworkProvider.java b/src/de/schildbach/pte/NetworkProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/NetworkProvider.java rename to src/de/schildbach/pte/NetworkProvider.java diff --git a/enabler/src/de/schildbach/pte/NicaraguaProvider.java b/src/de/schildbach/pte/NicaraguaProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/NicaraguaProvider.java rename to src/de/schildbach/pte/NicaraguaProvider.java diff --git a/enabler/src/de/schildbach/pte/NsProvider.java b/src/de/schildbach/pte/NsProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/NsProvider.java rename to src/de/schildbach/pte/NsProvider.java diff --git a/enabler/src/de/schildbach/pte/NvbwProvider.java b/src/de/schildbach/pte/NvbwProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/NvbwProvider.java rename to src/de/schildbach/pte/NvbwProvider.java diff --git a/enabler/src/de/schildbach/pte/NvvProvider.java b/src/de/schildbach/pte/NvvProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/NvvProvider.java rename to src/de/schildbach/pte/NvvProvider.java diff --git a/enabler/src/de/schildbach/pte/NzProvider.java b/src/de/schildbach/pte/NzProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/NzProvider.java rename to src/de/schildbach/pte/NzProvider.java diff --git a/enabler/src/de/schildbach/pte/OebbProvider.java b/src/de/schildbach/pte/OebbProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/OebbProvider.java rename to src/de/schildbach/pte/OebbProvider.java diff --git a/enabler/src/de/schildbach/pte/OntarioProvider.java b/src/de/schildbach/pte/OntarioProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/OntarioProvider.java rename to src/de/schildbach/pte/OntarioProvider.java diff --git a/enabler/src/de/schildbach/pte/OoevvProvider.java b/src/de/schildbach/pte/OoevvProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/OoevvProvider.java rename to src/de/schildbach/pte/OoevvProvider.java diff --git a/enabler/src/de/schildbach/pte/OregonProvider.java b/src/de/schildbach/pte/OregonProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/OregonProvider.java rename to src/de/schildbach/pte/OregonProvider.java diff --git a/enabler/src/de/schildbach/pte/ParisProvider.java b/src/de/schildbach/pte/ParisProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/ParisProvider.java rename to src/de/schildbach/pte/ParisProvider.java diff --git a/enabler/src/de/schildbach/pte/PlNavitiaProvider.java b/src/de/schildbach/pte/PlNavitiaProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/PlNavitiaProvider.java rename to src/de/schildbach/pte/PlNavitiaProvider.java diff --git a/enabler/src/de/schildbach/pte/PlProvider.java b/src/de/schildbach/pte/PlProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/PlProvider.java rename to src/de/schildbach/pte/PlProvider.java diff --git a/enabler/src/de/schildbach/pte/QuebecProvider.java b/src/de/schildbach/pte/QuebecProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/QuebecProvider.java rename to src/de/schildbach/pte/QuebecProvider.java diff --git a/enabler/src/de/schildbach/pte/RtProvider.java b/src/de/schildbach/pte/RtProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/RtProvider.java rename to src/de/schildbach/pte/RtProvider.java diff --git a/enabler/src/de/schildbach/pte/RtaChicagoProvider.java b/src/de/schildbach/pte/RtaChicagoProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/RtaChicagoProvider.java rename to src/de/schildbach/pte/RtaChicagoProvider.java diff --git a/enabler/src/de/schildbach/pte/SbbProvider.java b/src/de/schildbach/pte/SbbProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/SbbProvider.java rename to src/de/schildbach/pte/SbbProvider.java diff --git a/enabler/src/de/schildbach/pte/SeProvider.java b/src/de/schildbach/pte/SeProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/SeProvider.java rename to src/de/schildbach/pte/SeProvider.java diff --git a/enabler/src/de/schildbach/pte/ShProvider.java b/src/de/schildbach/pte/ShProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/ShProvider.java rename to src/de/schildbach/pte/ShProvider.java diff --git a/enabler/src/de/schildbach/pte/SncbProvider.java b/src/de/schildbach/pte/SncbProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/SncbProvider.java rename to src/de/schildbach/pte/SncbProvider.java diff --git a/enabler/src/de/schildbach/pte/SpainProvider.java b/src/de/schildbach/pte/SpainProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/SpainProvider.java rename to src/de/schildbach/pte/SpainProvider.java diff --git a/enabler/src/de/schildbach/pte/Standard.java b/src/de/schildbach/pte/Standard.java similarity index 100% rename from enabler/src/de/schildbach/pte/Standard.java rename to src/de/schildbach/pte/Standard.java diff --git a/enabler/src/de/schildbach/pte/StvProvider.java b/src/de/schildbach/pte/StvProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/StvProvider.java rename to src/de/schildbach/pte/StvProvider.java diff --git a/enabler/src/de/schildbach/pte/SvvProvider.java b/src/de/schildbach/pte/SvvProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/SvvProvider.java rename to src/de/schildbach/pte/SvvProvider.java diff --git a/enabler/src/de/schildbach/pte/SydneyProvider.java b/src/de/schildbach/pte/SydneyProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/SydneyProvider.java rename to src/de/schildbach/pte/SydneyProvider.java diff --git a/enabler/src/de/schildbach/pte/TfiProvider.java b/src/de/schildbach/pte/TfiProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/TfiProvider.java rename to src/de/schildbach/pte/TfiProvider.java diff --git a/enabler/src/de/schildbach/pte/TlemProvider.java b/src/de/schildbach/pte/TlemProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/TlemProvider.java rename to src/de/schildbach/pte/TlemProvider.java diff --git a/enabler/src/de/schildbach/pte/VaoProvider.java b/src/de/schildbach/pte/VaoProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VaoProvider.java rename to src/de/schildbach/pte/VaoProvider.java diff --git a/enabler/src/de/schildbach/pte/VbbProvider.java b/src/de/schildbach/pte/VbbProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VbbProvider.java rename to src/de/schildbach/pte/VbbProvider.java diff --git a/enabler/src/de/schildbach/pte/VblProvider.java b/src/de/schildbach/pte/VblProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VblProvider.java rename to src/de/schildbach/pte/VblProvider.java diff --git a/enabler/src/de/schildbach/pte/VbnProvider.java b/src/de/schildbach/pte/VbnProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VbnProvider.java rename to src/de/schildbach/pte/VbnProvider.java diff --git a/enabler/src/de/schildbach/pte/VgnProvider.java b/src/de/schildbach/pte/VgnProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VgnProvider.java rename to src/de/schildbach/pte/VgnProvider.java diff --git a/enabler/src/de/schildbach/pte/VgsProvider.java b/src/de/schildbach/pte/VgsProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VgsProvider.java rename to src/de/schildbach/pte/VgsProvider.java diff --git a/enabler/src/de/schildbach/pte/VmobilProvider.java b/src/de/schildbach/pte/VmobilProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VmobilProvider.java rename to src/de/schildbach/pte/VmobilProvider.java diff --git a/enabler/src/de/schildbach/pte/VmsProvider.java b/src/de/schildbach/pte/VmsProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VmsProvider.java rename to src/de/schildbach/pte/VmsProvider.java diff --git a/enabler/src/de/schildbach/pte/VmtProvider.java b/src/de/schildbach/pte/VmtProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VmtProvider.java rename to src/de/schildbach/pte/VmtProvider.java diff --git a/enabler/src/de/schildbach/pte/VmvProvider.java b/src/de/schildbach/pte/VmvProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VmvProvider.java rename to src/de/schildbach/pte/VmvProvider.java diff --git a/enabler/src/de/schildbach/pte/VorProvider.java b/src/de/schildbach/pte/VorProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VorProvider.java rename to src/de/schildbach/pte/VorProvider.java diff --git a/enabler/src/de/schildbach/pte/VrnProvider.java b/src/de/schildbach/pte/VrnProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VrnProvider.java rename to src/de/schildbach/pte/VrnProvider.java diff --git a/enabler/src/de/schildbach/pte/VrrProvider.java b/src/de/schildbach/pte/VrrProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VrrProvider.java rename to src/de/schildbach/pte/VrrProvider.java diff --git a/enabler/src/de/schildbach/pte/VrsProvider.java b/src/de/schildbach/pte/VrsProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VrsProvider.java rename to src/de/schildbach/pte/VrsProvider.java diff --git a/enabler/src/de/schildbach/pte/VvmProvider.java b/src/de/schildbach/pte/VvmProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VvmProvider.java rename to src/de/schildbach/pte/VvmProvider.java diff --git a/enabler/src/de/schildbach/pte/VvoProvider.java b/src/de/schildbach/pte/VvoProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VvoProvider.java rename to src/de/schildbach/pte/VvoProvider.java diff --git a/enabler/src/de/schildbach/pte/VvsProvider.java b/src/de/schildbach/pte/VvsProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VvsProvider.java rename to src/de/schildbach/pte/VvsProvider.java diff --git a/enabler/src/de/schildbach/pte/VvtProvider.java b/src/de/schildbach/pte/VvtProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VvtProvider.java rename to src/de/schildbach/pte/VvtProvider.java diff --git a/enabler/src/de/schildbach/pte/VvvProvider.java b/src/de/schildbach/pte/VvvProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/VvvProvider.java rename to src/de/schildbach/pte/VvvProvider.java diff --git a/enabler/src/de/schildbach/pte/WienProvider.java b/src/de/schildbach/pte/WienProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/WienProvider.java rename to src/de/schildbach/pte/WienProvider.java diff --git a/enabler/src/de/schildbach/pte/ZvvProvider.java b/src/de/schildbach/pte/ZvvProvider.java similarity index 100% rename from enabler/src/de/schildbach/pte/ZvvProvider.java rename to src/de/schildbach/pte/ZvvProvider.java diff --git a/enabler/src/de/schildbach/pte/dto/Departure.java b/src/de/schildbach/pte/dto/Departure.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/Departure.java rename to src/de/schildbach/pte/dto/Departure.java diff --git a/enabler/src/de/schildbach/pte/dto/Fare.java b/src/de/schildbach/pte/dto/Fare.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/Fare.java rename to src/de/schildbach/pte/dto/Fare.java diff --git a/enabler/src/de/schildbach/pte/dto/Line.java b/src/de/schildbach/pte/dto/Line.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/Line.java rename to src/de/schildbach/pte/dto/Line.java diff --git a/enabler/src/de/schildbach/pte/dto/LineDestination.java b/src/de/schildbach/pte/dto/LineDestination.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/LineDestination.java rename to src/de/schildbach/pte/dto/LineDestination.java diff --git a/enabler/src/de/schildbach/pte/dto/Location.java b/src/de/schildbach/pte/dto/Location.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/Location.java rename to src/de/schildbach/pte/dto/Location.java diff --git a/enabler/src/de/schildbach/pte/dto/LocationType.java b/src/de/schildbach/pte/dto/LocationType.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/LocationType.java rename to src/de/schildbach/pte/dto/LocationType.java diff --git a/enabler/src/de/schildbach/pte/dto/NearbyLocationsResult.java b/src/de/schildbach/pte/dto/NearbyLocationsResult.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/NearbyLocationsResult.java rename to src/de/schildbach/pte/dto/NearbyLocationsResult.java diff --git a/enabler/src/de/schildbach/pte/dto/Point.java b/src/de/schildbach/pte/dto/Point.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/Point.java rename to src/de/schildbach/pte/dto/Point.java diff --git a/enabler/src/de/schildbach/pte/dto/Position.java b/src/de/schildbach/pte/dto/Position.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/Position.java rename to src/de/schildbach/pte/dto/Position.java diff --git a/enabler/src/de/schildbach/pte/dto/Product.java b/src/de/schildbach/pte/dto/Product.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/Product.java rename to src/de/schildbach/pte/dto/Product.java diff --git a/enabler/src/de/schildbach/pte/dto/QueryDeparturesResult.java b/src/de/schildbach/pte/dto/QueryDeparturesResult.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/QueryDeparturesResult.java rename to src/de/schildbach/pte/dto/QueryDeparturesResult.java diff --git a/enabler/src/de/schildbach/pte/dto/QueryTripsContext.java b/src/de/schildbach/pte/dto/QueryTripsContext.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/QueryTripsContext.java rename to src/de/schildbach/pte/dto/QueryTripsContext.java diff --git a/enabler/src/de/schildbach/pte/dto/QueryTripsResult.java b/src/de/schildbach/pte/dto/QueryTripsResult.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/QueryTripsResult.java rename to src/de/schildbach/pte/dto/QueryTripsResult.java diff --git a/enabler/src/de/schildbach/pte/dto/ResultHeader.java b/src/de/schildbach/pte/dto/ResultHeader.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/ResultHeader.java rename to src/de/schildbach/pte/dto/ResultHeader.java diff --git a/enabler/src/de/schildbach/pte/dto/StationDepartures.java b/src/de/schildbach/pte/dto/StationDepartures.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/StationDepartures.java rename to src/de/schildbach/pte/dto/StationDepartures.java diff --git a/enabler/src/de/schildbach/pte/dto/Stop.java b/src/de/schildbach/pte/dto/Stop.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/Stop.java rename to src/de/schildbach/pte/dto/Stop.java diff --git a/enabler/src/de/schildbach/pte/dto/Style.java b/src/de/schildbach/pte/dto/Style.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/Style.java rename to src/de/schildbach/pte/dto/Style.java diff --git a/enabler/src/de/schildbach/pte/dto/SuggestLocationsResult.java b/src/de/schildbach/pte/dto/SuggestLocationsResult.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/SuggestLocationsResult.java rename to src/de/schildbach/pte/dto/SuggestLocationsResult.java diff --git a/enabler/src/de/schildbach/pte/dto/SuggestedLocation.java b/src/de/schildbach/pte/dto/SuggestedLocation.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/SuggestedLocation.java rename to src/de/schildbach/pte/dto/SuggestedLocation.java diff --git a/enabler/src/de/schildbach/pte/dto/Trip.java b/src/de/schildbach/pte/dto/Trip.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/Trip.java rename to src/de/schildbach/pte/dto/Trip.java diff --git a/enabler/src/de/schildbach/pte/dto/TripOptions.java b/src/de/schildbach/pte/dto/TripOptions.java similarity index 100% rename from enabler/src/de/schildbach/pte/dto/TripOptions.java rename to src/de/schildbach/pte/dto/TripOptions.java diff --git a/enabler/src/de/schildbach/pte/exception/AbstractHttpException.java b/src/de/schildbach/pte/exception/AbstractHttpException.java similarity index 100% rename from enabler/src/de/schildbach/pte/exception/AbstractHttpException.java rename to src/de/schildbach/pte/exception/AbstractHttpException.java diff --git a/enabler/src/de/schildbach/pte/exception/BlockedException.java b/src/de/schildbach/pte/exception/BlockedException.java similarity index 100% rename from enabler/src/de/schildbach/pte/exception/BlockedException.java rename to src/de/schildbach/pte/exception/BlockedException.java diff --git a/enabler/src/de/schildbach/pte/exception/InternalErrorException.java b/src/de/schildbach/pte/exception/InternalErrorException.java similarity index 100% rename from enabler/src/de/schildbach/pte/exception/InternalErrorException.java rename to src/de/schildbach/pte/exception/InternalErrorException.java diff --git a/enabler/src/de/schildbach/pte/exception/InvalidDataException.java b/src/de/schildbach/pte/exception/InvalidDataException.java similarity index 100% rename from enabler/src/de/schildbach/pte/exception/InvalidDataException.java rename to src/de/schildbach/pte/exception/InvalidDataException.java diff --git a/enabler/src/de/schildbach/pte/exception/NotFoundException.java b/src/de/schildbach/pte/exception/NotFoundException.java similarity index 100% rename from enabler/src/de/schildbach/pte/exception/NotFoundException.java rename to src/de/schildbach/pte/exception/NotFoundException.java diff --git a/enabler/src/de/schildbach/pte/exception/ParserException.java b/src/de/schildbach/pte/exception/ParserException.java similarity index 100% rename from enabler/src/de/schildbach/pte/exception/ParserException.java rename to src/de/schildbach/pte/exception/ParserException.java diff --git a/enabler/src/de/schildbach/pte/exception/SessionExpiredException.java b/src/de/schildbach/pte/exception/SessionExpiredException.java similarity index 100% rename from enabler/src/de/schildbach/pte/exception/SessionExpiredException.java rename to src/de/schildbach/pte/exception/SessionExpiredException.java diff --git a/enabler/src/de/schildbach/pte/exception/UnexpectedRedirectException.java b/src/de/schildbach/pte/exception/UnexpectedRedirectException.java similarity index 100% rename from enabler/src/de/schildbach/pte/exception/UnexpectedRedirectException.java rename to src/de/schildbach/pte/exception/UnexpectedRedirectException.java diff --git a/enabler/src/de/schildbach/pte/util/CharQueue.java b/src/de/schildbach/pte/util/CharQueue.java similarity index 100% rename from enabler/src/de/schildbach/pte/util/CharQueue.java rename to src/de/schildbach/pte/util/CharQueue.java diff --git a/enabler/src/de/schildbach/pte/util/HttpClient.java b/src/de/schildbach/pte/util/HttpClient.java similarity index 100% rename from enabler/src/de/schildbach/pte/util/HttpClient.java rename to src/de/schildbach/pte/util/HttpClient.java diff --git a/enabler/src/de/schildbach/pte/util/LittleEndianDataInputStream.java b/src/de/schildbach/pte/util/LittleEndianDataInputStream.java similarity index 100% rename from enabler/src/de/schildbach/pte/util/LittleEndianDataInputStream.java rename to src/de/schildbach/pte/util/LittleEndianDataInputStream.java diff --git a/enabler/src/de/schildbach/pte/util/ParserUtils.java b/src/de/schildbach/pte/util/ParserUtils.java similarity index 100% rename from enabler/src/de/schildbach/pte/util/ParserUtils.java rename to src/de/schildbach/pte/util/ParserUtils.java diff --git a/enabler/src/de/schildbach/pte/util/PolylineFormat.java b/src/de/schildbach/pte/util/PolylineFormat.java similarity index 100% rename from enabler/src/de/schildbach/pte/util/PolylineFormat.java rename to src/de/schildbach/pte/util/PolylineFormat.java diff --git a/enabler/src/de/schildbach/pte/util/StringReplaceReader.java b/src/de/schildbach/pte/util/StringReplaceReader.java similarity index 100% rename from enabler/src/de/schildbach/pte/util/StringReplaceReader.java rename to src/de/schildbach/pte/util/StringReplaceReader.java diff --git a/enabler/src/de/schildbach/pte/util/WordUtils.java b/src/de/schildbach/pte/util/WordUtils.java similarity index 100% rename from enabler/src/de/schildbach/pte/util/WordUtils.java rename to src/de/schildbach/pte/util/WordUtils.java diff --git a/enabler/src/de/schildbach/pte/util/XmlPullUtil.java b/src/de/schildbach/pte/util/XmlPullUtil.java similarity index 100% rename from enabler/src/de/schildbach/pte/util/XmlPullUtil.java rename to src/de/schildbach/pte/util/XmlPullUtil.java diff --git a/enabler/test/de/schildbach/pte/dto/StyleTest.java b/test/de/schildbach/pte/dto/StyleTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/dto/StyleTest.java rename to test/de/schildbach/pte/dto/StyleTest.java diff --git a/enabler/test/de/schildbach/pte/dto/TripTest.java b/test/de/schildbach/pte/dto/TripTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/dto/TripTest.java rename to test/de/schildbach/pte/dto/TripTest.java diff --git a/enabler/test/de/schildbach/pte/live/.gitignore b/test/de/schildbach/pte/live/.gitignore similarity index 100% rename from enabler/test/de/schildbach/pte/live/.gitignore rename to test/de/schildbach/pte/live/.gitignore diff --git a/enabler/test/de/schildbach/pte/live/AbstractNavitiaProviderLiveTest.java b/test/de/schildbach/pte/live/AbstractNavitiaProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/AbstractNavitiaProviderLiveTest.java rename to test/de/schildbach/pte/live/AbstractNavitiaProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java b/test/de/schildbach/pte/live/AbstractProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java rename to test/de/schildbach/pte/live/AbstractProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/AustraliaProviderLiveTest.java b/test/de/schildbach/pte/live/AustraliaProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/AustraliaProviderLiveTest.java rename to test/de/schildbach/pte/live/AustraliaProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/AvvAachenProviderLiveTest.java b/test/de/schildbach/pte/live/AvvAachenProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/AvvAachenProviderLiveTest.java rename to test/de/schildbach/pte/live/AvvAachenProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/AvvAugsburgProviderLiveTest.java b/test/de/schildbach/pte/live/AvvAugsburgProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/AvvAugsburgProviderLiveTest.java rename to test/de/schildbach/pte/live/AvvAugsburgProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java b/test/de/schildbach/pte/live/AvvProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java rename to test/de/schildbach/pte/live/AvvProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java b/test/de/schildbach/pte/live/BayernProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java rename to test/de/schildbach/pte/live/BayernProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/BritishColumbiaProviderLiveTest.java b/test/de/schildbach/pte/live/BritishColumbiaProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/BritishColumbiaProviderLiveTest.java rename to test/de/schildbach/pte/live/BritishColumbiaProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java b/test/de/schildbach/pte/live/BsvagProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java rename to test/de/schildbach/pte/live/BsvagProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java b/test/de/schildbach/pte/live/BvgProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java rename to test/de/schildbach/pte/live/BvgProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/CmtaProviderLiveTest.java b/test/de/schildbach/pte/live/CmtaProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/CmtaProviderLiveTest.java rename to test/de/schildbach/pte/live/CmtaProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/DbProviderLiveTest.java b/test/de/schildbach/pte/live/DbProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/DbProviderLiveTest.java rename to test/de/schildbach/pte/live/DbProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java b/test/de/schildbach/pte/live/DingProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java rename to test/de/schildbach/pte/live/DingProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java b/test/de/schildbach/pte/live/DsbProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java rename to test/de/schildbach/pte/live/DsbProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java b/test/de/schildbach/pte/live/DubProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java rename to test/de/schildbach/pte/live/DubProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java b/test/de/schildbach/pte/live/EireannProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java rename to test/de/schildbach/pte/live/EireannProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/FinlandProviderLiveTest.java b/test/de/schildbach/pte/live/FinlandProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/FinlandProviderLiveTest.java rename to test/de/schildbach/pte/live/FinlandProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/FranceNorthEastProviderLiveTest.java b/test/de/schildbach/pte/live/FranceNorthEastProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/FranceNorthEastProviderLiveTest.java rename to test/de/schildbach/pte/live/FranceNorthEastProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/FranceNorthWestProviderLiveTest.java b/test/de/schildbach/pte/live/FranceNorthWestProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/FranceNorthWestProviderLiveTest.java rename to test/de/schildbach/pte/live/FranceNorthWestProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/FranceSouthEastProviderLiveTest.java b/test/de/schildbach/pte/live/FranceSouthEastProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/FranceSouthEastProviderLiveTest.java rename to test/de/schildbach/pte/live/FranceSouthEastProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/FranceSouthWestProviderLiveTest.java b/test/de/schildbach/pte/live/FranceSouthWestProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/FranceSouthWestProviderLiveTest.java rename to test/de/schildbach/pte/live/FranceSouthWestProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/GhanaProviderLiveTest.java b/test/de/schildbach/pte/live/GhanaProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/GhanaProviderLiveTest.java rename to test/de/schildbach/pte/live/GhanaProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java b/test/de/schildbach/pte/live/GvhProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java rename to test/de/schildbach/pte/live/GvhProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java b/test/de/schildbach/pte/live/InvgProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java rename to test/de/schildbach/pte/live/InvgProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/ItalyProviderLiveTest.java b/test/de/schildbach/pte/live/ItalyProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/ItalyProviderLiveTest.java rename to test/de/schildbach/pte/live/ItalyProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java b/test/de/schildbach/pte/live/KvvProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java rename to test/de/schildbach/pte/live/KvvProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java b/test/de/schildbach/pte/live/LinzProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java rename to test/de/schildbach/pte/live/LinzProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java b/test/de/schildbach/pte/live/LuProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java rename to test/de/schildbach/pte/live/LuProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/MassachusettsProviderLiveTest.java b/test/de/schildbach/pte/live/MassachusettsProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/MassachusettsProviderLiveTest.java rename to test/de/schildbach/pte/live/MassachusettsProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/MerseyProviderLiveTest.java b/test/de/schildbach/pte/live/MerseyProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/MerseyProviderLiveTest.java rename to test/de/schildbach/pte/live/MerseyProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java b/test/de/schildbach/pte/live/MvgProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java rename to test/de/schildbach/pte/live/MvgProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java b/test/de/schildbach/pte/live/MvvProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java rename to test/de/schildbach/pte/live/MvvProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java b/test/de/schildbach/pte/live/NasaProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java rename to test/de/schildbach/pte/live/NasaProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/NegentweeProviderLiveTest.java b/test/de/schildbach/pte/live/NegentweeProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/NegentweeProviderLiveTest.java rename to test/de/schildbach/pte/live/NegentweeProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/NicaraguaProviderLiveTest.java b/test/de/schildbach/pte/live/NicaraguaProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/NicaraguaProviderLiveTest.java rename to test/de/schildbach/pte/live/NicaraguaProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java b/test/de/schildbach/pte/live/NsProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java rename to test/de/schildbach/pte/live/NsProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java b/test/de/schildbach/pte/live/NvbwProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java rename to test/de/schildbach/pte/live/NvbwProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java b/test/de/schildbach/pte/live/NvvProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java rename to test/de/schildbach/pte/live/NvvProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/NzProviderLiveTest.java b/test/de/schildbach/pte/live/NzProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/NzProviderLiveTest.java rename to test/de/schildbach/pte/live/NzProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java b/test/de/schildbach/pte/live/OebbProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java rename to test/de/schildbach/pte/live/OebbProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/OntarioProviderLiveTest.java b/test/de/schildbach/pte/live/OntarioProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/OntarioProviderLiveTest.java rename to test/de/schildbach/pte/live/OntarioProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/OoevvProviderLiveTest.java b/test/de/schildbach/pte/live/OoevvProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/OoevvProviderLiveTest.java rename to test/de/schildbach/pte/live/OoevvProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/OregonProviderLiveTest.java b/test/de/schildbach/pte/live/OregonProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/OregonProviderLiveTest.java rename to test/de/schildbach/pte/live/OregonProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/ParisProviderLiveTest.java b/test/de/schildbach/pte/live/ParisProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/ParisProviderLiveTest.java rename to test/de/schildbach/pte/live/ParisProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/PlNavitiaProviderLiveTest.java b/test/de/schildbach/pte/live/PlNavitiaProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/PlNavitiaProviderLiveTest.java rename to test/de/schildbach/pte/live/PlNavitiaProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java b/test/de/schildbach/pte/live/PlProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java rename to test/de/schildbach/pte/live/PlProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/QuebecProviderLiveTest.java b/test/de/schildbach/pte/live/QuebecProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/QuebecProviderLiveTest.java rename to test/de/schildbach/pte/live/QuebecProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java b/test/de/schildbach/pte/live/RtProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java rename to test/de/schildbach/pte/live/RtProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/RtaChicagoProviderLiveTest.java b/test/de/schildbach/pte/live/RtaChicagoProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/RtaChicagoProviderLiveTest.java rename to test/de/schildbach/pte/live/RtaChicagoProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java b/test/de/schildbach/pte/live/SbbProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java rename to test/de/schildbach/pte/live/SbbProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java b/test/de/schildbach/pte/live/SeProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java rename to test/de/schildbach/pte/live/SeProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java b/test/de/schildbach/pte/live/ShProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java rename to test/de/schildbach/pte/live/ShProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java b/test/de/schildbach/pte/live/SncbProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java rename to test/de/schildbach/pte/live/SncbProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/SpainProviderLiveTest.java b/test/de/schildbach/pte/live/SpainProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/SpainProviderLiveTest.java rename to test/de/schildbach/pte/live/SpainProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java b/test/de/schildbach/pte/live/StvProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java rename to test/de/schildbach/pte/live/StvProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java b/test/de/schildbach/pte/live/SvvProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java rename to test/de/schildbach/pte/live/SvvProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java b/test/de/schildbach/pte/live/SydneyProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java rename to test/de/schildbach/pte/live/SydneyProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java b/test/de/schildbach/pte/live/TfiProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java rename to test/de/schildbach/pte/live/TfiProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java b/test/de/schildbach/pte/live/TlemProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java rename to test/de/schildbach/pte/live/TlemProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VaoProviderLiveTest.java b/test/de/schildbach/pte/live/VaoProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VaoProviderLiveTest.java rename to test/de/schildbach/pte/live/VaoProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java b/test/de/schildbach/pte/live/VbbProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java rename to test/de/schildbach/pte/live/VbbProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java b/test/de/schildbach/pte/live/VblProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java rename to test/de/schildbach/pte/live/VblProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java b/test/de/schildbach/pte/live/VbnProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java rename to test/de/schildbach/pte/live/VbnProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java b/test/de/schildbach/pte/live/VgnProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java rename to test/de/schildbach/pte/live/VgnProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java b/test/de/schildbach/pte/live/VgsProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java rename to test/de/schildbach/pte/live/VgsProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java b/test/de/schildbach/pte/live/VmobilProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java rename to test/de/schildbach/pte/live/VmobilProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java b/test/de/schildbach/pte/live/VmsProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java rename to test/de/schildbach/pte/live/VmsProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VmtProviderLiveTest.java b/test/de/schildbach/pte/live/VmtProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VmtProviderLiveTest.java rename to test/de/schildbach/pte/live/VmtProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java b/test/de/schildbach/pte/live/VmvProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java rename to test/de/schildbach/pte/live/VmvProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java b/test/de/schildbach/pte/live/VorProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java rename to test/de/schildbach/pte/live/VorProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java b/test/de/schildbach/pte/live/VrnProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java rename to test/de/schildbach/pte/live/VrnProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java b/test/de/schildbach/pte/live/VrrProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java rename to test/de/schildbach/pte/live/VrrProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VrsProviderLiveTest.java b/test/de/schildbach/pte/live/VrsProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VrsProviderLiveTest.java rename to test/de/schildbach/pte/live/VrsProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java b/test/de/schildbach/pte/live/VvmProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java rename to test/de/schildbach/pte/live/VvmProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java b/test/de/schildbach/pte/live/VvoProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java rename to test/de/schildbach/pte/live/VvoProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java b/test/de/schildbach/pte/live/VvsProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java rename to test/de/schildbach/pte/live/VvsProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java b/test/de/schildbach/pte/live/VvtProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java rename to test/de/schildbach/pte/live/VvtProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java b/test/de/schildbach/pte/live/VvvProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java rename to test/de/schildbach/pte/live/VvvProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java b/test/de/schildbach/pte/live/WienProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java rename to test/de/schildbach/pte/live/WienProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java b/test/de/schildbach/pte/live/ZvvProviderLiveTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java rename to test/de/schildbach/pte/live/ZvvProviderLiveTest.java diff --git a/enabler/test/de/schildbach/pte/live/secrets.properties.template b/test/de/schildbach/pte/live/secrets.properties.template similarity index 100% rename from enabler/test/de/schildbach/pte/live/secrets.properties.template rename to test/de/schildbach/pte/live/secrets.properties.template diff --git a/enabler/test/de/schildbach/pte/util/HttpClientTest.java b/test/de/schildbach/pte/util/HttpClientTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/util/HttpClientTest.java rename to test/de/schildbach/pte/util/HttpClientTest.java diff --git a/enabler/test/de/schildbach/pte/util/Iso8601Format.java b/test/de/schildbach/pte/util/Iso8601Format.java similarity index 100% rename from enabler/test/de/schildbach/pte/util/Iso8601Format.java rename to test/de/schildbach/pte/util/Iso8601Format.java diff --git a/enabler/test/de/schildbach/pte/util/PolylineFormatTest.java b/test/de/schildbach/pte/util/PolylineFormatTest.java similarity index 100% rename from enabler/test/de/schildbach/pte/util/PolylineFormatTest.java rename to test/de/schildbach/pte/util/PolylineFormatTest.java