diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
index 37e37a84945..9f34ed64a9f 100644
--- a/.github/workflows/cibuild.yml
+++ b/.github/workflows/cibuild.yml
@@ -154,7 +154,7 @@ jobs:
           # schema hasn't changed.
           # example commit: https://github.com/opentripplanner/docs/commit/45e6ddf8e4a4
           
-          SCHEMA_FILE_MODIFIED=`git log -n 1 --pretty=format:%ct src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls`
+          SCHEMA_FILE_MODIFIED=`git log -n 1 --pretty=format:%ct application/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls`
           echo "schema modified at ${SCHEMA_FILE_MODIFIED}"
           git checkout $LOCAL_BRANCH
           DOCS_MODIFIED=`git log -n 1 --pretty=format:%ct api/dev-2.x/graphql-gtfs/introduction.html`
@@ -181,7 +181,7 @@ jobs:
         with:
           node-version: 16
       - name: Run code generator
-        working-directory: src/main/java/org/opentripplanner/apis/gtfs/generated
+        working-directory: application/src/main/java/org/opentripplanner/apis/gtfs/generated
         run: |
           yarn install
           yarn generate
diff --git a/.github/workflows/debug-client.yml b/.github/workflows/debug-client.yml
index 6857b56b161..3c87e1c1b5c 100644
--- a/.github/workflows/debug-client.yml
+++ b/.github/workflows/debug-client.yml
@@ -76,8 +76,8 @@ jobs:
           git checkout dev-2.x
           git pull --rebase
           
-          CLIENT_HTML_OUTPUT=src/client/index.html
-          mkdir -p src/client/
+          CLIENT_HTML_OUTPUT=application/src/client/index.html
+          mkdir -p application/src/client/
           cp client/output/index.html ${CLIENT_HTML_OUTPUT}
           
           # just to debug
diff --git a/application/pom.xml b/application/pom.xml
new file mode 100644
index 00000000000..a9c61668b17
--- /dev/null
+++ b/application/pom.xml
@@ -0,0 +1,551 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.opentripplanner</groupId>
+        <artifactId>otp-root</artifactId>
+        <version>2.7.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>otp</artifactId>
+    <name>OpenTripPlanner - Application</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>net.sf.trove4j</groupId>
+            <artifactId>trove4j</artifactId>
+        </dependency>
+        <!-- Logging API -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <!-- Jersey uses java.util logging, redirect it to slf4j API (we use the Logback implementation) -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jul-to-slf4j</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <!-- Logging library, implements slf4j logging API -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <!-- JSON-formatted logging -->
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <version>8.0</version>
+        </dependency>
+
+        <!-- dependency injection -->
+        <dependency>
+            <groupId>com.google.dagger</groupId>
+            <artifactId>dagger</artifactId>
+            <version>${google.dagger.version}</version>
+        </dependency>
+
+        <!-- GEOTOOLS -->
+
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-coverage</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-geotiff</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-geojson-core</artifactId>
+        </dependency>
+
+        <!-- Lucene is used by the Debug Client Geocode API -->
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-core</artifactId>
+            <version>${lucene.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-queryparser</artifactId>
+            <version>${lucene.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-suggest</artifactId>
+            <version>${lucene.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+            <version>${micrometer.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-influx</artifactId>
+            <version>${micrometer.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- netcdf4 -->
+
+        <dependency>
+            <groupId>edu.ucar</groupId>
+            <artifactId>netcdf4</artifactId>
+            <version>${netcdf4.version}</version>
+        </dependency>
+        <!--
+            Netex XML document - JAXB generated Java model.
+            This is generated using the official Netex schema(v1.0) and support the entire model,
+            not just the Nordic/Norwegian profile which is currently supported by OTP.
+         -->
+        <dependency>
+            <groupId>org.entur</groupId>
+            <artifactId>netex-java-model</artifactId>
+            <version>${netex-java-model.version}</version>
+        </dependency>
+
+        <!-- SIRI -->
+        <dependency>
+            <groupId>org.entur</groupId>
+            <artifactId>siri-java-model</artifactId>
+            <version>${siri-java-model.version}</version>
+        </dependency>
+
+        <!-- XML <-> protobuf-mapper for SIRI-->
+        <dependency>
+            <groupId>org.entur</groupId>
+            <artifactId>siri-protobuf-mapper</artifactId>
+            <version>1.0.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mobilitydata</groupId>
+            <artifactId>gbfs-java-model</artifactId>
+            <version>1.0.7</version>
+        </dependency>
+
+        <!-- TESTING -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.truth</groupId>
+            <artifactId>truth</artifactId>
+            <version>1.4.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.tngtech.archunit</groupId>
+            <artifactId>archunit</artifactId>
+            <version>1.3.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>5.13.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.github.origin-energy</groupId>
+            <artifactId>java-snapshot-testing-junit5</artifactId>
+            <version>2.3.0</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- Provides some shared serializers for Kryo. Introduces transitive dependencies on Trove, and Kryo. -->
+        <!-- Also provides classes for testing that a round trip through serialization reproduces the same network. -->
+        <dependency>
+            <groupId>com.conveyal</groupId>
+            <artifactId>kryo-tools</artifactId>
+            <version>1.6.0</version>
+        </dependency>
+        <!-- kryo serializers for Guava types !-->
+        <dependency>
+            <groupId>de.javakaffee</groupId>
+            <artifactId>kryo-serializers</artifactId>
+            <version>0.45</version>
+        </dependency>
+        <!-- Direct dependency with -jre version, in order to not resolve to the limited -android version -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <!-- Jersey annotation-driven REST web services (JAX-RS implementation) -->
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-server</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+        <!-- Deploy Jersey apps in stand-alone Grizzly server instead of a servlet container. -->
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-grizzly2-http</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+        <!-- Jackson modules to serialize Jersey response objects to JSON. -->
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-json-jackson</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+        <!-- HK2 dependency injection framework for injecting context -->
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+
+        <!-- JAXB API Implementation no longer supplied with Java 11+ -->
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${jaxb-runtime.version}</version>
+        </dependency>
+
+        <!-- Jackson modules. -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jdk8</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <!--
+            jersey pulls in older versions of this dependency which are binary-incompatible
+            with the latest jackson version, so we need to explicitly define them here
+         -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
+        <!--
+          Google library imports
+          The version is imported using google libraries-bom, see dep.management
+        -->
+
+        <!-- Google Cloud Storage - as OTP DataSource -->
+        <dependency>
+            <groupId>com.google.cloud</groupId>
+            <artifactId>google-cloud-storage</artifactId>
+        </dependency>
+
+        <!-- Google Cloud Pubsub for SIRI-updater-->
+        <dependency>
+            <groupId>com.google.cloud</groupId>
+            <artifactId>google-cloud-pubsub</artifactId>
+        </dependency>
+
+        <!-- Google Protocol Buffers compact binary serialization format -->
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+        </dependency>
+
+        <!-- OBA GTFS loader -->
+        <dependency>
+            <groupId>org.onebusaway</groupId>
+            <artifactId>onebusaway-gtfs</artifactId>
+            <version>3.2.4</version>
+        </dependency>
+        <!-- Processing is used for the debug GUI (though we could probably use just Java2D) -->
+        <dependency>
+            <groupId>org.processing</groupId>
+            <artifactId>core</artifactId>
+            <version>2.2.1</version>
+        </dependency>
+        <!-- Used in DegreeGridNEDTileSource to fetch tiles from Amazon S3 -->
+        <dependency>
+            <groupId>net.java.dev.jets3t</groupId>
+            <artifactId>jets3t</artifactId>
+            <version>0.9.4</version>
+        </dependency>
+        <!-- OpenStreetMap protobuf (PBF) definitions and parser -->
+        <dependency>
+            <groupId>org.openstreetmap.osmosis</groupId>
+            <artifactId>osmosis-osm-binary</artifactId>
+            <version>0.48.3</version>
+        </dependency>
+        <!-- Command line parameter parsing -->
+        <dependency>
+            <groupId>com.beust</groupId>
+            <artifactId>jcommander</artifactId>
+            <version>1.82</version>
+        </dependency>
+        <dependency>
+            <groupId>com.graphql-java</groupId>
+            <artifactId>graphql-java</artifactId>
+            <version>22.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.graphql-java</groupId>
+            <artifactId>graphql-java-extended-scalars</artifactId>
+            <version>22.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.4</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>1.5.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.javacsv</groupId>
+            <artifactId>javacsv</artifactId>
+            <version>2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.paho</groupId>
+            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+            <version>1.2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.ci-cmg</groupId>
+            <artifactId>mapbox-vector-tile</artifactId>
+            <version>4.0.6</version>
+        </dependency>
+        <dependency>
+            <groupId>net.objecthunter</groupId>
+            <artifactId>exp4j</artifactId>
+            <version>0.4.8</version>
+        </dependency>
+        <dependency>
+            <groupId>com.azure</groupId>
+            <artifactId>azure-core</artifactId>
+            <version>1.46.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.azure</groupId>
+            <artifactId>azure-messaging-servicebus</artifactId>
+            <version>7.15.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.azure</groupId>
+            <artifactId>azure-identity</artifactId>
+            <version>1.11.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.poole</groupId>
+            <artifactId>OpeningHoursParser</artifactId>
+            <version>0.28.2</version>
+        </dependency>
+
+        <!-- create zip test files-->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.27.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <!--
+        Filtering will perform substitution on otp-project-info.properties,
+        see git commit id plugin below.
+        -->
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>src/ext/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>src/client</directory>
+                <targetPath>client</targetPath>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+            </testResource>
+            <testResource>
+                <directory>src/ext-test/resources</directory>
+            </testResource>
+        </testResources>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <id>build-helper-generate-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/main/java</source>
+                                <source>src/ext/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>build-helper-generate-test-sources</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/java</source>
+                                <source>src/ext-test/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <id>build-helper-generate-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/main/java</source>
+                                <source>src/ext/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>build-helper-generate-test-sources</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/java</source>
+                                <source>src/ext-test/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!--
+             There used to be a dependency-plugin:copy-dependencies plugin entry here, but the
+             shade-plugin will explode the dependencies even if they aren't manually copied in.
+            -->
+            <plugin>
+                <!-- We want to create a standalone jar that can be run on the command
+                  line. Java does not really allow this - you cannot place jars inside of jars.
+                  You must either provide all the dependency jars to the user (usually lib/
+                  under the directory containing the runnable jar) or explode all the jars
+                  and repackage them into a single jar. The problem is that while class files
+                  are nicely organized into the package namespace and should not collide, the
+                  META-INF directories of the jars will collide. Maven's standard assembly
+                  plugin does not account for this and will just clobber metadata. This then
+                  causes runtime errors, particularly with Spring. Instead, we use the shade
+                  plugin which has transformers that will for example append files of the same
+                  name rather than overwrite them in the combined JAR. NB: Don't use a version
+                  of the shade plugin older than 1.3.2, as it fixed MSHADE-76 (files not merged
+                  properly if some input files are missing a terminating newline) -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <filters>
+                                <filter>
+                                    <!-- exclude signatures from merged JAR to avoid invalid signature messages -->
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <!-- The shaded JAR will not be the main artifact for the project, it will be attached
+                              for deployment in the way source and docs are. -->
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedClassifierName>shaded</shadedClassifierName>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <!-- MinimizeJar removes unused classes, (classes not imported explicitly by name).
+                              We have eliminated most Jersey auto-scanning, but there is still some need for include
+                              filters to force-include classes that are dynamically loaded by name/auto-scanned. -->
+                            <!-- This roughly halves the size of the OTP JAR, bringing it down to around 20 MB.
+                              <minimizeJar>true</minimizeJar>
+                              <filters> <filter> <artifact>com.sun.jersey:*</artifact> <includes> <include>**</include>
+                              </includes> </filter> <filter> <artifact>org.opentripplanner:*</artifact>
+                              <includes> <include>**</include> </includes> </filter> </filters> -->
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <manifestEntries>
+                                        <Main-Class>org.opentripplanner.standalone.OTPMain</Main-Class>
+                                        <!-- The ImageIO lines allow some image reader plugins to work
+                                             https://stackoverflow.com/questions/7051603/jai-vendorname-null#18495658 -->
+                                        <Specification-Title>Java Advanced Imaging Image I/O
+                                            Tools
+                                        </Specification-Title>
+                                        <Specification-Version>1.1</Specification-Version>
+                                        <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
+                                        <Implementation-Title>com.sun.media.imageio</Implementation-Title>
+                                        <Implementation-Version>1.1</Implementation-Version>
+                                        <Implementation-Vendor>Sun Microsystems, Inc.</Implementation-Vendor>
+                                        <Extension-Name>com.sun.media.imageio</Extension-Name>
+                                    </manifestEntries>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/client/META-INF/MANIFEST.MF b/application/src/client/META-INF/MANIFEST.MF
similarity index 100%
rename from src/client/META-INF/MANIFEST.MF
rename to application/src/client/META-INF/MANIFEST.MF
diff --git a/src/client/WEB-INF/web_client.xml b/application/src/client/WEB-INF/web_client.xml
similarity index 100%
rename from src/client/WEB-INF/web_client.xml
rename to application/src/client/WEB-INF/web_client.xml
diff --git a/src/client/classic-debug/i18n/babel.cfg b/application/src/client/classic-debug/i18n/babel.cfg
similarity index 100%
rename from src/client/classic-debug/i18n/babel.cfg
rename to application/src/client/classic-debug/i18n/babel.cfg
diff --git a/src/client/classic-debug/i18n/ca_ES.po b/application/src/client/classic-debug/i18n/ca_ES.po
similarity index 100%
rename from src/client/classic-debug/i18n/ca_ES.po
rename to application/src/client/classic-debug/i18n/ca_ES.po
diff --git a/src/client/classic-debug/i18n/de.po b/application/src/client/classic-debug/i18n/de.po
similarity index 100%
rename from src/client/classic-debug/i18n/de.po
rename to application/src/client/classic-debug/i18n/de.po
diff --git a/src/client/classic-debug/i18n/en.po b/application/src/client/classic-debug/i18n/en.po
similarity index 100%
rename from src/client/classic-debug/i18n/en.po
rename to application/src/client/classic-debug/i18n/en.po
diff --git a/src/client/classic-debug/i18n/es.po b/application/src/client/classic-debug/i18n/es.po
similarity index 100%
rename from src/client/classic-debug/i18n/es.po
rename to application/src/client/classic-debug/i18n/es.po
diff --git a/src/client/classic-debug/i18n/fr.po b/application/src/client/classic-debug/i18n/fr.po
similarity index 100%
rename from src/client/classic-debug/i18n/fr.po
rename to application/src/client/classic-debug/i18n/fr.po
diff --git a/src/client/classic-debug/i18n/hu.po b/application/src/client/classic-debug/i18n/hu.po
similarity index 100%
rename from src/client/classic-debug/i18n/hu.po
rename to application/src/client/classic-debug/i18n/hu.po
diff --git a/src/client/classic-debug/i18n/it.po b/application/src/client/classic-debug/i18n/it.po
similarity index 100%
rename from src/client/classic-debug/i18n/it.po
rename to application/src/client/classic-debug/i18n/it.po
diff --git a/src/client/classic-debug/i18n/messages.pot b/application/src/client/classic-debug/i18n/messages.pot
similarity index 100%
rename from src/client/classic-debug/i18n/messages.pot
rename to application/src/client/classic-debug/i18n/messages.pot
diff --git a/src/client/classic-debug/i18n/no.po b/application/src/client/classic-debug/i18n/no.po
similarity index 100%
rename from src/client/classic-debug/i18n/no.po
rename to application/src/client/classic-debug/i18n/no.po
diff --git a/src/client/classic-debug/i18n/pl.po b/application/src/client/classic-debug/i18n/pl.po
similarity index 100%
rename from src/client/classic-debug/i18n/pl.po
rename to application/src/client/classic-debug/i18n/pl.po
diff --git a/src/client/classic-debug/i18n/pt.po b/application/src/client/classic-debug/i18n/pt.po
similarity index 100%
rename from src/client/classic-debug/i18n/pt.po
rename to application/src/client/classic-debug/i18n/pt.po
diff --git a/src/client/classic-debug/i18n/sl.po b/application/src/client/classic-debug/i18n/sl.po
similarity index 100%
rename from src/client/classic-debug/i18n/sl.po
rename to application/src/client/classic-debug/i18n/sl.po
diff --git a/src/client/classic-debug/images/agency_logo.png b/application/src/client/classic-debug/images/agency_logo.png
similarity index 100%
rename from src/client/classic-debug/images/agency_logo.png
rename to application/src/client/classic-debug/images/agency_logo.png
diff --git a/src/client/classic-debug/images/alert.png b/application/src/client/classic-debug/images/alert.png
similarity index 100%
rename from src/client/classic-debug/images/alert.png
rename to application/src/client/classic-debug/images/alert.png
diff --git a/src/client/classic-debug/images/bicycle_green.png b/application/src/client/classic-debug/images/bicycle_green.png
similarity index 100%
rename from src/client/classic-debug/images/bicycle_green.png
rename to application/src/client/classic-debug/images/bicycle_green.png
diff --git a/src/client/classic-debug/images/bicycle_green_small.png b/application/src/client/classic-debug/images/bicycle_green_small.png
similarity index 100%
rename from src/client/classic-debug/images/bicycle_green_small.png
rename to application/src/client/classic-debug/images/bicycle_green_small.png
diff --git a/src/client/classic-debug/images/bicycle_red.png b/application/src/client/classic-debug/images/bicycle_red.png
similarity index 100%
rename from src/client/classic-debug/images/bicycle_red.png
rename to application/src/client/classic-debug/images/bicycle_red.png
diff --git a/src/client/classic-debug/images/bicycle_red_small.png b/application/src/client/classic-debug/images/bicycle_red_small.png
similarity index 100%
rename from src/client/classic-debug/images/bicycle_red_small.png
rename to application/src/client/classic-debug/images/bicycle_red_small.png
diff --git a/src/client/classic-debug/images/directions/circle_clockwise.png b/application/src/client/classic-debug/images/directions/circle_clockwise.png
similarity index 100%
rename from src/client/classic-debug/images/directions/circle_clockwise.png
rename to application/src/client/classic-debug/images/directions/circle_clockwise.png
diff --git a/src/client/classic-debug/images/directions/circle_counterclockwise.png b/application/src/client/classic-debug/images/directions/circle_counterclockwise.png
similarity index 100%
rename from src/client/classic-debug/images/directions/circle_counterclockwise.png
rename to application/src/client/classic-debug/images/directions/circle_counterclockwise.png
diff --git a/src/client/classic-debug/images/directions/clear.png b/application/src/client/classic-debug/images/directions/clear.png
similarity index 100%
rename from src/client/classic-debug/images/directions/clear.png
rename to application/src/client/classic-debug/images/directions/clear.png
diff --git a/src/client/classic-debug/images/directions/continue.png b/application/src/client/classic-debug/images/directions/continue.png
similarity index 100%
rename from src/client/classic-debug/images/directions/continue.png
rename to application/src/client/classic-debug/images/directions/continue.png
diff --git a/src/client/classic-debug/images/directions/depart.png b/application/src/client/classic-debug/images/directions/depart.png
similarity index 100%
rename from src/client/classic-debug/images/directions/depart.png
rename to application/src/client/classic-debug/images/directions/depart.png
diff --git a/src/client/classic-debug/images/directions/direction_icons.svg b/application/src/client/classic-debug/images/directions/direction_icons.svg
similarity index 100%
rename from src/client/classic-debug/images/directions/direction_icons.svg
rename to application/src/client/classic-debug/images/directions/direction_icons.svg
diff --git a/src/client/classic-debug/images/directions/elevator.png b/application/src/client/classic-debug/images/directions/elevator.png
similarity index 100%
rename from src/client/classic-debug/images/directions/elevator.png
rename to application/src/client/classic-debug/images/directions/elevator.png
diff --git a/src/client/classic-debug/images/directions/enter_station.png b/application/src/client/classic-debug/images/directions/enter_station.png
similarity index 100%
rename from src/client/classic-debug/images/directions/enter_station.png
rename to application/src/client/classic-debug/images/directions/enter_station.png
diff --git a/src/client/classic-debug/images/directions/exit_left.png b/application/src/client/classic-debug/images/directions/exit_left.png
similarity index 100%
rename from src/client/classic-debug/images/directions/exit_left.png
rename to application/src/client/classic-debug/images/directions/exit_left.png
diff --git a/src/client/classic-debug/images/directions/exit_right.png b/application/src/client/classic-debug/images/directions/exit_right.png
similarity index 100%
rename from src/client/classic-debug/images/directions/exit_right.png
rename to application/src/client/classic-debug/images/directions/exit_right.png
diff --git a/src/client/classic-debug/images/directions/exit_station.png b/application/src/client/classic-debug/images/directions/exit_station.png
similarity index 100%
rename from src/client/classic-debug/images/directions/exit_station.png
rename to application/src/client/classic-debug/images/directions/exit_station.png
diff --git a/src/client/classic-debug/images/directions/follow_signs.png b/application/src/client/classic-debug/images/directions/follow_signs.png
similarity index 100%
rename from src/client/classic-debug/images/directions/follow_signs.png
rename to application/src/client/classic-debug/images/directions/follow_signs.png
diff --git a/src/client/classic-debug/images/directions/hard_left.png b/application/src/client/classic-debug/images/directions/hard_left.png
similarity index 100%
rename from src/client/classic-debug/images/directions/hard_left.png
rename to application/src/client/classic-debug/images/directions/hard_left.png
diff --git a/src/client/classic-debug/images/directions/hard_right.png b/application/src/client/classic-debug/images/directions/hard_right.png
similarity index 100%
rename from src/client/classic-debug/images/directions/hard_right.png
rename to application/src/client/classic-debug/images/directions/hard_right.png
diff --git a/src/client/classic-debug/images/directions/left.png b/application/src/client/classic-debug/images/directions/left.png
similarity index 100%
rename from src/client/classic-debug/images/directions/left.png
rename to application/src/client/classic-debug/images/directions/left.png
diff --git a/src/client/classic-debug/images/directions/merge.png b/application/src/client/classic-debug/images/directions/merge.png
similarity index 100%
rename from src/client/classic-debug/images/directions/merge.png
rename to application/src/client/classic-debug/images/directions/merge.png
diff --git a/src/client/classic-debug/images/directions/right.png b/application/src/client/classic-debug/images/directions/right.png
similarity index 100%
rename from src/client/classic-debug/images/directions/right.png
rename to application/src/client/classic-debug/images/directions/right.png
diff --git a/src/client/classic-debug/images/directions/slightly_left.png b/application/src/client/classic-debug/images/directions/slightly_left.png
similarity index 100%
rename from src/client/classic-debug/images/directions/slightly_left.png
rename to application/src/client/classic-debug/images/directions/slightly_left.png
diff --git a/src/client/classic-debug/images/directions/slightly_right.png b/application/src/client/classic-debug/images/directions/slightly_right.png
similarity index 100%
rename from src/client/classic-debug/images/directions/slightly_right.png
rename to application/src/client/classic-debug/images/directions/slightly_right.png
diff --git a/src/client/classic-debug/images/directions/turn_left.png b/application/src/client/classic-debug/images/directions/turn_left.png
similarity index 100%
rename from src/client/classic-debug/images/directions/turn_left.png
rename to application/src/client/classic-debug/images/directions/turn_left.png
diff --git a/src/client/classic-debug/images/directions/turn_right.png b/application/src/client/classic-debug/images/directions/turn_right.png
similarity index 100%
rename from src/client/classic-debug/images/directions/turn_right.png
rename to application/src/client/classic-debug/images/directions/turn_right.png
diff --git a/src/client/classic-debug/images/directions/uturn_left.png b/application/src/client/classic-debug/images/directions/uturn_left.png
similarity index 100%
rename from src/client/classic-debug/images/directions/uturn_left.png
rename to application/src/client/classic-debug/images/directions/uturn_left.png
diff --git a/src/client/classic-debug/images/directions/uturn_right.png b/application/src/client/classic-debug/images/directions/uturn_right.png
similarity index 100%
rename from src/client/classic-debug/images/directions/uturn_right.png
rename to application/src/client/classic-debug/images/directions/uturn_right.png
diff --git a/src/client/classic-debug/images/flag_marker_green.png b/application/src/client/classic-debug/images/flag_marker_green.png
similarity index 100%
rename from src/client/classic-debug/images/flag_marker_green.png
rename to application/src/client/classic-debug/images/flag_marker_green.png
diff --git a/src/client/classic-debug/images/flag_marker_red.png b/application/src/client/classic-debug/images/flag_marker_red.png
similarity index 100%
rename from src/client/classic-debug/images/flag_marker_red.png
rename to application/src/client/classic-debug/images/flag_marker_red.png
diff --git a/src/client/classic-debug/images/gear.svg b/application/src/client/classic-debug/images/gear.svg
similarity index 100%
rename from src/client/classic-debug/images/gear.svg
rename to application/src/client/classic-debug/images/gear.svg
diff --git a/src/client/classic-debug/images/language_icon.png b/application/src/client/classic-debug/images/language_icon.png
similarity index 100%
rename from src/client/classic-debug/images/language_icon.png
rename to application/src/client/classic-debug/images/language_icon.png
diff --git a/src/client/classic-debug/images/language_icon.svg b/application/src/client/classic-debug/images/language_icon.svg
similarity index 100%
rename from src/client/classic-debug/images/language_icon.svg
rename to application/src/client/classic-debug/images/language_icon.svg
diff --git a/src/client/classic-debug/images/marker-0pct.png b/application/src/client/classic-debug/images/marker-0pct.png
similarity index 100%
rename from src/client/classic-debug/images/marker-0pct.png
rename to application/src/client/classic-debug/images/marker-0pct.png
diff --git a/src/client/classic-debug/images/marker-100pct.png b/application/src/client/classic-debug/images/marker-100pct.png
similarity index 100%
rename from src/client/classic-debug/images/marker-100pct.png
rename to application/src/client/classic-debug/images/marker-100pct.png
diff --git a/src/client/classic-debug/images/marker-25pct.png b/application/src/client/classic-debug/images/marker-25pct.png
similarity index 100%
rename from src/client/classic-debug/images/marker-25pct.png
rename to application/src/client/classic-debug/images/marker-25pct.png
diff --git a/src/client/classic-debug/images/marker-50pct.png b/application/src/client/classic-debug/images/marker-50pct.png
similarity index 100%
rename from src/client/classic-debug/images/marker-50pct.png
rename to application/src/client/classic-debug/images/marker-50pct.png
diff --git a/src/client/classic-debug/images/marker-75pct.png b/application/src/client/classic-debug/images/marker-75pct.png
similarity index 100%
rename from src/client/classic-debug/images/marker-75pct.png
rename to application/src/client/classic-debug/images/marker-75pct.png
diff --git a/src/client/classic-debug/images/marker-bike-green-shadowed.png b/application/src/client/classic-debug/images/marker-bike-green-shadowed.png
similarity index 100%
rename from src/client/classic-debug/images/marker-bike-green-shadowed.png
rename to application/src/client/classic-debug/images/marker-bike-green-shadowed.png
diff --git a/src/client/classic-debug/images/marker-bike-green.png b/application/src/client/classic-debug/images/marker-bike-green.png
similarity index 100%
rename from src/client/classic-debug/images/marker-bike-green.png
rename to application/src/client/classic-debug/images/marker-bike-green.png
diff --git a/src/client/classic-debug/images/marker-bike-red-shadowed.png b/application/src/client/classic-debug/images/marker-bike-red-shadowed.png
similarity index 100%
rename from src/client/classic-debug/images/marker-bike-red-shadowed.png
rename to application/src/client/classic-debug/images/marker-bike-red-shadowed.png
diff --git a/src/client/classic-debug/images/marker-bike-red.png b/application/src/client/classic-debug/images/marker-bike-red.png
similarity index 100%
rename from src/client/classic-debug/images/marker-bike-red.png
rename to application/src/client/classic-debug/images/marker-bike-red.png
diff --git a/src/client/classic-debug/images/marker-bike-shadow.png b/application/src/client/classic-debug/images/marker-bike-shadow.png
similarity index 100%
rename from src/client/classic-debug/images/marker-bike-shadow.png
rename to application/src/client/classic-debug/images/marker-bike-shadow.png
diff --git a/src/client/classic-debug/images/marker-blue-med.png b/application/src/client/classic-debug/images/marker-blue-med.png
similarity index 100%
rename from src/client/classic-debug/images/marker-blue-med.png
rename to application/src/client/classic-debug/images/marker-blue-med.png
diff --git a/src/client/classic-debug/images/marker-blue-nub.png b/application/src/client/classic-debug/images/marker-blue-nub.png
similarity index 100%
rename from src/client/classic-debug/images/marker-blue-nub.png
rename to application/src/client/classic-debug/images/marker-blue-nub.png
diff --git a/src/client/classic-debug/images/marker-blue-sm.png b/application/src/client/classic-debug/images/marker-blue-sm.png
similarity index 100%
rename from src/client/classic-debug/images/marker-blue-sm.png
rename to application/src/client/classic-debug/images/marker-blue-sm.png
diff --git a/src/client/classic-debug/images/marker-flag-end-shadowed.png b/application/src/client/classic-debug/images/marker-flag-end-shadowed.png
similarity index 100%
rename from src/client/classic-debug/images/marker-flag-end-shadowed.png
rename to application/src/client/classic-debug/images/marker-flag-end-shadowed.png
diff --git a/src/client/classic-debug/images/marker-flag-end.png b/application/src/client/classic-debug/images/marker-flag-end.png
similarity index 100%
rename from src/client/classic-debug/images/marker-flag-end.png
rename to application/src/client/classic-debug/images/marker-flag-end.png
diff --git a/src/client/classic-debug/images/marker-flag-shadow.png b/application/src/client/classic-debug/images/marker-flag-shadow.png
similarity index 100%
rename from src/client/classic-debug/images/marker-flag-shadow.png
rename to application/src/client/classic-debug/images/marker-flag-shadow.png
diff --git a/src/client/classic-debug/images/marker-flag-start-shadowed.png b/application/src/client/classic-debug/images/marker-flag-start-shadowed.png
similarity index 100%
rename from src/client/classic-debug/images/marker-flag-start-shadowed.png
rename to application/src/client/classic-debug/images/marker-flag-start-shadowed.png
diff --git a/src/client/classic-debug/images/marker-flag-start.png b/application/src/client/classic-debug/images/marker-flag-start.png
similarity index 100%
rename from src/client/classic-debug/images/marker-flag-start.png
rename to application/src/client/classic-debug/images/marker-flag-start.png
diff --git a/src/client/classic-debug/images/marker-med-0pct.png b/application/src/client/classic-debug/images/marker-med-0pct.png
similarity index 100%
rename from src/client/classic-debug/images/marker-med-0pct.png
rename to application/src/client/classic-debug/images/marker-med-0pct.png
diff --git a/src/client/classic-debug/images/marker-med-100pct.png b/application/src/client/classic-debug/images/marker-med-100pct.png
similarity index 100%
rename from src/client/classic-debug/images/marker-med-100pct.png
rename to application/src/client/classic-debug/images/marker-med-100pct.png
diff --git a/src/client/classic-debug/images/marker-med-25pct.png b/application/src/client/classic-debug/images/marker-med-25pct.png
similarity index 100%
rename from src/client/classic-debug/images/marker-med-25pct.png
rename to application/src/client/classic-debug/images/marker-med-25pct.png
diff --git a/src/client/classic-debug/images/marker-med-50pct.png b/application/src/client/classic-debug/images/marker-med-50pct.png
similarity index 100%
rename from src/client/classic-debug/images/marker-med-50pct.png
rename to application/src/client/classic-debug/images/marker-med-50pct.png
diff --git a/src/client/classic-debug/images/marker-med-75pct.png b/application/src/client/classic-debug/images/marker-med-75pct.png
similarity index 100%
rename from src/client/classic-debug/images/marker-med-75pct.png
rename to application/src/client/classic-debug/images/marker-med-75pct.png
diff --git a/src/client/classic-debug/images/marker-sm-0pct.png b/application/src/client/classic-debug/images/marker-sm-0pct.png
similarity index 100%
rename from src/client/classic-debug/images/marker-sm-0pct.png
rename to application/src/client/classic-debug/images/marker-sm-0pct.png
diff --git a/src/client/classic-debug/images/marker-sm-100pct.png b/application/src/client/classic-debug/images/marker-sm-100pct.png
similarity index 100%
rename from src/client/classic-debug/images/marker-sm-100pct.png
rename to application/src/client/classic-debug/images/marker-sm-100pct.png
diff --git a/src/client/classic-debug/images/marker-sm-25pct.png b/application/src/client/classic-debug/images/marker-sm-25pct.png
similarity index 100%
rename from src/client/classic-debug/images/marker-sm-25pct.png
rename to application/src/client/classic-debug/images/marker-sm-25pct.png
diff --git a/src/client/classic-debug/images/marker-sm-50pct.png b/application/src/client/classic-debug/images/marker-sm-50pct.png
similarity index 100%
rename from src/client/classic-debug/images/marker-sm-50pct.png
rename to application/src/client/classic-debug/images/marker-sm-50pct.png
diff --git a/src/client/classic-debug/images/marker-sm-75pct.png b/application/src/client/classic-debug/images/marker-sm-75pct.png
similarity index 100%
rename from src/client/classic-debug/images/marker-sm-75pct.png
rename to application/src/client/classic-debug/images/marker-sm-75pct.png
diff --git a/src/client/classic-debug/images/mode/airplane.png b/application/src/client/classic-debug/images/mode/airplane.png
similarity index 100%
rename from src/client/classic-debug/images/mode/airplane.png
rename to application/src/client/classic-debug/images/mode/airplane.png
diff --git a/src/client/classic-debug/images/mode/arrow-left.png b/application/src/client/classic-debug/images/mode/arrow-left.png
similarity index 100%
rename from src/client/classic-debug/images/mode/arrow-left.png
rename to application/src/client/classic-debug/images/mode/arrow-left.png
diff --git a/src/client/classic-debug/images/mode/arrow.png b/application/src/client/classic-debug/images/mode/arrow.png
similarity index 100%
rename from src/client/classic-debug/images/mode/arrow.png
rename to application/src/client/classic-debug/images/mode/arrow.png
diff --git a/src/client/classic-debug/images/mode/bicycle.png b/application/src/client/classic-debug/images/mode/bicycle.png
similarity index 100%
rename from src/client/classic-debug/images/mode/bicycle.png
rename to application/src/client/classic-debug/images/mode/bicycle.png
diff --git a/src/client/classic-debug/images/mode/bicycle_darkbg.png b/application/src/client/classic-debug/images/mode/bicycle_darkbg.png
similarity index 100%
rename from src/client/classic-debug/images/mode/bicycle_darkbg.png
rename to application/src/client/classic-debug/images/mode/bicycle_darkbg.png
diff --git a/src/client/classic-debug/images/mode/bus.png b/application/src/client/classic-debug/images/mode/bus.png
similarity index 100%
rename from src/client/classic-debug/images/mode/bus.png
rename to application/src/client/classic-debug/images/mode/bus.png
diff --git a/src/client/classic-debug/images/mode/bus_darkbg.png b/application/src/client/classic-debug/images/mode/bus_darkbg.png
similarity index 100%
rename from src/client/classic-debug/images/mode/bus_darkbg.png
rename to application/src/client/classic-debug/images/mode/bus_darkbg.png
diff --git a/src/client/classic-debug/images/mode/cable_car.png b/application/src/client/classic-debug/images/mode/cable_car.png
similarity index 100%
rename from src/client/classic-debug/images/mode/cable_car.png
rename to application/src/client/classic-debug/images/mode/cable_car.png
diff --git a/src/client/classic-debug/images/mode/car.png b/application/src/client/classic-debug/images/mode/car.png
similarity index 100%
rename from src/client/classic-debug/images/mode/car.png
rename to application/src/client/classic-debug/images/mode/car.png
diff --git a/src/client/classic-debug/images/mode/car_darkbg.png b/application/src/client/classic-debug/images/mode/car_darkbg.png
similarity index 100%
rename from src/client/classic-debug/images/mode/car_darkbg.png
rename to application/src/client/classic-debug/images/mode/car_darkbg.png
diff --git a/src/client/classic-debug/images/mode/carpool.png b/application/src/client/classic-debug/images/mode/carpool.png
similarity index 100%
rename from src/client/classic-debug/images/mode/carpool.png
rename to application/src/client/classic-debug/images/mode/carpool.png
diff --git a/src/client/classic-debug/images/mode/carpool_darkbg.png b/application/src/client/classic-debug/images/mode/carpool_darkbg.png
similarity index 100%
rename from src/client/classic-debug/images/mode/carpool_darkbg.png
rename to application/src/client/classic-debug/images/mode/carpool_darkbg.png
diff --git a/src/client/classic-debug/images/mode/coach.png b/application/src/client/classic-debug/images/mode/coach.png
similarity index 100%
rename from src/client/classic-debug/images/mode/coach.png
rename to application/src/client/classic-debug/images/mode/coach.png
diff --git a/src/client/classic-debug/images/mode/ferry.png b/application/src/client/classic-debug/images/mode/ferry.png
similarity index 100%
rename from src/client/classic-debug/images/mode/ferry.png
rename to application/src/client/classic-debug/images/mode/ferry.png
diff --git a/src/client/classic-debug/images/mode/ferry_darkbg.png b/application/src/client/classic-debug/images/mode/ferry_darkbg.png
similarity index 100%
rename from src/client/classic-debug/images/mode/ferry_darkbg.png
rename to application/src/client/classic-debug/images/mode/ferry_darkbg.png
diff --git a/src/client/classic-debug/images/mode/funicular.png b/application/src/client/classic-debug/images/mode/funicular.png
similarity index 100%
rename from src/client/classic-debug/images/mode/funicular.png
rename to application/src/client/classic-debug/images/mode/funicular.png
diff --git a/src/client/classic-debug/images/mode/gondola.png b/application/src/client/classic-debug/images/mode/gondola.png
similarity index 100%
rename from src/client/classic-debug/images/mode/gondola.png
rename to application/src/client/classic-debug/images/mode/gondola.png
diff --git a/src/client/classic-debug/images/mode/gondola_darkbg.png b/application/src/client/classic-debug/images/mode/gondola_darkbg.png
similarity index 100%
rename from src/client/classic-debug/images/mode/gondola_darkbg.png
rename to application/src/client/classic-debug/images/mode/gondola_darkbg.png
diff --git a/src/client/classic-debug/images/mode/mode_bubble.psd b/application/src/client/classic-debug/images/mode/mode_bubble.psd
similarity index 100%
rename from src/client/classic-debug/images/mode/mode_bubble.psd
rename to application/src/client/classic-debug/images/mode/mode_bubble.psd
diff --git a/src/client/classic-debug/images/mode/mode_bubble_ne.png b/application/src/client/classic-debug/images/mode/mode_bubble_ne.png
similarity index 100%
rename from src/client/classic-debug/images/mode/mode_bubble_ne.png
rename to application/src/client/classic-debug/images/mode/mode_bubble_ne.png
diff --git a/src/client/classic-debug/images/mode/mode_bubble_ne_highlight.png b/application/src/client/classic-debug/images/mode/mode_bubble_ne_highlight.png
similarity index 100%
rename from src/client/classic-debug/images/mode/mode_bubble_ne_highlight.png
rename to application/src/client/classic-debug/images/mode/mode_bubble_ne_highlight.png
diff --git a/src/client/classic-debug/images/mode/mode_bubble_nw.png b/application/src/client/classic-debug/images/mode/mode_bubble_nw.png
similarity index 100%
rename from src/client/classic-debug/images/mode/mode_bubble_nw.png
rename to application/src/client/classic-debug/images/mode/mode_bubble_nw.png
diff --git a/src/client/classic-debug/images/mode/mode_bubble_nw_highlight.png b/application/src/client/classic-debug/images/mode/mode_bubble_nw_highlight.png
similarity index 100%
rename from src/client/classic-debug/images/mode/mode_bubble_nw_highlight.png
rename to application/src/client/classic-debug/images/mode/mode_bubble_nw_highlight.png
diff --git a/src/client/classic-debug/images/mode/mode_bubble_se.png b/application/src/client/classic-debug/images/mode/mode_bubble_se.png
similarity index 100%
rename from src/client/classic-debug/images/mode/mode_bubble_se.png
rename to application/src/client/classic-debug/images/mode/mode_bubble_se.png
diff --git a/src/client/classic-debug/images/mode/mode_bubble_se_highlight.png b/application/src/client/classic-debug/images/mode/mode_bubble_se_highlight.png
similarity index 100%
rename from src/client/classic-debug/images/mode/mode_bubble_se_highlight.png
rename to application/src/client/classic-debug/images/mode/mode_bubble_se_highlight.png
diff --git a/src/client/classic-debug/images/mode/mode_bubble_sw.png b/application/src/client/classic-debug/images/mode/mode_bubble_sw.png
similarity index 100%
rename from src/client/classic-debug/images/mode/mode_bubble_sw.png
rename to application/src/client/classic-debug/images/mode/mode_bubble_sw.png
diff --git a/src/client/classic-debug/images/mode/mode_bubble_sw_highlight.png b/application/src/client/classic-debug/images/mode/mode_bubble_sw_highlight.png
similarity index 100%
rename from src/client/classic-debug/images/mode/mode_bubble_sw_highlight.png
rename to application/src/client/classic-debug/images/mode/mode_bubble_sw_highlight.png
diff --git a/src/client/classic-debug/images/mode/monorail.png b/application/src/client/classic-debug/images/mode/monorail.png
similarity index 100%
rename from src/client/classic-debug/images/mode/monorail.png
rename to application/src/client/classic-debug/images/mode/monorail.png
diff --git a/src/client/classic-debug/images/mode/rail.png b/application/src/client/classic-debug/images/mode/rail.png
similarity index 100%
rename from src/client/classic-debug/images/mode/rail.png
rename to application/src/client/classic-debug/images/mode/rail.png
diff --git a/src/client/classic-debug/images/mode/rail_darkbg.png b/application/src/client/classic-debug/images/mode/rail_darkbg.png
similarity index 100%
rename from src/client/classic-debug/images/mode/rail_darkbg.png
rename to application/src/client/classic-debug/images/mode/rail_darkbg.png
diff --git a/src/client/classic-debug/images/mode/scooter.png b/application/src/client/classic-debug/images/mode/scooter.png
similarity index 100%
rename from src/client/classic-debug/images/mode/scooter.png
rename to application/src/client/classic-debug/images/mode/scooter.png
diff --git a/src/client/classic-debug/images/mode/subway.png b/application/src/client/classic-debug/images/mode/subway.png
similarity index 100%
rename from src/client/classic-debug/images/mode/subway.png
rename to application/src/client/classic-debug/images/mode/subway.png
diff --git a/src/client/classic-debug/images/mode/subway_darkbg.png b/application/src/client/classic-debug/images/mode/subway_darkbg.png
similarity index 100%
rename from src/client/classic-debug/images/mode/subway_darkbg.png
rename to application/src/client/classic-debug/images/mode/subway_darkbg.png
diff --git a/src/client/classic-debug/images/mode/taxi.png b/application/src/client/classic-debug/images/mode/taxi.png
similarity index 100%
rename from src/client/classic-debug/images/mode/taxi.png
rename to application/src/client/classic-debug/images/mode/taxi.png
diff --git a/src/client/classic-debug/images/mode/tram.png b/application/src/client/classic-debug/images/mode/tram.png
similarity index 100%
rename from src/client/classic-debug/images/mode/tram.png
rename to application/src/client/classic-debug/images/mode/tram.png
diff --git a/src/client/classic-debug/images/mode/tram_darkbg.png b/application/src/client/classic-debug/images/mode/tram_darkbg.png
similarity index 100%
rename from src/client/classic-debug/images/mode/tram_darkbg.png
rename to application/src/client/classic-debug/images/mode/tram_darkbg.png
diff --git a/src/client/classic-debug/images/mode/trolleybus.png b/application/src/client/classic-debug/images/mode/trolleybus.png
similarity index 100%
rename from src/client/classic-debug/images/mode/trolleybus.png
rename to application/src/client/classic-debug/images/mode/trolleybus.png
diff --git a/src/client/classic-debug/images/mode/walk.png b/application/src/client/classic-debug/images/mode/walk.png
similarity index 100%
rename from src/client/classic-debug/images/mode/walk.png
rename to application/src/client/classic-debug/images/mode/walk.png
diff --git a/src/client/classic-debug/images/mode/walk_darkbg.png b/application/src/client/classic-debug/images/mode/walk_darkbg.png
similarity index 100%
rename from src/client/classic-debug/images/mode/walk_darkbg.png
rename to application/src/client/classic-debug/images/mode/walk_darkbg.png
diff --git a/src/client/classic-debug/images/openplans-logo-20x20.png b/application/src/client/classic-debug/images/openplans-logo-20x20.png
similarity index 100%
rename from src/client/classic-debug/images/openplans-logo-20x20.png
rename to application/src/client/classic-debug/images/openplans-logo-20x20.png
diff --git a/src/client/classic-debug/images/openplans-logo-40x40.png b/application/src/client/classic-debug/images/openplans-logo-40x40.png
similarity index 100%
rename from src/client/classic-debug/images/openplans-logo-40x40.png
rename to application/src/client/classic-debug/images/openplans-logo-40x40.png
diff --git a/src/client/classic-debug/images/openplans-logo-gray.gif b/application/src/client/classic-debug/images/openplans-logo-gray.gif
similarity index 100%
rename from src/client/classic-debug/images/openplans-logo-gray.gif
rename to application/src/client/classic-debug/images/openplans-logo-gray.gif
diff --git a/src/client/classic-debug/images/otp_logo_40px.png b/application/src/client/classic-debug/images/otp_logo_40px.png
similarity index 100%
rename from src/client/classic-debug/images/otp_logo_40px.png
rename to application/src/client/classic-debug/images/otp_logo_40px.png
diff --git a/src/client/classic-debug/images/otp_logo_darkbg_40px.png b/application/src/client/classic-debug/images/otp_logo_darkbg_40px.png
similarity index 100%
rename from src/client/classic-debug/images/otp_logo_darkbg_40px.png
rename to application/src/client/classic-debug/images/otp_logo_darkbg_40px.png
diff --git a/src/client/classic-debug/images/reverse.png b/application/src/client/classic-debug/images/reverse.png
similarity index 100%
rename from src/client/classic-debug/images/reverse.png
rename to application/src/client/classic-debug/images/reverse.png
diff --git a/src/client/classic-debug/images/shadow.png b/application/src/client/classic-debug/images/shadow.png
similarity index 100%
rename from src/client/classic-debug/images/shadow.png
rename to application/src/client/classic-debug/images/shadow.png
diff --git a/src/client/classic-debug/images/spinner.gif b/application/src/client/classic-debug/images/spinner.gif
similarity index 100%
rename from src/client/classic-debug/images/spinner.gif
rename to application/src/client/classic-debug/images/spinner.gif
diff --git a/src/client/classic-debug/images/stop20.png b/application/src/client/classic-debug/images/stop20.png
similarity index 100%
rename from src/client/classic-debug/images/stop20.png
rename to application/src/client/classic-debug/images/stop20.png
diff --git a/src/client/classic-debug/images/widget-trip-stop-first.png b/application/src/client/classic-debug/images/widget-trip-stop-first.png
similarity index 100%
rename from src/client/classic-debug/images/widget-trip-stop-first.png
rename to application/src/client/classic-debug/images/widget-trip-stop-first.png
diff --git a/src/client/classic-debug/images/widget-trip-stop-last.png b/application/src/client/classic-debug/images/widget-trip-stop-last.png
similarity index 100%
rename from src/client/classic-debug/images/widget-trip-stop-last.png
rename to application/src/client/classic-debug/images/widget-trip-stop-last.png
diff --git a/src/client/classic-debug/images/widget-trip-stop-middle.png b/application/src/client/classic-debug/images/widget-trip-stop-middle.png
similarity index 100%
rename from src/client/classic-debug/images/widget-trip-stop-middle.png
rename to application/src/client/classic-debug/images/widget-trip-stop-middle.png
diff --git a/src/client/classic-debug/index.html b/application/src/client/classic-debug/index.html
similarity index 100%
rename from src/client/classic-debug/index.html
rename to application/src/client/classic-debug/index.html
diff --git a/src/client/classic-debug/js/lib/ICanHaz.js b/application/src/client/classic-debug/js/lib/ICanHaz.js
similarity index 100%
rename from src/client/classic-debug/js/lib/ICanHaz.js
rename to application/src/client/classic-debug/js/lib/ICanHaz.js
diff --git a/src/client/classic-debug/js/lib/backbone-min.js b/application/src/client/classic-debug/js/lib/backbone-min.js
similarity index 100%
rename from src/client/classic-debug/js/lib/backbone-min.js
rename to application/src/client/classic-debug/js/lib/backbone-min.js
diff --git a/src/client/classic-debug/js/lib/backbone.js b/application/src/client/classic-debug/js/lib/backbone.js
similarity index 100%
rename from src/client/classic-debug/js/lib/backbone.js
rename to application/src/client/classic-debug/js/lib/backbone.js
diff --git a/src/client/classic-debug/js/lib/i18next-1.7.3.min.js b/application/src/client/classic-debug/js/lib/i18next-1.7.3.min.js
similarity index 100%
rename from src/client/classic-debug/js/lib/i18next-1.7.3.min.js
rename to application/src/client/classic-debug/js/lib/i18next-1.7.3.min.js
diff --git a/src/client/classic-debug/js/lib/jquery-ui/addons/jquery-ui-timepicker.css b/application/src/client/classic-debug/js/lib/jquery-ui/addons/jquery-ui-timepicker.css
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/addons/jquery-ui-timepicker.css
rename to application/src/client/classic-debug/js/lib/jquery-ui/addons/jquery-ui-timepicker.css
diff --git a/src/client/classic-debug/js/lib/jquery-ui/addons/jquery-ui-timepicker.js b/application/src/client/classic-debug/js/lib/jquery-ui/addons/jquery-ui-timepicker.js
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/addons/jquery-ui-timepicker.js
rename to application/src/client/classic-debug/js/lib/jquery-ui/addons/jquery-ui-timepicker.js
diff --git a/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
rename to application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
rename to application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
rename to application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
rename to application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
rename to application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
rename to application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename to application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_222222_256x240.png b/application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_222222_256x240.png
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_222222_256x240.png
rename to application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_222222_256x240.png
diff --git a/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_2e83ff_256x240.png b/application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_2e83ff_256x240.png
rename to application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_2e83ff_256x240.png
diff --git a/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_454545_256x240.png b/application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_454545_256x240.png
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_454545_256x240.png
rename to application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_454545_256x240.png
diff --git a/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_888888_256x240.png b/application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_888888_256x240.png
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_888888_256x240.png
rename to application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_888888_256x240.png
diff --git a/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_cd0a0a_256x240.png b/application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_cd0a0a_256x240.png
rename to application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_cd0a0a_256x240.png
diff --git a/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/jquery-ui-1.9.1.custom.css b/application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/jquery-ui-1.9.1.custom.css
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/css/smoothness/jquery-ui-1.9.1.custom.css
rename to application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/jquery-ui-1.9.1.custom.css
diff --git a/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/jquery-ui-1.9.1.custom.min.css b/application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/jquery-ui-1.9.1.custom.min.css
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/css/smoothness/jquery-ui-1.9.1.custom.min.css
rename to application/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/jquery-ui-1.9.1.custom.min.css
diff --git a/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-ca.js b/application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-ca.js
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-ca.js
rename to application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-ca.js
diff --git a/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-de.js b/application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-de.js
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-de.js
rename to application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-de.js
diff --git a/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-es.js b/application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-es.js
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-es.js
rename to application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-es.js
diff --git a/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-fr.js b/application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-fr.js
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-fr.js
rename to application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-fr.js
diff --git a/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-hu.js b/application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-hu.js
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-hu.js
rename to application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-hu.js
diff --git a/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-it.js b/application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-it.js
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-it.js
rename to application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-it.js
diff --git a/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-no.js b/application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-no.js
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-no.js
rename to application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-no.js
diff --git a/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-pl.js b/application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-pl.js
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-pl.js
rename to application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-pl.js
diff --git a/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-pt.js b/application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-pt.js
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-pt.js
rename to application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-pt.js
diff --git a/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-sl.js b/application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-sl.js
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-sl.js
rename to application/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-sl.js
diff --git a/src/client/classic-debug/js/lib/jquery-ui/js/jquery-1.8.2.js b/application/src/client/classic-debug/js/lib/jquery-ui/js/jquery-1.8.2.js
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/js/jquery-1.8.2.js
rename to application/src/client/classic-debug/js/lib/jquery-ui/js/jquery-1.8.2.js
diff --git a/src/client/classic-debug/js/lib/jquery-ui/js/jquery-ui-1.9.1.custom.js b/application/src/client/classic-debug/js/lib/jquery-ui/js/jquery-ui-1.9.1.custom.js
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/js/jquery-ui-1.9.1.custom.js
rename to application/src/client/classic-debug/js/lib/jquery-ui/js/jquery-ui-1.9.1.custom.js
diff --git a/src/client/classic-debug/js/lib/jquery-ui/js/jquery-ui-1.9.1.custom.min.js b/application/src/client/classic-debug/js/lib/jquery-ui/js/jquery-ui-1.9.1.custom.min.js
similarity index 100%
rename from src/client/classic-debug/js/lib/jquery-ui/js/jquery-ui-1.9.1.custom.min.js
rename to application/src/client/classic-debug/js/lib/jquery-ui/js/jquery-ui-1.9.1.custom.min.js
diff --git a/src/client/classic-debug/js/otp/config.js b/application/src/client/classic-debug/js/otp/config.js
similarity index 100%
rename from src/client/classic-debug/js/otp/config.js
rename to application/src/client/classic-debug/js/otp/config.js
diff --git a/src/client/classic-debug/js/otp/core/ContextMenu.js b/application/src/client/classic-debug/js/otp/core/ContextMenu.js
similarity index 100%
rename from src/client/classic-debug/js/otp/core/ContextMenu.js
rename to application/src/client/classic-debug/js/otp/core/ContextMenu.js
diff --git a/src/client/classic-debug/js/otp/core/Geocoder.js b/application/src/client/classic-debug/js/otp/core/Geocoder.js
similarity index 100%
rename from src/client/classic-debug/js/otp/core/Geocoder.js
rename to application/src/client/classic-debug/js/otp/core/Geocoder.js
diff --git a/src/client/classic-debug/js/otp/core/GeocoderBag.js b/application/src/client/classic-debug/js/otp/core/GeocoderBag.js
similarity index 100%
rename from src/client/classic-debug/js/otp/core/GeocoderBag.js
rename to application/src/client/classic-debug/js/otp/core/GeocoderBag.js
diff --git a/src/client/classic-debug/js/otp/core/GeocoderBuiltin.js b/application/src/client/classic-debug/js/otp/core/GeocoderBuiltin.js
similarity index 100%
rename from src/client/classic-debug/js/otp/core/GeocoderBuiltin.js
rename to application/src/client/classic-debug/js/otp/core/GeocoderBuiltin.js
diff --git a/src/client/classic-debug/js/otp/core/IndexApi.js b/application/src/client/classic-debug/js/otp/core/IndexApi.js
similarity index 100%
rename from src/client/classic-debug/js/otp/core/IndexApi.js
rename to application/src/client/classic-debug/js/otp/core/IndexApi.js
diff --git a/src/client/classic-debug/js/otp/core/Map.js b/application/src/client/classic-debug/js/otp/core/Map.js
similarity index 100%
rename from src/client/classic-debug/js/otp/core/Map.js
rename to application/src/client/classic-debug/js/otp/core/Map.js
diff --git a/src/client/classic-debug/js/otp/core/MapContextMenu.js b/application/src/client/classic-debug/js/otp/core/MapContextMenu.js
similarity index 100%
rename from src/client/classic-debug/js/otp/core/MapContextMenu.js
rename to application/src/client/classic-debug/js/otp/core/MapContextMenu.js
diff --git a/src/client/classic-debug/js/otp/core/PopupMenu.js b/application/src/client/classic-debug/js/otp/core/PopupMenu.js
similarity index 100%
rename from src/client/classic-debug/js/otp/core/PopupMenu.js
rename to application/src/client/classic-debug/js/otp/core/PopupMenu.js
diff --git a/src/client/classic-debug/js/otp/core/QueryLogger.js b/application/src/client/classic-debug/js/otp/core/QueryLogger.js
similarity index 100%
rename from src/client/classic-debug/js/otp/core/QueryLogger.js
rename to application/src/client/classic-debug/js/otp/core/QueryLogger.js
diff --git a/src/client/classic-debug/js/otp/core/SOLRGeocoder.js b/application/src/client/classic-debug/js/otp/core/SOLRGeocoder.js
similarity index 100%
rename from src/client/classic-debug/js/otp/core/SOLRGeocoder.js
rename to application/src/client/classic-debug/js/otp/core/SOLRGeocoder.js
diff --git a/src/client/classic-debug/js/otp/core/TransitIndex.js b/application/src/client/classic-debug/js/otp/core/TransitIndex.js
similarity index 100%
rename from src/client/classic-debug/js/otp/core/TransitIndex.js
rename to application/src/client/classic-debug/js/otp/core/TransitIndex.js
diff --git a/src/client/classic-debug/js/otp/core/TripPlan.js b/application/src/client/classic-debug/js/otp/core/TripPlan.js
similarity index 100%
rename from src/client/classic-debug/js/otp/core/TripPlan.js
rename to application/src/client/classic-debug/js/otp/core/TripPlan.js
diff --git a/src/client/classic-debug/js/otp/core/Webapp.js b/application/src/client/classic-debug/js/otp/core/Webapp.js
similarity index 100%
rename from src/client/classic-debug/js/otp/core/Webapp.js
rename to application/src/client/classic-debug/js/otp/core/Webapp.js
diff --git a/src/client/classic-debug/js/otp/core/WidgetManagerMenu.js b/application/src/client/classic-debug/js/otp/core/WidgetManagerMenu.js
similarity index 100%
rename from src/client/classic-debug/js/otp/core/WidgetManagerMenu.js
rename to application/src/client/classic-debug/js/otp/core/WidgetManagerMenu.js
diff --git a/src/client/classic-debug/js/otp/debug.js b/application/src/client/classic-debug/js/otp/debug.js
similarity index 100%
rename from src/client/classic-debug/js/otp/debug.js
rename to application/src/client/classic-debug/js/otp/debug.js
diff --git a/src/client/classic-debug/js/otp/layers/AreaStopsLayer.js b/application/src/client/classic-debug/js/otp/layers/AreaStopsLayer.js
similarity index 100%
rename from src/client/classic-debug/js/otp/layers/AreaStopsLayer.js
rename to application/src/client/classic-debug/js/otp/layers/AreaStopsLayer.js
diff --git a/src/client/classic-debug/js/otp/layers/GeofencingZonesLayer.js b/application/src/client/classic-debug/js/otp/layers/GeofencingZonesLayer.js
similarity index 100%
rename from src/client/classic-debug/js/otp/layers/GeofencingZonesLayer.js
rename to application/src/client/classic-debug/js/otp/layers/GeofencingZonesLayer.js
diff --git a/src/client/classic-debug/js/otp/layers/StopsLayer.js b/application/src/client/classic-debug/js/otp/layers/StopsLayer.js
similarity index 100%
rename from src/client/classic-debug/js/otp/layers/StopsLayer.js
rename to application/src/client/classic-debug/js/otp/layers/StopsLayer.js
diff --git a/src/client/classic-debug/js/otp/layers/layers-templates.html b/application/src/client/classic-debug/js/otp/layers/layers-templates.html
similarity index 100%
rename from src/client/classic-debug/js/otp/layers/layers-templates.html
rename to application/src/client/classic-debug/js/otp/layers/layers-templates.html
diff --git a/src/client/classic-debug/js/otp/locale/Catalan.js b/application/src/client/classic-debug/js/otp/locale/Catalan.js
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/Catalan.js
rename to application/src/client/classic-debug/js/otp/locale/Catalan.js
diff --git a/src/client/classic-debug/js/otp/locale/English.js b/application/src/client/classic-debug/js/otp/locale/English.js
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/English.js
rename to application/src/client/classic-debug/js/otp/locale/English.js
diff --git a/src/client/classic-debug/js/otp/locale/French.js b/application/src/client/classic-debug/js/otp/locale/French.js
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/French.js
rename to application/src/client/classic-debug/js/otp/locale/French.js
diff --git a/src/client/classic-debug/js/otp/locale/German.js b/application/src/client/classic-debug/js/otp/locale/German.js
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/German.js
rename to application/src/client/classic-debug/js/otp/locale/German.js
diff --git a/src/client/classic-debug/js/otp/locale/Hungarian.js b/application/src/client/classic-debug/js/otp/locale/Hungarian.js
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/Hungarian.js
rename to application/src/client/classic-debug/js/otp/locale/Hungarian.js
diff --git a/src/client/classic-debug/js/otp/locale/Italian.js b/application/src/client/classic-debug/js/otp/locale/Italian.js
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/Italian.js
rename to application/src/client/classic-debug/js/otp/locale/Italian.js
diff --git a/src/client/classic-debug/js/otp/locale/Norwegian.js b/application/src/client/classic-debug/js/otp/locale/Norwegian.js
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/Norwegian.js
rename to application/src/client/classic-debug/js/otp/locale/Norwegian.js
diff --git a/src/client/classic-debug/js/otp/locale/Polish.js b/application/src/client/classic-debug/js/otp/locale/Polish.js
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/Polish.js
rename to application/src/client/classic-debug/js/otp/locale/Polish.js
diff --git a/src/client/classic-debug/js/otp/locale/Portuguese.js b/application/src/client/classic-debug/js/otp/locale/Portuguese.js
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/Portuguese.js
rename to application/src/client/classic-debug/js/otp/locale/Portuguese.js
diff --git a/src/client/classic-debug/js/otp/locale/Slovenian.js b/application/src/client/classic-debug/js/otp/locale/Slovenian.js
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/Slovenian.js
rename to application/src/client/classic-debug/js/otp/locale/Slovenian.js
diff --git a/src/client/classic-debug/js/otp/locale/Spanish.js b/application/src/client/classic-debug/js/otp/locale/Spanish.js
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/Spanish.js
rename to application/src/client/classic-debug/js/otp/locale/Spanish.js
diff --git a/src/client/classic-debug/js/otp/locale/ca_ES.json b/application/src/client/classic-debug/js/otp/locale/ca_ES.json
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/ca_ES.json
rename to application/src/client/classic-debug/js/otp/locale/ca_ES.json
diff --git a/src/client/classic-debug/js/otp/locale/de.json b/application/src/client/classic-debug/js/otp/locale/de.json
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/de.json
rename to application/src/client/classic-debug/js/otp/locale/de.json
diff --git a/src/client/classic-debug/js/otp/locale/en.json b/application/src/client/classic-debug/js/otp/locale/en.json
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/en.json
rename to application/src/client/classic-debug/js/otp/locale/en.json
diff --git a/src/client/classic-debug/js/otp/locale/es.json b/application/src/client/classic-debug/js/otp/locale/es.json
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/es.json
rename to application/src/client/classic-debug/js/otp/locale/es.json
diff --git a/src/client/classic-debug/js/otp/locale/fr.json b/application/src/client/classic-debug/js/otp/locale/fr.json
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/fr.json
rename to application/src/client/classic-debug/js/otp/locale/fr.json
diff --git a/src/client/classic-debug/js/otp/locale/hu.json b/application/src/client/classic-debug/js/otp/locale/hu.json
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/hu.json
rename to application/src/client/classic-debug/js/otp/locale/hu.json
diff --git a/src/client/classic-debug/js/otp/locale/it.json b/application/src/client/classic-debug/js/otp/locale/it.json
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/it.json
rename to application/src/client/classic-debug/js/otp/locale/it.json
diff --git a/src/client/classic-debug/js/otp/locale/no.json b/application/src/client/classic-debug/js/otp/locale/no.json
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/no.json
rename to application/src/client/classic-debug/js/otp/locale/no.json
diff --git a/src/client/classic-debug/js/otp/locale/pl.json b/application/src/client/classic-debug/js/otp/locale/pl.json
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/pl.json
rename to application/src/client/classic-debug/js/otp/locale/pl.json
diff --git a/src/client/classic-debug/js/otp/locale/pt.json b/application/src/client/classic-debug/js/otp/locale/pt.json
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/pt.json
rename to application/src/client/classic-debug/js/otp/locale/pt.json
diff --git a/src/client/classic-debug/js/otp/locale/sl.json b/application/src/client/classic-debug/js/otp/locale/sl.json
similarity index 100%
rename from src/client/classic-debug/js/otp/locale/sl.json
rename to application/src/client/classic-debug/js/otp/locale/sl.json
diff --git a/src/client/classic-debug/js/otp/modules/Module.js b/application/src/client/classic-debug/js/otp/modules/Module.js
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/Module.js
rename to application/src/client/classic-debug/js/otp/modules/Module.js
diff --git a/src/client/classic-debug/js/otp/modules/bikeshare/BikeShareModule.js b/application/src/client/classic-debug/js/otp/modules/bikeshare/BikeShareModule.js
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/bikeshare/BikeShareModule.js
rename to application/src/client/classic-debug/js/otp/modules/bikeshare/BikeShareModule.js
diff --git a/src/client/classic-debug/js/otp/modules/bikeshare/BikeStationsWidget.js b/application/src/client/classic-debug/js/otp/modules/bikeshare/BikeStationsWidget.js
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/bikeshare/BikeStationsWidget.js
rename to application/src/client/classic-debug/js/otp/modules/bikeshare/BikeStationsWidget.js
diff --git a/src/client/classic-debug/js/otp/modules/bikeshare/bikeshare-style.css b/application/src/client/classic-debug/js/otp/modules/bikeshare/bikeshare-style.css
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/bikeshare/bikeshare-style.css
rename to application/src/client/classic-debug/js/otp/modules/bikeshare/bikeshare-style.css
diff --git a/src/client/classic-debug/js/otp/modules/multimodal/MultimodalPlannerModule.js b/application/src/client/classic-debug/js/otp/modules/multimodal/MultimodalPlannerModule.js
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/multimodal/MultimodalPlannerModule.js
rename to application/src/client/classic-debug/js/otp/modules/multimodal/MultimodalPlannerModule.js
diff --git a/src/client/classic-debug/js/otp/modules/multimodal/multimodal-style.css b/application/src/client/classic-debug/js/otp/modules/multimodal/multimodal-style.css
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/multimodal/multimodal-style.css
rename to application/src/client/classic-debug/js/otp/modules/multimodal/multimodal-style.css
diff --git a/src/client/classic-debug/js/otp/modules/planner/IconFactory.js b/application/src/client/classic-debug/js/otp/modules/planner/IconFactory.js
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/planner/IconFactory.js
rename to application/src/client/classic-debug/js/otp/modules/planner/IconFactory.js
diff --git a/src/client/classic-debug/js/otp/modules/planner/ItinerariesWidget.js b/application/src/client/classic-debug/js/otp/modules/planner/ItinerariesWidget.js
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/planner/ItinerariesWidget.js
rename to application/src/client/classic-debug/js/otp/modules/planner/ItinerariesWidget.js
diff --git a/src/client/classic-debug/js/otp/modules/planner/Itinerary.js b/application/src/client/classic-debug/js/otp/modules/planner/Itinerary.js
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/planner/Itinerary.js
rename to application/src/client/classic-debug/js/otp/modules/planner/Itinerary.js
diff --git a/src/client/classic-debug/js/otp/modules/planner/PlannerModule.js b/application/src/client/classic-debug/js/otp/modules/planner/PlannerModule.js
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/planner/PlannerModule.js
rename to application/src/client/classic-debug/js/otp/modules/planner/PlannerModule.js
diff --git a/src/client/classic-debug/js/otp/modules/planner/TripPlan.js b/application/src/client/classic-debug/js/otp/modules/planner/TripPlan.js
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/planner/TripPlan.js
rename to application/src/client/classic-debug/js/otp/modules/planner/TripPlan.js
diff --git a/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble.psd b/application/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble.psd
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble.psd
rename to application/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble.psd
diff --git a/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_ne.png b/application/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_ne.png
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_ne.png
rename to application/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_ne.png
diff --git a/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_ne_highlight.png b/application/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_ne_highlight.png
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_ne_highlight.png
rename to application/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_ne_highlight.png
diff --git a/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_nw.png b/application/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_nw.png
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_nw.png
rename to application/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_nw.png
diff --git a/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_nw_highlight.png b/application/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_nw_highlight.png
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_nw_highlight.png
rename to application/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_nw_highlight.png
diff --git a/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_se.png b/application/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_se.png
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_se.png
rename to application/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_se.png
diff --git a/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_se_highlight.png b/application/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_se_highlight.png
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_se_highlight.png
rename to application/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_se_highlight.png
diff --git a/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_sw.png b/application/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_sw.png
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_sw.png
rename to application/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_sw.png
diff --git a/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_sw_highlight.png b/application/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_sw_highlight.png
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_sw_highlight.png
rename to application/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_sw_highlight.png
diff --git a/src/client/classic-debug/js/otp/modules/planner/images/user_icon.png b/application/src/client/classic-debug/js/otp/modules/planner/images/user_icon.png
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/planner/images/user_icon.png
rename to application/src/client/classic-debug/js/otp/modules/planner/images/user_icon.png
diff --git a/src/client/classic-debug/js/otp/modules/planner/planner-style.css b/application/src/client/classic-debug/js/otp/modules/planner/planner-style.css
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/planner/planner-style.css
rename to application/src/client/classic-debug/js/otp/modules/planner/planner-style.css
diff --git a/src/client/classic-debug/js/otp/modules/planner/planner-templates.html b/application/src/client/classic-debug/js/otp/modules/planner/planner-templates.html
similarity index 100%
rename from src/client/classic-debug/js/otp/modules/planner/planner-templates.html
rename to application/src/client/classic-debug/js/otp/modules/planner/planner-templates.html
diff --git a/src/client/classic-debug/js/otp/otp.js b/application/src/client/classic-debug/js/otp/otp.js
similarity index 100%
rename from src/client/classic-debug/js/otp/otp.js
rename to application/src/client/classic-debug/js/otp/otp.js
diff --git a/src/client/classic-debug/js/otp/templates.js b/application/src/client/classic-debug/js/otp/templates.js
similarity index 100%
rename from src/client/classic-debug/js/otp/templates.js
rename to application/src/client/classic-debug/js/otp/templates.js
diff --git a/src/client/classic-debug/js/otp/util/DataStorage.js b/application/src/client/classic-debug/js/otp/util/DataStorage.js
similarity index 100%
rename from src/client/classic-debug/js/otp/util/DataStorage.js
rename to application/src/client/classic-debug/js/otp/util/DataStorage.js
diff --git a/src/client/classic-debug/js/otp/util/Geo.js b/application/src/client/classic-debug/js/otp/util/Geo.js
similarity index 100%
rename from src/client/classic-debug/js/otp/util/Geo.js
rename to application/src/client/classic-debug/js/otp/util/Geo.js
diff --git a/src/client/classic-debug/js/otp/util/Imperial.js b/application/src/client/classic-debug/js/otp/util/Imperial.js
similarity index 100%
rename from src/client/classic-debug/js/otp/util/Imperial.js
rename to application/src/client/classic-debug/js/otp/util/Imperial.js
diff --git a/src/client/classic-debug/js/otp/util/Itin.js b/application/src/client/classic-debug/js/otp/util/Itin.js
similarity index 100%
rename from src/client/classic-debug/js/otp/util/Itin.js
rename to application/src/client/classic-debug/js/otp/util/Itin.js
diff --git a/src/client/classic-debug/js/otp/util/Logger.js b/application/src/client/classic-debug/js/otp/util/Logger.js
similarity index 100%
rename from src/client/classic-debug/js/otp/util/Logger.js
rename to application/src/client/classic-debug/js/otp/util/Logger.js
diff --git a/src/client/classic-debug/js/otp/util/Text.js b/application/src/client/classic-debug/js/otp/util/Text.js
similarity index 100%
rename from src/client/classic-debug/js/otp/util/Text.js
rename to application/src/client/classic-debug/js/otp/util/Text.js
diff --git a/src/client/classic-debug/js/otp/util/Time.js b/application/src/client/classic-debug/js/otp/util/Time.js
similarity index 100%
rename from src/client/classic-debug/js/otp/util/Time.js
rename to application/src/client/classic-debug/js/otp/util/Time.js
diff --git a/src/client/classic-debug/js/otp/widgets/Dialogs.js b/application/src/client/classic-debug/js/otp/widgets/Dialogs.js
similarity index 100%
rename from src/client/classic-debug/js/otp/widgets/Dialogs.js
rename to application/src/client/classic-debug/js/otp/widgets/Dialogs.js
diff --git a/src/client/classic-debug/js/otp/widgets/InfoWidget.js b/application/src/client/classic-debug/js/otp/widgets/InfoWidget.js
similarity index 100%
rename from src/client/classic-debug/js/otp/widgets/InfoWidget.js
rename to application/src/client/classic-debug/js/otp/widgets/InfoWidget.js
diff --git a/src/client/classic-debug/js/otp/widgets/Widget.js b/application/src/client/classic-debug/js/otp/widgets/Widget.js
similarity index 100%
rename from src/client/classic-debug/js/otp/widgets/Widget.js
rename to application/src/client/classic-debug/js/otp/widgets/Widget.js
diff --git a/src/client/classic-debug/js/otp/widgets/WidgetManager.js b/application/src/client/classic-debug/js/otp/widgets/WidgetManager.js
similarity index 100%
rename from src/client/classic-debug/js/otp/widgets/WidgetManager.js
rename to application/src/client/classic-debug/js/otp/widgets/WidgetManager.js
diff --git a/src/client/classic-debug/js/otp/widgets/transit/RouteBasedWidget.js b/application/src/client/classic-debug/js/otp/widgets/transit/RouteBasedWidget.js
similarity index 100%
rename from src/client/classic-debug/js/otp/widgets/transit/RouteBasedWidget.js
rename to application/src/client/classic-debug/js/otp/widgets/transit/RouteBasedWidget.js
diff --git a/src/client/classic-debug/js/otp/widgets/transit/StopFinderWidget.js b/application/src/client/classic-debug/js/otp/widgets/transit/StopFinderWidget.js
similarity index 100%
rename from src/client/classic-debug/js/otp/widgets/transit/StopFinderWidget.js
rename to application/src/client/classic-debug/js/otp/widgets/transit/StopFinderWidget.js
diff --git a/src/client/classic-debug/js/otp/widgets/transit/StopViewerWidget.js b/application/src/client/classic-debug/js/otp/widgets/transit/StopViewerWidget.js
similarity index 100%
rename from src/client/classic-debug/js/otp/widgets/transit/StopViewerWidget.js
rename to application/src/client/classic-debug/js/otp/widgets/transit/StopViewerWidget.js
diff --git a/src/client/classic-debug/js/otp/widgets/transit/TripViewerWidget.js b/application/src/client/classic-debug/js/otp/widgets/transit/TripViewerWidget.js
similarity index 100%
rename from src/client/classic-debug/js/otp/widgets/transit/TripViewerWidget.js
rename to application/src/client/classic-debug/js/otp/widgets/transit/TripViewerWidget.js
diff --git a/src/client/classic-debug/js/otp/widgets/transit/widgets-transit-style.css b/application/src/client/classic-debug/js/otp/widgets/transit/widgets-transit-style.css
similarity index 100%
rename from src/client/classic-debug/js/otp/widgets/transit/widgets-transit-style.css
rename to application/src/client/classic-debug/js/otp/widgets/transit/widgets-transit-style.css
diff --git a/src/client/classic-debug/js/otp/widgets/transit/widgets-transit-templates.html b/application/src/client/classic-debug/js/otp/widgets/transit/widgets-transit-templates.html
similarity index 100%
rename from src/client/classic-debug/js/otp/widgets/transit/widgets-transit-templates.html
rename to application/src/client/classic-debug/js/otp/widgets/transit/widgets-transit-templates.html
diff --git a/src/client/classic-debug/js/otp/widgets/tripoptions/BikeTrianglePanel.js b/application/src/client/classic-debug/js/otp/widgets/tripoptions/BikeTrianglePanel.js
similarity index 100%
rename from src/client/classic-debug/js/otp/widgets/tripoptions/BikeTrianglePanel.js
rename to application/src/client/classic-debug/js/otp/widgets/tripoptions/BikeTrianglePanel.js
diff --git a/src/client/classic-debug/js/otp/widgets/tripoptions/RoutesSelectorWidget.js b/application/src/client/classic-debug/js/otp/widgets/tripoptions/RoutesSelectorWidget.js
similarity index 100%
rename from src/client/classic-debug/js/otp/widgets/tripoptions/RoutesSelectorWidget.js
rename to application/src/client/classic-debug/js/otp/widgets/tripoptions/RoutesSelectorWidget.js
diff --git a/src/client/classic-debug/js/otp/widgets/tripoptions/TripOptionsWidget.js b/application/src/client/classic-debug/js/otp/widgets/tripoptions/TripOptionsWidget.js
similarity index 100%
rename from src/client/classic-debug/js/otp/widgets/tripoptions/TripOptionsWidget.js
rename to application/src/client/classic-debug/js/otp/widgets/tripoptions/TripOptionsWidget.js
diff --git a/src/client/classic-debug/js/otp/widgets/tripoptions/tripoptions-style.css b/application/src/client/classic-debug/js/otp/widgets/tripoptions/tripoptions-style.css
similarity index 100%
rename from src/client/classic-debug/js/otp/widgets/tripoptions/tripoptions-style.css
rename to application/src/client/classic-debug/js/otp/widgets/tripoptions/tripoptions-style.css
diff --git a/src/client/classic-debug/js/otp/widgets/tripoptions/tripoptions-templates.html b/application/src/client/classic-debug/js/otp/widgets/tripoptions/tripoptions-templates.html
similarity index 100%
rename from src/client/classic-debug/js/otp/widgets/tripoptions/tripoptions-templates.html
rename to application/src/client/classic-debug/js/otp/widgets/tripoptions/tripoptions-templates.html
diff --git a/src/client/classic-debug/js/otp/widgets/widget-style.css b/application/src/client/classic-debug/js/otp/widgets/widget-style.css
similarity index 100%
rename from src/client/classic-debug/js/otp/widgets/widget-style.css
rename to application/src/client/classic-debug/js/otp/widgets/widget-style.css
diff --git a/src/client/classic-debug/js/otp/widgets/widget-templates.html b/application/src/client/classic-debug/js/otp/widgets/widget-templates.html
similarity index 100%
rename from src/client/classic-debug/js/otp/widgets/widget-templates.html
rename to application/src/client/classic-debug/js/otp/widgets/widget-templates.html
diff --git a/src/client/classic-debug/style.css b/application/src/client/classic-debug/style.css
similarity index 100%
rename from src/client/classic-debug/style.css
rename to application/src/client/classic-debug/style.css
diff --git a/src/client/graphiql/index.html b/application/src/client/graphiql/index.html
similarity index 100%
rename from src/client/graphiql/index.html
rename to application/src/client/graphiql/index.html
diff --git a/src/client/index.html b/application/src/client/index.html
similarity index 100%
rename from src/client/index.html
rename to application/src/client/index.html
diff --git a/src/client/legacygraphql/graphiql/index.html b/application/src/client/legacygraphql/graphiql/index.html
similarity index 100%
rename from src/client/legacygraphql/graphiql/index.html
rename to application/src/client/legacygraphql/graphiql/index.html
diff --git a/src/ext-test/java/org/opentripplanner/ext/SandboxExtensionResourceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/SandboxExtensionResourceTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/SandboxExtensionResourceTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/SandboxExtensionResourceTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScoreTest.java b/application/src/ext-test/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScoreTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScoreTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScoreTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/datastore/gs/GsDataSourceRepositoryTest.java b/application/src/ext-test/java/org/opentripplanner/ext/datastore/gs/GsDataSourceRepositoryTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/datastore/gs/GsDataSourceRepositoryTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/datastore/gs/GsDataSourceRepositoryTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/datastore/gs/GsHelperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/datastore/gs/GsHelperTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/datastore/gs/GsHelperTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/datastore/gs/GsHelperTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/datastore/gs/GsIntegrationTest.java b/application/src/ext-test/java/org/opentripplanner/ext/datastore/gs/GsIntegrationTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/datastore/gs/GsIntegrationTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/datastore/gs/GsIntegrationTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/emissions/Co2EmissionsDataReaderTest.java b/application/src/ext-test/java/org/opentripplanner/ext/emissions/Co2EmissionsDataReaderTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/emissions/Co2EmissionsDataReaderTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/emissions/Co2EmissionsDataReaderTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/emissions/EmissionsModuleTest.java b/application/src/ext-test/java/org/opentripplanner/ext/emissions/EmissionsModuleTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/emissions/EmissionsModuleTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/emissions/EmissionsModuleTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/emissions/EmissionsTest.java b/application/src/ext-test/java/org/opentripplanner/ext/emissions/EmissionsTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/emissions/EmissionsTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/emissions/EmissionsTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/FareRuleSetTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/FareRuleSetTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/fares/FareRuleSetTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/fares/FareRuleSetTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/FaresConfigurationTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/FaresConfigurationTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/fares/FaresConfigurationTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/fares/FaresConfigurationTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/FaresFilterTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/FaresFilterTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/fares/FaresFilterTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/fares/FaresFilterTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FareModelForTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/impl/FareModelForTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/fares/impl/FareModelForTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/fares/impl/FareModelForTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/GtfsFaresV2ServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/impl/GtfsFaresV2ServiceTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/fares/impl/GtfsFaresV2ServiceTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/fares/impl/GtfsFaresV2ServiceTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/model/FareProductTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/model/FareProductTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/fares/model/FareProductTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/fares/model/FareProductTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java
rename to application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexPathDurationsTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexPathDurationsTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/flex/FlexPathDurationsTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/flex/FlexPathDurationsTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexStopTimesForTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexStopTimesForTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/flex/FlexStopTimesForTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/flex/FlexStopTimesForTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculatorTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculatorTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculatorTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculatorTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculatorTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculatorTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculatorTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculatorTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/template/BoardAlight.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/template/BoardAlight.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/flex/template/BoardAlight.java
rename to application/src/ext-test/java/org/opentripplanner/ext/flex/template/BoardAlight.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/FlexTripsMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/trip/FlexTripsMapperTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/flex/trip/FlexTripsMapperTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/flex/trip/FlexTripsMapperTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/geocoder/EnglishNgramAnalyzerTest.java b/application/src/ext-test/java/org/opentripplanner/ext/geocoder/EnglishNgramAnalyzerTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/geocoder/EnglishNgramAnalyzerTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/geocoder/EnglishNgramAnalyzerTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java b/application/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/geocoder/StopClusterMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/geocoder/StopClusterMapperTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/geocoder/StopClusterMapperTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/geocoder/StopClusterMapperTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/mapping/TransmodelMappingUtilTest.java b/application/src/ext-test/java/org/opentripplanner/ext/mapping/TransmodelMappingUtilTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/mapping/TransmodelMappingUtilTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/mapping/TransmodelMappingUtilTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/realtimeresolver/RealtimeResolverTest.java b/application/src/ext-test/java/org/opentripplanner/ext/realtimeresolver/RealtimeResolverTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/realtimeresolver/RealtimeResolverTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/realtimeresolver/RealtimeResolverTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/restapi/mapping/EnumMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/restapi/mapping/EnumMapperTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/restapi/mapping/EnumMapperTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/restapi/mapping/EnumMapperTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/restapi/model/ApiTravelOptionsMakerTest.java b/application/src/ext-test/java/org/opentripplanner/ext/restapi/model/ApiTravelOptionsMakerTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/restapi/model/ApiTravelOptionsMakerTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/restapi/model/ApiTravelOptionsMakerTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/restapi/model/ApiWalkStepTest.java b/application/src/ext-test/java/org/opentripplanner/ext/restapi/model/ApiWalkStepTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/restapi/model/ApiWalkStepTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/restapi/model/ApiWalkStepTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/ApiRequestModeTest.java b/application/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/ApiRequestModeTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/restapi/parameter/ApiRequestModeTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/ApiRequestModeTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/QualifiedModeSetTest.java b/application/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/QualifiedModeSetTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/restapi/parameter/QualifiedModeSetTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/QualifiedModeSetTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/QualifiedModeTest.java b/application/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/QualifiedModeTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/restapi/parameter/QualifiedModeTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/QualifiedModeTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/ridehailing/DecorateWithRideHailingTest.java b/application/src/ext-test/java/org/opentripplanner/ext/ridehailing/DecorateWithRideHailingTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/ridehailing/DecorateWithRideHailingTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/ridehailing/DecorateWithRideHailingTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/ridehailing/FailingRideHailingService.java b/application/src/ext-test/java/org/opentripplanner/ext/ridehailing/FailingRideHailingService.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/ridehailing/FailingRideHailingService.java
rename to application/src/ext-test/java/org/opentripplanner/ext/ridehailing/FailingRideHailingService.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/ridehailing/RideHailingAccessAdapterTest.java b/application/src/ext-test/java/org/opentripplanner/ext/ridehailing/RideHailingAccessAdapterTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/ridehailing/RideHailingAccessAdapterTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/ridehailing/RideHailingAccessAdapterTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifterTest.java b/application/src/ext-test/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifterTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifterTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifterTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/ridehailing/TestRideHailingService.java b/application/src/ext-test/java/org/opentripplanner/ext/ridehailing/TestRideHailingService.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/ridehailing/TestRideHailingService.java
rename to application/src/ext-test/java/org/opentripplanner/ext/ridehailing/TestRideHailingService.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/ridehailing/configure/RideHailingServicesModuleTest.java b/application/src/ext-test/java/org/opentripplanner/ext/ridehailing/configure/RideHailingServicesModuleTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/ridehailing/configure/RideHailingServicesModuleTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/ridehailing/configure/RideHailingServicesModuleTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/ridehailing/service/uber/UberServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/ridehailing/service/uber/UberServiceTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/ridehailing/service/uber/UberServiceTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/ridehailing/service/uber/UberServiceTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSourceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSourceTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSourceTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSourceTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java b/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationModuleTest.java b/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationModuleTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationModuleTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationModuleTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParserTest.java b/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParserTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParserTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParserTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/TestStopConsolidationModel.java b/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/TestStopConsolidationModel.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/stopconsolidation/TestStopConsolidationModel.java
rename to application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/TestStopConsolidationModel.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationRepositoryTest.java b/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationRepositoryTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationRepositoryTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationRepositoryTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationServiceTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationServiceTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationServiceTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesResourceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesResourceTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesResourceTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesResourceTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/LayerFiltersTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/LayerFiltersTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/LayerFiltersTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/LayerFiltersTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/TestTransitService.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/TestTransitService.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/TestTransitService.java
rename to application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/TestTransitService.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapperTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapperTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapperTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapperTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapperTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapperTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/VehicleRentalLayerTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/VehicleRentalLayerTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/VehicleRentalLayerTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/VehicleRentalLayerTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdaterTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdaterTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdaterTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdaterTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdaterTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdaterTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdaterTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdaterTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/vehicleparking/sirifm/SiriFmUpdaterTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vehicleparking/sirifm/SiriFmUpdaterTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/vehicleparking/sirifm/SiriFmUpdaterTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/vehicleparking/sirifm/SiriFmUpdaterTest.java
diff --git a/src/ext-test/java/org/opentripplanner/ext/vehiclerentalservicedirectory/generatedoc/VehicleRentalServiceDirectoryConfigDocTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vehiclerentalservicedirectory/generatedoc/VehicleRentalServiceDirectoryConfigDocTest.java
similarity index 100%
rename from src/ext-test/java/org/opentripplanner/ext/vehiclerentalservicedirectory/generatedoc/VehicleRentalServiceDirectoryConfigDocTest.java
rename to application/src/ext-test/java/org/opentripplanner/ext/vehiclerentalservicedirectory/generatedoc/VehicleRentalServiceDirectoryConfigDocTest.java
diff --git a/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-invalid-test-gtfs/emissions.txt b/application/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-invalid-test-gtfs/emissions.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-invalid-test-gtfs/emissions.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-invalid-test-gtfs/emissions.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-invalid-test-gtfs/feed_info.txt b/application/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-invalid-test-gtfs/feed_info.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-invalid-test-gtfs/feed_info.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-invalid-test-gtfs/feed_info.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-missing-test-gtfs.zip b/application/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-missing-test-gtfs.zip
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-missing-test-gtfs.zip
rename to application/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-missing-test-gtfs.zip
diff --git a/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-missing-test-gtfs/feed_info.txt b/application/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-missing-test-gtfs/feed_info.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-missing-test-gtfs/feed_info.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-missing-test-gtfs/feed_info.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-test-gtfs.zip b/application/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-test-gtfs.zip
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-test-gtfs.zip
rename to application/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-test-gtfs.zip
diff --git a/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-test-gtfs/emissions.txt b/application/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-test-gtfs/emissions.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-test-gtfs/emissions.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-test-gtfs/emissions.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-test-gtfs/feed_info.txt b/application/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-test-gtfs/feed_info.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-test-gtfs/feed_info.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/emissions/emissions-test-gtfs/feed_info.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/agency.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/agency.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/agency.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/agency.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/booking_rules.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/booking_rules.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/booking_rules.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/booking_rules.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/calendar.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/calendar.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/calendar.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/calendar.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/calendar_attributes.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/calendar_attributes.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/calendar_attributes.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/calendar_attributes.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/calendar_dates.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/calendar_dates.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/calendar_dates.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/calendar_dates.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/feed_info.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/feed_info.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/feed_info.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/feed_info.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/location_groups.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/location_groups.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/location_groups.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/location_groups.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/locations.geojson b/application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/locations.geojson
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/locations.geojson
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/locations.geojson
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/routes.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/routes.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/routes.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/routes.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/shapes.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/shapes.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/shapes.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/shapes.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/stop_times.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/stop_times.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/stop_times.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/stop_times.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/stops.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/stops.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/stops.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/stops.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/trips.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/trips.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/trips.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/aspen-flex-on-demand.gtfs/trips.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/cobb-county.filtered.osm.pbf b/application/src/ext-test/resources/org/opentripplanner/ext/flex/cobb-county.filtered.osm.pbf
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/cobb-county.filtered.osm.pbf
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/cobb-county.filtered.osm.pbf
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-bus-30-only.gtfs.zip b/application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-bus-30-only.gtfs.zip
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-bus-30-only.gtfs.zip
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-bus-30-only.gtfs.zip
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/agency.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/agency.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/agency.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/agency.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/booking_rules.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/booking_rules.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/booking_rules.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/booking_rules.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/calendar.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/calendar.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/calendar.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/calendar.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/fare_attributes.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/fare_attributes.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/fare_attributes.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/fare_attributes.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/fare_rules.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/fare_rules.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/fare_rules.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/fare_rules.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/feed_info.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/feed_info.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/feed_info.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/feed_info.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/location_groups.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/location_groups.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/location_groups.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/location_groups.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/locations.geojson b/application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/locations.geojson
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/locations.geojson
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/locations.geojson
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/routes.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/routes.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/routes.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/routes.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/shapes.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/shapes.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/shapes.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/shapes.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/stop_times.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/stop_times.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/stop_times.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/stop_times.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/stops.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/stops.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/stops.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/stops.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/trips.txt b/application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/trips.txt
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/trips.txt
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/cobblinc-scheduled-deviated-flex.gtfs/trips.txt
diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/marta-bus-856-only.gtfs.zip b/application/src/ext-test/resources/org/opentripplanner/ext/flex/marta-bus-856-only.gtfs.zip
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/flex/marta-bus-856-only.gtfs.zip
rename to application/src/ext-test/resources/org/opentripplanner/ext/flex/marta-bus-856-only.gtfs.zip
diff --git a/src/ext-test/resources/org/opentripplanner/ext/stopconsolidation/consolidated-stops.csv b/application/src/ext-test/resources/org/opentripplanner/ext/stopconsolidation/consolidated-stops.csv
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/stopconsolidation/consolidated-stops.csv
rename to application/src/ext-test/resources/org/opentripplanner/ext/stopconsolidation/consolidated-stops.csv
diff --git a/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/bikeep/bikeep.json b/application/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/bikeep/bikeep.json
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/vehicleparking/bikeep/bikeep.json
rename to application/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/bikeep/bikeep.json
diff --git a/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/bikely/bikely.json b/application/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/bikely/bikely.json
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/vehicleparking/bikely/bikely.json
rename to application/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/bikely/bikely.json
diff --git a/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/hslpark/facilities.json b/application/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/hslpark/facilities.json
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/vehicleparking/hslpark/facilities.json
rename to application/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/hslpark/facilities.json
diff --git a/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/hslpark/hubs.json b/application/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/hslpark/hubs.json
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/vehicleparking/hslpark/hubs.json
rename to application/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/hslpark/hubs.json
diff --git a/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/hslpark/utilizations.json b/application/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/hslpark/utilizations.json
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/vehicleparking/hslpark/utilizations.json
rename to application/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/hslpark/utilizations.json
diff --git a/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/parkapi/herrenberg.json b/application/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/parkapi/herrenberg.json
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/vehicleparking/parkapi/herrenberg.json
rename to application/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/parkapi/herrenberg.json
diff --git a/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/parkapi/parkapi-reutlingen.json b/application/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/parkapi/parkapi-reutlingen.json
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/vehicleparking/parkapi/parkapi-reutlingen.json
rename to application/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/parkapi/parkapi-reutlingen.json
diff --git a/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/sirifm/siri-fm.xml b/application/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/sirifm/siri-fm.xml
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/vehicleparking/sirifm/siri-fm.xml
rename to application/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/sirifm/siri-fm.xml
diff --git a/src/ext-test/resources/org/opentripplanner/ext/vehiclerentalservicedirectory/generatedoc/router-config.json b/application/src/ext-test/resources/org/opentripplanner/ext/vehiclerentalservicedirectory/generatedoc/router-config.json
similarity index 100%
rename from src/ext-test/resources/org/opentripplanner/ext/vehiclerentalservicedirectory/generatedoc/router-config.json
rename to application/src/ext-test/resources/org/opentripplanner/ext/vehiclerentalservicedirectory/generatedoc/router-config.json
diff --git a/src/ext-test/resources/ridehailing/uber-arrival-estimates.json b/application/src/ext-test/resources/ridehailing/uber-arrival-estimates.json
similarity index 100%
rename from src/ext-test/resources/ridehailing/uber-arrival-estimates.json
rename to application/src/ext-test/resources/ridehailing/uber-arrival-estimates.json
diff --git a/src/ext-test/resources/ridehailing/uber-price-estimates.json b/application/src/ext-test/resources/ridehailing/uber-price-estimates.json
similarity index 100%
rename from src/ext-test/resources/ridehailing/uber-price-estimates.json
rename to application/src/ext-test/resources/ridehailing/uber-price-estimates.json
diff --git a/src/ext-test/resources/smoovebikerental/smoove.json b/application/src/ext-test/resources/smoovebikerental/smoove.json
similarity index 100%
rename from src/ext-test/resources/smoovebikerental/smoove.json
rename to application/src/ext-test/resources/smoovebikerental/smoove.json
diff --git a/src/ext-test/resources/test.txt b/application/src/ext-test/resources/test.txt
similarity index 100%
rename from src/ext-test/resources/test.txt
rename to application/src/ext-test/resources/test.txt
diff --git a/src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java b/application/src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java
rename to application/src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java
diff --git a/src/ext/java/org/opentripplanner/ext/actuator/ActuatorAPI.java b/application/src/ext/java/org/opentripplanner/ext/actuator/ActuatorAPI.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/actuator/ActuatorAPI.java
rename to application/src/ext/java/org/opentripplanner/ext/actuator/ActuatorAPI.java
diff --git a/src/ext/java/org/opentripplanner/ext/actuator/MicrometerGraphQLInstrumentation.java b/application/src/ext/java/org/opentripplanner/ext/actuator/MicrometerGraphQLInstrumentation.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/actuator/MicrometerGraphQLInstrumentation.java
rename to application/src/ext/java/org/opentripplanner/ext/actuator/MicrometerGraphQLInstrumentation.java
diff --git a/src/ext/java/org/opentripplanner/ext/dataoverlay/DataOverlayStreetEdgeCostExtension.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/DataOverlayStreetEdgeCostExtension.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/dataoverlay/DataOverlayStreetEdgeCostExtension.java
rename to application/src/ext/java/org/opentripplanner/ext/dataoverlay/DataOverlayStreetEdgeCostExtension.java
diff --git a/src/ext/java/org/opentripplanner/ext/dataoverlay/EdgeGenQuality.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/EdgeGenQuality.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/dataoverlay/EdgeGenQuality.java
rename to application/src/ext/java/org/opentripplanner/ext/dataoverlay/EdgeGenQuality.java
diff --git a/src/ext/java/org/opentripplanner/ext/dataoverlay/EdgeUpdaterModule.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/EdgeUpdaterModule.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/dataoverlay/EdgeUpdaterModule.java
rename to application/src/ext/java/org/opentripplanner/ext/dataoverlay/EdgeUpdaterModule.java
diff --git a/src/ext/java/org/opentripplanner/ext/dataoverlay/GenericDataFile.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/GenericDataFile.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/dataoverlay/GenericDataFile.java
rename to application/src/ext/java/org/opentripplanner/ext/dataoverlay/GenericDataFile.java
diff --git a/src/ext/java/org/opentripplanner/ext/dataoverlay/GenericEdgeUpdater.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/GenericEdgeUpdater.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/dataoverlay/GenericEdgeUpdater.java
rename to application/src/ext/java/org/opentripplanner/ext/dataoverlay/GenericEdgeUpdater.java
diff --git a/src/ext/java/org/opentripplanner/ext/dataoverlay/api/DataOverlayParameters.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/api/DataOverlayParameters.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/dataoverlay/api/DataOverlayParameters.java
rename to application/src/ext/java/org/opentripplanner/ext/dataoverlay/api/DataOverlayParameters.java
diff --git a/src/ext/java/org/opentripplanner/ext/dataoverlay/api/DataOverlayParametersBuilder.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/api/DataOverlayParametersBuilder.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/dataoverlay/api/DataOverlayParametersBuilder.java
rename to application/src/ext/java/org/opentripplanner/ext/dataoverlay/api/DataOverlayParametersBuilder.java
diff --git a/src/ext/java/org/opentripplanner/ext/dataoverlay/api/Parameter.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/api/Parameter.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/dataoverlay/api/Parameter.java
rename to application/src/ext/java/org/opentripplanner/ext/dataoverlay/api/Parameter.java
diff --git a/src/ext/java/org/opentripplanner/ext/dataoverlay/api/ParameterName.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/api/ParameterName.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/dataoverlay/api/ParameterName.java
rename to application/src/ext/java/org/opentripplanner/ext/dataoverlay/api/ParameterName.java
diff --git a/src/ext/java/org/opentripplanner/ext/dataoverlay/api/ParameterType.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/api/ParameterType.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/dataoverlay/api/ParameterType.java
rename to application/src/ext/java/org/opentripplanner/ext/dataoverlay/api/ParameterType.java
diff --git a/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/DataOverlayConfig.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/DataOverlayConfig.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/DataOverlayConfig.java
rename to application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/DataOverlayConfig.java
diff --git a/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/DataOverlayParameterBindings.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/DataOverlayParameterBindings.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/DataOverlayParameterBindings.java
rename to application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/DataOverlayParameterBindings.java
diff --git a/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/IndexVariable.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/IndexVariable.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/IndexVariable.java
rename to application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/IndexVariable.java
diff --git a/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/ParameterBinding.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/ParameterBinding.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/ParameterBinding.java
rename to application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/ParameterBinding.java
diff --git a/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/TimeUnit.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/TimeUnit.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/TimeUnit.java
rename to application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/TimeUnit.java
diff --git a/src/ext/java/org/opentripplanner/ext/dataoverlay/configure/DataOverlayFactory.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/configure/DataOverlayFactory.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/dataoverlay/configure/DataOverlayFactory.java
rename to application/src/ext/java/org/opentripplanner/ext/dataoverlay/configure/DataOverlayFactory.java
diff --git a/src/ext/java/org/opentripplanner/ext/dataoverlay/routing/DataOverlayContext.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/routing/DataOverlayContext.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/dataoverlay/routing/DataOverlayContext.java
rename to application/src/ext/java/org/opentripplanner/ext/dataoverlay/routing/DataOverlayContext.java
diff --git a/src/ext/java/org/opentripplanner/ext/dataoverlay/routing/Parameter.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/routing/Parameter.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/dataoverlay/routing/Parameter.java
rename to application/src/ext/java/org/opentripplanner/ext/dataoverlay/routing/Parameter.java
diff --git a/src/ext/java/org/opentripplanner/ext/datastore/gs/AbstractGsDataSource.java b/application/src/ext/java/org/opentripplanner/ext/datastore/gs/AbstractGsDataSource.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/datastore/gs/AbstractGsDataSource.java
rename to application/src/ext/java/org/opentripplanner/ext/datastore/gs/AbstractGsDataSource.java
diff --git a/src/ext/java/org/opentripplanner/ext/datastore/gs/GsDataSourceModule.java b/application/src/ext/java/org/opentripplanner/ext/datastore/gs/GsDataSourceModule.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/datastore/gs/GsDataSourceModule.java
rename to application/src/ext/java/org/opentripplanner/ext/datastore/gs/GsDataSourceModule.java
diff --git a/src/ext/java/org/opentripplanner/ext/datastore/gs/GsDataSourceRepository.java b/application/src/ext/java/org/opentripplanner/ext/datastore/gs/GsDataSourceRepository.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/datastore/gs/GsDataSourceRepository.java
rename to application/src/ext/java/org/opentripplanner/ext/datastore/gs/GsDataSourceRepository.java
diff --git a/src/ext/java/org/opentripplanner/ext/datastore/gs/GsDirectoryDataSource.java b/application/src/ext/java/org/opentripplanner/ext/datastore/gs/GsDirectoryDataSource.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/datastore/gs/GsDirectoryDataSource.java
rename to application/src/ext/java/org/opentripplanner/ext/datastore/gs/GsDirectoryDataSource.java
diff --git a/src/ext/java/org/opentripplanner/ext/datastore/gs/GsFileDataSource.java b/application/src/ext/java/org/opentripplanner/ext/datastore/gs/GsFileDataSource.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/datastore/gs/GsFileDataSource.java
rename to application/src/ext/java/org/opentripplanner/ext/datastore/gs/GsFileDataSource.java
diff --git a/src/ext/java/org/opentripplanner/ext/datastore/gs/GsHelper.java b/application/src/ext/java/org/opentripplanner/ext/datastore/gs/GsHelper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/datastore/gs/GsHelper.java
rename to application/src/ext/java/org/opentripplanner/ext/datastore/gs/GsHelper.java
diff --git a/src/ext/java/org/opentripplanner/ext/datastore/gs/GsOutFileDataSource.java b/application/src/ext/java/org/opentripplanner/ext/datastore/gs/GsOutFileDataSource.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/datastore/gs/GsOutFileDataSource.java
rename to application/src/ext/java/org/opentripplanner/ext/datastore/gs/GsOutFileDataSource.java
diff --git a/src/ext/java/org/opentripplanner/ext/datastore/gs/package-info.java b/application/src/ext/java/org/opentripplanner/ext/datastore/gs/package-info.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/datastore/gs/package-info.java
rename to application/src/ext/java/org/opentripplanner/ext/datastore/gs/package-info.java
diff --git a/src/ext/java/org/opentripplanner/ext/emissions/Co2EmissionsDataReader.java b/application/src/ext/java/org/opentripplanner/ext/emissions/Co2EmissionsDataReader.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/emissions/Co2EmissionsDataReader.java
rename to application/src/ext/java/org/opentripplanner/ext/emissions/Co2EmissionsDataReader.java
diff --git a/src/ext/java/org/opentripplanner/ext/emissions/DecorateWithEmission.java b/application/src/ext/java/org/opentripplanner/ext/emissions/DecorateWithEmission.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/emissions/DecorateWithEmission.java
rename to application/src/ext/java/org/opentripplanner/ext/emissions/DecorateWithEmission.java
diff --git a/src/ext/java/org/opentripplanner/ext/emissions/DefaultEmissionsService.java b/application/src/ext/java/org/opentripplanner/ext/emissions/DefaultEmissionsService.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/emissions/DefaultEmissionsService.java
rename to application/src/ext/java/org/opentripplanner/ext/emissions/DefaultEmissionsService.java
diff --git a/src/ext/java/org/opentripplanner/ext/emissions/EmissionsConfig.java b/application/src/ext/java/org/opentripplanner/ext/emissions/EmissionsConfig.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/emissions/EmissionsConfig.java
rename to application/src/ext/java/org/opentripplanner/ext/emissions/EmissionsConfig.java
diff --git a/src/ext/java/org/opentripplanner/ext/emissions/EmissionsDataModel.java b/application/src/ext/java/org/opentripplanner/ext/emissions/EmissionsDataModel.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/emissions/EmissionsDataModel.java
rename to application/src/ext/java/org/opentripplanner/ext/emissions/EmissionsDataModel.java
diff --git a/src/ext/java/org/opentripplanner/ext/emissions/EmissionsModule.java b/application/src/ext/java/org/opentripplanner/ext/emissions/EmissionsModule.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/emissions/EmissionsModule.java
rename to application/src/ext/java/org/opentripplanner/ext/emissions/EmissionsModule.java
diff --git a/src/ext/java/org/opentripplanner/ext/emissions/EmissionsService.java b/application/src/ext/java/org/opentripplanner/ext/emissions/EmissionsService.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/emissions/EmissionsService.java
rename to application/src/ext/java/org/opentripplanner/ext/emissions/EmissionsService.java
diff --git a/src/ext/java/org/opentripplanner/ext/emissions/EmissionsServiceModule.java b/application/src/ext/java/org/opentripplanner/ext/emissions/EmissionsServiceModule.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/emissions/EmissionsServiceModule.java
rename to application/src/ext/java/org/opentripplanner/ext/emissions/EmissionsServiceModule.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/DecorateWithFare.java b/application/src/ext/java/org/opentripplanner/ext/fares/DecorateWithFare.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/DecorateWithFare.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/DecorateWithFare.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/FaresConfiguration.java b/application/src/ext/java/org/opentripplanner/ext/fares/FaresConfiguration.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/FaresConfiguration.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/FaresConfiguration.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/FaresToItineraryMapper.java b/application/src/ext/java/org/opentripplanner/ext/fares/FaresToItineraryMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/FaresToItineraryMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/FaresToItineraryMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceFactory.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceFactory.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceFactory.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/CombineInterlinedLegsFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/impl/CombineInterlinedLegsFactory.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/impl/CombineInterlinedLegsFactory.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/impl/CombineInterlinedLegsFactory.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareService.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareService.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareService.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java b/application/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceFactory.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceFactory.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceFactory.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/GtfsFaresService.java b/application/src/ext/java/org/opentripplanner/ext/fares/impl/GtfsFaresService.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/impl/GtfsFaresService.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/impl/GtfsFaresService.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/GtfsFaresV2Service.java b/application/src/ext/java/org/opentripplanner/ext/fares/impl/GtfsFaresV2Service.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/impl/GtfsFaresV2Service.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/impl/GtfsFaresV2Service.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/HSLFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/impl/HSLFareService.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/impl/HSLFareService.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/impl/HSLFareService.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/HSLFareServiceFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/impl/HSLFareServiceFactory.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/impl/HSLFareServiceFactory.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/impl/HSLFareServiceFactory.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareService.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareService.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareService.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceFactory.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceFactory.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceFactory.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/NoopFareServiceFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/impl/NoopFareServiceFactory.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/impl/NoopFareServiceFactory.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/impl/NoopFareServiceFactory.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareFactory.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareFactory.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareFactory.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFaresData.java b/application/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFaresData.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFaresData.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFaresData.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/model/Distance.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/Distance.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/model/Distance.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/model/Distance.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/model/FareAttribute.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttribute.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/model/FareAttribute.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttribute.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/model/FareAttributeBuilder.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttributeBuilder.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/model/FareAttributeBuilder.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttributeBuilder.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/model/FareDistance.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareDistance.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/model/FareDistance.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/model/FareDistance.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRule.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRule.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/model/FareLegRule.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRule.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRuleBuilder.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRuleBuilder.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/model/FareLegRuleBuilder.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRuleBuilder.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/model/FareRule.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRule.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/model/FareRule.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/model/FareRule.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/model/FareRulesData.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRulesData.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/model/FareRulesData.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/model/FareRulesData.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRule.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRule.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRule.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRule.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferType.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferType.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/model/FareTransferType.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferType.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/model/LegProducts.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/LegProducts.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/model/LegProducts.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/model/LegProducts.java
diff --git a/src/ext/java/org/opentripplanner/ext/fares/model/RouteOriginDestination.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/RouteOriginDestination.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/fares/model/RouteOriginDestination.java
rename to application/src/ext/java/org/opentripplanner/ext/fares/model/RouteOriginDestination.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapper.java b/application/src/ext/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/Flex.svg b/application/src/ext/java/org/opentripplanner/ext/flex/Flex.svg
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/Flex.svg
rename to application/src/ext/java/org/opentripplanner/ext/flex/Flex.svg
diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java b/application/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java b/application/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexParameters.java b/application/src/ext/java/org/opentripplanner/ext/flex/FlexParameters.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/FlexParameters.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/FlexParameters.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexPathDurations.java b/application/src/ext/java/org/opentripplanner/ext/flex/FlexPathDurations.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/FlexPathDurations.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/FlexPathDurations.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/application/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java b/application/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java b/application/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/README.md b/application/src/ext/java/org/opentripplanner/ext/flex/README.md
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/README.md
rename to application/src/ext/java/org/opentripplanner/ext/flex/README.md
diff --git a/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java b/application/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DirectFlexPathCalculator.java b/application/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DirectFlexPathCalculator.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DirectFlexPathCalculator.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DirectFlexPathCalculator.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java b/application/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathCalculator.java b/application/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathCalculator.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathCalculator.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathCalculator.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculator.java b/application/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculator.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculator.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculator.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/StreetFlexPathCalculator.java b/application/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/StreetFlexPathCalculator.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/StreetFlexPathCalculator.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/StreetFlexPathCalculator.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java b/application/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/DirectFlexPath.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/DirectFlexPath.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/template/DirectFlexPath.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/template/DirectFlexPath.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackAdapter.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackAdapter.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackAdapter.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackAdapter.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexServiceDate.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexServiceDate.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/template/FlexServiceDate.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/template/FlexServiceDate.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTripBuilder.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTripBuilder.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/trip/FlexTripBuilder.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTripBuilder.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/StopTimeWindow.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/StopTimeWindow.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/trip/StopTimeWindow.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/trip/StopTimeWindow.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java
diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java
rename to application/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java
diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/EnglishNGramAnalyzer.java b/application/src/ext/java/org/opentripplanner/ext/geocoder/EnglishNGramAnalyzer.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/geocoder/EnglishNGramAnalyzer.java
rename to application/src/ext/java/org/opentripplanner/ext/geocoder/EnglishNGramAnalyzer.java
diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java b/application/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java
rename to application/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java
diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java
rename to application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java
diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java b/application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java
rename to application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java
diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java b/application/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java
rename to application/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java
diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java b/application/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java b/application/src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java
rename to application/src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/api/LauncherRequestDecorator.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/api/LauncherRequestDecorator.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/api/LauncherRequestDecorator.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/api/LauncherRequestDecorator.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/configuration/InteractiveLauncherModule.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/configuration/InteractiveLauncherModule.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/configuration/InteractiveLauncherModule.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/configuration/InteractiveLauncherModule.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/OtpDebugController.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/OtpDebugController.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/OtpDebugController.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/OtpDebugController.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggers.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggers.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggers.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggers.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggingSupport.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggingSupport.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggingSupport.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggingSupport.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogModel.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogModel.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogModel.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogModel.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugModel.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugModel.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugModel.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugModel.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugView.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugView.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugView.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugView.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourceRootView.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourceRootView.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourceRootView.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourceRootView.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourcesView.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourcesView.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourcesView.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourcesView.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/MainView.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/MainView.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/MainView.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/MainView.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/OptionsView.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/OptionsView.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/OptionsView.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/OptionsView.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StartOtpButtonView.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StartOtpButtonView.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StartOtpButtonView.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StartOtpButtonView.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StartupModel.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StartupModel.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StartupModel.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StartupModel.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StatusBar.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StatusBar.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StatusBar.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StatusBar.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/support/SearchForOtpConfig.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/support/SearchForOtpConfig.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/support/SearchForOtpConfig.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/support/SearchForOtpConfig.java
diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/support/ViewUtils.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/support/ViewUtils.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/support/ViewUtils.java
rename to application/src/ext/java/org/opentripplanner/ext/interactivelauncher/support/ViewUtils.java
diff --git a/src/ext/java/org/opentripplanner/ext/parkAndRideApi/ParkAndRideResource.java b/application/src/ext/java/org/opentripplanner/ext/parkAndRideApi/ParkAndRideResource.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/parkAndRideApi/ParkAndRideResource.java
rename to application/src/ext/java/org/opentripplanner/ext/parkAndRideApi/ParkAndRideResource.java
diff --git a/src/ext/java/org/opentripplanner/ext/realtimeresolver/RealtimeResolver.java b/application/src/ext/java/org/opentripplanner/ext/realtimeresolver/RealtimeResolver.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/realtimeresolver/RealtimeResolver.java
rename to application/src/ext/java/org/opentripplanner/ext/realtimeresolver/RealtimeResolver.java
diff --git a/src/ext/java/org/opentripplanner/ext/reportapi/model/CachedValue.java b/application/src/ext/java/org/opentripplanner/ext/reportapi/model/CachedValue.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/reportapi/model/CachedValue.java
rename to application/src/ext/java/org/opentripplanner/ext/reportapi/model/CachedValue.java
diff --git a/src/ext/java/org/opentripplanner/ext/reportapi/model/CsvReportBuilder.java b/application/src/ext/java/org/opentripplanner/ext/reportapi/model/CsvReportBuilder.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/reportapi/model/CsvReportBuilder.java
rename to application/src/ext/java/org/opentripplanner/ext/reportapi/model/CsvReportBuilder.java
diff --git a/src/ext/java/org/opentripplanner/ext/reportapi/model/GraphReportBuilder.java b/application/src/ext/java/org/opentripplanner/ext/reportapi/model/GraphReportBuilder.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/reportapi/model/GraphReportBuilder.java
rename to application/src/ext/java/org/opentripplanner/ext/reportapi/model/GraphReportBuilder.java
diff --git a/src/ext/java/org/opentripplanner/ext/reportapi/model/TransfersReport.java b/application/src/ext/java/org/opentripplanner/ext/reportapi/model/TransfersReport.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/reportapi/model/TransfersReport.java
rename to application/src/ext/java/org/opentripplanner/ext/reportapi/model/TransfersReport.java
diff --git a/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java b/application/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java
rename to application/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java
diff --git a/src/ext/java/org/opentripplanner/ext/reportapi/resource/ReportResource.java b/application/src/ext/java/org/opentripplanner/ext/reportapi/resource/ReportResource.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/reportapi/resource/ReportResource.java
rename to application/src/ext/java/org/opentripplanner/ext/reportapi/resource/ReportResource.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/AbsoluteDirectionMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/AbsoluteDirectionMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/AbsoluteDirectionMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/AbsoluteDirectionMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/AgencyMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/AgencyMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/AgencyMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/AgencyMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/AlertMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/AlertMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/AlertMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/AlertMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BikeAccessMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/BikeAccessMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/BikeAccessMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/BikeAccessMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingMethodMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingMethodMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingMethodMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingMethodMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingTimeMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingTimeMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingTimeMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingTimeMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/ContactInfoMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/ContactInfoMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/ContactInfoMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/ContactInfoMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/DirectionMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/DirectionMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/DirectionMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/DirectionMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/ElevationMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/ElevationMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/ElevationMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/ElevationMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/FareMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/FareMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/FareMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/FareMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/FeedInfoMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/FeedInfoMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/FeedInfoMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/FeedInfoMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/FeedScopedIdMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/FeedScopedIdMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/FeedScopedIdMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/FeedScopedIdMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/ItineraryMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/ItineraryMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/ItineraryMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/ItineraryMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/LegMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegacyVehicleRoutingOptimizeType.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegacyVehicleRoutingOptimizeType.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/LegacyVehicleRoutingOptimizeType.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegacyVehicleRoutingOptimizeType.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/LocalDateMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/LocalDateMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/LocalDateMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/LocalDateMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/ModeMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/ModeMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/ModeMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/ModeMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/PlaceMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/PlaceMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/PlaceMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/PlaceMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/RelativeDirectionMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/RelativeDirectionMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/RelativeDirectionMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/RelativeDirectionMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/RouteMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/RouteMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/RouteMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/RouteMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/RouteTypeMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/RouteTypeMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/RouteTypeMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/RouteTypeMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/StopMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/StopMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/StopMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/StopMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/StopTimesInPatternMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/StopTimesInPatternMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/StopTimesInPatternMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/StopTimesInPatternMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/SystemNoticeMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/SystemNoticeMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/SystemNoticeMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/SystemNoticeMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/TransferMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/TransferMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/TransferMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/TransferMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/TripMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripPatternMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripPatternMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/TripPatternMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripPatternMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripPlanMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripPlanMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/TripPlanMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripPlanMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripSearchMetadataMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripSearchMetadataMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/TripSearchMetadataMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripSearchMetadataMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripTimeMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripTimeMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/TripTimeMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripTimeMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/VehicleRentalStationMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/VehicleRentalStationMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/VehicleRentalStationMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/VehicleRentalStationMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/VertexTypeMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/VertexTypeMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/VertexTypeMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/VertexTypeMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/WalkStepMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/WalkStepMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/WalkStepMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/WalkStepMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/WheelchairAccessibilityMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/WheelchairAccessibilityMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/WheelchairAccessibilityMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/mapping/WheelchairAccessibilityMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiAbsoluteDirection.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiAbsoluteDirection.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiAbsoluteDirection.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiAbsoluteDirection.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiAgency.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiAgency.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiAgency.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiAgency.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiAlert.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiAlert.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiAlert.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiAlert.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiBookingInfo.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiBookingInfo.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiBookingInfo.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiBookingInfo.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiBookingTime.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiBookingTime.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiBookingTime.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiBookingTime.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiContactInfo.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiContactInfo.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiContactInfo.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiContactInfo.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiCurrency.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiCurrency.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiCurrency.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiCurrency.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiFareComponent.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiFareComponent.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiFareComponent.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiFareComponent.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiFareProduct.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiFareProduct.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiFareProduct.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiFareProduct.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiFareQualifier.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiFareQualifier.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiFareQualifier.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiFareQualifier.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiFeedInfo.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiFeedInfo.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiFeedInfo.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiFeedInfo.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiItinerary.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiItinerary.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiItinerary.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiItinerary.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiItineraryFares.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiItineraryFares.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiItineraryFares.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiItineraryFares.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiLeg.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiLeg.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiLeg.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiLeg.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiLegProducts.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiLegProducts.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiLegProducts.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiLegProducts.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiMoney.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiMoney.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiMoney.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiMoney.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiPatternDetail.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiPatternDetail.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiPatternDetail.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiPatternDetail.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiPatternShort.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiPatternShort.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiPatternShort.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiPatternShort.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiPlace.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiPlace.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiPlace.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiPlace.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRealTimeState.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRealTimeState.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiRealTimeState.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRealTimeState.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRelativeDirection.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRelativeDirection.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiRelativeDirection.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRelativeDirection.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRoute.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRoute.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiRoute.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRoute.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRouteShort.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRouteShort.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiRouteShort.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRouteShort.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRouterInfo.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRouterInfo.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiRouterInfo.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRouterInfo.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRouterList.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRouterList.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiRouterList.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRouterList.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiStop.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiStop.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiStop.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiStop.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiStopShort.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiStopShort.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiStopShort.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiStopShort.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiStopTimesInPattern.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiStopTimesInPattern.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiStopTimesInPattern.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiStopTimesInPattern.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiSystemNotice.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiSystemNotice.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiSystemNotice.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiSystemNotice.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTransfer.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTransfer.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiTransfer.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTransfer.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTravelOption.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTravelOption.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiTravelOption.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTravelOption.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTravelOptionsMaker.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTravelOptionsMaker.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiTravelOptionsMaker.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTravelOptionsMaker.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTrip.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTrip.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiTrip.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTrip.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripPlan.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripPlan.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripPlan.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripPlan.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripSearchMetadata.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripSearchMetadata.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripSearchMetadata.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripSearchMetadata.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripShort.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripShort.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripShort.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripShort.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripTimeShort.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripTimeShort.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripTimeShort.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripTimeShort.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleParkingSpaces.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleParkingSpaces.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleParkingSpaces.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleParkingSpaces.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleParkingWithEntrance.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleParkingWithEntrance.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleParkingWithEntrance.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleParkingWithEntrance.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleRentalStation.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleRentalStation.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleRentalStation.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleRentalStation.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleRentalStationList.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleRentalStationList.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleRentalStationList.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleRentalStationList.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVertexType.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVertexType.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiVertexType.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVertexType.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiWalkStep.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiWalkStep.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ApiWalkStep.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiWalkStep.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ElevationMetadata.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ElevationMetadata.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/ElevationMetadata.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/ElevationMetadata.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/TripPlannerResponse.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/TripPlannerResponse.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/model/TripPlannerResponse.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/model/TripPlannerResponse.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/BikeRental.java b/application/src/ext/java/org/opentripplanner/ext/restapi/resources/BikeRental.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/resources/BikeRental.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/resources/BikeRental.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/IndexAPI.java b/application/src/ext/java/org/opentripplanner/ext/restapi/resources/IndexAPI.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/resources/IndexAPI.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/resources/IndexAPI.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/PlannerResource.java b/application/src/ext/java/org/opentripplanner/ext/restapi/resources/PlannerResource.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/resources/PlannerResource.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/resources/PlannerResource.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/Routers.java b/application/src/ext/java/org/opentripplanner/ext/restapi/resources/Routers.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/resources/Routers.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/resources/Routers.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java b/application/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/ValidateParameters.java b/application/src/ext/java/org/opentripplanner/ext/restapi/resources/ValidateParameters.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/resources/ValidateParameters.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/resources/ValidateParameters.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/package-info.java b/application/src/ext/java/org/opentripplanner/ext/restapi/resources/package-info.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/resources/package-info.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/resources/package-info.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdDeserializer.java b/application/src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdDeserializer.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdDeserializer.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdDeserializer.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdKeyDeserializer.java b/application/src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdKeyDeserializer.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdKeyDeserializer.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdKeyDeserializer.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdSerializer.java b/application/src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdSerializer.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdSerializer.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdSerializer.java
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/serialization/JSONObjectMapperProvider.java b/application/src/ext/java/org/opentripplanner/ext/restapi/serialization/JSONObjectMapperProvider.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/restapi/serialization/JSONObjectMapperProvider.java
rename to application/src/ext/java/org/opentripplanner/ext/restapi/serialization/JSONObjectMapperProvider.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/CachingRideHailingService.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/CachingRideHailingService.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/CachingRideHailingService.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/CachingRideHailingService.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/DecorateWithRideHailing.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/DecorateWithRideHailing.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/DecorateWithRideHailing.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/DecorateWithRideHailing.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessAdapter.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessAdapter.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessAdapter.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessAdapter.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingService.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingService.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingService.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingService.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingServiceParameters.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingServiceParameters.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingServiceParameters.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingServiceParameters.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/configure/RideHailingServicesModule.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/configure/RideHailingServicesModule.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/configure/RideHailingServicesModule.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/configure/RideHailingServicesModule.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/model/ArrivalTime.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/model/ArrivalTime.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/model/ArrivalTime.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/model/ArrivalTime.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/model/Ride.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/model/Ride.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/model/Ride.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/model/Ride.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/model/RideEstimate.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/model/RideEstimate.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/model/RideEstimate.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/model/RideEstimate.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/model/RideEstimateRequest.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/model/RideEstimateRequest.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/model/RideEstimateRequest.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/model/RideEstimateRequest.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/model/RideHailingLeg.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/model/RideHailingLeg.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/model/RideHailingLeg.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/model/RideHailingLeg.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/model/RideHailingProvider.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/model/RideHailingProvider.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/model/RideHailingProvider.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/model/RideHailingProvider.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/CachedOAuthToken.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/CachedOAuthToken.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/CachedOAuthToken.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/CachedOAuthToken.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/CachingOAuthService.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/CachingOAuthService.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/CachingOAuthService.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/CachingOAuthService.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/ClientCredentialsRequest.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/ClientCredentialsRequest.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/ClientCredentialsRequest.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/ClientCredentialsRequest.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/OAuthService.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/OAuthService.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/OAuthService.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/OAuthService.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/UrlEncodedOAuthService.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/UrlEncodedOAuthService.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/UrlEncodedOAuthService.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/service/oauth/UrlEncodedOAuthService.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberArrivalEstimateResponse.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberArrivalEstimateResponse.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberArrivalEstimateResponse.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberArrivalEstimateResponse.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberService.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberService.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberService.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberService.java
diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberTripTimeEstimateResponse.java b/application/src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberTripTimeEstimateResponse.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberTripTimeEstimateResponse.java
rename to application/src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberTripTimeEstimateResponse.java
diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java b/application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
rename to application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AuthenticationType.java b/application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AuthenticationType.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/siri/updater/azure/AuthenticationType.java
rename to application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AuthenticationType.java
diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java b/application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java
rename to application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java
diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdaterParameters.java b/application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdaterParameters.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdaterParameters.java
rename to application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdaterParameters.java
diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureInitializationException.java b/application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureInitializationException.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureInitializationException.java
rename to application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureInitializationException.java
diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdater.java b/application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdater.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdater.java
rename to application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdater.java
diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdaterParameters.java b/application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdaterParameters.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdaterParameters.java
rename to application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdaterParameters.java
diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureUpdaterParameters.java b/application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureUpdaterParameters.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureUpdaterParameters.java
rename to application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureUpdaterParameters.java
diff --git a/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java b/application/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java
rename to application/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java
diff --git a/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSourceParameters.java b/application/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSourceParameters.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSourceParameters.java
rename to application/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSourceParameters.java
diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java
rename to application/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java
diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationModule.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationModule.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationModule.java
rename to application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationModule.java
diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParser.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParser.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParser.java
rename to application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParser.java
diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationRepository.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationRepository.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationRepository.java
rename to application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationRepository.java
diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java
rename to application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java
diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/configure/StopConsolidationRepositoryModule.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/configure/StopConsolidationRepositoryModule.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/stopconsolidation/configure/StopConsolidationRepositoryModule.java
rename to application/src/ext/java/org/opentripplanner/ext/stopconsolidation/configure/StopConsolidationRepositoryModule.java
diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/configure/StopConsolidationServiceModule.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/configure/StopConsolidationServiceModule.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/stopconsolidation/configure/StopConsolidationServiceModule.java
rename to application/src/ext/java/org/opentripplanner/ext/stopconsolidation/configure/StopConsolidationServiceModule.java
diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationRepository.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationRepository.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationRepository.java
rename to application/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationRepository.java
diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java
rename to application/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java
diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopGroup.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopGroup.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopGroup.java
rename to application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopGroup.java
diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java
rename to application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java
diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/StopReplacement.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/StopReplacement.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/stopconsolidation/model/StopReplacement.java
rename to application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/StopReplacement.java
diff --git a/src/ext/java/org/opentripplanner/ext/transferanalyzer/DirectTransferAnalyzer.java b/application/src/ext/java/org/opentripplanner/ext/transferanalyzer/DirectTransferAnalyzer.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/transferanalyzer/DirectTransferAnalyzer.java
rename to application/src/ext/java/org/opentripplanner/ext/transferanalyzer/DirectTransferAnalyzer.java
diff --git a/src/ext/java/org/opentripplanner/ext/transferanalyzer/annotations/TransferCouldNotBeRouted.java b/application/src/ext/java/org/opentripplanner/ext/transferanalyzer/annotations/TransferCouldNotBeRouted.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/transferanalyzer/annotations/TransferCouldNotBeRouted.java
rename to application/src/ext/java/org/opentripplanner/ext/transferanalyzer/annotations/TransferCouldNotBeRouted.java
diff --git a/src/ext/java/org/opentripplanner/ext/transferanalyzer/annotations/TransferRoutingDistanceTooLong.java b/application/src/ext/java/org/opentripplanner/ext/transferanalyzer/annotations/TransferRoutingDistanceTooLong.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/transferanalyzer/annotations/TransferRoutingDistanceTooLong.java
rename to application/src/ext/java/org/opentripplanner/ext/transferanalyzer/annotations/TransferRoutingDistanceTooLong.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/LayerFilters.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/LayerFilters.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/LayerFilters.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/LayerFilters.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilder.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilder.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilder.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilder.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/StationsLayerBuilder.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/StationsLayerBuilder.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/StationsLayerBuilder.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/StationsLayerBuilder.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingPropertyMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingPropertyMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingPropertyMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingAndGroup.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingAndGroup.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingAndGroup.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingAndGroup.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerBuilder.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerBuilder.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerBuilder.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerBuilder.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerBuilder.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerBuilder.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerBuilder.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerBuilder.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalLayerBuilder.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalLayerBuilder.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalLayerBuilder.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalLayerBuilder.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalPlacesLayerBuilder.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalPlacesLayerBuilder.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalPlacesLayerBuilder.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalPlacesLayerBuilder.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalStationsLayerBuilder.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalStationsLayerBuilder.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalStationsLayerBuilder.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalStationsLayerBuilder.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalVehiclesLayerBuilder.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalVehiclesLayerBuilder.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalVehiclesLayerBuilder.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalVehiclesLayerBuilder.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRealtimeVehicleRentalStationPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRealtimeVehicleRentalStationPropertyMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRealtimeVehicleRentalStationPropertyMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRealtimeVehicleRentalStationPropertyMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRentalVehiclePropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRentalVehiclePropertyMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRentalVehiclePropertyMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRentalVehiclePropertyMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalPropertyMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalPropertyMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalPropertyMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdater.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdater.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdater.java
rename to application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdater.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterParameters.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterParameters.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterParameters.java
rename to application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterParameters.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java
rename to application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterParameters.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterParameters.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterParameters.java
rename to application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterParameters.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslFacilitiesDownloader.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslFacilitiesDownloader.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslFacilitiesDownloader.java
rename to application/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslFacilitiesDownloader.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslHubToVehicleParkingGroupMapper.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslHubToVehicleParkingGroupMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslHubToVehicleParkingGroupMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslHubToVehicleParkingGroupMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslHubsDownloader.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslHubsDownloader.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslHubsDownloader.java
rename to application/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslHubsDownloader.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkPatch.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkPatch.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkPatch.java
rename to application/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkPatch.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkToVehicleParkingMapper.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkToVehicleParkingMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkToVehicleParkingMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkToVehicleParkingMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdater.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdater.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdater.java
rename to application/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdater.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdaterParameters.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdaterParameters.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdaterParameters.java
rename to application/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdaterParameters.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUtilizationToPatchMapper.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUtilizationToPatchMapper.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUtilizationToPatchMapper.java
rename to application/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUtilizationToPatchMapper.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/BicycleParkAPIUpdater.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/BicycleParkAPIUpdater.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/BicycleParkAPIUpdater.java
rename to application/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/BicycleParkAPIUpdater.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/CarParkAPIUpdater.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/CarParkAPIUpdater.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/CarParkAPIUpdater.java
rename to application/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/CarParkAPIUpdater.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdater.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdater.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdater.java
rename to application/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdater.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdaterParameters.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdaterParameters.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdaterParameters.java
rename to application/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdaterParameters.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/sirifm/SiriFmDatasource.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/sirifm/SiriFmDatasource.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehicleparking/sirifm/SiriFmDatasource.java
rename to application/src/ext/java/org/opentripplanner/ext/vehicleparking/sirifm/SiriFmDatasource.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/sirifm/SiriFmUpdaterParameters.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/sirifm/SiriFmUpdaterParameters.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehicleparking/sirifm/SiriFmUpdaterParameters.java
rename to application/src/ext/java/org/opentripplanner/ext/vehicleparking/sirifm/SiriFmUpdaterParameters.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalParameters.java b/application/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalParameters.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalParameters.java
rename to application/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalParameters.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java b/application/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java
rename to application/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java b/application/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java
rename to application/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java
diff --git a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/VehicleRentalServiceDirectoryFetcherParameters.java b/application/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/VehicleRentalServiceDirectoryFetcherParameters.java
similarity index 100%
rename from src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/VehicleRentalServiceDirectoryFetcherParameters.java
rename to application/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/VehicleRentalServiceDirectoryFetcherParameters.java
diff --git a/src/ext/resources/org/opentripplanner/ext/vectortiles/router-config.json b/application/src/ext/resources/org/opentripplanner/ext/vectortiles/router-config.json
similarity index 100%
rename from src/ext/resources/org/opentripplanner/ext/vectortiles/router-config.json
rename to application/src/ext/resources/org/opentripplanner/ext/vectortiles/router-config.json
diff --git a/src/main/java/META-INF/MANIFEST.MF b/application/src/main/java/META-INF/MANIFEST.MF
similarity index 100%
rename from src/main/java/META-INF/MANIFEST.MF
rename to application/src/main/java/META-INF/MANIFEST.MF
diff --git a/src/main/java/com/jhlabs/awt/ShapeStroke.java b/application/src/main/java/com/jhlabs/awt/ShapeStroke.java
similarity index 100%
rename from src/main/java/com/jhlabs/awt/ShapeStroke.java
rename to application/src/main/java/com/jhlabs/awt/ShapeStroke.java
diff --git a/src/main/java/com/jhlabs/awt/TextStroke.java b/application/src/main/java/com/jhlabs/awt/TextStroke.java
similarity index 100%
rename from src/main/java/com/jhlabs/awt/TextStroke.java
rename to application/src/main/java/com/jhlabs/awt/TextStroke.java
diff --git a/src/main/java/org/opentripplanner/api/common/LocationStringParser.java b/application/src/main/java/org/opentripplanner/api/common/LocationStringParser.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/common/LocationStringParser.java
rename to application/src/main/java/org/opentripplanner/api/common/LocationStringParser.java
diff --git a/src/main/java/org/opentripplanner/api/common/Message.java b/application/src/main/java/org/opentripplanner/api/common/Message.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/common/Message.java
rename to application/src/main/java/org/opentripplanner/api/common/Message.java
diff --git a/src/main/java/org/opentripplanner/api/common/OTPExceptionMapper.java b/application/src/main/java/org/opentripplanner/api/common/OTPExceptionMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/common/OTPExceptionMapper.java
rename to application/src/main/java/org/opentripplanner/api/common/OTPExceptionMapper.java
diff --git a/src/main/java/org/opentripplanner/api/error/PlannerError.java b/application/src/main/java/org/opentripplanner/api/error/PlannerError.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/error/PlannerError.java
rename to application/src/main/java/org/opentripplanner/api/error/PlannerError.java
diff --git a/src/main/java/org/opentripplanner/api/model/serverinfo/ApiConfigInfo.java b/application/src/main/java/org/opentripplanner/api/model/serverinfo/ApiConfigInfo.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/model/serverinfo/ApiConfigInfo.java
rename to application/src/main/java/org/opentripplanner/api/model/serverinfo/ApiConfigInfo.java
diff --git a/src/main/java/org/opentripplanner/api/model/serverinfo/ApiProjectVersion.java b/application/src/main/java/org/opentripplanner/api/model/serverinfo/ApiProjectVersion.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/model/serverinfo/ApiProjectVersion.java
rename to application/src/main/java/org/opentripplanner/api/model/serverinfo/ApiProjectVersion.java
diff --git a/src/main/java/org/opentripplanner/api/model/serverinfo/ApiServerInfo.java b/application/src/main/java/org/opentripplanner/api/model/serverinfo/ApiServerInfo.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/model/serverinfo/ApiServerInfo.java
rename to application/src/main/java/org/opentripplanner/api/model/serverinfo/ApiServerInfo.java
diff --git a/src/main/java/org/opentripplanner/api/model/serverinfo/ApiVersionControlInfo.java b/application/src/main/java/org/opentripplanner/api/model/serverinfo/ApiVersionControlInfo.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/model/serverinfo/ApiVersionControlInfo.java
rename to application/src/main/java/org/opentripplanner/api/model/serverinfo/ApiVersionControlInfo.java
diff --git a/src/main/java/org/opentripplanner/api/parameter/ApiRequestMode.java b/application/src/main/java/org/opentripplanner/api/parameter/ApiRequestMode.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/parameter/ApiRequestMode.java
rename to application/src/main/java/org/opentripplanner/api/parameter/ApiRequestMode.java
diff --git a/src/main/java/org/opentripplanner/api/parameter/MIMEImageFormat.java b/application/src/main/java/org/opentripplanner/api/parameter/MIMEImageFormat.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/parameter/MIMEImageFormat.java
rename to application/src/main/java/org/opentripplanner/api/parameter/MIMEImageFormat.java
diff --git a/src/main/java/org/opentripplanner/api/parameter/QualifiedMode.java b/application/src/main/java/org/opentripplanner/api/parameter/QualifiedMode.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/parameter/QualifiedMode.java
rename to application/src/main/java/org/opentripplanner/api/parameter/QualifiedMode.java
diff --git a/src/main/java/org/opentripplanner/api/parameter/QualifiedModeSet.java b/application/src/main/java/org/opentripplanner/api/parameter/QualifiedModeSet.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/parameter/QualifiedModeSet.java
rename to application/src/main/java/org/opentripplanner/api/parameter/QualifiedModeSet.java
diff --git a/src/main/java/org/opentripplanner/api/parameter/Qualifier.java b/application/src/main/java/org/opentripplanner/api/parameter/Qualifier.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/parameter/Qualifier.java
rename to application/src/main/java/org/opentripplanner/api/parameter/Qualifier.java
diff --git a/src/main/java/org/opentripplanner/api/parameter/package-info.java b/application/src/main/java/org/opentripplanner/api/parameter/package-info.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/parameter/package-info.java
rename to application/src/main/java/org/opentripplanner/api/parameter/package-info.java
diff --git a/src/main/java/org/opentripplanner/api/resource/DebugOutput.java b/application/src/main/java/org/opentripplanner/api/resource/DebugOutput.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/resource/DebugOutput.java
rename to application/src/main/java/org/opentripplanner/api/resource/DebugOutput.java
diff --git a/src/main/java/org/opentripplanner/api/resource/GraphInspectorTileResource.java b/application/src/main/java/org/opentripplanner/api/resource/GraphInspectorTileResource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/resource/GraphInspectorTileResource.java
rename to application/src/main/java/org/opentripplanner/api/resource/GraphInspectorTileResource.java
diff --git a/src/main/java/org/opentripplanner/api/resource/InspectorLayersList.java b/application/src/main/java/org/opentripplanner/api/resource/InspectorLayersList.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/resource/InspectorLayersList.java
rename to application/src/main/java/org/opentripplanner/api/resource/InspectorLayersList.java
diff --git a/src/main/java/org/opentripplanner/api/resource/ServerInfo.java b/application/src/main/java/org/opentripplanner/api/resource/ServerInfo.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/resource/ServerInfo.java
rename to application/src/main/java/org/opentripplanner/api/resource/ServerInfo.java
diff --git a/src/main/java/org/opentripplanner/api/resource/TransitTimingOutput.java b/application/src/main/java/org/opentripplanner/api/resource/TransitTimingOutput.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/resource/TransitTimingOutput.java
rename to application/src/main/java/org/opentripplanner/api/resource/TransitTimingOutput.java
diff --git a/src/main/java/org/opentripplanner/api/resource/UpdaterStatusResource.java b/application/src/main/java/org/opentripplanner/api/resource/UpdaterStatusResource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/resource/UpdaterStatusResource.java
rename to application/src/main/java/org/opentripplanner/api/resource/UpdaterStatusResource.java
diff --git a/src/main/java/org/opentripplanner/api/resource/WebMercatorTile.java b/application/src/main/java/org/opentripplanner/api/resource/WebMercatorTile.java
similarity index 100%
rename from src/main/java/org/opentripplanner/api/resource/WebMercatorTile.java
rename to application/src/main/java/org/opentripplanner/api/resource/WebMercatorTile.java
diff --git a/src/main/java/org/opentripplanner/apis/APIEndpoints.java b/application/src/main/java/org/opentripplanner/apis/APIEndpoints.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/APIEndpoints.java
rename to application/src/main/java/org/opentripplanner/apis/APIEndpoints.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLRequestContext.java b/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLRequestContext.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/GraphQLRequestContext.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLRequestContext.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java b/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLAPI.java b/application/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLAPI.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLAPI.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLAPI.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java b/application/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/IntrospectionTypeWiring.java b/application/src/main/java/org/opentripplanner/apis/gtfs/IntrospectionTypeWiring.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/IntrospectionTypeWiring.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/IntrospectionTypeWiring.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AgencyImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AgencyImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AgencyImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AgencyImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertEntityTypeResolver.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertEntityTypeResolver.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertEntityTypeResolver.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertEntityTypeResolver.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BikeParkImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BikeParkImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BikeParkImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BikeParkImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BikeRentalStationImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BikeRentalStationImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BikeRentalStationImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BikeRentalStationImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingInfoImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingInfoImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingInfoImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingInfoImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingTimeImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingTimeImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingTimeImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingTimeImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/CarParkImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/CarParkImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/CarParkImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/CarParkImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ContactInfoImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ContactInfoImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ContactInfoImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ContactInfoImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/CoordinatesImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/CoordinatesImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/CoordinatesImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/CoordinatesImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/CurrencyImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/CurrencyImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/CurrencyImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/CurrencyImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/DefaultFareProductImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/DefaultFareProductImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/DefaultFareProductImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/DefaultFareProductImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/DepartureRowImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/DepartureRowImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/DepartureRowImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/DepartureRowImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FareProductTypeResolver.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FareProductTypeResolver.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FareProductTypeResolver.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FareProductTypeResolver.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FareProductUseImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FareProductUseImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FareProductUseImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FareProductUseImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/GeometryImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/GeometryImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/GeometryImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/GeometryImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/MoneyImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/MoneyImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/MoneyImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/MoneyImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/NodeTypeResolver.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/NodeTypeResolver.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/NodeTypeResolver.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/NodeTypeResolver.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/OpeningHoursImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/OpeningHoursImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/OpeningHoursImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/OpeningHoursImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PatternImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PatternImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PatternImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PatternImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceInterfaceTypeResolver.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceInterfaceTypeResolver.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceInterfaceTypeResolver.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceInterfaceTypeResolver.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanConnectionImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanConnectionImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanConnectionImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanConnectionImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleTypeImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleTypeImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleTypeImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleTypeImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RideHailingEstimateImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RideHailingEstimateImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RideHailingEstimateImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RideHailingEstimateImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteTypeImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteTypeImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteTypeImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteTypeImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RoutingErrorImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RoutingErrorImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RoutingErrorImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RoutingErrorImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopGeometriesImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopGeometriesImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopGeometriesImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopGeometriesImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopOnRouteImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopOnRouteImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopOnRouteImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopOnRouteImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopOnTripImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopOnTripImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopOnTripImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopOnTripImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopRelationshipImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopRelationshipImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopRelationshipImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopRelationshipImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimesInPatternImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimesInPatternImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimesInPatternImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimesInPatternImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/SystemNoticeImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/SystemNoticeImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/SystemNoticeImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/SystemNoticeImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TicketTypeImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TicketTypeImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TicketTypeImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TicketTypeImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TranslatedStringImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TranslatedStringImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TranslatedStringImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TranslatedStringImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripOccupancyImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripOccupancyImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripOccupancyImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripOccupancyImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/UnknownImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/UnknownImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/UnknownImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/UnknownImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleParkingImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleParkingImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleParkingImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleParkingImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehiclePositionImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehiclePositionImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehiclePositionImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehiclePositionImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalNetworkImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalNetworkImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalNetworkImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalNetworkImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalStationImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalStationImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalStationImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalStationImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/debugOutputImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/debugOutputImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/debugOutputImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/debugOutputImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/elevationProfileComponentImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/elevationProfileComponentImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/elevationProfileComponentImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/elevationProfileComponentImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/placeAtDistanceImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/placeAtDistanceImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/placeAtDistanceImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/placeAtDistanceImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/serviceTimeRangeImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/serviceTimeRangeImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/serviceTimeRangeImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/serviceTimeRangeImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/stepImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/stepImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/stepImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/stepImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/stopAtDistanceImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/stopAtDistanceImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/stopAtDistanceImpl.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/stopAtDistanceImpl.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/application/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/application/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/README.md b/application/src/main/java/org/opentripplanner/apis/gtfs/generated/README.md
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/generated/README.md
rename to application/src/main/java/org/opentripplanner/apis/gtfs/generated/README.md
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/application/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml
rename to application/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/package.json b/application/src/main/java/org/opentripplanner/apis/gtfs/generated/package.json
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/generated/package.json
rename to application/src/main/java/org/opentripplanner/apis/gtfs/generated/package.json
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/yarn.lock b/application/src/main/java/org/opentripplanner/apis/gtfs/generated/yarn.lock
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/generated/yarn.lock
rename to application/src/main/java/org/opentripplanner/apis/gtfs/generated/yarn.lock
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/AlertCauseMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/AlertCauseMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/AlertCauseMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/AlertCauseMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/AlertEffectMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/AlertEffectMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/AlertEffectMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/AlertEffectMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/BikesAllowedMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/BikesAllowedMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/BikesAllowedMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/BikesAllowedMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/DirectionMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/DirectionMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/DirectionMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/DirectionMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/NumberMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/NumberMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/NumberMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/NumberMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RealtimeStateMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/RealtimeStateMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/RealtimeStateMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/RealtimeStateMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/SeverityMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/SeverityMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/SeverityMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/SeverityMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/StreetNoteMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/StreetNoteMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/StreetNoteMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/StreetNoteMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/TransitModeMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/TransitModeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/TransitModeMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/TransitModeMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/AccessModeMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/AccessModeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/AccessModeMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/AccessModeMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ArgumentUtils.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ArgumentUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ArgumentUtils.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ArgumentUtils.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/DirectModeMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/DirectModeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/DirectModeMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/DirectModeMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/EgressModeMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/EgressModeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/EgressModeMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/EgressModeMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ItineraryFilterDebugProfileMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ItineraryFilterDebugProfileMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ItineraryFilterDebugProfileMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ItineraryFilterDebugProfileMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ModePreferencesMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ModePreferencesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ModePreferencesMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ModePreferencesMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/OptimizationTypeMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/OptimizationTypeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/OptimizationTypeMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/OptimizationTypeMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransferModeMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransferModeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransferModeMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransferModeMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/VehicleOptimizationTypeMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/VehicleOptimizationTypeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/VehicleOptimizationTypeMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/VehicleOptimizationTypeMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/WalkPreferencesMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/WalkPreferencesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/WalkPreferencesMapper.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/WalkPreferencesMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/FeedPublisher.java b/application/src/main/java/org/opentripplanner/apis/gtfs/model/FeedPublisher.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/model/FeedPublisher.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/model/FeedPublisher.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java b/application/src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java b/application/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/RideHailingProvider.java b/application/src/main/java/org/opentripplanner/apis/gtfs/model/RideHailingProvider.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/model/RideHailingProvider.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/model/RideHailingProvider.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/RouteTypeModel.java b/application/src/main/java/org/opentripplanner/apis/gtfs/model/RouteTypeModel.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/model/RouteTypeModel.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/model/RouteTypeModel.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/StopOnRouteModel.java b/application/src/main/java/org/opentripplanner/apis/gtfs/model/StopOnRouteModel.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/model/StopOnRouteModel.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/model/StopOnRouteModel.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/StopOnTripModel.java b/application/src/main/java/org/opentripplanner/apis/gtfs/model/StopOnTripModel.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/model/StopOnTripModel.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/model/StopOnTripModel.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/StopPosition.java b/application/src/main/java/org/opentripplanner/apis/gtfs/model/StopPosition.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/model/StopPosition.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/model/StopPosition.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/TripOccupancy.java b/application/src/main/java/org/opentripplanner/apis/gtfs/model/TripOccupancy.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/model/TripOccupancy.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/model/TripOccupancy.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/UnknownModel.java b/application/src/main/java/org/opentripplanner/apis/gtfs/model/UnknownModel.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/model/UnknownModel.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/model/UnknownModel.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/support/filter/PatternByDateFilterUtil.java b/application/src/main/java/org/opentripplanner/apis/gtfs/support/filter/PatternByDateFilterUtil.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/support/filter/PatternByDateFilterUtil.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/support/filter/PatternByDateFilterUtil.java
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/support/time/LocalDateRangeUtil.java b/application/src/main/java/org/opentripplanner/apis/gtfs/support/time/LocalDateRangeUtil.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/gtfs/support/time/LocalDateRangeUtil.java
rename to application/src/main/java/org/opentripplanner/apis/gtfs/support/time/LocalDateRangeUtil.java
diff --git a/src/main/java/org/opentripplanner/apis/support/SemanticHash.java b/application/src/main/java/org/opentripplanner/apis/support/SemanticHash.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/support/SemanticHash.java
rename to application/src/main/java/org/opentripplanner/apis/support/SemanticHash.java
diff --git a/src/main/java/org/opentripplanner/apis/support/TileJson.java b/application/src/main/java/org/opentripplanner/apis/support/TileJson.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/support/TileJson.java
rename to application/src/main/java/org/opentripplanner/apis/support/TileJson.java
diff --git a/src/main/java/org/opentripplanner/apis/support/graphql/LoggingDataFetcherExceptionHandler.java b/application/src/main/java/org/opentripplanner/apis/support/graphql/LoggingDataFetcherExceptionHandler.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/support/graphql/LoggingDataFetcherExceptionHandler.java
rename to application/src/main/java/org/opentripplanner/apis/support/graphql/LoggingDataFetcherExceptionHandler.java
diff --git a/src/main/java/org/opentripplanner/apis/support/mapping/PlannerErrorMapper.java b/application/src/main/java/org/opentripplanner/apis/support/mapping/PlannerErrorMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/support/mapping/PlannerErrorMapper.java
rename to application/src/main/java/org/opentripplanner/apis/support/mapping/PlannerErrorMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/support/mapping/PropertyMapper.java b/application/src/main/java/org/opentripplanner/apis/support/mapping/PropertyMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/support/mapping/PropertyMapper.java
rename to application/src/main/java/org/opentripplanner/apis/support/mapping/PropertyMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/support/mapping/StreetNoteMapper.java b/application/src/main/java/org/opentripplanner/apis/support/mapping/StreetNoteMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/support/mapping/StreetNoteMapper.java
rename to application/src/main/java/org/opentripplanner/apis/support/mapping/StreetNoteMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/MaxFieldsInResultInstrumentation.java b/application/src/main/java/org/opentripplanner/apis/transmodel/MaxFieldsInResultInstrumentation.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/MaxFieldsInResultInstrumentation.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/MaxFieldsInResultInstrumentation.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/ResponseTooLargeException.java b/application/src/main/java/org/opentripplanner/apis/transmodel/ResponseTooLargeException.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/ResponseTooLargeException.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/ResponseTooLargeException.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPI.java b/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPI.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPI.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPI.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPIParameters.java b/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPIParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPIParameters.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPIParameters.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java b/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLPlanner.java b/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLPlanner.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLPlanner.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLPlanner.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java b/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelRequestContext.java b/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelRequestContext.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/TransmodelRequestContext.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelRequestContext.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/FilterMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/FilterMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/FilterMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/FilterMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/GenericLocationMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/GenericLocationMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/GenericLocationMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/GenericLocationMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/GeometryMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/GeometryMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/GeometryMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/GeometryMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/OccupancyStatusMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/OccupancyStatusMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/OccupancyStatusMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/OccupancyStatusMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/PlaceMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/PlaceMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/PlaceMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/PlaceMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/PreferencesMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/PreferencesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/PreferencesMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/PreferencesMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/SelectRequestMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/SelectRequestMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/SelectRequestMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/SelectRequestMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/SeverityMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/SeverityMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/SeverityMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/SeverityMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/TransitIdMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TransitIdMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/TransitIdMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TransitIdMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripViaLocationMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripViaLocationMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/TripViaLocationMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripViaLocationMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/ViaLocationDeprecatedMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/ViaLocationDeprecatedMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/ViaLocationDeprecatedMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/ViaLocationDeprecatedMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/ViaRequestMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/ViaRequestMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/ViaRequestMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/ViaRequestMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/ViaSegmentMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/ViaSegmentMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/ViaSegmentMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/ViaSegmentMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/CarPreferencesMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/CarPreferencesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/CarPreferencesMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/CarPreferencesMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/ItineraryFilterPreferencesMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/ItineraryFilterPreferencesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/ItineraryFilterPreferencesMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/ItineraryFilterPreferencesMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/RentalPreferencesMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/RentalPreferencesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/RentalPreferencesMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/RentalPreferencesMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/ScooterPreferencesMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/ScooterPreferencesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/ScooterPreferencesMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/ScooterPreferencesMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/StreetPreferencesMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/StreetPreferencesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/StreetPreferencesMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/StreetPreferencesMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransferPreferencesMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransferPreferencesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransferPreferencesMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransferPreferencesMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransitPreferencesMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransitPreferencesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransitPreferencesMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransitPreferencesMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/WalkPreferencesMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/WalkPreferencesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/WalkPreferencesMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/WalkPreferencesMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/PlanResponse.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/PlanResponse.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/PlanResponse.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/PlanResponse.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/TransmodelPlaceType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/TransmodelPlaceType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/TransmodelPlaceType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/TransmodelPlaceType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/TransmodelStopPlaceType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/TransmodelStopPlaceType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/TransmodelStopPlaceType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/TransmodelStopPlaceType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/TransmodelTransportSubmode.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/TransmodelTransportSubmode.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/TransmodelTransportSubmode.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/TransmodelTransportSubmode.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/TransportModeSlack.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/TransportModeSlack.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/TransportModeSlack.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/TransportModeSlack.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/TripTimeOnDateHelper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/TripTimeOnDateHelper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/TripTimeOnDateHelper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/TripTimeOnDateHelper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/AuthorityType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/AuthorityType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/AuthorityType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/AuthorityType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/BrandingType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/BrandingType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/BrandingType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/BrandingType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/CoordinateInputType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/CoordinateInputType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/CoordinateInputType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/CoordinateInputType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/EncodedPolylineBeanWithStops.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/EncodedPolylineBeanWithStops.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/EncodedPolylineBeanWithStops.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/EncodedPolylineBeanWithStops.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/InfoLinkType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/InfoLinkType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/InfoLinkType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/InfoLinkType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/LocationInputType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/LocationInputType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/LocationInputType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/LocationInputType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/MultilingualStringType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/MultilingualStringType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/MultilingualStringType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/MultilingualStringType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/NoticeType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/NoticeType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/NoticeType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/NoticeType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/OperatorType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/OperatorType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/OperatorType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/OperatorType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/PassThroughPointInputType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/PassThroughPointInputType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/PassThroughPointInputType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/PassThroughPointInputType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/PenaltyForStreetModeType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/PenaltyForStreetModeType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/PenaltyForStreetModeType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/PenaltyForStreetModeType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/PointsOnLinkType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/PointsOnLinkType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/PointsOnLinkType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/PointsOnLinkType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/RentalVehicleTypeType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/RentalVehicleTypeType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/RentalVehicleTypeType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/RentalVehicleTypeType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/ServerInfoType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/ServerInfoType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/ServerInfoType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/ServerInfoType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/StreetModeDurationInputType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/StreetModeDurationInputType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/StreetModeDurationInputType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/StreetModeDurationInputType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/SystemNoticeType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/SystemNoticeType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/SystemNoticeType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/SystemNoticeType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/TransmodelDirectives.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/TransmodelDirectives.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/TransmodelDirectives.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/TransmodelDirectives.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/TransmodelScalars.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/TransmodelScalars.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/TransmodelScalars.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/TransmodelScalars.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/ValidityPeriodType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/ValidityPeriodType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/framework/ValidityPeriodType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/ValidityPeriodType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/network/DestinationDisplayType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/network/DestinationDisplayType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/network/DestinationDisplayType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/network/DestinationDisplayType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/network/GroupOfLinesType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/network/GroupOfLinesType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/network/GroupOfLinesType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/network/GroupOfLinesType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/network/JourneyPatternType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/network/JourneyPatternType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/network/JourneyPatternType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/network/JourneyPatternType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/network/LineType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/network/LineType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/network/LineType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/network/LineType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/network/PresentationType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/network/PresentationType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/network/PresentationType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/network/PresentationType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/network/StopToStopGeometryType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/network/StopToStopGeometryType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/network/StopToStopGeometryType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/network/StopToStopGeometryType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/BannedInputType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/BannedInputType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/BannedInputType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/BannedInputType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/ElevationProfileStepType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/ElevationProfileStepType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/ElevationProfileStepType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/ElevationProfileStepType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/FilterInputType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/FilterInputType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/FilterInputType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/FilterInputType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/ItineraryFiltersInputType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/ItineraryFiltersInputType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/ItineraryFiltersInputType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/ItineraryFiltersInputType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/JourneyWhiteListed.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/JourneyWhiteListed.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/JourneyWhiteListed.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/JourneyWhiteListed.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/LegType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/LegType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/LegType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/LegType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/ModeAndSubModeInputType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/ModeAndSubModeInputType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/ModeAndSubModeInputType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/ModeAndSubModeInputType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/ModeInputType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/ModeInputType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/ModeInputType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/ModeInputType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/PathGuidanceType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/PathGuidanceType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/PathGuidanceType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/PathGuidanceType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/PlanPlaceType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/PlanPlaceType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/PlanPlaceType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/PlanPlaceType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RoutingErrorType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RoutingErrorType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/RoutingErrorType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RoutingErrorType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/SelectInputType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/SelectInputType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/SelectInputType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/SelectInputType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TriangleFactorsInputType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TriangleFactorsInputType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/TriangleFactorsInputType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TriangleFactorsInputType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternTimePenaltyType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternTimePenaltyType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternTimePenaltyType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternTimePenaltyType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDto.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDto.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDto.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDto.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/ViaLocationInputType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/ViaLocationInputType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/ViaLocationInputType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/ViaLocationInputType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/legacyvia/ViaLocationInputType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/legacyvia/ViaLocationInputType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/legacyvia/ViaLocationInputType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/legacyvia/ViaLocationInputType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/legacyvia/ViaSegmentInputType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/legacyvia/ViaSegmentInputType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/legacyvia/ViaSegmentInputType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/legacyvia/ViaSegmentInputType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/legacyvia/ViaTripQuery.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/legacyvia/ViaTripQuery.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/legacyvia/ViaTripQuery.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/legacyvia/ViaTripQuery.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/legacyvia/ViaTripType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/legacyvia/ViaTripType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/plan/legacyvia/ViaTripType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/legacyvia/ViaTripType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactory.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactory.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactory.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DoubleFunction.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DoubleFunction.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DoubleFunction.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DoubleFunction.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DoubleFunctionFactory.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DoubleFunctionFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DoubleFunctionFactory.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DoubleFunctionFactory.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/GeoJSONCoordinatesScalar.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/GeoJSONCoordinatesScalar.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/scalars/GeoJSONCoordinatesScalar.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/GeoJSONCoordinatesScalar.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/LocalTimeScalarFactory.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/LocalTimeScalarFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/scalars/LocalTimeScalarFactory.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/LocalTimeScalarFactory.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/TimeScalarFactory.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/TimeScalarFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/scalars/TimeScalarFactory.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/TimeScalarFactory.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/siri/et/EstimatedCallType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/et/EstimatedCallType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/siri/et/EstimatedCallType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/et/EstimatedCallType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/AffectsType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/AffectsType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/AffectsType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/AffectsType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/PtSituationElementType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/PtSituationElementType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/PtSituationElementType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/PtSituationElementType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/ValidityPeriod.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/ValidityPeriod.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/ValidityPeriod.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/ValidityPeriod.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/BikeParkType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/BikeParkType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/stop/BikeParkType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/BikeParkType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/BikeRentalStationType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/BikeRentalStationType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/stop/BikeRentalStationType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/BikeRentalStationType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/MonoOrMultiModalStation.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/MonoOrMultiModalStation.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/stop/MonoOrMultiModalStation.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/MonoOrMultiModalStation.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/PlaceAtDistanceType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/PlaceAtDistanceType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/stop/PlaceAtDistanceType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/PlaceAtDistanceType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/PlaceInterfaceType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/PlaceInterfaceType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/stop/PlaceInterfaceType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/PlaceInterfaceType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/PlaceType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/PlaceType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/stop/PlaceType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/PlaceType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayAtDistanceType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayAtDistanceType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayAtDistanceType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayAtDistanceType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/RentalVehicleType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/RentalVehicleType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/stop/RentalVehicleType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/RentalVehicleType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopTypeMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopTypeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopTypeMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopTypeMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/TariffZoneType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/TariffZoneType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/stop/TariffZoneType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/TariffZoneType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyQuery.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyQuery.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyQuery.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyQuery.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/InterchangeType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/InterchangeType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/timetable/InterchangeType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/InterchangeType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/ServiceJourneyType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/ServiceJourneyType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/timetable/ServiceJourneyType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/ServiceJourneyType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/TimetabledPassingTimeType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/TimetabledPassingTimeType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/timetable/TimetabledPassingTimeType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/TimetabledPassingTimeType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/TripMetadataType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/TripMetadataType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/model/timetable/TripMetadataType.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/TripMetadataType.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java b/application/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/support/DataFetcherDecorator.java b/application/src/main/java/org/opentripplanner/apis/transmodel/support/DataFetcherDecorator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/support/DataFetcherDecorator.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/support/DataFetcherDecorator.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapper.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapper.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java b/application/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/support/OneOfInputValidator.java b/application/src/main/java/org/opentripplanner/apis/transmodel/support/OneOfInputValidator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/transmodel/support/OneOfInputValidator.java
rename to application/src/main/java/org/opentripplanner/apis/transmodel/support/OneOfInputValidator.java
diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/application/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java
rename to application/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java
diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/application/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java
rename to application/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java
diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerParams.java b/application/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerParams.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/vectortiles/model/LayerParams.java
rename to application/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerParams.java
diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java b/application/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java
rename to application/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java
diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java b/application/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java
rename to application/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java
diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java b/application/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java
rename to application/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java
diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java b/application/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java
rename to application/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java
diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/VectorSourceLayer.java b/application/src/main/java/org/opentripplanner/apis/vectortiles/model/VectorSourceLayer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/vectortiles/model/VectorSourceLayer.java
rename to application/src/main/java/org/opentripplanner/apis/vectortiles/model/VectorSourceLayer.java
diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/ZoomDependentNumber.java b/application/src/main/java/org/opentripplanner/apis/vectortiles/model/ZoomDependentNumber.java
similarity index 100%
rename from src/main/java/org/opentripplanner/apis/vectortiles/model/ZoomDependentNumber.java
rename to application/src/main/java/org/opentripplanner/apis/vectortiles/model/ZoomDependentNumber.java
diff --git a/src/main/java/org/opentripplanner/astar/AStar.java b/application/src/main/java/org/opentripplanner/astar/AStar.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/AStar.java
rename to application/src/main/java/org/opentripplanner/astar/AStar.java
diff --git a/src/main/java/org/opentripplanner/astar/AStarBuilder.java b/application/src/main/java/org/opentripplanner/astar/AStarBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/AStarBuilder.java
rename to application/src/main/java/org/opentripplanner/astar/AStarBuilder.java
diff --git a/src/main/java/org/opentripplanner/astar/model/BinHeap.java b/application/src/main/java/org/opentripplanner/astar/model/BinHeap.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/model/BinHeap.java
rename to application/src/main/java/org/opentripplanner/astar/model/BinHeap.java
diff --git a/src/main/java/org/opentripplanner/astar/model/GraphPath.java b/application/src/main/java/org/opentripplanner/astar/model/GraphPath.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/model/GraphPath.java
rename to application/src/main/java/org/opentripplanner/astar/model/GraphPath.java
diff --git a/src/main/java/org/opentripplanner/astar/model/ShortestPathTree.java b/application/src/main/java/org/opentripplanner/astar/model/ShortestPathTree.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/model/ShortestPathTree.java
rename to application/src/main/java/org/opentripplanner/astar/model/ShortestPathTree.java
diff --git a/src/main/java/org/opentripplanner/astar/spi/AStarEdge.java b/application/src/main/java/org/opentripplanner/astar/spi/AStarEdge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/spi/AStarEdge.java
rename to application/src/main/java/org/opentripplanner/astar/spi/AStarEdge.java
diff --git a/src/main/java/org/opentripplanner/astar/spi/AStarRequest.java b/application/src/main/java/org/opentripplanner/astar/spi/AStarRequest.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/spi/AStarRequest.java
rename to application/src/main/java/org/opentripplanner/astar/spi/AStarRequest.java
diff --git a/src/main/java/org/opentripplanner/astar/spi/AStarState.java b/application/src/main/java/org/opentripplanner/astar/spi/AStarState.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/spi/AStarState.java
rename to application/src/main/java/org/opentripplanner/astar/spi/AStarState.java
diff --git a/src/main/java/org/opentripplanner/astar/spi/AStarVertex.java b/application/src/main/java/org/opentripplanner/astar/spi/AStarVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/spi/AStarVertex.java
rename to application/src/main/java/org/opentripplanner/astar/spi/AStarVertex.java
diff --git a/src/main/java/org/opentripplanner/astar/spi/DominanceFunction.java b/application/src/main/java/org/opentripplanner/astar/spi/DominanceFunction.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/spi/DominanceFunction.java
rename to application/src/main/java/org/opentripplanner/astar/spi/DominanceFunction.java
diff --git a/src/main/java/org/opentripplanner/astar/spi/RemainingWeightHeuristic.java b/application/src/main/java/org/opentripplanner/astar/spi/RemainingWeightHeuristic.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/spi/RemainingWeightHeuristic.java
rename to application/src/main/java/org/opentripplanner/astar/spi/RemainingWeightHeuristic.java
diff --git a/src/main/java/org/opentripplanner/astar/spi/SearchTerminationStrategy.java b/application/src/main/java/org/opentripplanner/astar/spi/SearchTerminationStrategy.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/spi/SearchTerminationStrategy.java
rename to application/src/main/java/org/opentripplanner/astar/spi/SearchTerminationStrategy.java
diff --git a/src/main/java/org/opentripplanner/astar/spi/SkipEdgeStrategy.java b/application/src/main/java/org/opentripplanner/astar/spi/SkipEdgeStrategy.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/spi/SkipEdgeStrategy.java
rename to application/src/main/java/org/opentripplanner/astar/spi/SkipEdgeStrategy.java
diff --git a/src/main/java/org/opentripplanner/astar/spi/TraverseVisitor.java b/application/src/main/java/org/opentripplanner/astar/spi/TraverseVisitor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/spi/TraverseVisitor.java
rename to application/src/main/java/org/opentripplanner/astar/spi/TraverseVisitor.java
diff --git a/src/main/java/org/opentripplanner/astar/strategy/ComposingSkipEdgeStrategy.java b/application/src/main/java/org/opentripplanner/astar/strategy/ComposingSkipEdgeStrategy.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/strategy/ComposingSkipEdgeStrategy.java
rename to application/src/main/java/org/opentripplanner/astar/strategy/ComposingSkipEdgeStrategy.java
diff --git a/src/main/java/org/opentripplanner/astar/strategy/DurationComparator.java b/application/src/main/java/org/opentripplanner/astar/strategy/DurationComparator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/strategy/DurationComparator.java
rename to application/src/main/java/org/opentripplanner/astar/strategy/DurationComparator.java
diff --git a/src/main/java/org/opentripplanner/astar/strategy/DurationSkipEdgeStrategy.java b/application/src/main/java/org/opentripplanner/astar/strategy/DurationSkipEdgeStrategy.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/strategy/DurationSkipEdgeStrategy.java
rename to application/src/main/java/org/opentripplanner/astar/strategy/DurationSkipEdgeStrategy.java
diff --git a/src/main/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategy.java b/application/src/main/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategy.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategy.java
rename to application/src/main/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategy.java
diff --git a/src/main/java/org/opentripplanner/astar/strategy/PathComparator.java b/application/src/main/java/org/opentripplanner/astar/strategy/PathComparator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/astar/strategy/PathComparator.java
rename to application/src/main/java/org/opentripplanner/astar/strategy/PathComparator.java
diff --git a/src/main/java/org/opentripplanner/datastore/OtpDataStore.java b/application/src/main/java/org/opentripplanner/datastore/OtpDataStore.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/OtpDataStore.java
rename to application/src/main/java/org/opentripplanner/datastore/OtpDataStore.java
diff --git a/src/main/java/org/opentripplanner/datastore/api/CompositeDataSource.java b/application/src/main/java/org/opentripplanner/datastore/api/CompositeDataSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/api/CompositeDataSource.java
rename to application/src/main/java/org/opentripplanner/datastore/api/CompositeDataSource.java
diff --git a/src/main/java/org/opentripplanner/datastore/api/DataSource.java b/application/src/main/java/org/opentripplanner/datastore/api/DataSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/api/DataSource.java
rename to application/src/main/java/org/opentripplanner/datastore/api/DataSource.java
diff --git a/src/main/java/org/opentripplanner/datastore/api/FileType.java b/application/src/main/java/org/opentripplanner/datastore/api/FileType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/api/FileType.java
rename to application/src/main/java/org/opentripplanner/datastore/api/FileType.java
diff --git a/src/main/java/org/opentripplanner/datastore/api/GoogleStorageDSRepository.java b/application/src/main/java/org/opentripplanner/datastore/api/GoogleStorageDSRepository.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/api/GoogleStorageDSRepository.java
rename to application/src/main/java/org/opentripplanner/datastore/api/GoogleStorageDSRepository.java
diff --git a/src/main/java/org/opentripplanner/datastore/api/OtpBaseDirectory.java b/application/src/main/java/org/opentripplanner/datastore/api/OtpBaseDirectory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/api/OtpBaseDirectory.java
rename to application/src/main/java/org/opentripplanner/datastore/api/OtpBaseDirectory.java
diff --git a/src/main/java/org/opentripplanner/datastore/api/OtpDataStoreConfig.java b/application/src/main/java/org/opentripplanner/datastore/api/OtpDataStoreConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/api/OtpDataStoreConfig.java
rename to application/src/main/java/org/opentripplanner/datastore/api/OtpDataStoreConfig.java
diff --git a/src/main/java/org/opentripplanner/datastore/base/ByteArrayDataSource.java b/application/src/main/java/org/opentripplanner/datastore/base/ByteArrayDataSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/base/ByteArrayDataSource.java
rename to application/src/main/java/org/opentripplanner/datastore/base/ByteArrayDataSource.java
diff --git a/src/main/java/org/opentripplanner/datastore/base/DataSourceRepository.java b/application/src/main/java/org/opentripplanner/datastore/base/DataSourceRepository.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/base/DataSourceRepository.java
rename to application/src/main/java/org/opentripplanner/datastore/base/DataSourceRepository.java
diff --git a/src/main/java/org/opentripplanner/datastore/base/LocalDataSourceRepository.java b/application/src/main/java/org/opentripplanner/datastore/base/LocalDataSourceRepository.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/base/LocalDataSourceRepository.java
rename to application/src/main/java/org/opentripplanner/datastore/base/LocalDataSourceRepository.java
diff --git a/src/main/java/org/opentripplanner/datastore/configure/DataStoreModule.java b/application/src/main/java/org/opentripplanner/datastore/configure/DataStoreModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/configure/DataStoreModule.java
rename to application/src/main/java/org/opentripplanner/datastore/configure/DataStoreModule.java
diff --git a/src/main/java/org/opentripplanner/datastore/file/AbstractFileDataSource.java b/application/src/main/java/org/opentripplanner/datastore/file/AbstractFileDataSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/file/AbstractFileDataSource.java
rename to application/src/main/java/org/opentripplanner/datastore/file/AbstractFileDataSource.java
diff --git a/src/main/java/org/opentripplanner/datastore/file/DirectoryDataSource.java b/application/src/main/java/org/opentripplanner/datastore/file/DirectoryDataSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/file/DirectoryDataSource.java
rename to application/src/main/java/org/opentripplanner/datastore/file/DirectoryDataSource.java
diff --git a/src/main/java/org/opentripplanner/datastore/file/FileDataSource.java b/application/src/main/java/org/opentripplanner/datastore/file/FileDataSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/file/FileDataSource.java
rename to application/src/main/java/org/opentripplanner/datastore/file/FileDataSource.java
diff --git a/src/main/java/org/opentripplanner/datastore/file/FileDataSourceRepository.java b/application/src/main/java/org/opentripplanner/datastore/file/FileDataSourceRepository.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/file/FileDataSourceRepository.java
rename to application/src/main/java/org/opentripplanner/datastore/file/FileDataSourceRepository.java
diff --git a/src/main/java/org/opentripplanner/datastore/file/TemporaryFileDataSource.java b/application/src/main/java/org/opentripplanner/datastore/file/TemporaryFileDataSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/file/TemporaryFileDataSource.java
rename to application/src/main/java/org/opentripplanner/datastore/file/TemporaryFileDataSource.java
diff --git a/src/main/java/org/opentripplanner/datastore/file/ZipFileDataSource.java b/application/src/main/java/org/opentripplanner/datastore/file/ZipFileDataSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/file/ZipFileDataSource.java
rename to application/src/main/java/org/opentripplanner/datastore/file/ZipFileDataSource.java
diff --git a/src/main/java/org/opentripplanner/datastore/file/ZipFileEntryDataSource.java b/application/src/main/java/org/opentripplanner/datastore/file/ZipFileEntryDataSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/file/ZipFileEntryDataSource.java
rename to application/src/main/java/org/opentripplanner/datastore/file/ZipFileEntryDataSource.java
diff --git a/src/main/java/org/opentripplanner/datastore/file/ZipFileEntryParent.java b/application/src/main/java/org/opentripplanner/datastore/file/ZipFileEntryParent.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/file/ZipFileEntryParent.java
rename to application/src/main/java/org/opentripplanner/datastore/file/ZipFileEntryParent.java
diff --git a/src/main/java/org/opentripplanner/datastore/file/ZipStreamDataSourceDecorator.java b/application/src/main/java/org/opentripplanner/datastore/file/ZipStreamDataSourceDecorator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/file/ZipStreamDataSourceDecorator.java
rename to application/src/main/java/org/opentripplanner/datastore/file/ZipStreamDataSourceDecorator.java
diff --git a/src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceMetadata.java b/application/src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceMetadata.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceMetadata.java
rename to application/src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceMetadata.java
diff --git a/src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceRepository.java b/application/src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceRepository.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceRepository.java
rename to application/src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceRepository.java
diff --git a/src/main/java/org/opentripplanner/datastore/https/HttpsFileDataSource.java b/application/src/main/java/org/opentripplanner/datastore/https/HttpsFileDataSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/datastore/https/HttpsFileDataSource.java
rename to application/src/main/java/org/opentripplanner/datastore/https/HttpsFileDataSource.java
diff --git a/src/main/java/org/opentripplanner/framework/application/ApplicationShutdownSupport.java b/application/src/main/java/org/opentripplanner/framework/application/ApplicationShutdownSupport.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/application/ApplicationShutdownSupport.java
rename to application/src/main/java/org/opentripplanner/framework/application/ApplicationShutdownSupport.java
diff --git a/src/main/java/org/opentripplanner/framework/application/LogMDCSupport.java b/application/src/main/java/org/opentripplanner/framework/application/LogMDCSupport.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/application/LogMDCSupport.java
rename to application/src/main/java/org/opentripplanner/framework/application/LogMDCSupport.java
diff --git a/src/main/java/org/opentripplanner/framework/application/OTPFeature.java b/application/src/main/java/org/opentripplanner/framework/application/OTPFeature.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/application/OTPFeature.java
rename to application/src/main/java/org/opentripplanner/framework/application/OTPFeature.java
diff --git a/src/main/java/org/opentripplanner/framework/application/OTPRequestTimeoutException.java b/application/src/main/java/org/opentripplanner/framework/application/OTPRequestTimeoutException.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/application/OTPRequestTimeoutException.java
rename to application/src/main/java/org/opentripplanner/framework/application/OTPRequestTimeoutException.java
diff --git a/src/main/java/org/opentripplanner/framework/application/OtpAppException.java b/application/src/main/java/org/opentripplanner/framework/application/OtpAppException.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/application/OtpAppException.java
rename to application/src/main/java/org/opentripplanner/framework/application/OtpAppException.java
diff --git a/src/main/java/org/opentripplanner/framework/application/OtpFileNames.java b/application/src/main/java/org/opentripplanner/framework/application/OtpFileNames.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/application/OtpFileNames.java
rename to application/src/main/java/org/opentripplanner/framework/application/OtpFileNames.java
diff --git a/src/main/java/org/opentripplanner/framework/collection/CollectionUtils.java b/application/src/main/java/org/opentripplanner/framework/collection/CollectionUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/collection/CollectionUtils.java
rename to application/src/main/java/org/opentripplanner/framework/collection/CollectionUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/collection/CollectionsView.java b/application/src/main/java/org/opentripplanner/framework/collection/CollectionsView.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/collection/CollectionsView.java
rename to application/src/main/java/org/opentripplanner/framework/collection/CollectionsView.java
diff --git a/src/main/java/org/opentripplanner/framework/collection/CompositeComparator.java b/application/src/main/java/org/opentripplanner/framework/collection/CompositeComparator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/collection/CompositeComparator.java
rename to application/src/main/java/org/opentripplanner/framework/collection/CompositeComparator.java
diff --git a/src/main/java/org/opentripplanner/framework/collection/ListSection.java b/application/src/main/java/org/opentripplanner/framework/collection/ListSection.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/collection/ListSection.java
rename to application/src/main/java/org/opentripplanner/framework/collection/ListSection.java
diff --git a/src/main/java/org/opentripplanner/framework/collection/ListUtils.java b/application/src/main/java/org/opentripplanner/framework/collection/ListUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/collection/ListUtils.java
rename to application/src/main/java/org/opentripplanner/framework/collection/ListUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/collection/MapUtils.java b/application/src/main/java/org/opentripplanner/framework/collection/MapUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/collection/MapUtils.java
rename to application/src/main/java/org/opentripplanner/framework/collection/MapUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/collection/SetUtils.java b/application/src/main/java/org/opentripplanner/framework/collection/SetUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/collection/SetUtils.java
rename to application/src/main/java/org/opentripplanner/framework/collection/SetUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/concurrent/LogMDCRunnableDecorator.java b/application/src/main/java/org/opentripplanner/framework/concurrent/LogMDCRunnableDecorator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/concurrent/LogMDCRunnableDecorator.java
rename to application/src/main/java/org/opentripplanner/framework/concurrent/LogMDCRunnableDecorator.java
diff --git a/src/main/java/org/opentripplanner/framework/concurrent/OtpRequestThreadFactory.java b/application/src/main/java/org/opentripplanner/framework/concurrent/OtpRequestThreadFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/concurrent/OtpRequestThreadFactory.java
rename to application/src/main/java/org/opentripplanner/framework/concurrent/OtpRequestThreadFactory.java
diff --git a/src/main/java/org/opentripplanner/framework/doc/DocumentedEnum.java b/application/src/main/java/org/opentripplanner/framework/doc/DocumentedEnum.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/doc/DocumentedEnum.java
rename to application/src/main/java/org/opentripplanner/framework/doc/DocumentedEnum.java
diff --git a/src/main/java/org/opentripplanner/framework/error/DefaultOtpError.java b/application/src/main/java/org/opentripplanner/framework/error/DefaultOtpError.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/error/DefaultOtpError.java
rename to application/src/main/java/org/opentripplanner/framework/error/DefaultOtpError.java
diff --git a/src/main/java/org/opentripplanner/framework/error/OtpError.java b/application/src/main/java/org/opentripplanner/framework/error/OtpError.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/error/OtpError.java
rename to application/src/main/java/org/opentripplanner/framework/error/OtpError.java
diff --git a/src/main/java/org/opentripplanner/framework/functional/FunctionUtils.java b/application/src/main/java/org/opentripplanner/framework/functional/FunctionUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/functional/FunctionUtils.java
rename to application/src/main/java/org/opentripplanner/framework/functional/FunctionUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/CompactElevationProfile.java b/application/src/main/java/org/opentripplanner/framework/geometry/CompactElevationProfile.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/CompactElevationProfile.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/CompactElevationProfile.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/CompactLineStringUtils.java b/application/src/main/java/org/opentripplanner/framework/geometry/CompactLineStringUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/CompactLineStringUtils.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/CompactLineStringUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/CoordinateArrayListSequence.java b/application/src/main/java/org/opentripplanner/framework/geometry/CoordinateArrayListSequence.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/CoordinateArrayListSequence.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/CoordinateArrayListSequence.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/DirectionUtils.java b/application/src/main/java/org/opentripplanner/framework/geometry/DirectionUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/DirectionUtils.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/DirectionUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/DlugoszVarLenIntPacker.java b/application/src/main/java/org/opentripplanner/framework/geometry/DlugoszVarLenIntPacker.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/DlugoszVarLenIntPacker.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/DlugoszVarLenIntPacker.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/EncodedPolyline.java b/application/src/main/java/org/opentripplanner/framework/geometry/EncodedPolyline.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/EncodedPolyline.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/EncodedPolyline.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java b/application/src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/HashGridSpatialIndex.java b/application/src/main/java/org/opentripplanner/framework/geometry/HashGridSpatialIndex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/HashGridSpatialIndex.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/HashGridSpatialIndex.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/PolylineEncoder.java b/application/src/main/java/org/opentripplanner/framework/geometry/PolylineEncoder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/PolylineEncoder.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/PolylineEncoder.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/SphericalDistanceLibrary.java b/application/src/main/java/org/opentripplanner/framework/geometry/SphericalDistanceLibrary.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/SphericalDistanceLibrary.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/SphericalDistanceLibrary.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/SplitLineString.java b/application/src/main/java/org/opentripplanner/framework/geometry/SplitLineString.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/SplitLineString.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/SplitLineString.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/UnsupportedGeometryException.java b/application/src/main/java/org/opentripplanner/framework/geometry/UnsupportedGeometryException.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/UnsupportedGeometryException.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/UnsupportedGeometryException.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/WgsCoordinate.java b/application/src/main/java/org/opentripplanner/framework/geometry/WgsCoordinate.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/WgsCoordinate.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/WgsCoordinate.java
diff --git a/src/main/java/org/opentripplanner/framework/graphql/GraphQLResponseSerializer.java b/application/src/main/java/org/opentripplanner/framework/graphql/GraphQLResponseSerializer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/graphql/GraphQLResponseSerializer.java
rename to application/src/main/java/org/opentripplanner/framework/graphql/GraphQLResponseSerializer.java
diff --git a/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java b/application/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java
rename to application/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactory.java b/application/src/main/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactory.java
rename to application/src/main/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactory.java
diff --git a/src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java b/application/src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java
rename to application/src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java
diff --git a/src/main/java/org/opentripplanner/framework/graphql/scalar/DurationScalarFactory.java b/application/src/main/java/org/opentripplanner/framework/graphql/scalar/DurationScalarFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/graphql/scalar/DurationScalarFactory.java
rename to application/src/main/java/org/opentripplanner/framework/graphql/scalar/DurationScalarFactory.java
diff --git a/src/main/java/org/opentripplanner/framework/http/OtpHttpStatus.java b/application/src/main/java/org/opentripplanner/framework/http/OtpHttpStatus.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/http/OtpHttpStatus.java
rename to application/src/main/java/org/opentripplanner/framework/http/OtpHttpStatus.java
diff --git a/src/main/java/org/opentripplanner/framework/i18n/I18NString.java b/application/src/main/java/org/opentripplanner/framework/i18n/I18NString.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/i18n/I18NString.java
rename to application/src/main/java/org/opentripplanner/framework/i18n/I18NString.java
diff --git a/src/main/java/org/opentripplanner/framework/i18n/I18NStringMapper.java b/application/src/main/java/org/opentripplanner/framework/i18n/I18NStringMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/i18n/I18NStringMapper.java
rename to application/src/main/java/org/opentripplanner/framework/i18n/I18NStringMapper.java
diff --git a/src/main/java/org/opentripplanner/framework/i18n/LocalizedString.java b/application/src/main/java/org/opentripplanner/framework/i18n/LocalizedString.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/i18n/LocalizedString.java
rename to application/src/main/java/org/opentripplanner/framework/i18n/LocalizedString.java
diff --git a/src/main/java/org/opentripplanner/framework/i18n/LocalizedStringFormat.java b/application/src/main/java/org/opentripplanner/framework/i18n/LocalizedStringFormat.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/i18n/LocalizedStringFormat.java
rename to application/src/main/java/org/opentripplanner/framework/i18n/LocalizedStringFormat.java
diff --git a/src/main/java/org/opentripplanner/framework/i18n/NonLocalizedString.java b/application/src/main/java/org/opentripplanner/framework/i18n/NonLocalizedString.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/i18n/NonLocalizedString.java
rename to application/src/main/java/org/opentripplanner/framework/i18n/NonLocalizedString.java
diff --git a/src/main/java/org/opentripplanner/framework/i18n/TranslatedString.java b/application/src/main/java/org/opentripplanner/framework/i18n/TranslatedString.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/i18n/TranslatedString.java
rename to application/src/main/java/org/opentripplanner/framework/i18n/TranslatedString.java
diff --git a/src/main/java/org/opentripplanner/framework/io/FileUtils.java b/application/src/main/java/org/opentripplanner/framework/io/FileUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/io/FileUtils.java
rename to application/src/main/java/org/opentripplanner/framework/io/FileUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/io/HttpUtils.java b/application/src/main/java/org/opentripplanner/framework/io/HttpUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/io/HttpUtils.java
rename to application/src/main/java/org/opentripplanner/framework/io/HttpUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/io/JsonDataListDownloader.java b/application/src/main/java/org/opentripplanner/framework/io/JsonDataListDownloader.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/io/JsonDataListDownloader.java
rename to application/src/main/java/org/opentripplanner/framework/io/JsonDataListDownloader.java
diff --git a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java b/application/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java
rename to application/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java
diff --git a/src/main/java/org/opentripplanner/framework/io/OtpHttpClientException.java b/application/src/main/java/org/opentripplanner/framework/io/OtpHttpClientException.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/io/OtpHttpClientException.java
rename to application/src/main/java/org/opentripplanner/framework/io/OtpHttpClientException.java
diff --git a/src/main/java/org/opentripplanner/framework/io/OtpHttpClientFactory.java b/application/src/main/java/org/opentripplanner/framework/io/OtpHttpClientFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/io/OtpHttpClientFactory.java
rename to application/src/main/java/org/opentripplanner/framework/io/OtpHttpClientFactory.java
diff --git a/src/main/java/org/opentripplanner/framework/json/JsonUtils.java b/application/src/main/java/org/opentripplanner/framework/json/JsonUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/json/JsonUtils.java
rename to application/src/main/java/org/opentripplanner/framework/json/JsonUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/json/ObjectMappers.java b/application/src/main/java/org/opentripplanner/framework/json/ObjectMappers.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/json/ObjectMappers.java
rename to application/src/main/java/org/opentripplanner/framework/json/ObjectMappers.java
diff --git a/src/main/java/org/opentripplanner/framework/lang/ArrayUtils.java b/application/src/main/java/org/opentripplanner/framework/lang/ArrayUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/lang/ArrayUtils.java
rename to application/src/main/java/org/opentripplanner/framework/lang/ArrayUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/lang/BitSetUtils.java b/application/src/main/java/org/opentripplanner/framework/lang/BitSetUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/lang/BitSetUtils.java
rename to application/src/main/java/org/opentripplanner/framework/lang/BitSetUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/lang/Box.java b/application/src/main/java/org/opentripplanner/framework/lang/Box.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/lang/Box.java
rename to application/src/main/java/org/opentripplanner/framework/lang/Box.java
diff --git a/src/main/java/org/opentripplanner/framework/lang/DoubleUtils.java b/application/src/main/java/org/opentripplanner/framework/lang/DoubleUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/lang/DoubleUtils.java
rename to application/src/main/java/org/opentripplanner/framework/lang/DoubleUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/lang/IntBox.java b/application/src/main/java/org/opentripplanner/framework/lang/IntBox.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/lang/IntBox.java
rename to application/src/main/java/org/opentripplanner/framework/lang/IntBox.java
diff --git a/src/main/java/org/opentripplanner/framework/lang/IntRange.java b/application/src/main/java/org/opentripplanner/framework/lang/IntRange.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/lang/IntRange.java
rename to application/src/main/java/org/opentripplanner/framework/lang/IntRange.java
diff --git a/src/main/java/org/opentripplanner/framework/lang/IntUtils.java b/application/src/main/java/org/opentripplanner/framework/lang/IntUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/lang/IntUtils.java
rename to application/src/main/java/org/opentripplanner/framework/lang/IntUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java b/application/src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java
rename to application/src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java
diff --git a/src/main/java/org/opentripplanner/framework/lang/ObjectUtils.java b/application/src/main/java/org/opentripplanner/framework/lang/ObjectUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/lang/ObjectUtils.java
rename to application/src/main/java/org/opentripplanner/framework/lang/ObjectUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/lang/OtpNumberFormat.java b/application/src/main/java/org/opentripplanner/framework/lang/OtpNumberFormat.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/lang/OtpNumberFormat.java
rename to application/src/main/java/org/opentripplanner/framework/lang/OtpNumberFormat.java
diff --git a/src/main/java/org/opentripplanner/framework/lang/Sandbox.java b/application/src/main/java/org/opentripplanner/framework/lang/Sandbox.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/lang/Sandbox.java
rename to application/src/main/java/org/opentripplanner/framework/lang/Sandbox.java
diff --git a/src/main/java/org/opentripplanner/framework/lang/StringUtils.java b/application/src/main/java/org/opentripplanner/framework/lang/StringUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/lang/StringUtils.java
rename to application/src/main/java/org/opentripplanner/framework/lang/StringUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/logging/AbstractFilterLogger.java b/application/src/main/java/org/opentripplanner/framework/logging/AbstractFilterLogger.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/logging/AbstractFilterLogger.java
rename to application/src/main/java/org/opentripplanner/framework/logging/AbstractFilterLogger.java
diff --git a/src/main/java/org/opentripplanner/framework/logging/MaxCountLogger.java b/application/src/main/java/org/opentripplanner/framework/logging/MaxCountLogger.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/logging/MaxCountLogger.java
rename to application/src/main/java/org/opentripplanner/framework/logging/MaxCountLogger.java
diff --git a/src/main/java/org/opentripplanner/framework/logging/ProgressTracker.java b/application/src/main/java/org/opentripplanner/framework/logging/ProgressTracker.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/logging/ProgressTracker.java
rename to application/src/main/java/org/opentripplanner/framework/logging/ProgressTracker.java
diff --git a/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerInputStream.java b/application/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerInputStream.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/logging/ProgressTrackerInputStream.java
rename to application/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerInputStream.java
diff --git a/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerOutputStream.java b/application/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerOutputStream.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/logging/ProgressTrackerOutputStream.java
rename to application/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerOutputStream.java
diff --git a/src/main/java/org/opentripplanner/framework/logging/Throttle.java b/application/src/main/java/org/opentripplanner/framework/logging/Throttle.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/logging/Throttle.java
rename to application/src/main/java/org/opentripplanner/framework/logging/Throttle.java
diff --git a/src/main/java/org/opentripplanner/framework/model/Cost.java b/application/src/main/java/org/opentripplanner/framework/model/Cost.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/model/Cost.java
rename to application/src/main/java/org/opentripplanner/framework/model/Cost.java
diff --git a/src/main/java/org/opentripplanner/framework/model/Grams.java b/application/src/main/java/org/opentripplanner/framework/model/Grams.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/model/Grams.java
rename to application/src/main/java/org/opentripplanner/framework/model/Grams.java
diff --git a/src/main/java/org/opentripplanner/framework/model/TimeAndCost.java b/application/src/main/java/org/opentripplanner/framework/model/TimeAndCost.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/model/TimeAndCost.java
rename to application/src/main/java/org/opentripplanner/framework/model/TimeAndCost.java
diff --git a/src/main/java/org/opentripplanner/framework/model/Units.java b/application/src/main/java/org/opentripplanner/framework/model/Units.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/model/Units.java
rename to application/src/main/java/org/opentripplanner/framework/model/Units.java
diff --git a/src/main/java/org/opentripplanner/framework/resources/ResourceBundleAdaptor.java b/application/src/main/java/org/opentripplanner/framework/resources/ResourceBundleAdaptor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/resources/ResourceBundleAdaptor.java
rename to application/src/main/java/org/opentripplanner/framework/resources/ResourceBundleAdaptor.java
diff --git a/src/main/java/org/opentripplanner/framework/resources/ResourceBundleSingleton.java b/application/src/main/java/org/opentripplanner/framework/resources/ResourceBundleSingleton.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/resources/ResourceBundleSingleton.java
rename to application/src/main/java/org/opentripplanner/framework/resources/ResourceBundleSingleton.java
diff --git a/src/main/java/org/opentripplanner/framework/retry/OtpRetry.java b/application/src/main/java/org/opentripplanner/framework/retry/OtpRetry.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/retry/OtpRetry.java
rename to application/src/main/java/org/opentripplanner/framework/retry/OtpRetry.java
diff --git a/src/main/java/org/opentripplanner/framework/retry/OtpRetryBuilder.java b/application/src/main/java/org/opentripplanner/framework/retry/OtpRetryBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/retry/OtpRetryBuilder.java
rename to application/src/main/java/org/opentripplanner/framework/retry/OtpRetryBuilder.java
diff --git a/src/main/java/org/opentripplanner/framework/retry/OtpRetryException.java b/application/src/main/java/org/opentripplanner/framework/retry/OtpRetryException.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/retry/OtpRetryException.java
rename to application/src/main/java/org/opentripplanner/framework/retry/OtpRetryException.java
diff --git a/src/main/java/org/opentripplanner/framework/text/CharacterEscapeFormatter.java b/application/src/main/java/org/opentripplanner/framework/text/CharacterEscapeFormatter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/text/CharacterEscapeFormatter.java
rename to application/src/main/java/org/opentripplanner/framework/text/CharacterEscapeFormatter.java
diff --git a/src/main/java/org/opentripplanner/framework/text/FileSizeToTextConverter.java b/application/src/main/java/org/opentripplanner/framework/text/FileSizeToTextConverter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/text/FileSizeToTextConverter.java
rename to application/src/main/java/org/opentripplanner/framework/text/FileSizeToTextConverter.java
diff --git a/src/main/java/org/opentripplanner/framework/text/HexString.java b/application/src/main/java/org/opentripplanner/framework/text/HexString.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/text/HexString.java
rename to application/src/main/java/org/opentripplanner/framework/text/HexString.java
diff --git a/src/main/java/org/opentripplanner/framework/text/MarkdownFormatter.java b/application/src/main/java/org/opentripplanner/framework/text/MarkdownFormatter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/text/MarkdownFormatter.java
rename to application/src/main/java/org/opentripplanner/framework/text/MarkdownFormatter.java
diff --git a/src/main/java/org/opentripplanner/framework/text/Table.java b/application/src/main/java/org/opentripplanner/framework/text/Table.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/text/Table.java
rename to application/src/main/java/org/opentripplanner/framework/text/Table.java
diff --git a/src/main/java/org/opentripplanner/framework/text/TableBuilder.java b/application/src/main/java/org/opentripplanner/framework/text/TableBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/text/TableBuilder.java
rename to application/src/main/java/org/opentripplanner/framework/text/TableBuilder.java
diff --git a/src/main/java/org/opentripplanner/framework/text/TableRowFormatter.java b/application/src/main/java/org/opentripplanner/framework/text/TableRowFormatter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/text/TableRowFormatter.java
rename to application/src/main/java/org/opentripplanner/framework/text/TableRowFormatter.java
diff --git a/src/main/java/org/opentripplanner/framework/time/CountdownTimer.java b/application/src/main/java/org/opentripplanner/framework/time/CountdownTimer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/time/CountdownTimer.java
rename to application/src/main/java/org/opentripplanner/framework/time/CountdownTimer.java
diff --git a/src/main/java/org/opentripplanner/framework/time/DateUtils.java b/application/src/main/java/org/opentripplanner/framework/time/DateUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/time/DateUtils.java
rename to application/src/main/java/org/opentripplanner/framework/time/DateUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/time/DurationUtils.java b/application/src/main/java/org/opentripplanner/framework/time/DurationUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/time/DurationUtils.java
rename to application/src/main/java/org/opentripplanner/framework/time/DurationUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/time/LocalDateUtils.java b/application/src/main/java/org/opentripplanner/framework/time/LocalDateUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/time/LocalDateUtils.java
rename to application/src/main/java/org/opentripplanner/framework/time/LocalDateUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java b/application/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java
rename to application/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java
diff --git a/src/main/java/org/opentripplanner/framework/time/RelativeTime.java b/application/src/main/java/org/opentripplanner/framework/time/RelativeTime.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/time/RelativeTime.java
rename to application/src/main/java/org/opentripplanner/framework/time/RelativeTime.java
diff --git a/src/main/java/org/opentripplanner/framework/time/ServiceDateUtils.java b/application/src/main/java/org/opentripplanner/framework/time/ServiceDateUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/time/ServiceDateUtils.java
rename to application/src/main/java/org/opentripplanner/framework/time/ServiceDateUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/time/TimeUtils.java b/application/src/main/java/org/opentripplanner/framework/time/TimeUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/time/TimeUtils.java
rename to application/src/main/java/org/opentripplanner/framework/time/TimeUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/time/ZoneIdFallback.java b/application/src/main/java/org/opentripplanner/framework/time/ZoneIdFallback.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/time/ZoneIdFallback.java
rename to application/src/main/java/org/opentripplanner/framework/time/ZoneIdFallback.java
diff --git a/src/main/java/org/opentripplanner/framework/token/Deserializer.java b/application/src/main/java/org/opentripplanner/framework/token/Deserializer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/token/Deserializer.java
rename to application/src/main/java/org/opentripplanner/framework/token/Deserializer.java
diff --git a/src/main/java/org/opentripplanner/framework/token/FieldDefinition.java b/application/src/main/java/org/opentripplanner/framework/token/FieldDefinition.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/token/FieldDefinition.java
rename to application/src/main/java/org/opentripplanner/framework/token/FieldDefinition.java
diff --git a/src/main/java/org/opentripplanner/framework/token/Serializer.java b/application/src/main/java/org/opentripplanner/framework/token/Serializer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/token/Serializer.java
rename to application/src/main/java/org/opentripplanner/framework/token/Serializer.java
diff --git a/src/main/java/org/opentripplanner/framework/token/Token.java b/application/src/main/java/org/opentripplanner/framework/token/Token.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/token/Token.java
rename to application/src/main/java/org/opentripplanner/framework/token/Token.java
diff --git a/src/main/java/org/opentripplanner/framework/token/TokenBuilder.java b/application/src/main/java/org/opentripplanner/framework/token/TokenBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/token/TokenBuilder.java
rename to application/src/main/java/org/opentripplanner/framework/token/TokenBuilder.java
diff --git a/src/main/java/org/opentripplanner/framework/token/TokenDefinition.java b/application/src/main/java/org/opentripplanner/framework/token/TokenDefinition.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/token/TokenDefinition.java
rename to application/src/main/java/org/opentripplanner/framework/token/TokenDefinition.java
diff --git a/src/main/java/org/opentripplanner/framework/token/TokenDefinitionBuilder.java b/application/src/main/java/org/opentripplanner/framework/token/TokenDefinitionBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/token/TokenDefinitionBuilder.java
rename to application/src/main/java/org/opentripplanner/framework/token/TokenDefinitionBuilder.java
diff --git a/src/main/java/org/opentripplanner/framework/token/TokenFormatterConfiguration.java b/application/src/main/java/org/opentripplanner/framework/token/TokenFormatterConfiguration.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/token/TokenFormatterConfiguration.java
rename to application/src/main/java/org/opentripplanner/framework/token/TokenFormatterConfiguration.java
diff --git a/src/main/java/org/opentripplanner/framework/token/TokenSchema.java b/application/src/main/java/org/opentripplanner/framework/token/TokenSchema.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/token/TokenSchema.java
rename to application/src/main/java/org/opentripplanner/framework/token/TokenSchema.java
diff --git a/src/main/java/org/opentripplanner/framework/token/TokenType.java b/application/src/main/java/org/opentripplanner/framework/token/TokenType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/token/TokenType.java
rename to application/src/main/java/org/opentripplanner/framework/token/TokenType.java
diff --git a/src/main/java/org/opentripplanner/framework/token/package.md b/application/src/main/java/org/opentripplanner/framework/token/package.md
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/token/package.md
rename to application/src/main/java/org/opentripplanner/framework/token/package.md
diff --git a/src/main/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilder.java b/application/src/main/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilder.java
rename to application/src/main/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilder.java
diff --git a/src/main/java/org/opentripplanner/framework/tostring/ToStringBuilder.java b/application/src/main/java/org/opentripplanner/framework/tostring/ToStringBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/tostring/ToStringBuilder.java
rename to application/src/main/java/org/opentripplanner/framework/tostring/ToStringBuilder.java
diff --git a/src/main/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilder.java b/application/src/main/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilder.java
rename to application/src/main/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilder.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/ConfiguredDataSource.java b/application/src/main/java/org/opentripplanner/graph_builder/ConfiguredDataSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/ConfiguredDataSource.java
rename to application/src/main/java/org/opentripplanner/graph_builder/ConfiguredDataSource.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java b/application/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java
rename to application/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/GraphBuilderDataSources.java b/application/src/main/java/org/opentripplanner/graph_builder/GraphBuilderDataSources.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/GraphBuilderDataSources.java
rename to application/src/main/java/org/opentripplanner/graph_builder/GraphBuilderDataSources.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/GraphStats.java b/application/src/main/java/org/opentripplanner/graph_builder/GraphStats.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/GraphStats.java
rename to application/src/main/java/org/opentripplanner/graph_builder/GraphStats.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issue/api/DataImportIssue.java b/application/src/main/java/org/opentripplanner/graph_builder/issue/api/DataImportIssue.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issue/api/DataImportIssue.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issue/api/DataImportIssue.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issue/api/DataImportIssueStore.java b/application/src/main/java/org/opentripplanner/graph_builder/issue/api/DataImportIssueStore.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issue/api/DataImportIssueStore.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issue/api/DataImportIssueStore.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issue/api/DataImportIssueSummary.java b/application/src/main/java/org/opentripplanner/graph_builder/issue/api/DataImportIssueSummary.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issue/api/DataImportIssueSummary.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issue/api/DataImportIssueSummary.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issue/api/Issue.java b/application/src/main/java/org/opentripplanner/graph_builder/issue/api/Issue.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issue/api/Issue.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issue/api/Issue.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issue/api/IssueWithSource.java b/application/src/main/java/org/opentripplanner/graph_builder/issue/api/IssueWithSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issue/api/IssueWithSource.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issue/api/IssueWithSource.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issue/api/NoopDataImportIssueStore.java b/application/src/main/java/org/opentripplanner/graph_builder/issue/api/NoopDataImportIssueStore.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issue/api/NoopDataImportIssueStore.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issue/api/NoopDataImportIssueStore.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issue/api/OsmUrlGenerator.java b/application/src/main/java/org/opentripplanner/graph_builder/issue/api/OsmUrlGenerator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issue/api/OsmUrlGenerator.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issue/api/OsmUrlGenerator.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issue/report/Bucket.java b/application/src/main/java/org/opentripplanner/graph_builder/issue/report/Bucket.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issue/report/Bucket.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issue/report/Bucket.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issue/report/BucketKey.java b/application/src/main/java/org/opentripplanner/graph_builder/issue/report/BucketKey.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issue/report/BucketKey.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issue/report/BucketKey.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issue/report/DataImportIssueReporter.java b/application/src/main/java/org/opentripplanner/graph_builder/issue/report/DataImportIssueReporter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issue/report/DataImportIssueReporter.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issue/report/DataImportIssueReporter.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issue/report/GeoJsonWriter.java b/application/src/main/java/org/opentripplanner/graph_builder/issue/report/GeoJsonWriter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issue/report/GeoJsonWriter.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issue/report/GeoJsonWriter.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issue/report/HTMLWriter.java b/application/src/main/java/org/opentripplanner/graph_builder/issue/report/HTMLWriter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issue/report/HTMLWriter.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issue/report/HTMLWriter.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issue/report/IssueColors.java b/application/src/main/java/org/opentripplanner/graph_builder/issue/report/IssueColors.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issue/report/IssueColors.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issue/report/IssueColors.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issue/service/DefaultDataImportIssueStore.java b/application/src/main/java/org/opentripplanner/graph_builder/issue/service/DefaultDataImportIssueStore.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issue/service/DefaultDataImportIssueStore.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issue/service/DefaultDataImportIssueStore.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeDistanceTraveled.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeDistanceTraveled.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeDistanceTraveled.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeDistanceTraveled.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometry.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometry.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometry.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometry.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometryCaught.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometryCaught.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometryCaught.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometryCaught.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/DisconnectedOsmNode.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/DisconnectedOsmNode.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/DisconnectedOsmNode.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/DisconnectedOsmNode.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/ElevationFlattened.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/ElevationFlattened.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/ElevationFlattened.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/ElevationFlattened.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/ElevationProfileFailure.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/ElevationProfileFailure.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/ElevationProfileFailure.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/ElevationProfileFailure.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/GraphConnectivity.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/GraphConnectivity.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/GraphConnectivity.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/GraphConnectivity.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/Graphwide.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/Graphwide.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/Graphwide.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/Graphwide.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/HopSpeedFast.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/HopSpeedFast.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/HopSpeedFast.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/HopSpeedFast.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/HopSpeedSlow.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/HopSpeedSlow.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/HopSpeedSlow.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/HopSpeedSlow.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/HopZeroDistance.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/HopZeroDistance.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/HopZeroDistance.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/HopZeroDistance.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/HopZeroTime.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/HopZeroTime.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/HopZeroTime.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/HopZeroTime.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/IgnoredGtfsTransfer.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/IgnoredGtfsTransfer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/IgnoredGtfsTransfer.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/IgnoredGtfsTransfer.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/InterliningTeleport.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/InterliningTeleport.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/InterliningTeleport.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/InterliningTeleport.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/InvalidGtfsTransfer.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/InvalidGtfsTransfer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/InvalidGtfsTransfer.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/InvalidGtfsTransfer.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/InvalidOsmGeometry.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/InvalidOsmGeometry.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/InvalidOsmGeometry.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/InvalidOsmGeometry.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/InvalidVehicleParkingCapacity.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/InvalidVehicleParkingCapacity.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/InvalidVehicleParkingCapacity.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/InvalidVehicleParkingCapacity.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/IsolatedStop.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/IsolatedStop.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/IsolatedStop.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/IsolatedStop.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/LevelAmbiguous.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/LevelAmbiguous.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/LevelAmbiguous.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/LevelAmbiguous.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/MissingProjectionInServiceLink.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/MissingProjectionInServiceLink.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/MissingProjectionInServiceLink.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/MissingProjectionInServiceLink.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/MissingShapeGeometry.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/MissingShapeGeometry.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/MissingShapeGeometry.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/MissingShapeGeometry.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/NegativeDwellTime.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/NegativeDwellTime.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/NegativeDwellTime.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/NegativeDwellTime.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/NegativeHopTime.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/NegativeHopTime.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/NegativeHopTime.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/NegativeHopTime.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/NoFutureDates.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/NoFutureDates.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/NoFutureDates.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/NoFutureDates.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/ParkAndRideEntranceRemoved.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/ParkAndRideEntranceRemoved.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/ParkAndRideEntranceRemoved.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/ParkAndRideEntranceRemoved.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/ParkAndRideUnlinked.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/ParkAndRideUnlinked.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/ParkAndRideUnlinked.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/ParkAndRideUnlinked.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/RepeatedStops.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/RepeatedStops.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/RepeatedStops.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/RepeatedStops.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/ShapeGeometryTooFar.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/ShapeGeometryTooFar.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/ShapeGeometryTooFar.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/ShapeGeometryTooFar.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/StopNotLinkedForTransfers.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/StopNotLinkedForTransfers.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/StopNotLinkedForTransfers.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/StopNotLinkedForTransfers.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/TripDegenerate.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/TripDegenerate.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/TripDegenerate.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/TripDegenerate.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/TripUndefinedService.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/TripUndefinedService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/TripUndefinedService.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/TripUndefinedService.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/TurnRestrictionBad.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/TurnRestrictionBad.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/TurnRestrictionBad.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/TurnRestrictionBad.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/TurnRestrictionException.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/TurnRestrictionException.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/TurnRestrictionException.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/TurnRestrictionException.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/TurnRestrictionUnknown.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/TurnRestrictionUnknown.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/TurnRestrictionUnknown.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/TurnRestrictionUnknown.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/package-info.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/package-info.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/issues/package-info.java
rename to application/src/main/java/org/opentripplanner/graph_builder/issues/package-info.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/model/DataSourceConfig.java b/application/src/main/java/org/opentripplanner/graph_builder/model/DataSourceConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/model/DataSourceConfig.java
rename to application/src/main/java/org/opentripplanner/graph_builder/model/DataSourceConfig.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/model/GraphBuilderModule.java b/application/src/main/java/org/opentripplanner/graph_builder/model/GraphBuilderModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/model/GraphBuilderModule.java
rename to application/src/main/java/org/opentripplanner/graph_builder/model/GraphBuilderModule.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/AddTransitModelEntitiesToGraph.java b/application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitModelEntitiesToGraph.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/AddTransitModelEntitiesToGraph.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitModelEntitiesToGraph.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/DirectTransferGenerator.java b/application/src/main/java/org/opentripplanner/graph_builder/module/DirectTransferGenerator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/DirectTransferGenerator.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/DirectTransferGenerator.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/GraphCoherencyCheckerModule.java b/application/src/main/java/org/opentripplanner/graph_builder/module/GraphCoherencyCheckerModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/GraphCoherencyCheckerModule.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/GraphCoherencyCheckerModule.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/GtfsFeedId.java b/application/src/main/java/org/opentripplanner/graph_builder/module/GtfsFeedId.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/GtfsFeedId.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/GtfsFeedId.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModule.java b/application/src/main/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModule.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModule.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/RouteToCentroidStationIdsValidator.java b/application/src/main/java/org/opentripplanner/graph_builder/module/RouteToCentroidStationIdsValidator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/RouteToCentroidStationIdsValidator.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/RouteToCentroidStationIdsValidator.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/StreetLinkerModule.java b/application/src/main/java/org/opentripplanner/graph_builder/module/StreetLinkerModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/StreetLinkerModule.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/StreetLinkerModule.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/TimeZoneAdjusterModule.java b/application/src/main/java/org/opentripplanner/graph_builder/module/TimeZoneAdjusterModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/TimeZoneAdjusterModule.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/TimeZoneAdjusterModule.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/TripPatternNamer.java b/application/src/main/java/org/opentripplanner/graph_builder/module/TripPatternNamer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/TripPatternNamer.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/TripPatternNamer.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ValidateAndInterpolateStopTimesForEachTrip.java b/application/src/main/java/org/opentripplanner/graph_builder/module/ValidateAndInterpolateStopTimesForEachTrip.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/ValidateAndInterpolateStopTimesForEachTrip.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/ValidateAndInterpolateStopTimesForEachTrip.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderFactory.java b/application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderFactory.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderFactory.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java b/application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModule.java b/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModule.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModule.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessor.java b/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessor.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessor.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/geometry/IndexedLineSegment.java b/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/IndexedLineSegment.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/geometry/IndexedLineSegment.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/geometry/IndexedLineSegment.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/geometry/IndexedLineSegmentComparator.java b/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/IndexedLineSegmentComparator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/geometry/IndexedLineSegmentComparator.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/geometry/IndexedLineSegmentComparator.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/geometry/ShapeSegmentKey.java b/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/ShapeSegmentKey.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/geometry/ShapeSegmentKey.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/geometry/ShapeSegmentKey.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/GraphIsland.java b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/GraphIsland.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/islandpruning/GraphIsland.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/GraphIsland.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PrunedStopIsland.java b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PrunedStopIsland.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PrunedStopIsland.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PrunedStopIsland.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/MinMap.java b/application/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/MinMap.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/nearbystops/MinMap.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/MinMap.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/NearbyStopFinder.java b/application/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/NearbyStopFinder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/nearbystops/NearbyStopFinder.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/NearbyStopFinder.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/PatternConsideringNearbyStopFinder.java b/application/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/PatternConsideringNearbyStopFinder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/nearbystops/PatternConsideringNearbyStopFinder.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/PatternConsideringNearbyStopFinder.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/StraightLineNearbyStopFinder.java b/application/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/StraightLineNearbyStopFinder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/nearbystops/StraightLineNearbyStopFinder.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/StraightLineNearbyStopFinder.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/StreetNearbyStopFinder.java b/application/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/StreetNearbyStopFinder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/nearbystops/StreetNearbyStopFinder.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/StreetNearbyStopFinder.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/DegreeGridNEDTileSource.java b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/DegreeGridNEDTileSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/ned/DegreeGridNEDTileSource.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/ned/DegreeGridNEDTileSource.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/GeotiffGridCoverageFactoryImpl.java b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/GeotiffGridCoverageFactoryImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/ned/GeotiffGridCoverageFactoryImpl.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/ned/GeotiffGridCoverageFactoryImpl.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandler.java b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandler.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandler.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandler.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/NEDGridCoverageFactoryImpl.java b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/NEDGridCoverageFactoryImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/ned/NEDGridCoverageFactoryImpl.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/ned/NEDGridCoverageFactoryImpl.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/NoDataGridCoverage.java b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/NoDataGridCoverage.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/ned/NoDataGridCoverage.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/ned/NoDataGridCoverage.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/UnifiedGridCoverage.java b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/UnifiedGridCoverage.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/ned/UnifiedGridCoverage.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/ned/UnifiedGridCoverage.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/VerticalDatum.java b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/VerticalDatum.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/ned/VerticalDatum.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/ned/VerticalDatum.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/parameter/DemExtractParameters.java b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/parameter/DemExtractParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/ned/parameter/DemExtractParameters.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/ned/parameter/DemExtractParameters.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/parameter/DemExtractParametersBuilder.java b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/parameter/DemExtractParametersBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/ned/parameter/DemExtractParametersBuilder.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/ned/parameter/DemExtractParametersBuilder.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/parameter/DemExtractParametersList.java b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/parameter/DemExtractParametersList.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/ned/parameter/DemExtractParametersList.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/ned/parameter/DemExtractParametersList.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/Area.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/Area.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/Area.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/Area.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/AreaGroup.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/AreaGroup.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/AreaGroup.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/AreaGroup.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/AreaTooComplicated.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/AreaTooComplicated.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/AreaTooComplicated.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/AreaTooComplicated.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/DisjointSet.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/DisjointSet.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/DisjointSet.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/DisjointSet.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/ElevatorProcessor.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ElevatorProcessor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/ElevatorProcessor.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/ElevatorProcessor.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/EscalatorProcessor.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/EscalatorProcessor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/EscalatorProcessor.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/EscalatorProcessor.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmDatabase.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmDatabase.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/OsmDatabase.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmDatabase.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModuleBuilder.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModuleBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModuleBuilder.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModuleBuilder.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessor.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessor.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessor.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/Ring.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/Ring.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/Ring.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/Ring.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/SafetyValueNormalizer.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/SafetyValueNormalizer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/SafetyValueNormalizer.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/SafetyValueNormalizer.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/StreetEdgePair.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/StreetEdgePair.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/StreetEdgePair.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/StreetEdgePair.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/StreetTraversalPermissionPair.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/StreetTraversalPermissionPair.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/StreetTraversalPermissionPair.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/StreetTraversalPermissionPair.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/TurnRestrictionTag.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/TurnRestrictionTag.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/TurnRestrictionTag.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/TurnRestrictionTag.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/TurnRestrictionUnifier.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/TurnRestrictionUnifier.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/TurnRestrictionUnifier.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/TurnRestrictionUnifier.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/UnconnectedArea.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/UnconnectedArea.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/UnconnectedArea.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/UnconnectedArea.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/VertexGenerator.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/VertexGenerator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/VertexGenerator.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/VertexGenerator.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/DefaultNamer.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/DefaultNamer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/naming/DefaultNamer.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/DefaultNamer.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/PortlandCustomNamer.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/PortlandCustomNamer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/naming/PortlandCustomNamer.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/PortlandCustomNamer.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParameters.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParameters.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParameters.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParametersBuilder.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParametersBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParametersBuilder.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParametersBuilder.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParametersList.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParametersList.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParametersList.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmExtractParametersList.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmProcessingParameters.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmProcessingParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmProcessingParameters.java
rename to application/src/main/java/org/opentripplanner/graph_builder/module/osm/parameters/OsmProcessingParameters.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/services/ned/ElevationGridCoverageFactory.java b/application/src/main/java/org/opentripplanner/graph_builder/services/ned/ElevationGridCoverageFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/services/ned/ElevationGridCoverageFactory.java
rename to application/src/main/java/org/opentripplanner/graph_builder/services/ned/ElevationGridCoverageFactory.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/services/ned/NEDTileSource.java b/application/src/main/java/org/opentripplanner/graph_builder/services/ned/NEDTileSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/services/ned/NEDTileSource.java
rename to application/src/main/java/org/opentripplanner/graph_builder/services/ned/NEDTileSource.java
diff --git a/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java b/application/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java
rename to application/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java
diff --git a/src/main/java/org/opentripplanner/gtfs/GenerateTripPatternsOperation.java b/application/src/main/java/org/opentripplanner/gtfs/GenerateTripPatternsOperation.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/GenerateTripPatternsOperation.java
rename to application/src/main/java/org/opentripplanner/gtfs/GenerateTripPatternsOperation.java
diff --git a/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsBundle.java b/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsBundle.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsBundle.java
rename to application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsBundle.java
diff --git a/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsFeedParameters.java b/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsFeedParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsFeedParameters.java
rename to application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsFeedParameters.java
diff --git a/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsFeedParametersBuilder.java b/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsFeedParametersBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsFeedParametersBuilder.java
rename to application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsFeedParametersBuilder.java
diff --git a/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java b/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java
rename to application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java
diff --git a/src/main/java/org/opentripplanner/gtfs/interlining/InterlineProcessor.java b/application/src/main/java/org/opentripplanner/gtfs/interlining/InterlineProcessor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/interlining/InterlineProcessor.java
rename to application/src/main/java/org/opentripplanner/gtfs/interlining/InterlineProcessor.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/AgencyAndIdMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/AgencyAndIdMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/AgencyAndIdMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/AgencyAndIdMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/AgencyMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/AgencyMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/AgencyMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/AgencyMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/BikeAccessMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/BikeAccessMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/BikeAccessMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/BikeAccessMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/BrandingMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/BrandingMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/BrandingMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/BrandingMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/DirectionMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/DirectionMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/DirectionMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/DirectionMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/EntranceMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/EntranceMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/EntranceMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/EntranceMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/FareAttributeMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareAttributeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/FareAttributeMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/FareAttributeMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/FareProductMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareProductMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/FareProductMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/FareProductMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/FareRuleMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareRuleMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/FareRuleMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/FareRuleMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/FeedInfoMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/FeedInfoMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/FeedInfoMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/FeedInfoMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/FrequencyMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/FrequencyMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/FrequencyMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/FrequencyMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/LocationMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/LocationMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/LocationMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/LocationMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/PathwayMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/PathwayMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/PathwayMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/PathwayMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/PathwayModeMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/PathwayModeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/PathwayModeMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/PathwayModeMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/PickDropMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/PickDropMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/PickDropMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/PickDropMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/ServiceDateMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceDateMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/ServiceDateMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceDateMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/ShapePointMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/ShapePointMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/ShapePointMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/ShapePointMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StationMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/StationMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/StationMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/StationMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StaySeatedNotAllowed.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/StaySeatedNotAllowed.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/StaySeatedNotAllowed.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/StaySeatedNotAllowed.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StopMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/StopMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/StopMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StopMappingWrapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopMappingWrapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/StopMappingWrapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/StopMappingWrapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/TransferMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/TransferMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/TransferMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/TransferMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/TransferMappingResult.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/TransferMappingResult.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/TransferMappingResult.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/TransferMappingResult.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/TransitModeMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/TransitModeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/TransitModeMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/TransitModeMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/TranslationHelper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/TranslationHelper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/TranslationHelper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/TranslationHelper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/WgsCoordinateMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/WgsCoordinateMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/WgsCoordinateMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/WgsCoordinateMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/WheelchairAccessibilityMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/WheelchairAccessibilityMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/mapping/WheelchairAccessibilityMapper.java
rename to application/src/main/java/org/opentripplanner/gtfs/mapping/WheelchairAccessibilityMapper.java
diff --git a/src/main/java/org/opentripplanner/gtfs/package.md b/application/src/main/java/org/opentripplanner/gtfs/package.md
similarity index 100%
rename from src/main/java/org/opentripplanner/gtfs/package.md
rename to application/src/main/java/org/opentripplanner/gtfs/package.md
diff --git a/src/main/java/org/opentripplanner/inspector/raster/AreaEdgeRenderer.java b/application/src/main/java/org/opentripplanner/inspector/raster/AreaEdgeRenderer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/raster/AreaEdgeRenderer.java
rename to application/src/main/java/org/opentripplanner/inspector/raster/AreaEdgeRenderer.java
diff --git a/src/main/java/org/opentripplanner/inspector/raster/BikeSafetyEdgeRenderer.java b/application/src/main/java/org/opentripplanner/inspector/raster/BikeSafetyEdgeRenderer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/raster/BikeSafetyEdgeRenderer.java
rename to application/src/main/java/org/opentripplanner/inspector/raster/BikeSafetyEdgeRenderer.java
diff --git a/src/main/java/org/opentripplanner/inspector/raster/DefaultScalarColorPalette.java b/application/src/main/java/org/opentripplanner/inspector/raster/DefaultScalarColorPalette.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/raster/DefaultScalarColorPalette.java
rename to application/src/main/java/org/opentripplanner/inspector/raster/DefaultScalarColorPalette.java
diff --git a/src/main/java/org/opentripplanner/inspector/raster/EdgeVertexTileRenderer.java b/application/src/main/java/org/opentripplanner/inspector/raster/EdgeVertexTileRenderer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/raster/EdgeVertexTileRenderer.java
rename to application/src/main/java/org/opentripplanner/inspector/raster/EdgeVertexTileRenderer.java
diff --git a/src/main/java/org/opentripplanner/inspector/raster/ElevationEdgeRenderer.java b/application/src/main/java/org/opentripplanner/inspector/raster/ElevationEdgeRenderer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/raster/ElevationEdgeRenderer.java
rename to application/src/main/java/org/opentripplanner/inspector/raster/ElevationEdgeRenderer.java
diff --git a/src/main/java/org/opentripplanner/inspector/raster/MapTile.java b/application/src/main/java/org/opentripplanner/inspector/raster/MapTile.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/raster/MapTile.java
rename to application/src/main/java/org/opentripplanner/inspector/raster/MapTile.java
diff --git a/src/main/java/org/opentripplanner/inspector/raster/NoThruTrafficEdgeRenderer.java b/application/src/main/java/org/opentripplanner/inspector/raster/NoThruTrafficEdgeRenderer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/raster/NoThruTrafficEdgeRenderer.java
rename to application/src/main/java/org/opentripplanner/inspector/raster/NoThruTrafficEdgeRenderer.java
diff --git a/src/main/java/org/opentripplanner/inspector/raster/PathwayEdgeRenderer.java b/application/src/main/java/org/opentripplanner/inspector/raster/PathwayEdgeRenderer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/raster/PathwayEdgeRenderer.java
rename to application/src/main/java/org/opentripplanner/inspector/raster/PathwayEdgeRenderer.java
diff --git a/src/main/java/org/opentripplanner/inspector/raster/ScalarColorPalette.java b/application/src/main/java/org/opentripplanner/inspector/raster/ScalarColorPalette.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/raster/ScalarColorPalette.java
rename to application/src/main/java/org/opentripplanner/inspector/raster/ScalarColorPalette.java
diff --git a/src/main/java/org/opentripplanner/inspector/raster/TileRenderer.java b/application/src/main/java/org/opentripplanner/inspector/raster/TileRenderer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/raster/TileRenderer.java
rename to application/src/main/java/org/opentripplanner/inspector/raster/TileRenderer.java
diff --git a/src/main/java/org/opentripplanner/inspector/raster/TileRendererManager.java b/application/src/main/java/org/opentripplanner/inspector/raster/TileRendererManager.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/raster/TileRendererManager.java
rename to application/src/main/java/org/opentripplanner/inspector/raster/TileRendererManager.java
diff --git a/src/main/java/org/opentripplanner/inspector/raster/TraversalPermissionsEdgeRenderer.java b/application/src/main/java/org/opentripplanner/inspector/raster/TraversalPermissionsEdgeRenderer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/raster/TraversalPermissionsEdgeRenderer.java
rename to application/src/main/java/org/opentripplanner/inspector/raster/TraversalPermissionsEdgeRenderer.java
diff --git a/src/main/java/org/opentripplanner/inspector/raster/WalkSafetyEdgeRenderer.java b/application/src/main/java/org/opentripplanner/inspector/raster/WalkSafetyEdgeRenderer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/raster/WalkSafetyEdgeRenderer.java
rename to application/src/main/java/org/opentripplanner/inspector/raster/WalkSafetyEdgeRenderer.java
diff --git a/src/main/java/org/opentripplanner/inspector/raster/WheelchairEdgeRenderer.java b/application/src/main/java/org/opentripplanner/inspector/raster/WheelchairEdgeRenderer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/raster/WheelchairEdgeRenderer.java
rename to application/src/main/java/org/opentripplanner/inspector/raster/WheelchairEdgeRenderer.java
diff --git a/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java b/application/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/vector/KeyValue.java
rename to application/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java
diff --git a/src/main/java/org/opentripplanner/inspector/vector/LayerBuilder.java b/application/src/main/java/org/opentripplanner/inspector/vector/LayerBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/vector/LayerBuilder.java
rename to application/src/main/java/org/opentripplanner/inspector/vector/LayerBuilder.java
diff --git a/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java b/application/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java
rename to application/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java
diff --git a/src/main/java/org/opentripplanner/inspector/vector/VectorTileResponseFactory.java b/application/src/main/java/org/opentripplanner/inspector/vector/VectorTileResponseFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/vector/VectorTileResponseFactory.java
rename to application/src/main/java/org/opentripplanner/inspector/vector/VectorTileResponseFactory.java
diff --git a/src/main/java/org/opentripplanner/inspector/vector/edge/EdgeLayerBuilder.java b/application/src/main/java/org/opentripplanner/inspector/vector/edge/EdgeLayerBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/vector/edge/EdgeLayerBuilder.java
rename to application/src/main/java/org/opentripplanner/inspector/vector/edge/EdgeLayerBuilder.java
diff --git a/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java b/application/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java
rename to application/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java
diff --git a/src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesLayerBuilder.java b/application/src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesLayerBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesLayerBuilder.java
rename to application/src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesLayerBuilder.java
diff --git a/src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesPropertyMapper.java b/application/src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesPropertyMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesPropertyMapper.java
rename to application/src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesPropertyMapper.java
diff --git a/src/main/java/org/opentripplanner/inspector/vector/stop/GroupStopLayerBuilder.java b/application/src/main/java/org/opentripplanner/inspector/vector/stop/GroupStopLayerBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/vector/stop/GroupStopLayerBuilder.java
rename to application/src/main/java/org/opentripplanner/inspector/vector/stop/GroupStopLayerBuilder.java
diff --git a/src/main/java/org/opentripplanner/inspector/vector/stop/StopLayerBuilder.java b/application/src/main/java/org/opentripplanner/inspector/vector/stop/StopLayerBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/vector/stop/StopLayerBuilder.java
rename to application/src/main/java/org/opentripplanner/inspector/vector/stop/StopLayerBuilder.java
diff --git a/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java b/application/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java
rename to application/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java
diff --git a/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexLayerBuilder.java b/application/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexLayerBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/vector/vertex/VertexLayerBuilder.java
rename to application/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexLayerBuilder.java
diff --git a/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java b/application/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java
rename to application/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java
diff --git a/src/main/java/org/opentripplanner/kryo/BuildConfigSerializer.java b/application/src/main/java/org/opentripplanner/kryo/BuildConfigSerializer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/kryo/BuildConfigSerializer.java
rename to application/src/main/java/org/opentripplanner/kryo/BuildConfigSerializer.java
diff --git a/src/main/java/org/opentripplanner/kryo/RouterConfigSerializer.java b/application/src/main/java/org/opentripplanner/kryo/RouterConfigSerializer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/kryo/RouterConfigSerializer.java
rename to application/src/main/java/org/opentripplanner/kryo/RouterConfigSerializer.java
diff --git a/src/main/java/org/opentripplanner/kryo/UnmodifiableCollectionsSerializer.java b/application/src/main/java/org/opentripplanner/kryo/UnmodifiableCollectionsSerializer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/kryo/UnmodifiableCollectionsSerializer.java
rename to application/src/main/java/org/opentripplanner/kryo/UnmodifiableCollectionsSerializer.java
diff --git a/src/main/java/org/opentripplanner/model/FeedInfo.java b/application/src/main/java/org/opentripplanner/model/FeedInfo.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/FeedInfo.java
rename to application/src/main/java/org/opentripplanner/model/FeedInfo.java
diff --git a/src/main/java/org/opentripplanner/model/Frequency.java b/application/src/main/java/org/opentripplanner/model/Frequency.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/Frequency.java
rename to application/src/main/java/org/opentripplanner/model/Frequency.java
diff --git a/src/main/java/org/opentripplanner/model/GenericLocation.java b/application/src/main/java/org/opentripplanner/model/GenericLocation.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/GenericLocation.java
rename to application/src/main/java/org/opentripplanner/model/GenericLocation.java
diff --git a/src/main/java/org/opentripplanner/model/OtpTransitService.java b/application/src/main/java/org/opentripplanner/model/OtpTransitService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/OtpTransitService.java
rename to application/src/main/java/org/opentripplanner/model/OtpTransitService.java
diff --git a/src/main/java/org/opentripplanner/model/PathTransfer.java b/application/src/main/java/org/opentripplanner/model/PathTransfer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/PathTransfer.java
rename to application/src/main/java/org/opentripplanner/model/PathTransfer.java
diff --git a/src/main/java/org/opentripplanner/model/PickDrop.java b/application/src/main/java/org/opentripplanner/model/PickDrop.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/PickDrop.java
rename to application/src/main/java/org/opentripplanner/model/PickDrop.java
diff --git a/src/main/java/org/opentripplanner/model/RealTimeTripUpdate.java b/application/src/main/java/org/opentripplanner/model/RealTimeTripUpdate.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/RealTimeTripUpdate.java
rename to application/src/main/java/org/opentripplanner/model/RealTimeTripUpdate.java
diff --git a/src/main/java/org/opentripplanner/model/ShapePoint.java b/application/src/main/java/org/opentripplanner/model/ShapePoint.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/ShapePoint.java
rename to application/src/main/java/org/opentripplanner/model/ShapePoint.java
diff --git a/src/main/java/org/opentripplanner/model/StopTime.java b/application/src/main/java/org/opentripplanner/model/StopTime.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/StopTime.java
rename to application/src/main/java/org/opentripplanner/model/StopTime.java
diff --git a/src/main/java/org/opentripplanner/model/StopTimesInPattern.java b/application/src/main/java/org/opentripplanner/model/StopTimesInPattern.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/StopTimesInPattern.java
rename to application/src/main/java/org/opentripplanner/model/StopTimesInPattern.java
diff --git a/src/main/java/org/opentripplanner/model/SystemNotice.java b/application/src/main/java/org/opentripplanner/model/SystemNotice.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/SystemNotice.java
rename to application/src/main/java/org/opentripplanner/model/SystemNotice.java
diff --git a/src/main/java/org/opentripplanner/model/Timetable.java b/application/src/main/java/org/opentripplanner/model/Timetable.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/Timetable.java
rename to application/src/main/java/org/opentripplanner/model/Timetable.java
diff --git a/src/main/java/org/opentripplanner/model/TimetableBuilder.java b/application/src/main/java/org/opentripplanner/model/TimetableBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/TimetableBuilder.java
rename to application/src/main/java/org/opentripplanner/model/TimetableBuilder.java
diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/application/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/TimetableSnapshot.java
rename to application/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshotProvider.java b/application/src/main/java/org/opentripplanner/model/TimetableSnapshotProvider.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/TimetableSnapshotProvider.java
rename to application/src/main/java/org/opentripplanner/model/TimetableSnapshotProvider.java
diff --git a/src/main/java/org/opentripplanner/model/TripStopTimes.java b/application/src/main/java/org/opentripplanner/model/TripStopTimes.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/TripStopTimes.java
rename to application/src/main/java/org/opentripplanner/model/TripStopTimes.java
diff --git a/src/main/java/org/opentripplanner/model/TripTimeOnDate.java b/application/src/main/java/org/opentripplanner/model/TripTimeOnDate.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/TripTimeOnDate.java
rename to application/src/main/java/org/opentripplanner/model/TripTimeOnDate.java
diff --git a/src/main/java/org/opentripplanner/model/TripTimesPatch.java b/application/src/main/java/org/opentripplanner/model/TripTimesPatch.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/TripTimesPatch.java
rename to application/src/main/java/org/opentripplanner/model/TripTimesPatch.java
diff --git a/src/main/java/org/opentripplanner/model/calendar/CalendarService.java b/application/src/main/java/org/opentripplanner/model/calendar/CalendarService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/calendar/CalendarService.java
rename to application/src/main/java/org/opentripplanner/model/calendar/CalendarService.java
diff --git a/src/main/java/org/opentripplanner/model/calendar/CalendarServiceData.java b/application/src/main/java/org/opentripplanner/model/calendar/CalendarServiceData.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/calendar/CalendarServiceData.java
rename to application/src/main/java/org/opentripplanner/model/calendar/CalendarServiceData.java
diff --git a/src/main/java/org/opentripplanner/model/calendar/ServiceCalendar.java b/application/src/main/java/org/opentripplanner/model/calendar/ServiceCalendar.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/calendar/ServiceCalendar.java
rename to application/src/main/java/org/opentripplanner/model/calendar/ServiceCalendar.java
diff --git a/src/main/java/org/opentripplanner/model/calendar/ServiceCalendarDate.java b/application/src/main/java/org/opentripplanner/model/calendar/ServiceCalendarDate.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/calendar/ServiceCalendarDate.java
rename to application/src/main/java/org/opentripplanner/model/calendar/ServiceCalendarDate.java
diff --git a/src/main/java/org/opentripplanner/model/calendar/ServiceDateInterval.java b/application/src/main/java/org/opentripplanner/model/calendar/ServiceDateInterval.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/calendar/ServiceDateInterval.java
rename to application/src/main/java/org/opentripplanner/model/calendar/ServiceDateInterval.java
diff --git a/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImpl.java b/application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImpl.java
rename to application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImpl.java
diff --git a/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceImpl.java b/application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceImpl.java
rename to application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceImpl.java
diff --git a/src/main/java/org/opentripplanner/model/calendar/impl/MultipleCalendarsForServiceIdException.java b/application/src/main/java/org/opentripplanner/model/calendar/impl/MultipleCalendarsForServiceIdException.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/calendar/impl/MultipleCalendarsForServiceIdException.java
rename to application/src/main/java/org/opentripplanner/model/calendar/impl/MultipleCalendarsForServiceIdException.java
diff --git a/src/main/java/org/opentripplanner/model/calendar/impl/UnknownAgencyTimezoneException.java b/application/src/main/java/org/opentripplanner/model/calendar/impl/UnknownAgencyTimezoneException.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/calendar/impl/UnknownAgencyTimezoneException.java
rename to application/src/main/java/org/opentripplanner/model/calendar/impl/UnknownAgencyTimezoneException.java
diff --git a/src/main/java/org/opentripplanner/model/calendar/openinghours/OHCalendar.java b/application/src/main/java/org/opentripplanner/model/calendar/openinghours/OHCalendar.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/calendar/openinghours/OHCalendar.java
rename to application/src/main/java/org/opentripplanner/model/calendar/openinghours/OHCalendar.java
diff --git a/src/main/java/org/opentripplanner/model/calendar/openinghours/OHCalendarBuilder.java b/application/src/main/java/org/opentripplanner/model/calendar/openinghours/OHCalendarBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/calendar/openinghours/OHCalendarBuilder.java
rename to application/src/main/java/org/opentripplanner/model/calendar/openinghours/OHCalendarBuilder.java
diff --git a/src/main/java/org/opentripplanner/model/calendar/openinghours/OHSearchContext.java b/application/src/main/java/org/opentripplanner/model/calendar/openinghours/OHSearchContext.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/calendar/openinghours/OHSearchContext.java
rename to application/src/main/java/org/opentripplanner/model/calendar/openinghours/OHSearchContext.java
diff --git a/src/main/java/org/opentripplanner/model/calendar/openinghours/OpeningHours.java b/application/src/main/java/org/opentripplanner/model/calendar/openinghours/OpeningHours.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/calendar/openinghours/OpeningHours.java
rename to application/src/main/java/org/opentripplanner/model/calendar/openinghours/OpeningHours.java
diff --git a/src/main/java/org/opentripplanner/model/calendar/openinghours/OpeningHoursCalendarService.java b/application/src/main/java/org/opentripplanner/model/calendar/openinghours/OpeningHoursCalendarService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/calendar/openinghours/OpeningHoursCalendarService.java
rename to application/src/main/java/org/opentripplanner/model/calendar/openinghours/OpeningHoursCalendarService.java
diff --git a/src/main/java/org/opentripplanner/model/calendar/openinghours/OsmOpeningHoursSupport.java b/application/src/main/java/org/opentripplanner/model/calendar/openinghours/OsmOpeningHoursSupport.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/calendar/openinghours/OsmOpeningHoursSupport.java
rename to application/src/main/java/org/opentripplanner/model/calendar/openinghours/OsmOpeningHoursSupport.java
diff --git a/src/main/java/org/opentripplanner/model/fare/FareMedium.java b/application/src/main/java/org/opentripplanner/model/fare/FareMedium.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/fare/FareMedium.java
rename to application/src/main/java/org/opentripplanner/model/fare/FareMedium.java
diff --git a/src/main/java/org/opentripplanner/model/fare/FareProduct.java b/application/src/main/java/org/opentripplanner/model/fare/FareProduct.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/fare/FareProduct.java
rename to application/src/main/java/org/opentripplanner/model/fare/FareProduct.java
diff --git a/src/main/java/org/opentripplanner/model/fare/FareProductBuilder.java b/application/src/main/java/org/opentripplanner/model/fare/FareProductBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/fare/FareProductBuilder.java
rename to application/src/main/java/org/opentripplanner/model/fare/FareProductBuilder.java
diff --git a/src/main/java/org/opentripplanner/model/fare/FareProductUse.java b/application/src/main/java/org/opentripplanner/model/fare/FareProductUse.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/fare/FareProductUse.java
rename to application/src/main/java/org/opentripplanner/model/fare/FareProductUse.java
diff --git a/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java b/application/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/fare/ItineraryFares.java
rename to application/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java
diff --git a/src/main/java/org/opentripplanner/model/fare/RiderCategory.java b/application/src/main/java/org/opentripplanner/model/fare/RiderCategory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/fare/RiderCategory.java
rename to application/src/main/java/org/opentripplanner/model/fare/RiderCategory.java
diff --git a/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java b/application/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java
rename to application/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java
diff --git a/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceImpl.java b/application/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/impl/OtpTransitServiceImpl.java
rename to application/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceImpl.java
diff --git a/src/main/java/org/opentripplanner/model/modes/AllowAllModesFilter.java b/application/src/main/java/org/opentripplanner/model/modes/AllowAllModesFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/modes/AllowAllModesFilter.java
rename to application/src/main/java/org/opentripplanner/model/modes/AllowAllModesFilter.java
diff --git a/src/main/java/org/opentripplanner/model/modes/AllowMainAndSubModeFilter.java b/application/src/main/java/org/opentripplanner/model/modes/AllowMainAndSubModeFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/modes/AllowMainAndSubModeFilter.java
rename to application/src/main/java/org/opentripplanner/model/modes/AllowMainAndSubModeFilter.java
diff --git a/src/main/java/org/opentripplanner/model/modes/AllowMainAndSubModesFilter.java b/application/src/main/java/org/opentripplanner/model/modes/AllowMainAndSubModesFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/modes/AllowMainAndSubModesFilter.java
rename to application/src/main/java/org/opentripplanner/model/modes/AllowMainAndSubModesFilter.java
diff --git a/src/main/java/org/opentripplanner/model/modes/AllowMainModeFilter.java b/application/src/main/java/org/opentripplanner/model/modes/AllowMainModeFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/modes/AllowMainModeFilter.java
rename to application/src/main/java/org/opentripplanner/model/modes/AllowMainModeFilter.java
diff --git a/src/main/java/org/opentripplanner/model/modes/AllowMainModesFilter.java b/application/src/main/java/org/opentripplanner/model/modes/AllowMainModesFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/modes/AllowMainModesFilter.java
rename to application/src/main/java/org/opentripplanner/model/modes/AllowMainModesFilter.java
diff --git a/src/main/java/org/opentripplanner/model/modes/AllowTransitModeFilter.java b/application/src/main/java/org/opentripplanner/model/modes/AllowTransitModeFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/modes/AllowTransitModeFilter.java
rename to application/src/main/java/org/opentripplanner/model/modes/AllowTransitModeFilter.java
diff --git a/src/main/java/org/opentripplanner/model/modes/ExcludeAllTransitFilter.java b/application/src/main/java/org/opentripplanner/model/modes/ExcludeAllTransitFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/modes/ExcludeAllTransitFilter.java
rename to application/src/main/java/org/opentripplanner/model/modes/ExcludeAllTransitFilter.java
diff --git a/src/main/java/org/opentripplanner/model/modes/FilterCollection.java b/application/src/main/java/org/opentripplanner/model/modes/FilterCollection.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/modes/FilterCollection.java
rename to application/src/main/java/org/opentripplanner/model/modes/FilterCollection.java
diff --git a/src/main/java/org/opentripplanner/model/modes/FilterFactory.java b/application/src/main/java/org/opentripplanner/model/modes/FilterFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/modes/FilterFactory.java
rename to application/src/main/java/org/opentripplanner/model/modes/FilterFactory.java
diff --git a/src/main/java/org/opentripplanner/model/plan/AbsoluteDirection.java b/application/src/main/java/org/opentripplanner/model/plan/AbsoluteDirection.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/AbsoluteDirection.java
rename to application/src/main/java/org/opentripplanner/model/plan/AbsoluteDirection.java
diff --git a/src/main/java/org/opentripplanner/model/plan/ElevationProfile.java b/application/src/main/java/org/opentripplanner/model/plan/ElevationProfile.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/ElevationProfile.java
rename to application/src/main/java/org/opentripplanner/model/plan/ElevationProfile.java
diff --git a/src/main/java/org/opentripplanner/model/plan/Emissions.java b/application/src/main/java/org/opentripplanner/model/plan/Emissions.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/Emissions.java
rename to application/src/main/java/org/opentripplanner/model/plan/Emissions.java
diff --git a/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java b/application/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java
rename to application/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java
diff --git a/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLegBuilder.java b/application/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLegBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/FrequencyTransitLegBuilder.java
rename to application/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLegBuilder.java
diff --git a/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java b/application/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java
rename to application/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java
diff --git a/src/main/java/org/opentripplanner/model/plan/Itinerary.java b/application/src/main/java/org/opentripplanner/model/plan/Itinerary.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/Itinerary.java
rename to application/src/main/java/org/opentripplanner/model/plan/Itinerary.java
diff --git a/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java b/application/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java
rename to application/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java
diff --git a/src/main/java/org/opentripplanner/model/plan/Leg.java b/application/src/main/java/org/opentripplanner/model/plan/Leg.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/Leg.java
rename to application/src/main/java/org/opentripplanner/model/plan/Leg.java
diff --git a/src/main/java/org/opentripplanner/model/plan/LegTime.java b/application/src/main/java/org/opentripplanner/model/plan/LegTime.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/LegTime.java
rename to application/src/main/java/org/opentripplanner/model/plan/LegTime.java
diff --git a/src/main/java/org/opentripplanner/model/plan/Place.java b/application/src/main/java/org/opentripplanner/model/plan/Place.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/Place.java
rename to application/src/main/java/org/opentripplanner/model/plan/Place.java
diff --git a/src/main/java/org/opentripplanner/model/plan/RelativeDirection.java b/application/src/main/java/org/opentripplanner/model/plan/RelativeDirection.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/RelativeDirection.java
rename to application/src/main/java/org/opentripplanner/model/plan/RelativeDirection.java
diff --git a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java b/application/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java
rename to application/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java
diff --git a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilder.java b/application/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilder.java
rename to application/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilder.java
diff --git a/src/main/java/org/opentripplanner/model/plan/SortOrder.java b/application/src/main/java/org/opentripplanner/model/plan/SortOrder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/SortOrder.java
rename to application/src/main/java/org/opentripplanner/model/plan/SortOrder.java
diff --git a/src/main/java/org/opentripplanner/model/plan/StopArrival.java b/application/src/main/java/org/opentripplanner/model/plan/StopArrival.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/StopArrival.java
rename to application/src/main/java/org/opentripplanner/model/plan/StopArrival.java
diff --git a/src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java b/application/src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java
rename to application/src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java
diff --git a/src/main/java/org/opentripplanner/model/plan/StreetLeg.java b/application/src/main/java/org/opentripplanner/model/plan/StreetLeg.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/StreetLeg.java
rename to application/src/main/java/org/opentripplanner/model/plan/StreetLeg.java
diff --git a/src/main/java/org/opentripplanner/model/plan/StreetLegBuilder.java b/application/src/main/java/org/opentripplanner/model/plan/StreetLegBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/StreetLegBuilder.java
rename to application/src/main/java/org/opentripplanner/model/plan/StreetLegBuilder.java
diff --git a/src/main/java/org/opentripplanner/model/plan/TransitLeg.java b/application/src/main/java/org/opentripplanner/model/plan/TransitLeg.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/TransitLeg.java
rename to application/src/main/java/org/opentripplanner/model/plan/TransitLeg.java
diff --git a/src/main/java/org/opentripplanner/model/plan/TripPlan.java b/application/src/main/java/org/opentripplanner/model/plan/TripPlan.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/TripPlan.java
rename to application/src/main/java/org/opentripplanner/model/plan/TripPlan.java
diff --git a/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java b/application/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java
rename to application/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java
diff --git a/src/main/java/org/opentripplanner/model/plan/VehicleParkingWithEntrance.java b/application/src/main/java/org/opentripplanner/model/plan/VehicleParkingWithEntrance.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/VehicleParkingWithEntrance.java
rename to application/src/main/java/org/opentripplanner/model/plan/VehicleParkingWithEntrance.java
diff --git a/src/main/java/org/opentripplanner/model/plan/VertexType.java b/application/src/main/java/org/opentripplanner/model/plan/VertexType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/VertexType.java
rename to application/src/main/java/org/opentripplanner/model/plan/VertexType.java
diff --git a/src/main/java/org/opentripplanner/model/plan/WalkStep.java b/application/src/main/java/org/opentripplanner/model/plan/WalkStep.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/WalkStep.java
rename to application/src/main/java/org/opentripplanner/model/plan/WalkStep.java
diff --git a/src/main/java/org/opentripplanner/model/plan/WalkStepBuilder.java b/application/src/main/java/org/opentripplanner/model/plan/WalkStepBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/WalkStepBuilder.java
rename to application/src/main/java/org/opentripplanner/model/plan/WalkStepBuilder.java
diff --git a/src/main/java/org/opentripplanner/model/plan/grouppriority/TransitGroupPriorityItineraryDecorator.java b/application/src/main/java/org/opentripplanner/model/plan/grouppriority/TransitGroupPriorityItineraryDecorator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/grouppriority/TransitGroupPriorityItineraryDecorator.java
rename to application/src/main/java/org/opentripplanner/model/plan/grouppriority/TransitGroupPriorityItineraryDecorator.java
diff --git a/src/main/java/org/opentripplanner/model/plan/legreference/LegReference.java b/application/src/main/java/org/opentripplanner/model/plan/legreference/LegReference.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/legreference/LegReference.java
rename to application/src/main/java/org/opentripplanner/model/plan/legreference/LegReference.java
diff --git a/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java b/application/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java
rename to application/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java
diff --git a/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceType.java b/application/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceType.java
rename to application/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceType.java
diff --git a/src/main/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReference.java b/application/src/main/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReference.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReference.java
rename to application/src/main/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReference.java
diff --git a/src/main/java/org/opentripplanner/model/plan/paging/PagingSearchWindowAdjuster.java b/application/src/main/java/org/opentripplanner/model/plan/paging/PagingSearchWindowAdjuster.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/paging/PagingSearchWindowAdjuster.java
rename to application/src/main/java/org/opentripplanner/model/plan/paging/PagingSearchWindowAdjuster.java
diff --git a/src/main/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCut.java b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCut.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCut.java
rename to application/src/main/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCut.java
diff --git a/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursor.java b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursor.java
rename to application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursor.java
diff --git a/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorFactory.java b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorFactory.java
rename to application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorFactory.java
diff --git a/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorInput.java b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorInput.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorInput.java
rename to application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorInput.java
diff --git a/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializer.java b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializer.java
rename to application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializer.java
diff --git a/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageType.java b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/paging/cursor/PageType.java
rename to application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageType.java
diff --git a/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/pagecursor.excalidraw b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/pagecursor.excalidraw
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/paging/cursor/images/pagecursor.excalidraw
rename to application/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/pagecursor.excalidraw
diff --git a/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-arrival-crop-sw-prev-page.svg b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-arrival-crop-sw-prev-page.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-arrival-crop-sw-prev-page.svg
rename to application/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-arrival-crop-sw-prev-page.svg
diff --git a/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-arrival-crop-sw.svg b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-arrival-crop-sw.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-arrival-crop-sw.svg
rename to application/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-arrival-crop-sw.svg
diff --git a/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-arrival.svg b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-arrival.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-arrival.svg
rename to application/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-arrival.svg
diff --git a/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-departure-crop-sw-next-page.svg b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-departure-crop-sw-next-page.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-departure-crop-sw-next-page.svg
rename to application/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-departure-crop-sw-next-page.svg
diff --git a/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-departure-crop-sw.svg b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-departure-crop-sw.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-departure-crop-sw.svg
rename to application/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-departure-crop-sw.svg
diff --git a/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-departure.svg b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-departure.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-departure.svg
rename to application/src/main/java/org/opentripplanner/model/plan/paging/cursor/images/sort-by-departure.svg
diff --git a/src/main/java/org/opentripplanner/model/plan/paging/cursor/readme.md b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/readme.md
similarity index 100%
rename from src/main/java/org/opentripplanner/model/plan/paging/cursor/readme.md
rename to application/src/main/java/org/opentripplanner/model/plan/paging/cursor/readme.md
diff --git a/src/main/java/org/opentripplanner/model/projectinfo/GraphFileHeader.java b/application/src/main/java/org/opentripplanner/model/projectinfo/GraphFileHeader.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/projectinfo/GraphFileHeader.java
rename to application/src/main/java/org/opentripplanner/model/projectinfo/GraphFileHeader.java
diff --git a/src/main/java/org/opentripplanner/model/projectinfo/MavenProjectVersion.java b/application/src/main/java/org/opentripplanner/model/projectinfo/MavenProjectVersion.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/projectinfo/MavenProjectVersion.java
rename to application/src/main/java/org/opentripplanner/model/projectinfo/MavenProjectVersion.java
diff --git a/src/main/java/org/opentripplanner/model/projectinfo/OtpProjectInfo.java b/application/src/main/java/org/opentripplanner/model/projectinfo/OtpProjectInfo.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/projectinfo/OtpProjectInfo.java
rename to application/src/main/java/org/opentripplanner/model/projectinfo/OtpProjectInfo.java
diff --git a/src/main/java/org/opentripplanner/model/projectinfo/OtpProjectInfoParser.java b/application/src/main/java/org/opentripplanner/model/projectinfo/OtpProjectInfoParser.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/projectinfo/OtpProjectInfoParser.java
rename to application/src/main/java/org/opentripplanner/model/projectinfo/OtpProjectInfoParser.java
diff --git a/src/main/java/org/opentripplanner/model/projectinfo/VersionControlInfo.java b/application/src/main/java/org/opentripplanner/model/projectinfo/VersionControlInfo.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/projectinfo/VersionControlInfo.java
rename to application/src/main/java/org/opentripplanner/model/projectinfo/VersionControlInfo.java
diff --git a/src/main/java/org/opentripplanner/model/transfer/ConstrainedTransfer.java b/application/src/main/java/org/opentripplanner/model/transfer/ConstrainedTransfer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/transfer/ConstrainedTransfer.java
rename to application/src/main/java/org/opentripplanner/model/transfer/ConstrainedTransfer.java
diff --git a/src/main/java/org/opentripplanner/model/transfer/DefaultTransferService.java b/application/src/main/java/org/opentripplanner/model/transfer/DefaultTransferService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/transfer/DefaultTransferService.java
rename to application/src/main/java/org/opentripplanner/model/transfer/DefaultTransferService.java
diff --git a/src/main/java/org/opentripplanner/model/transfer/RouteStationTransferPoint.java b/application/src/main/java/org/opentripplanner/model/transfer/RouteStationTransferPoint.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/transfer/RouteStationTransferPoint.java
rename to application/src/main/java/org/opentripplanner/model/transfer/RouteStationTransferPoint.java
diff --git a/src/main/java/org/opentripplanner/model/transfer/RouteStopTransferPoint.java b/application/src/main/java/org/opentripplanner/model/transfer/RouteStopTransferPoint.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/transfer/RouteStopTransferPoint.java
rename to application/src/main/java/org/opentripplanner/model/transfer/RouteStopTransferPoint.java
diff --git a/src/main/java/org/opentripplanner/model/transfer/StationTransferPoint.java b/application/src/main/java/org/opentripplanner/model/transfer/StationTransferPoint.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/transfer/StationTransferPoint.java
rename to application/src/main/java/org/opentripplanner/model/transfer/StationTransferPoint.java
diff --git a/src/main/java/org/opentripplanner/model/transfer/StopTransferPoint.java b/application/src/main/java/org/opentripplanner/model/transfer/StopTransferPoint.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/transfer/StopTransferPoint.java
rename to application/src/main/java/org/opentripplanner/model/transfer/StopTransferPoint.java
diff --git a/src/main/java/org/opentripplanner/model/transfer/TransferConstraint.java b/application/src/main/java/org/opentripplanner/model/transfer/TransferConstraint.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/transfer/TransferConstraint.java
rename to application/src/main/java/org/opentripplanner/model/transfer/TransferConstraint.java
diff --git a/src/main/java/org/opentripplanner/model/transfer/TransferPoint.java b/application/src/main/java/org/opentripplanner/model/transfer/TransferPoint.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/transfer/TransferPoint.java
rename to application/src/main/java/org/opentripplanner/model/transfer/TransferPoint.java
diff --git a/src/main/java/org/opentripplanner/model/transfer/TransferPointMap.java b/application/src/main/java/org/opentripplanner/model/transfer/TransferPointMap.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/transfer/TransferPointMap.java
rename to application/src/main/java/org/opentripplanner/model/transfer/TransferPointMap.java
diff --git a/src/main/java/org/opentripplanner/model/transfer/TransferPriority.java b/application/src/main/java/org/opentripplanner/model/transfer/TransferPriority.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/transfer/TransferPriority.java
rename to application/src/main/java/org/opentripplanner/model/transfer/TransferPriority.java
diff --git a/src/main/java/org/opentripplanner/model/transfer/TransferService.java b/application/src/main/java/org/opentripplanner/model/transfer/TransferService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/transfer/TransferService.java
rename to application/src/main/java/org/opentripplanner/model/transfer/TransferService.java
diff --git a/src/main/java/org/opentripplanner/model/transfer/TripTransferPoint.java b/application/src/main/java/org/opentripplanner/model/transfer/TripTransferPoint.java
similarity index 100%
rename from src/main/java/org/opentripplanner/model/transfer/TripTransferPoint.java
rename to application/src/main/java/org/opentripplanner/model/transfer/TripTransferPoint.java
diff --git a/src/main/java/org/opentripplanner/netex/NetexBundle.java b/application/src/main/java/org/opentripplanner/netex/NetexBundle.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/NetexBundle.java
rename to application/src/main/java/org/opentripplanner/netex/NetexBundle.java
diff --git a/src/main/java/org/opentripplanner/netex/NetexModule.java b/application/src/main/java/org/opentripplanner/netex/NetexModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/NetexModule.java
rename to application/src/main/java/org/opentripplanner/netex/NetexModule.java
diff --git a/src/main/java/org/opentripplanner/netex/config/IgnorableFeature.java b/application/src/main/java/org/opentripplanner/netex/config/IgnorableFeature.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/config/IgnorableFeature.java
rename to application/src/main/java/org/opentripplanner/netex/config/IgnorableFeature.java
diff --git a/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java b/application/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java
rename to application/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java
diff --git a/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java b/application/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java
rename to application/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java
diff --git a/src/main/java/org/opentripplanner/netex/images/Colaboration.png b/application/src/main/java/org/opentripplanner/netex/images/Colaboration.png
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/images/Colaboration.png
rename to application/src/main/java/org/opentripplanner/netex/images/Colaboration.png
diff --git a/src/main/java/org/opentripplanner/netex/images/Colaboration.uxf b/application/src/main/java/org/opentripplanner/netex/images/Colaboration.uxf
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/images/Colaboration.uxf
rename to application/src/main/java/org/opentripplanner/netex/images/Colaboration.uxf
diff --git a/src/main/java/org/opentripplanner/netex/images/DegignOverview.png b/application/src/main/java/org/opentripplanner/netex/images/DegignOverview.png
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/images/DegignOverview.png
rename to application/src/main/java/org/opentripplanner/netex/images/DegignOverview.png
diff --git a/src/main/java/org/opentripplanner/netex/images/DegignOverview.uxf b/application/src/main/java/org/opentripplanner/netex/images/DegignOverview.uxf
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/images/DegignOverview.uxf
rename to application/src/main/java/org/opentripplanner/netex/images/DegignOverview.uxf
diff --git a/src/main/java/org/opentripplanner/netex/images/PackageDependencies.png b/application/src/main/java/org/opentripplanner/netex/images/PackageDependencies.png
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/images/PackageDependencies.png
rename to application/src/main/java/org/opentripplanner/netex/images/PackageDependencies.png
diff --git a/src/main/java/org/opentripplanner/netex/images/PackageDependencies.uxf b/application/src/main/java/org/opentripplanner/netex/images/PackageDependencies.uxf
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/images/PackageDependencies.uxf
rename to application/src/main/java/org/opentripplanner/netex/images/PackageDependencies.uxf
diff --git a/src/main/java/org/opentripplanner/netex/index/NetexEntityIndex.java b/application/src/main/java/org/opentripplanner/netex/index/NetexEntityIndex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/index/NetexEntityIndex.java
rename to application/src/main/java/org/opentripplanner/netex/index/NetexEntityIndex.java
diff --git a/src/main/java/org/opentripplanner/netex/index/api/HMapValidationRule.java b/application/src/main/java/org/opentripplanner/netex/index/api/HMapValidationRule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/index/api/HMapValidationRule.java
rename to application/src/main/java/org/opentripplanner/netex/index/api/HMapValidationRule.java
diff --git a/src/main/java/org/opentripplanner/netex/index/api/NetexEntityIndexReadOnlyView.java b/application/src/main/java/org/opentripplanner/netex/index/api/NetexEntityIndexReadOnlyView.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/index/api/NetexEntityIndexReadOnlyView.java
rename to application/src/main/java/org/opentripplanner/netex/index/api/NetexEntityIndexReadOnlyView.java
diff --git a/src/main/java/org/opentripplanner/netex/index/api/ReadOnlyHierarchicalMap.java b/application/src/main/java/org/opentripplanner/netex/index/api/ReadOnlyHierarchicalMap.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/index/api/ReadOnlyHierarchicalMap.java
rename to application/src/main/java/org/opentripplanner/netex/index/api/ReadOnlyHierarchicalMap.java
diff --git a/src/main/java/org/opentripplanner/netex/index/api/ReadOnlyHierarchicalMapById.java b/application/src/main/java/org/opentripplanner/netex/index/api/ReadOnlyHierarchicalMapById.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/index/api/ReadOnlyHierarchicalMapById.java
rename to application/src/main/java/org/opentripplanner/netex/index/api/ReadOnlyHierarchicalMapById.java
diff --git a/src/main/java/org/opentripplanner/netex/index/api/ReadOnlyHierarchicalVersionMapById.java b/application/src/main/java/org/opentripplanner/netex/index/api/ReadOnlyHierarchicalVersionMapById.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/index/api/ReadOnlyHierarchicalVersionMapById.java
rename to application/src/main/java/org/opentripplanner/netex/index/api/ReadOnlyHierarchicalVersionMapById.java
diff --git a/src/main/java/org/opentripplanner/netex/index/hierarchy/AbstractHierarchicalMap.java b/application/src/main/java/org/opentripplanner/netex/index/hierarchy/AbstractHierarchicalMap.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/index/hierarchy/AbstractHierarchicalMap.java
rename to application/src/main/java/org/opentripplanner/netex/index/hierarchy/AbstractHierarchicalMap.java
diff --git a/src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalElement.java b/application/src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalElement.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalElement.java
rename to application/src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalElement.java
diff --git a/src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMap.java b/application/src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMap.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMap.java
rename to application/src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMap.java
diff --git a/src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMapById.java b/application/src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMapById.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMapById.java
rename to application/src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMapById.java
diff --git a/src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMultimap.java b/application/src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMultimap.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMultimap.java
rename to application/src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMultimap.java
diff --git a/src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalVersionMapById.java b/application/src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalVersionMapById.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalVersionMapById.java
rename to application/src/main/java/org/opentripplanner/netex/index/hierarchy/HierarchicalVersionMapById.java
diff --git a/src/main/java/org/opentripplanner/netex/index/hierarchy/ValidOnDate.java b/application/src/main/java/org/opentripplanner/netex/index/hierarchy/ValidOnDate.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/index/hierarchy/ValidOnDate.java
rename to application/src/main/java/org/opentripplanner/netex/index/hierarchy/ValidOnDate.java
diff --git a/src/main/java/org/opentripplanner/netex/issues/DayTypeScheduleIsEmpty.java b/application/src/main/java/org/opentripplanner/netex/issues/DayTypeScheduleIsEmpty.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/issues/DayTypeScheduleIsEmpty.java
rename to application/src/main/java/org/opentripplanner/netex/issues/DayTypeScheduleIsEmpty.java
diff --git a/src/main/java/org/opentripplanner/netex/issues/InterchangeMaxWaitTimeNotGuaranteed.java b/application/src/main/java/org/opentripplanner/netex/issues/InterchangeMaxWaitTimeNotGuaranteed.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/issues/InterchangeMaxWaitTimeNotGuaranteed.java
rename to application/src/main/java/org/opentripplanner/netex/issues/InterchangeMaxWaitTimeNotGuaranteed.java
diff --git a/src/main/java/org/opentripplanner/netex/issues/InterchangePointMappingFailed.java b/application/src/main/java/org/opentripplanner/netex/issues/InterchangePointMappingFailed.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/issues/InterchangePointMappingFailed.java
rename to application/src/main/java/org/opentripplanner/netex/issues/InterchangePointMappingFailed.java
diff --git a/src/main/java/org/opentripplanner/netex/issues/InterchangeWithoutConstraint.java b/application/src/main/java/org/opentripplanner/netex/issues/InterchangeWithoutConstraint.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/issues/InterchangeWithoutConstraint.java
rename to application/src/main/java/org/opentripplanner/netex/issues/InterchangeWithoutConstraint.java
diff --git a/src/main/java/org/opentripplanner/netex/issues/ObjectNotFound.java b/application/src/main/java/org/opentripplanner/netex/issues/ObjectNotFound.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/issues/ObjectNotFound.java
rename to application/src/main/java/org/opentripplanner/netex/issues/ObjectNotFound.java
diff --git a/src/main/java/org/opentripplanner/netex/issues/StopPlaceWithoutCoordinates.java b/application/src/main/java/org/opentripplanner/netex/issues/StopPlaceWithoutCoordinates.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/issues/StopPlaceWithoutCoordinates.java
rename to application/src/main/java/org/opentripplanner/netex/issues/StopPlaceWithoutCoordinates.java
diff --git a/src/main/java/org/opentripplanner/netex/issues/StopPlaceWithoutQuays.java b/application/src/main/java/org/opentripplanner/netex/issues/StopPlaceWithoutQuays.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/issues/StopPlaceWithoutQuays.java
rename to application/src/main/java/org/opentripplanner/netex/issues/StopPlaceWithoutQuays.java
diff --git a/src/main/java/org/opentripplanner/netex/loader/GroupEntries.java b/application/src/main/java/org/opentripplanner/netex/loader/GroupEntries.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/loader/GroupEntries.java
rename to application/src/main/java/org/opentripplanner/netex/loader/GroupEntries.java
diff --git a/src/main/java/org/opentripplanner/netex/loader/NetexDataSourceHierarchy.java b/application/src/main/java/org/opentripplanner/netex/loader/NetexDataSourceHierarchy.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/loader/NetexDataSourceHierarchy.java
rename to application/src/main/java/org/opentripplanner/netex/loader/NetexDataSourceHierarchy.java
diff --git a/src/main/java/org/opentripplanner/netex/loader/NetexXmlParser.java b/application/src/main/java/org/opentripplanner/netex/loader/NetexXmlParser.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/loader/NetexXmlParser.java
rename to application/src/main/java/org/opentripplanner/netex/loader/NetexXmlParser.java
diff --git a/src/main/java/org/opentripplanner/netex/loader/parser/FareFrameParser.java b/application/src/main/java/org/opentripplanner/netex/loader/parser/FareFrameParser.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/loader/parser/FareFrameParser.java
rename to application/src/main/java/org/opentripplanner/netex/loader/parser/FareFrameParser.java
diff --git a/src/main/java/org/opentripplanner/netex/loader/parser/NetexDocumentParser.java b/application/src/main/java/org/opentripplanner/netex/loader/parser/NetexDocumentParser.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/loader/parser/NetexDocumentParser.java
rename to application/src/main/java/org/opentripplanner/netex/loader/parser/NetexDocumentParser.java
diff --git a/src/main/java/org/opentripplanner/netex/loader/parser/NetexParser.java b/application/src/main/java/org/opentripplanner/netex/loader/parser/NetexParser.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/loader/parser/NetexParser.java
rename to application/src/main/java/org/opentripplanner/netex/loader/parser/NetexParser.java
diff --git a/src/main/java/org/opentripplanner/netex/loader/parser/NoticeParser.java b/application/src/main/java/org/opentripplanner/netex/loader/parser/NoticeParser.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/loader/parser/NoticeParser.java
rename to application/src/main/java/org/opentripplanner/netex/loader/parser/NoticeParser.java
diff --git a/src/main/java/org/opentripplanner/netex/loader/parser/ResourceFrameParser.java b/application/src/main/java/org/opentripplanner/netex/loader/parser/ResourceFrameParser.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/loader/parser/ResourceFrameParser.java
rename to application/src/main/java/org/opentripplanner/netex/loader/parser/ResourceFrameParser.java
diff --git a/src/main/java/org/opentripplanner/netex/loader/parser/ServiceCalendarFrameParser.java b/application/src/main/java/org/opentripplanner/netex/loader/parser/ServiceCalendarFrameParser.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/loader/parser/ServiceCalendarFrameParser.java
rename to application/src/main/java/org/opentripplanner/netex/loader/parser/ServiceCalendarFrameParser.java
diff --git a/src/main/java/org/opentripplanner/netex/loader/parser/ServiceFrameParser.java b/application/src/main/java/org/opentripplanner/netex/loader/parser/ServiceFrameParser.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/loader/parser/ServiceFrameParser.java
rename to application/src/main/java/org/opentripplanner/netex/loader/parser/ServiceFrameParser.java
diff --git a/src/main/java/org/opentripplanner/netex/loader/parser/SiteFrameParser.java b/application/src/main/java/org/opentripplanner/netex/loader/parser/SiteFrameParser.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/loader/parser/SiteFrameParser.java
rename to application/src/main/java/org/opentripplanner/netex/loader/parser/SiteFrameParser.java
diff --git a/src/main/java/org/opentripplanner/netex/loader/parser/TimeTableFrameParser.java b/application/src/main/java/org/opentripplanner/netex/loader/parser/TimeTableFrameParser.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/loader/parser/TimeTableFrameParser.java
rename to application/src/main/java/org/opentripplanner/netex/loader/parser/TimeTableFrameParser.java
diff --git a/src/main/java/org/opentripplanner/netex/loader/parser/package-info.java b/application/src/main/java/org/opentripplanner/netex/loader/parser/package-info.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/loader/parser/package-info.java
rename to application/src/main/java/org/opentripplanner/netex/loader/parser/package-info.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/BookingMethodMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/BookingMethodMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/BookingMethodMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/BookingMethodMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/BrandingMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/BrandingMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/BrandingMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/BrandingMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/DirectionMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/DirectionMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/DirectionMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/DirectionMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/DurationMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/DurationMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/DurationMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/DurationMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/GroupNetexMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/GroupNetexMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/GroupNetexMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/GroupNetexMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/GroupOfRoutesMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/GroupOfRoutesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/GroupOfRoutesMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/GroupOfRoutesMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/GroupOfStationsMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/GroupOfStationsMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/GroupOfStationsMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/GroupOfStationsMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/MultiModalStationMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/MultiModalStationMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/MultiModalStationMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/MultiModalStationMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/MultilingualStringMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/MultilingualStringMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/MultilingualStringMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/MultilingualStringMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/NoticeAssignmentMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/NoticeAssignmentMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/NoticeAssignmentMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/NoticeAssignmentMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/NoticeMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/NoticeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/NoticeMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/NoticeMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/OpenGisMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/OpenGisMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/OpenGisMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/OpenGisMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/OperatorToAgencyMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/OperatorToAgencyMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/OperatorToAgencyMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/OperatorToAgencyMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/QuayMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/QuayMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/QuayMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/QuayMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/RouteMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/RouteMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/RouteMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/RouteMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/ServiceLinkMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/ServiceLinkMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/ServiceLinkMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/ServiceLinkMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/StationMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/StationMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/StationMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/StationMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/StopAndStationMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/StopAndStationMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/StopAndStationMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/StopAndStationMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/StopPlaceTypeMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/StopPlaceTypeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/StopPlaceTypeMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/StopPlaceTypeMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapperResult.java b/application/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapperResult.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/StopTimesMapperResult.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapperResult.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/StopTransferPriorityMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/StopTransferPriorityMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/StopTransferPriorityMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/StopTransferPriorityMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/TariffZoneMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/TariffZoneMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/TariffZoneMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/TariffZoneMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/TransferMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/TransferMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/TransferMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/TransferMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/TransportModeMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/TransportModeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/TransportModeMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/TransportModeMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/TripCalendarBuilder.java b/application/src/main/java/org/opentripplanner/netex/mapping/TripCalendarBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/TripCalendarBuilder.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/TripCalendarBuilder.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/TripMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/TripMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/TripMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/TripMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapperResult.java b/application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapperResult.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/TripPatternMapperResult.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapperResult.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/TripServiceAlterationMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/TripServiceAlterationMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/TripServiceAlterationMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/TripServiceAlterationMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/WgsCoordinateMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/WgsCoordinateMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/WgsCoordinateMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/WgsCoordinateMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/WheelChairMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/WheelChairMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/WheelChairMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/WheelChairMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilder.java b/application/src/main/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilder.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilder.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/calendar/DatedServiceJourneyMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/calendar/DatedServiceJourneyMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/calendar/DatedServiceJourneyMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/calendar/DatedServiceJourneyMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/calendar/DayOfWeekMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/calendar/DayOfWeekMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/calendar/DayOfWeekMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/calendar/DayOfWeekMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/calendar/DayTypeAssignmentMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/calendar/DayTypeAssignmentMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/calendar/DayTypeAssignmentMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/calendar/DayTypeAssignmentMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/calendar/OperatingDayMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/calendar/OperatingDayMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/calendar/OperatingDayMapper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/calendar/OperatingDayMapper.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/support/FeedScopedIdFactory.java b/application/src/main/java/org/opentripplanner/netex/mapping/support/FeedScopedIdFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/support/FeedScopedIdFactory.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/support/FeedScopedIdFactory.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/support/NetexMainAndSubMode.java b/application/src/main/java/org/opentripplanner/netex/mapping/support/NetexMainAndSubMode.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/support/NetexMainAndSubMode.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/support/NetexMainAndSubMode.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/support/NetexMapperIndexes.java b/application/src/main/java/org/opentripplanner/netex/mapping/support/NetexMapperIndexes.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/support/NetexMapperIndexes.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/support/NetexMapperIndexes.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/support/NetexObjectDecorator.java b/application/src/main/java/org/opentripplanner/netex/mapping/support/NetexObjectDecorator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/support/NetexObjectDecorator.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/support/NetexObjectDecorator.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/support/ServiceAlterationFilter.java b/application/src/main/java/org/opentripplanner/netex/mapping/support/ServiceAlterationFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/support/ServiceAlterationFilter.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/support/ServiceAlterationFilter.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/support/StopPlaceVersionAndValidityComparator.java b/application/src/main/java/org/opentripplanner/netex/mapping/support/StopPlaceVersionAndValidityComparator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/support/StopPlaceVersionAndValidityComparator.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/support/StopPlaceVersionAndValidityComparator.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/support/ValidityComparator.java b/application/src/main/java/org/opentripplanner/netex/mapping/support/ValidityComparator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/support/ValidityComparator.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/support/ValidityComparator.java
diff --git a/src/main/java/org/opentripplanner/netex/mapping/support/ValidityHelper.java b/application/src/main/java/org/opentripplanner/netex/mapping/support/ValidityHelper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/mapping/support/ValidityHelper.java
rename to application/src/main/java/org/opentripplanner/netex/mapping/support/ValidityHelper.java
diff --git a/src/main/java/org/opentripplanner/netex/package.md b/application/src/main/java/org/opentripplanner/netex/package.md
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/package.md
rename to application/src/main/java/org/opentripplanner/netex/package.md
diff --git a/src/main/java/org/opentripplanner/netex/support/JAXBUtils.java b/application/src/main/java/org/opentripplanner/netex/support/JAXBUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/support/JAXBUtils.java
rename to application/src/main/java/org/opentripplanner/netex/support/JAXBUtils.java
diff --git a/src/main/java/org/opentripplanner/netex/support/JourneyPatternHelper.java b/application/src/main/java/org/opentripplanner/netex/support/JourneyPatternHelper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/support/JourneyPatternHelper.java
rename to application/src/main/java/org/opentripplanner/netex/support/JourneyPatternHelper.java
diff --git a/src/main/java/org/opentripplanner/netex/support/NetexVersionHelper.java b/application/src/main/java/org/opentripplanner/netex/support/NetexVersionHelper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/support/NetexVersionHelper.java
rename to application/src/main/java/org/opentripplanner/netex/support/NetexVersionHelper.java
diff --git a/src/main/java/org/opentripplanner/netex/support/ServiceJourneyHelper.java b/application/src/main/java/org/opentripplanner/netex/support/ServiceJourneyHelper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/support/ServiceJourneyHelper.java
rename to application/src/main/java/org/opentripplanner/netex/support/ServiceJourneyHelper.java
diff --git a/src/main/java/org/opentripplanner/netex/support/ServiceJourneyInfo.java b/application/src/main/java/org/opentripplanner/netex/support/ServiceJourneyInfo.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/support/ServiceJourneyInfo.java
rename to application/src/main/java/org/opentripplanner/netex/support/ServiceJourneyInfo.java
diff --git a/src/main/java/org/opentripplanner/netex/support/stoptime/AbstractStopTimeAdaptor.java b/application/src/main/java/org/opentripplanner/netex/support/stoptime/AbstractStopTimeAdaptor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/support/stoptime/AbstractStopTimeAdaptor.java
rename to application/src/main/java/org/opentripplanner/netex/support/stoptime/AbstractStopTimeAdaptor.java
diff --git a/src/main/java/org/opentripplanner/netex/support/stoptime/AreaStopTimeAdaptor.java b/application/src/main/java/org/opentripplanner/netex/support/stoptime/AreaStopTimeAdaptor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/support/stoptime/AreaStopTimeAdaptor.java
rename to application/src/main/java/org/opentripplanner/netex/support/stoptime/AreaStopTimeAdaptor.java
diff --git a/src/main/java/org/opentripplanner/netex/support/stoptime/RegularStopTimeAdaptor.java b/application/src/main/java/org/opentripplanner/netex/support/stoptime/RegularStopTimeAdaptor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/support/stoptime/RegularStopTimeAdaptor.java
rename to application/src/main/java/org/opentripplanner/netex/support/stoptime/RegularStopTimeAdaptor.java
diff --git a/src/main/java/org/opentripplanner/netex/support/stoptime/StopTimeAdaptor.java b/application/src/main/java/org/opentripplanner/netex/support/stoptime/StopTimeAdaptor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/support/stoptime/StopTimeAdaptor.java
rename to application/src/main/java/org/opentripplanner/netex/support/stoptime/StopTimeAdaptor.java
diff --git a/src/main/java/org/opentripplanner/netex/validation/AbstractHMapValidationRule.java b/application/src/main/java/org/opentripplanner/netex/validation/AbstractHMapValidationRule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/validation/AbstractHMapValidationRule.java
rename to application/src/main/java/org/opentripplanner/netex/validation/AbstractHMapValidationRule.java
diff --git a/src/main/java/org/opentripplanner/netex/validation/DSJOperatingDayNotFound.java b/application/src/main/java/org/opentripplanner/netex/validation/DSJOperatingDayNotFound.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/validation/DSJOperatingDayNotFound.java
rename to application/src/main/java/org/opentripplanner/netex/validation/DSJOperatingDayNotFound.java
diff --git a/src/main/java/org/opentripplanner/netex/validation/DSJServiceJourneyNotFound.java b/application/src/main/java/org/opentripplanner/netex/validation/DSJServiceJourneyNotFound.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/validation/DSJServiceJourneyNotFound.java
rename to application/src/main/java/org/opentripplanner/netex/validation/DSJServiceJourneyNotFound.java
diff --git a/src/main/java/org/opentripplanner/netex/validation/JourneyPatternNotFoundInSJ.java b/application/src/main/java/org/opentripplanner/netex/validation/JourneyPatternNotFoundInSJ.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/validation/JourneyPatternNotFoundInSJ.java
rename to application/src/main/java/org/opentripplanner/netex/validation/JourneyPatternNotFoundInSJ.java
diff --git a/src/main/java/org/opentripplanner/netex/validation/JourneyPatternSJMismatch.java b/application/src/main/java/org/opentripplanner/netex/validation/JourneyPatternSJMismatch.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/validation/JourneyPatternSJMismatch.java
rename to application/src/main/java/org/opentripplanner/netex/validation/JourneyPatternSJMismatch.java
diff --git a/src/main/java/org/opentripplanner/netex/validation/PassengerStopAssignmentQuayNotFound.java b/application/src/main/java/org/opentripplanner/netex/validation/PassengerStopAssignmentQuayNotFound.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/validation/PassengerStopAssignmentQuayNotFound.java
rename to application/src/main/java/org/opentripplanner/netex/validation/PassengerStopAssignmentQuayNotFound.java
diff --git a/src/main/java/org/opentripplanner/netex/validation/ServiceJourneyNonIncreasingPassingTime.java b/application/src/main/java/org/opentripplanner/netex/validation/ServiceJourneyNonIncreasingPassingTime.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/validation/ServiceJourneyNonIncreasingPassingTime.java
rename to application/src/main/java/org/opentripplanner/netex/validation/ServiceJourneyNonIncreasingPassingTime.java
diff --git a/src/main/java/org/opentripplanner/netex/validation/Validator.java b/application/src/main/java/org/opentripplanner/netex/validation/Validator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/netex/validation/Validator.java
rename to application/src/main/java/org/opentripplanner/netex/validation/Validator.java
diff --git a/src/main/java/org/opentripplanner/osm/OsmOpeningHoursParser.java b/application/src/main/java/org/opentripplanner/osm/OsmOpeningHoursParser.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/OsmOpeningHoursParser.java
rename to application/src/main/java/org/opentripplanner/osm/OsmOpeningHoursParser.java
diff --git a/src/main/java/org/opentripplanner/osm/OsmParser.java b/application/src/main/java/org/opentripplanner/osm/OsmParser.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/OsmParser.java
rename to application/src/main/java/org/opentripplanner/osm/OsmParser.java
diff --git a/src/main/java/org/opentripplanner/osm/OsmParserPhase.java b/application/src/main/java/org/opentripplanner/osm/OsmParserPhase.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/OsmParserPhase.java
rename to application/src/main/java/org/opentripplanner/osm/OsmParserPhase.java
diff --git a/src/main/java/org/opentripplanner/osm/OsmProvider.java b/application/src/main/java/org/opentripplanner/osm/OsmProvider.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/OsmProvider.java
rename to application/src/main/java/org/opentripplanner/osm/OsmProvider.java
diff --git a/src/main/java/org/opentripplanner/osm/issues/FloorNumberUnknownAssumedGroundLevel.java b/application/src/main/java/org/opentripplanner/osm/issues/FloorNumberUnknownAssumedGroundLevel.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/issues/FloorNumberUnknownAssumedGroundLevel.java
rename to application/src/main/java/org/opentripplanner/osm/issues/FloorNumberUnknownAssumedGroundLevel.java
diff --git a/src/main/java/org/opentripplanner/osm/issues/FloorNumberUnknownGuessedFromAltitude.java b/application/src/main/java/org/opentripplanner/osm/issues/FloorNumberUnknownGuessedFromAltitude.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/issues/FloorNumberUnknownGuessedFromAltitude.java
rename to application/src/main/java/org/opentripplanner/osm/issues/FloorNumberUnknownGuessedFromAltitude.java
diff --git a/src/main/java/org/opentripplanner/osm/model/OsmLevel.java b/application/src/main/java/org/opentripplanner/osm/model/OsmLevel.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/model/OsmLevel.java
rename to application/src/main/java/org/opentripplanner/osm/model/OsmLevel.java
diff --git a/src/main/java/org/opentripplanner/osm/model/OsmMemberType.java b/application/src/main/java/org/opentripplanner/osm/model/OsmMemberType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/model/OsmMemberType.java
rename to application/src/main/java/org/opentripplanner/osm/model/OsmMemberType.java
diff --git a/src/main/java/org/opentripplanner/osm/model/OsmNode.java b/application/src/main/java/org/opentripplanner/osm/model/OsmNode.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/model/OsmNode.java
rename to application/src/main/java/org/opentripplanner/osm/model/OsmNode.java
diff --git a/src/main/java/org/opentripplanner/osm/model/OsmRelation.java b/application/src/main/java/org/opentripplanner/osm/model/OsmRelation.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/model/OsmRelation.java
rename to application/src/main/java/org/opentripplanner/osm/model/OsmRelation.java
diff --git a/src/main/java/org/opentripplanner/osm/model/OsmRelationMember.java b/application/src/main/java/org/opentripplanner/osm/model/OsmRelationMember.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/model/OsmRelationMember.java
rename to application/src/main/java/org/opentripplanner/osm/model/OsmRelationMember.java
diff --git a/src/main/java/org/opentripplanner/osm/model/OsmTag.java b/application/src/main/java/org/opentripplanner/osm/model/OsmTag.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/model/OsmTag.java
rename to application/src/main/java/org/opentripplanner/osm/model/OsmTag.java
diff --git a/src/main/java/org/opentripplanner/osm/model/OsmWay.java b/application/src/main/java/org/opentripplanner/osm/model/OsmWay.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/model/OsmWay.java
rename to application/src/main/java/org/opentripplanner/osm/model/OsmWay.java
diff --git a/src/main/java/org/opentripplanner/osm/model/OsmWithTags.java b/application/src/main/java/org/opentripplanner/osm/model/OsmWithTags.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/model/OsmWithTags.java
rename to application/src/main/java/org/opentripplanner/osm/model/OsmWithTags.java
diff --git a/src/main/java/org/opentripplanner/osm/tagmapping/AtlantaMapper.java b/application/src/main/java/org/opentripplanner/osm/tagmapping/AtlantaMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/tagmapping/AtlantaMapper.java
rename to application/src/main/java/org/opentripplanner/osm/tagmapping/AtlantaMapper.java
diff --git a/src/main/java/org/opentripplanner/osm/tagmapping/ConstantSpeedMapper.java b/application/src/main/java/org/opentripplanner/osm/tagmapping/ConstantSpeedMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/tagmapping/ConstantSpeedMapper.java
rename to application/src/main/java/org/opentripplanner/osm/tagmapping/ConstantSpeedMapper.java
diff --git a/src/main/java/org/opentripplanner/osm/tagmapping/DefaultMapper.java b/application/src/main/java/org/opentripplanner/osm/tagmapping/DefaultMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/tagmapping/DefaultMapper.java
rename to application/src/main/java/org/opentripplanner/osm/tagmapping/DefaultMapper.java
diff --git a/src/main/java/org/opentripplanner/osm/tagmapping/FinlandMapper.java b/application/src/main/java/org/opentripplanner/osm/tagmapping/FinlandMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/tagmapping/FinlandMapper.java
rename to application/src/main/java/org/opentripplanner/osm/tagmapping/FinlandMapper.java
diff --git a/src/main/java/org/opentripplanner/osm/tagmapping/GermanyMapper.java b/application/src/main/java/org/opentripplanner/osm/tagmapping/GermanyMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/tagmapping/GermanyMapper.java
rename to application/src/main/java/org/opentripplanner/osm/tagmapping/GermanyMapper.java
diff --git a/src/main/java/org/opentripplanner/osm/tagmapping/HamburgMapper.java b/application/src/main/java/org/opentripplanner/osm/tagmapping/HamburgMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/tagmapping/HamburgMapper.java
rename to application/src/main/java/org/opentripplanner/osm/tagmapping/HamburgMapper.java
diff --git a/src/main/java/org/opentripplanner/osm/tagmapping/HoustonMapper.java b/application/src/main/java/org/opentripplanner/osm/tagmapping/HoustonMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/tagmapping/HoustonMapper.java
rename to application/src/main/java/org/opentripplanner/osm/tagmapping/HoustonMapper.java
diff --git a/src/main/java/org/opentripplanner/osm/tagmapping/NorwayMapper.java b/application/src/main/java/org/opentripplanner/osm/tagmapping/NorwayMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/tagmapping/NorwayMapper.java
rename to application/src/main/java/org/opentripplanner/osm/tagmapping/NorwayMapper.java
diff --git a/src/main/java/org/opentripplanner/osm/tagmapping/OsmTagMapper.java b/application/src/main/java/org/opentripplanner/osm/tagmapping/OsmTagMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/tagmapping/OsmTagMapper.java
rename to application/src/main/java/org/opentripplanner/osm/tagmapping/OsmTagMapper.java
diff --git a/src/main/java/org/opentripplanner/osm/tagmapping/OsmTagMapperSource.java b/application/src/main/java/org/opentripplanner/osm/tagmapping/OsmTagMapperSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/tagmapping/OsmTagMapperSource.java
rename to application/src/main/java/org/opentripplanner/osm/tagmapping/OsmTagMapperSource.java
diff --git a/src/main/java/org/opentripplanner/osm/tagmapping/PortlandMapper.java b/application/src/main/java/org/opentripplanner/osm/tagmapping/PortlandMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/tagmapping/PortlandMapper.java
rename to application/src/main/java/org/opentripplanner/osm/tagmapping/PortlandMapper.java
diff --git a/src/main/java/org/opentripplanner/osm/tagmapping/UKMapper.java b/application/src/main/java/org/opentripplanner/osm/tagmapping/UKMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/tagmapping/UKMapper.java
rename to application/src/main/java/org/opentripplanner/osm/tagmapping/UKMapper.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/CreativeNamer.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/CreativeNamer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/CreativeNamer.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/CreativeNamer.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/CreativeNamerPicker.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/CreativeNamerPicker.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/CreativeNamerPicker.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/CreativeNamerPicker.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/LocalizedStringMapper.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/LocalizedStringMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/LocalizedStringMapper.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/LocalizedStringMapper.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/MixinProperties.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/MixinProperties.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/MixinProperties.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/MixinProperties.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/MixinPropertiesBuilder.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/MixinPropertiesBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/MixinPropertiesBuilder.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/MixinPropertiesBuilder.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/NotePicker.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/NotePicker.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/NotePicker.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/NotePicker.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/NoteProperties.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/NoteProperties.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/NoteProperties.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/NoteProperties.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/SafetyFeatures.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/SafetyFeatures.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/SafetyFeatures.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/SafetyFeatures.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/SlopeOverridePicker.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/SlopeOverridePicker.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/SlopeOverridePicker.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/SlopeOverridePicker.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/SpeedPicker.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/SpeedPicker.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/SpeedPicker.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/SpeedPicker.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/WayProperties.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/WayProperties.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/WayProperties.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/WayProperties.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertiesBuilder.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertiesBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/WayPropertiesBuilder.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertiesBuilder.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertyPicker.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertyPicker.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/WayPropertyPicker.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertyPicker.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/specifier/BestMatchSpecifier.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/specifier/BestMatchSpecifier.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/specifier/BestMatchSpecifier.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/specifier/BestMatchSpecifier.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/specifier/Condition.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/specifier/Condition.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/specifier/Condition.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/specifier/Condition.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/specifier/ExactMatchSpecifier.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/specifier/ExactMatchSpecifier.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/specifier/ExactMatchSpecifier.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/specifier/ExactMatchSpecifier.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/specifier/LogicalOrSpecifier.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/specifier/LogicalOrSpecifier.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/specifier/LogicalOrSpecifier.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/specifier/LogicalOrSpecifier.java
diff --git a/src/main/java/org/opentripplanner/osm/wayproperty/specifier/OsmSpecifier.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/specifier/OsmSpecifier.java
similarity index 100%
rename from src/main/java/org/opentripplanner/osm/wayproperty/specifier/OsmSpecifier.java
rename to application/src/main/java/org/opentripplanner/osm/wayproperty/specifier/OsmSpecifier.java
diff --git a/src/main/java/org/opentripplanner/raptor/RaptorService.java b/application/src/main/java/org/opentripplanner/raptor/RaptorService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/RaptorService.java
rename to application/src/main/java/org/opentripplanner/raptor/RaptorService.java
diff --git a/src/main/java/org/opentripplanner/raptor/RaptorTimeLine.svg b/application/src/main/java/org/opentripplanner/raptor/RaptorTimeLine.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/RaptorTimeLine.svg
rename to application/src/main/java/org/opentripplanner/raptor/RaptorTimeLine.svg
diff --git a/src/main/java/org/opentripplanner/raptor/api/debug/DebugEvent.java b/application/src/main/java/org/opentripplanner/raptor/api/debug/DebugEvent.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/debug/DebugEvent.java
rename to application/src/main/java/org/opentripplanner/raptor/api/debug/DebugEvent.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/debug/DebugLogger.java b/application/src/main/java/org/opentripplanner/raptor/api/debug/DebugLogger.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/debug/DebugLogger.java
rename to application/src/main/java/org/opentripplanner/raptor/api/debug/DebugLogger.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/debug/DebugTopic.java b/application/src/main/java/org/opentripplanner/raptor/api/debug/DebugTopic.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/debug/DebugTopic.java
rename to application/src/main/java/org/opentripplanner/raptor/api/debug/DebugTopic.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/debug/RaptorTimers.java b/application/src/main/java/org/opentripplanner/raptor/api/debug/RaptorTimers.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/debug/RaptorTimers.java
rename to application/src/main/java/org/opentripplanner/raptor/api/debug/RaptorTimers.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java b/application/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java
rename to application/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/model/DominanceFunction.java b/application/src/main/java/org/opentripplanner/raptor/api/model/DominanceFunction.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/model/DominanceFunction.java
rename to application/src/main/java/org/opentripplanner/raptor/api/model/DominanceFunction.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunction.java b/application/src/main/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunction.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunction.java
rename to application/src/main/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunction.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/model/PathLegType.java b/application/src/main/java/org/opentripplanner/raptor/api/model/PathLegType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/model/PathLegType.java
rename to application/src/main/java/org/opentripplanner/raptor/api/model/PathLegType.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java b/application/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java
rename to application/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RaptorConstants.java b/application/src/main/java/org/opentripplanner/raptor/api/model/RaptorConstants.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/model/RaptorConstants.java
rename to application/src/main/java/org/opentripplanner/raptor/api/model/RaptorConstants.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RaptorConstrainedTransfer.java b/application/src/main/java/org/opentripplanner/raptor/api/model/RaptorConstrainedTransfer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/model/RaptorConstrainedTransfer.java
rename to application/src/main/java/org/opentripplanner/raptor/api/model/RaptorConstrainedTransfer.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RaptorStopNameResolver.java b/application/src/main/java/org/opentripplanner/raptor/api/model/RaptorStopNameResolver.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/model/RaptorStopNameResolver.java
rename to application/src/main/java/org/opentripplanner/raptor/api/model/RaptorStopNameResolver.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RaptorTransfer.java b/application/src/main/java/org/opentripplanner/raptor/api/model/RaptorTransfer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/model/RaptorTransfer.java
rename to application/src/main/java/org/opentripplanner/raptor/api/model/RaptorTransfer.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RaptorTransferConstraint.java b/application/src/main/java/org/opentripplanner/raptor/api/model/RaptorTransferConstraint.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/model/RaptorTransferConstraint.java
rename to application/src/main/java/org/opentripplanner/raptor/api/model/RaptorTransferConstraint.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RaptorTripPattern.java b/application/src/main/java/org/opentripplanner/raptor/api/model/RaptorTripPattern.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/model/RaptorTripPattern.java
rename to application/src/main/java/org/opentripplanner/raptor/api/model/RaptorTripPattern.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RaptorTripSchedule.java b/application/src/main/java/org/opentripplanner/raptor/api/model/RaptorTripSchedule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/model/RaptorTripSchedule.java
rename to application/src/main/java/org/opentripplanner/raptor/api/model/RaptorTripSchedule.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RaptorValueFormatter.java b/application/src/main/java/org/opentripplanner/raptor/api/model/RaptorValueFormatter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/model/RaptorValueFormatter.java
rename to application/src/main/java/org/opentripplanner/raptor/api/model/RaptorValueFormatter.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RelaxFunction.java b/application/src/main/java/org/opentripplanner/raptor/api/model/RelaxFunction.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/model/RelaxFunction.java
rename to application/src/main/java/org/opentripplanner/raptor/api/model/RelaxFunction.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/model/SearchDirection.java b/application/src/main/java/org/opentripplanner/raptor/api/model/SearchDirection.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/model/SearchDirection.java
rename to application/src/main/java/org/opentripplanner/raptor/api/model/SearchDirection.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/model/TransitArrival.java b/application/src/main/java/org/opentripplanner/raptor/api/model/TransitArrival.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/model/TransitArrival.java
rename to application/src/main/java/org/opentripplanner/raptor/api/model/TransitArrival.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/path/AccessPathLeg.java b/application/src/main/java/org/opentripplanner/raptor/api/path/AccessPathLeg.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/path/AccessPathLeg.java
rename to application/src/main/java/org/opentripplanner/raptor/api/path/AccessPathLeg.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/path/EgressPathLeg.java b/application/src/main/java/org/opentripplanner/raptor/api/path/EgressPathLeg.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/path/EgressPathLeg.java
rename to application/src/main/java/org/opentripplanner/raptor/api/path/EgressPathLeg.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/path/PathLeg.java b/application/src/main/java/org/opentripplanner/raptor/api/path/PathLeg.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/path/PathLeg.java
rename to application/src/main/java/org/opentripplanner/raptor/api/path/PathLeg.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/path/PathStringBuilder.java b/application/src/main/java/org/opentripplanner/raptor/api/path/PathStringBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/path/PathStringBuilder.java
rename to application/src/main/java/org/opentripplanner/raptor/api/path/PathStringBuilder.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/path/RaptorPath.java b/application/src/main/java/org/opentripplanner/raptor/api/path/RaptorPath.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/path/RaptorPath.java
rename to application/src/main/java/org/opentripplanner/raptor/api/path/RaptorPath.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/path/TransferPathLeg.java b/application/src/main/java/org/opentripplanner/raptor/api/path/TransferPathLeg.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/path/TransferPathLeg.java
rename to application/src/main/java/org/opentripplanner/raptor/api/path/TransferPathLeg.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/path/TransitPathLeg.java b/application/src/main/java/org/opentripplanner/raptor/api/path/TransitPathLeg.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/path/TransitPathLeg.java
rename to application/src/main/java/org/opentripplanner/raptor/api/path/TransitPathLeg.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/request/DebugRequest.java b/application/src/main/java/org/opentripplanner/raptor/api/request/DebugRequest.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/request/DebugRequest.java
rename to application/src/main/java/org/opentripplanner/raptor/api/request/DebugRequest.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/request/DebugRequestBuilder.java b/application/src/main/java/org/opentripplanner/raptor/api/request/DebugRequestBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/request/DebugRequestBuilder.java
rename to application/src/main/java/org/opentripplanner/raptor/api/request/DebugRequestBuilder.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/request/DynamicSearchWindowCoefficients.java b/application/src/main/java/org/opentripplanner/raptor/api/request/DynamicSearchWindowCoefficients.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/request/DynamicSearchWindowCoefficients.java
rename to application/src/main/java/org/opentripplanner/raptor/api/request/DynamicSearchWindowCoefficients.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequest.java b/application/src/main/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequest.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequest.java
rename to application/src/main/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequest.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/request/Optimization.java b/application/src/main/java/org/opentripplanner/raptor/api/request/Optimization.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/request/Optimization.java
rename to application/src/main/java/org/opentripplanner/raptor/api/request/Optimization.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/request/PassThroughPoint.java b/application/src/main/java/org/opentripplanner/raptor/api/request/PassThroughPoint.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/request/PassThroughPoint.java
rename to application/src/main/java/org/opentripplanner/raptor/api/request/PassThroughPoint.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/request/RaptorProfile.java b/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorProfile.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/request/RaptorProfile.java
rename to application/src/main/java/org/opentripplanner/raptor/api/request/RaptorProfile.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequest.java b/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequest.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/request/RaptorRequest.java
rename to application/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequest.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequestBuilder.java b/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequestBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/request/RaptorRequestBuilder.java
rename to application/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequestBuilder.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/request/RaptorTransitGroupPriorityCalculator.java b/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorTransitGroupPriorityCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/request/RaptorTransitGroupPriorityCalculator.java
rename to application/src/main/java/org/opentripplanner/raptor/api/request/RaptorTransitGroupPriorityCalculator.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/request/RaptorTuningParameters.java b/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorTuningParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/request/RaptorTuningParameters.java
rename to application/src/main/java/org/opentripplanner/raptor/api/request/RaptorTuningParameters.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/request/RaptorViaConnection.java b/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorViaConnection.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/request/RaptorViaConnection.java
rename to application/src/main/java/org/opentripplanner/raptor/api/request/RaptorViaConnection.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/request/RaptorViaLocation.java b/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorViaLocation.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/request/RaptorViaLocation.java
rename to application/src/main/java/org/opentripplanner/raptor/api/request/RaptorViaLocation.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java b/application/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java
rename to application/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java b/application/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java
rename to application/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/response/RaptorResponse.java b/application/src/main/java/org/opentripplanner/raptor/api/response/RaptorResponse.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/response/RaptorResponse.java
rename to application/src/main/java/org/opentripplanner/raptor/api/response/RaptorResponse.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/response/StopArrivals.java b/application/src/main/java/org/opentripplanner/raptor/api/response/StopArrivals.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/response/StopArrivals.java
rename to application/src/main/java/org/opentripplanner/raptor/api/response/StopArrivals.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/view/AccessPathView.java b/application/src/main/java/org/opentripplanner/raptor/api/view/AccessPathView.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/view/AccessPathView.java
rename to application/src/main/java/org/opentripplanner/raptor/api/view/AccessPathView.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/view/ArrivalView.java b/application/src/main/java/org/opentripplanner/raptor/api/view/ArrivalView.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/view/ArrivalView.java
rename to application/src/main/java/org/opentripplanner/raptor/api/view/ArrivalView.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/view/EgressPathView.java b/application/src/main/java/org/opentripplanner/raptor/api/view/EgressPathView.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/view/EgressPathView.java
rename to application/src/main/java/org/opentripplanner/raptor/api/view/EgressPathView.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/view/PatternRideView.java b/application/src/main/java/org/opentripplanner/raptor/api/view/PatternRideView.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/view/PatternRideView.java
rename to application/src/main/java/org/opentripplanner/raptor/api/view/PatternRideView.java
diff --git a/src/main/java/org/opentripplanner/raptor/api/view/TransitPathView.java b/application/src/main/java/org/opentripplanner/raptor/api/view/TransitPathView.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/api/view/TransitPathView.java
rename to application/src/main/java/org/opentripplanner/raptor/api/view/TransitPathView.java
diff --git a/src/main/java/org/opentripplanner/raptor/configure/RaptorConfig.java b/application/src/main/java/org/opentripplanner/raptor/configure/RaptorConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/configure/RaptorConfig.java
rename to application/src/main/java/org/opentripplanner/raptor/configure/RaptorConfig.java
diff --git a/src/main/java/org/opentripplanner/raptor/package.md b/application/src/main/java/org/opentripplanner/raptor/package.md
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/package.md
rename to application/src/main/java/org/opentripplanner/raptor/package.md
diff --git a/src/main/java/org/opentripplanner/raptor/path/Path.java b/application/src/main/java/org/opentripplanner/raptor/path/Path.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/path/Path.java
rename to application/src/main/java/org/opentripplanner/raptor/path/Path.java
diff --git a/src/main/java/org/opentripplanner/raptor/path/PathBuilder.java b/application/src/main/java/org/opentripplanner/raptor/path/PathBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/path/PathBuilder.java
rename to application/src/main/java/org/opentripplanner/raptor/path/PathBuilder.java
diff --git a/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java b/application/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java
rename to application/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptor.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptor.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptor.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptorWorkerComposite.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptorWorkerComposite.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptorWorkerComposite.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptorWorkerComposite.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/SystemErrDebugLogger.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/SystemErrDebugLogger.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/SystemErrDebugLogger.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/SystemErrDebugLogger.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextBuilder.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextBuilder.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextBuilder.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextViaLeg.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextViaLeg.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextViaLeg.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextViaLeg.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/AbstractDebugHandlerAdapter.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/AbstractDebugHandlerAdapter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/debug/AbstractDebugHandlerAdapter.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/AbstractDebugHandlerAdapter.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerFactory.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerFactory.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerFactory.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerPathAdapter.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerPathAdapter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerPathAdapter.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerPathAdapter.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerPatternRideAdapter.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerPatternRideAdapter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerPatternRideAdapter.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerPatternRideAdapter.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerStopArrivalAdapter.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerStopArrivalAdapter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerStopArrivalAdapter.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerStopArrivalAdapter.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/ParetoSetDebugHandlerAdapter.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/ParetoSetDebugHandlerAdapter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/debug/ParetoSetDebugHandlerAdapter.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/ParetoSetDebugHandlerAdapter.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/DebugHandler.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/DebugHandler.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/DebugHandler.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/DebugHandler.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/HeuristicAtStop.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/HeuristicAtStop.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/HeuristicAtStop.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/HeuristicAtStop.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/Heuristics.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/Heuristics.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/Heuristics.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/Heuristics.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/ParetoSetCost.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/ParetoSetCost.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/ParetoSetCost.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/ParetoSetCost.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/ParetoSetTime.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/ParetoSetTime.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/ParetoSetTime.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/ParetoSetTime.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/PassThroughPointsService.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/PassThroughPointsService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/PassThroughPointsService.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/PassThroughPointsService.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RangeRaptorWorker.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RangeRaptorWorker.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RangeRaptorWorker.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RangeRaptorWorker.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorRouter.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorRouter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorRouter.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorRouter.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorRouterResult.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorRouterResult.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorRouterResult.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorRouterResult.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorWorkerState.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorWorkerState.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorWorkerState.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorWorkerState.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RoutingStrategy.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RoutingStrategy.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RoutingStrategy.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RoutingStrategy.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/SingleCriteriaStopArrivals.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/SingleCriteriaStopArrivals.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/SingleCriteriaStopArrivals.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/SingleCriteriaStopArrivals.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/SlackProvider.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/SlackProvider.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/SlackProvider.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/SlackProvider.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/WorkerLifeCycle.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/WorkerLifeCycle.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/WorkerLifeCycle.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/WorkerLifeCycle.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/lifecycle/LifeCycleEventPublisher.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/lifecycle/LifeCycleEventPublisher.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/lifecycle/LifeCycleEventPublisher.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/lifecycle/LifeCycleEventPublisher.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/lifecycle/LifeCycleSubscriptions.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/lifecycle/LifeCycleSubscriptions.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/lifecycle/LifeCycleSubscriptions.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/lifecycle/LifeCycleSubscriptions.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/CalculateTransferToDestination.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/CalculateTransferToDestination.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/CalculateTransferToDestination.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/CalculateTransferToDestination.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/DebugStopArrivalsStatistics.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/DebugStopArrivalsStatistics.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/DebugStopArrivalsStatistics.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/DebugStopArrivalsStatistics.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McRangeRaptorWorkerState.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McRangeRaptorWorkerState.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McRangeRaptorWorkerState.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McRangeRaptorWorkerState.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McRaptorRouterResult.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McRaptorRouterResult.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McRaptorRouterResult.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McRaptorRouterResult.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McStopArrivals.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McStopArrivals.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McStopArrivals.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McStopArrivals.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/MultiCriteriaRoutingStrategy.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/MultiCriteriaRoutingStrategy.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/MultiCriteriaRoutingStrategy.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/MultiCriteriaRoutingStrategy.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/StopArrivalParetoSet.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/StopArrivalParetoSet.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/StopArrivalParetoSet.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/StopArrivalParetoSet.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ViaConnectionStopArrivalEventListener.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ViaConnectionStopArrivalEventListener.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ViaConnectionStopArrivalEventListener.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ViaConnectionStopArrivalEventListener.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/ArrivalParetoSetComparatorFactory.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/ArrivalParetoSetComparatorFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/ArrivalParetoSetComparatorFactory.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/ArrivalParetoSetComparatorFactory.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McStopArrival.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McStopArrival.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McStopArrival.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McStopArrival.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McStopArrivalFactory.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McStopArrivalFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McStopArrivalFactory.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McStopArrivalFactory.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/AccessStopArrival.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/AccessStopArrival.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/AccessStopArrival.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/AccessStopArrival.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/StopArrivalFactoryC1.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/StopArrivalFactoryC1.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/StopArrivalFactoryC1.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/StopArrivalFactoryC1.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/TransferStopArrival.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/TransferStopArrival.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/TransferStopArrival.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/TransferStopArrival.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/TransitStopArrival.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/TransitStopArrival.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/TransitStopArrival.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/TransitStopArrival.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/AbstractStopArrivalC2.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/AbstractStopArrivalC2.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/AbstractStopArrivalC2.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/AbstractStopArrivalC2.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/AccessStopArrivalC2.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/AccessStopArrivalC2.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/AccessStopArrivalC2.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/AccessStopArrivalC2.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/StopArrivalFactoryC2.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/StopArrivalFactoryC2.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/StopArrivalFactoryC2.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/StopArrivalFactoryC2.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/TransferStopArrivalC2.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/TransferStopArrivalC2.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/TransferStopArrivalC2.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/TransferStopArrivalC2.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/TransitStopArrivalC2.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/TransitStopArrivalC2.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/TransitStopArrivalC2.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/TransitStopArrivalC2.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/configure/McRangeRaptorConfig.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/configure/McRangeRaptorConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/configure/McRangeRaptorConfig.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/configure/McRangeRaptorConfig.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/heuristic/HeuristicsProvider.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/heuristic/HeuristicsProvider.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/heuristic/HeuristicsProvider.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/heuristic/HeuristicsProvider.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/passthrough/BitSetPassThroughPointsService.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/passthrough/BitSetPassThroughPointsService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/passthrough/BitSetPassThroughPointsService.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/passthrough/BitSetPassThroughPointsService.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRide.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRide.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRide.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRide.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideFactory.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideFactory.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideFactory.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c1/PatternRideC1.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c1/PatternRideC1.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c1/PatternRideC1.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c1/PatternRideC1.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PassThroughRideFactory.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PassThroughRideFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PassThroughRideFactory.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PassThroughRideFactory.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PatternRideC2.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PatternRideC2.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PatternRideC2.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PatternRideC2.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/TransitGroupPriorityRideFactory.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/TransitGroupPriorityRideFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/TransitGroupPriorityRideFactory.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/TransitGroupPriorityRideFactory.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/path/BoardAndAlightTimeSearch.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/BoardAndAlightTimeSearch.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/path/BoardAndAlightTimeSearch.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/BoardAndAlightTimeSearch.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrival.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrival.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrival.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrival.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/path/ForwardPathMapper.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/ForwardPathMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/path/ForwardPathMapper.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/ForwardPathMapper.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathMapper.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathMapper.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathMapper.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparators.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparators.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparators.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparators.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/path/ReversePathMapper.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/ReversePathMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/path/ReversePathMapper.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/ReversePathMapper.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/path/configure/PathConfig.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/configure/PathConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/path/configure/PathConfig.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/configure/PathConfig.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/ArrivalTimeRoutingStrategy.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/ArrivalTimeRoutingStrategy.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/ArrivalTimeRoutingStrategy.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/ArrivalTimeRoutingStrategy.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/MinTravelDurationRoutingStrategy.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/MinTravelDurationRoutingStrategy.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/MinTravelDurationRoutingStrategy.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/MinTravelDurationRoutingStrategy.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdRangeRaptorWorkerState.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdRangeRaptorWorkerState.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdRangeRaptorWorkerState.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdRangeRaptorWorkerState.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdRaptorRouterResult.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdRaptorRouterResult.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdRaptorRouterResult.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdRaptorRouterResult.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdWorkerState.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdWorkerState.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdWorkerState.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdWorkerState.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimes.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimes.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimes.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimes.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimesOnlyStopArrivalsState.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimesOnlyStopArrivalsState.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimesOnlyStopArrivalsState.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimesOnlyStopArrivalsState.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleArrivedAtDestinationCheck.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleArrivedAtDestinationCheck.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleArrivedAtDestinationCheck.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleArrivedAtDestinationCheck.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleBestNumberOfTransfers.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleBestNumberOfTransfers.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleBestNumberOfTransfers.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleBestNumberOfTransfers.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPathFactory.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPathFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPathFactory.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPathFactory.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/configure/StdRangeRaptorConfig.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/configure/StdRangeRaptorConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/configure/StdRangeRaptorConfig.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/configure/StdRangeRaptorConfig.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/configure/VerifyRequestIsValid.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/configure/VerifyRequestIsValid.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/configure/VerifyRequestIsValid.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/configure/VerifyRequestIsValid.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/debug/DebugStopArrivalsState.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/debug/DebugStopArrivalsState.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/debug/DebugStopArrivalsState.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/debug/DebugStopArrivalsState.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/debug/StateDebugger.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/debug/StateDebugger.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/debug/StateDebugger.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/debug/StateDebugger.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/heuristics/HeuristicsAdapter.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/heuristics/HeuristicsAdapter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/heuristics/HeuristicsAdapter.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/heuristics/HeuristicsAdapter.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/ArrivedAtDestinationCheck.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/ArrivedAtDestinationCheck.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/ArrivedAtDestinationCheck.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/ArrivedAtDestinationCheck.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/BestNumberOfTransfers.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/BestNumberOfTransfers.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/BestNumberOfTransfers.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/BestNumberOfTransfers.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/DestinationArrivalListener.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/DestinationArrivalListener.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/DestinationArrivalListener.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/DestinationArrivalListener.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/StopArrivalsState.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/StopArrivalsState.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/StopArrivalsState.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/StopArrivalsState.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/AccessStopArrivalState.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/AccessStopArrivalState.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/AccessStopArrivalState.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/AccessStopArrivalState.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/DefaultStopArrivalState.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/DefaultStopArrivalState.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/DefaultStopArrivalState.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/DefaultStopArrivalState.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/EgressStopArrivalState.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/EgressStopArrivalState.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/EgressStopArrivalState.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/EgressStopArrivalState.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StdStopArrivals.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StdStopArrivals.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StdStopArrivals.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StdStopArrivals.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StdStopArrivalsState.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StdStopArrivalsState.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StdStopArrivalsState.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StdStopArrivalsState.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StopArrivalState.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StopArrivalState.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StopArrivalState.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StopArrivalState.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/path/EgressArrivalToPathAdapter.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/path/EgressArrivalToPathAdapter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/path/EgressArrivalToPathAdapter.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/path/EgressArrivalToPathAdapter.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Access.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Access.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Access.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Access.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/StopArrivalViewAdapter.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/StopArrivalViewAdapter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/StopArrivalViewAdapter.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/StopArrivalViewAdapter.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/StopsCursor.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/StopsCursor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/StopsCursor.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/StopsCursor.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Transfer.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Transfer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Transfer.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Transfer.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Transit.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Transit.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Transit.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Transit.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/support/IntArraySingleCriteriaArrivals.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/support/IntArraySingleCriteriaArrivals.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/support/IntArraySingleCriteriaArrivals.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/support/IntArraySingleCriteriaArrivals.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/support/TimeBasedBoardingSupport.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/support/TimeBasedBoardingSupport.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/support/TimeBasedBoardingSupport.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/support/TimeBasedBoardingSupport.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTimeCalculator.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTimeCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTimeCalculator.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTimeCalculator.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculator.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculator.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculator.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorSearchWindowCalculator.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorSearchWindowCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorSearchWindowCalculator.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorSearchWindowCalculator.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTimeCalculator.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTimeCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTimeCalculator.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTimeCalculator.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTransitCalculator.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTransitCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTransitCalculator.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTransitCalculator.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RoundTracker.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RoundTracker.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RoundTracker.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RoundTracker.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/SlackProviderAdapter.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/SlackProviderAdapter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/SlackProviderAdapter.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/SlackProviderAdapter.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TimeCalculator.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TimeCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TimeCalculator.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TimeCalculator.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TransitCalculator.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TransitCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TransitCalculator.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TransitCalculator.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearch.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearch.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearch.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearch.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearch.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearch.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearch.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearch.java
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ViaConnections.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ViaConnections.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ViaConnections.java
rename to application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ViaConnections.java
diff --git a/src/main/java/org/opentripplanner/raptor/service/DebugHeuristics.java b/application/src/main/java/org/opentripplanner/raptor/service/DebugHeuristics.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/service/DebugHeuristics.java
rename to application/src/main/java/org/opentripplanner/raptor/service/DebugHeuristics.java
diff --git a/src/main/java/org/opentripplanner/raptor/service/DefaultStopArrivals.java b/application/src/main/java/org/opentripplanner/raptor/service/DefaultStopArrivals.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/service/DefaultStopArrivals.java
rename to application/src/main/java/org/opentripplanner/raptor/service/DefaultStopArrivals.java
diff --git a/src/main/java/org/opentripplanner/raptor/service/DestinationNotReachedException.java b/application/src/main/java/org/opentripplanner/raptor/service/DestinationNotReachedException.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/service/DestinationNotReachedException.java
rename to application/src/main/java/org/opentripplanner/raptor/service/DestinationNotReachedException.java
diff --git a/src/main/java/org/opentripplanner/raptor/service/HeuristicSearchTask.java b/application/src/main/java/org/opentripplanner/raptor/service/HeuristicSearchTask.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/service/HeuristicSearchTask.java
rename to application/src/main/java/org/opentripplanner/raptor/service/HeuristicSearchTask.java
diff --git a/src/main/java/org/opentripplanner/raptor/service/HeuristicToRunResolver.java b/application/src/main/java/org/opentripplanner/raptor/service/HeuristicToRunResolver.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/service/HeuristicToRunResolver.java
rename to application/src/main/java/org/opentripplanner/raptor/service/HeuristicToRunResolver.java
diff --git a/src/main/java/org/opentripplanner/raptor/service/RangeRaptorDynamicSearch.java b/application/src/main/java/org/opentripplanner/raptor/service/RangeRaptorDynamicSearch.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/service/RangeRaptorDynamicSearch.java
rename to application/src/main/java/org/opentripplanner/raptor/service/RangeRaptorDynamicSearch.java
diff --git a/src/main/java/org/opentripplanner/raptor/service/ViaRangeRaptorDynamicSearch.java b/application/src/main/java/org/opentripplanner/raptor/service/ViaRangeRaptorDynamicSearch.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/service/ViaRangeRaptorDynamicSearch.java
rename to application/src/main/java/org/opentripplanner/raptor/service/ViaRangeRaptorDynamicSearch.java
diff --git a/src/main/java/org/opentripplanner/raptor/spi/BoardAndAlightTime.java b/application/src/main/java/org/opentripplanner/raptor/spi/BoardAndAlightTime.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/spi/BoardAndAlightTime.java
rename to application/src/main/java/org/opentripplanner/raptor/spi/BoardAndAlightTime.java
diff --git a/src/main/java/org/opentripplanner/raptor/spi/DefaultSlackProvider.java b/application/src/main/java/org/opentripplanner/raptor/spi/DefaultSlackProvider.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/spi/DefaultSlackProvider.java
rename to application/src/main/java/org/opentripplanner/raptor/spi/DefaultSlackProvider.java
diff --git a/src/main/java/org/opentripplanner/raptor/spi/EmptyBoardOrAlightEvent.java b/application/src/main/java/org/opentripplanner/raptor/spi/EmptyBoardOrAlightEvent.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/spi/EmptyBoardOrAlightEvent.java
rename to application/src/main/java/org/opentripplanner/raptor/spi/EmptyBoardOrAlightEvent.java
diff --git a/src/main/java/org/opentripplanner/raptor/spi/Flyweight.java b/application/src/main/java/org/opentripplanner/raptor/spi/Flyweight.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/spi/Flyweight.java
rename to application/src/main/java/org/opentripplanner/raptor/spi/Flyweight.java
diff --git a/src/main/java/org/opentripplanner/raptor/spi/IntIterator.java b/application/src/main/java/org/opentripplanner/raptor/spi/IntIterator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/spi/IntIterator.java
rename to application/src/main/java/org/opentripplanner/raptor/spi/IntIterator.java
diff --git a/src/main/java/org/opentripplanner/raptor/spi/RaptorBoardOrAlightEvent.java b/application/src/main/java/org/opentripplanner/raptor/spi/RaptorBoardOrAlightEvent.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/spi/RaptorBoardOrAlightEvent.java
rename to application/src/main/java/org/opentripplanner/raptor/spi/RaptorBoardOrAlightEvent.java
diff --git a/src/main/java/org/opentripplanner/raptor/spi/RaptorConstrainedBoardingSearch.java b/application/src/main/java/org/opentripplanner/raptor/spi/RaptorConstrainedBoardingSearch.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/spi/RaptorConstrainedBoardingSearch.java
rename to application/src/main/java/org/opentripplanner/raptor/spi/RaptorConstrainedBoardingSearch.java
diff --git a/src/main/java/org/opentripplanner/raptor/spi/RaptorCostCalculator.java b/application/src/main/java/org/opentripplanner/raptor/spi/RaptorCostCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/spi/RaptorCostCalculator.java
rename to application/src/main/java/org/opentripplanner/raptor/spi/RaptorCostCalculator.java
diff --git a/src/main/java/org/opentripplanner/raptor/spi/RaptorPathConstrainedTransferSearch.java b/application/src/main/java/org/opentripplanner/raptor/spi/RaptorPathConstrainedTransferSearch.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/spi/RaptorPathConstrainedTransferSearch.java
rename to application/src/main/java/org/opentripplanner/raptor/spi/RaptorPathConstrainedTransferSearch.java
diff --git a/src/main/java/org/opentripplanner/raptor/spi/RaptorRoute.java b/application/src/main/java/org/opentripplanner/raptor/spi/RaptorRoute.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/spi/RaptorRoute.java
rename to application/src/main/java/org/opentripplanner/raptor/spi/RaptorRoute.java
diff --git a/src/main/java/org/opentripplanner/raptor/spi/RaptorSlackProvider.java b/application/src/main/java/org/opentripplanner/raptor/spi/RaptorSlackProvider.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/spi/RaptorSlackProvider.java
rename to application/src/main/java/org/opentripplanner/raptor/spi/RaptorSlackProvider.java
diff --git a/src/main/java/org/opentripplanner/raptor/spi/RaptorTimeTable.java b/application/src/main/java/org/opentripplanner/raptor/spi/RaptorTimeTable.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/spi/RaptorTimeTable.java
rename to application/src/main/java/org/opentripplanner/raptor/spi/RaptorTimeTable.java
diff --git a/src/main/java/org/opentripplanner/raptor/spi/RaptorTransitDataProvider.java b/application/src/main/java/org/opentripplanner/raptor/spi/RaptorTransitDataProvider.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/spi/RaptorTransitDataProvider.java
rename to application/src/main/java/org/opentripplanner/raptor/spi/RaptorTransitDataProvider.java
diff --git a/src/main/java/org/opentripplanner/raptor/spi/RaptorTripScheduleSearch.java b/application/src/main/java/org/opentripplanner/raptor/spi/RaptorTripScheduleSearch.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/spi/RaptorTripScheduleSearch.java
rename to application/src/main/java/org/opentripplanner/raptor/spi/RaptorTripScheduleSearch.java
diff --git a/src/main/java/org/opentripplanner/raptor/spi/UnknownPath.java b/application/src/main/java/org/opentripplanner/raptor/spi/UnknownPath.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/spi/UnknownPath.java
rename to application/src/main/java/org/opentripplanner/raptor/spi/UnknownPath.java
diff --git a/src/main/java/org/opentripplanner/raptor/util/BitSetIterator.java b/application/src/main/java/org/opentripplanner/raptor/util/BitSetIterator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/util/BitSetIterator.java
rename to application/src/main/java/org/opentripplanner/raptor/util/BitSetIterator.java
diff --git a/src/main/java/org/opentripplanner/raptor/util/CompareIntArrays.java b/application/src/main/java/org/opentripplanner/raptor/util/CompareIntArrays.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/util/CompareIntArrays.java
rename to application/src/main/java/org/opentripplanner/raptor/util/CompareIntArrays.java
diff --git a/src/main/java/org/opentripplanner/raptor/util/IntIterators.java b/application/src/main/java/org/opentripplanner/raptor/util/IntIterators.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/util/IntIterators.java
rename to application/src/main/java/org/opentripplanner/raptor/util/IntIterators.java
diff --git a/src/main/java/org/opentripplanner/raptor/util/composite/CompositeUtil.java b/application/src/main/java/org/opentripplanner/raptor/util/composite/CompositeUtil.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/util/composite/CompositeUtil.java
rename to application/src/main/java/org/opentripplanner/raptor/util/composite/CompositeUtil.java
diff --git a/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoComparator.java b/application/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoComparator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoComparator.java
rename to application/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoComparator.java
diff --git a/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSet.java b/application/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSet.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSet.java
rename to application/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSet.java
diff --git a/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListener.java b/application/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListener.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListener.java
rename to application/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListener.java
diff --git a/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerComposite.java b/application/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerComposite.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerComposite.java
rename to application/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerComposite.java
diff --git a/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetWithMarker.java b/application/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetWithMarker.java
similarity index 100%
rename from src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetWithMarker.java
rename to application/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetWithMarker.java
diff --git a/src/main/java/org/opentripplanner/routing/TripTimeOnDateHelper.java b/application/src/main/java/org/opentripplanner/routing/TripTimeOnDateHelper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/TripTimeOnDateHelper.java
rename to application/src/main/java/org/opentripplanner/routing/TripTimeOnDateHelper.java
diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/AlertCause.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/AlertCause.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/alertpatch/AlertCause.java
rename to application/src/main/java/org/opentripplanner/routing/alertpatch/AlertCause.java
diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/AlertEffect.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/AlertEffect.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/alertpatch/AlertEffect.java
rename to application/src/main/java/org/opentripplanner/routing/alertpatch/AlertEffect.java
diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/AlertSeverity.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/AlertSeverity.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/alertpatch/AlertSeverity.java
rename to application/src/main/java/org/opentripplanner/routing/alertpatch/AlertSeverity.java
diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/AlertUrl.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/AlertUrl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/alertpatch/AlertUrl.java
rename to application/src/main/java/org/opentripplanner/routing/alertpatch/AlertUrl.java
diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/EntityKey.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/EntityKey.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/alertpatch/EntityKey.java
rename to application/src/main/java/org/opentripplanner/routing/alertpatch/EntityKey.java
diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/EntitySelector.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/EntitySelector.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/alertpatch/EntitySelector.java
rename to application/src/main/java/org/opentripplanner/routing/alertpatch/EntitySelector.java
diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/StopCondition.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/StopCondition.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/alertpatch/StopCondition.java
rename to application/src/main/java/org/opentripplanner/routing/alertpatch/StopCondition.java
diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/StopConditionsHelper.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/StopConditionsHelper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/alertpatch/StopConditionsHelper.java
rename to application/src/main/java/org/opentripplanner/routing/alertpatch/StopConditionsHelper.java
diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/TimePeriod.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/TimePeriod.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/alertpatch/TimePeriod.java
rename to application/src/main/java/org/opentripplanner/routing/alertpatch/TimePeriod.java
diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java
rename to application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java
diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlertBuilder.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlertBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/alertpatch/TransitAlertBuilder.java
rename to application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlertBuilder.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java b/application/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/GroupBySimilarity.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/GroupBySimilarity.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/GroupBySimilarity.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/GroupBySimilarity.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveBikeRentalWithMostlyWalking.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveBikeRentalWithMostlyWalking.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveBikeRentalWithMostlyWalking.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveBikeRentalWithMostlyWalking.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveParkAndRideWithMostlyWalkingFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveParkAndRideWithMostlyWalkingFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveParkAndRideWithMostlyWalkingFilter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveParkAndRideWithMostlyWalkingFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveWalkOnlyFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveWalkOnlyFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveWalkOnlyFilter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveWalkOnlyFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/FlexSearchWindowFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/FlexSearchWindowFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/FlexSearchWindowFilter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/FlexSearchWindowFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterResults.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterResults.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterResults.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterResults.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingleCriteriaComparator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingleCriteriaComparator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingleCriteriaComparator.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingleCriteriaComparator.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/Group.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/Group.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/Group.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/Group.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/Item.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/Item.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/Item.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/Item.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/State.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/State.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/State.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/State.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlert.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlert.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlert.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlert.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/KeepItinerariesWithFewestTransfers.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/KeepItinerariesWithFewestTransfers.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/KeepItinerariesWithFewestTransfers.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/KeepItinerariesWithFewestTransfers.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveIfFirstOrLastTripIsTheSame.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveIfFirstOrLastTripIsTheSame.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveIfFirstOrLastTripIsTheSame.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveIfFirstOrLastTripIsTheSame.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimit.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimit.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimit.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimit.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/RemoveFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/RemoveFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/RemoveFilter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/RemoveFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/SortingFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/SortingFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/SortingFilter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/SortingFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandler.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandler.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandler.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandler.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacher.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacher.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacher.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacher.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStations.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStations.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStations.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStations.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistance.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistance.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistance.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistance.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTrip.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTrip.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTrip.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTrip.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStops.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStops.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStops.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStops.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparator.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparator.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/GroupId.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/GroupId.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/GroupId.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/GroupId.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryDecorator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryDecorator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryDecorator.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryDecorator.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/RemoveItineraryFlagger.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/RemoveItineraryFlagger.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/RemoveItineraryFlagger.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/RemoveItineraryFlagger.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.excalidraw b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.excalidraw
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.excalidraw
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.excalidraw
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.svg b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.svg
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.svg
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/package.md b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/package.md
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/package.md
rename to application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/package.md
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/GraphPathToItineraryMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/GraphPathToItineraryMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/mapping/GraphPathToItineraryMapper.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/mapping/GraphPathToItineraryMapper.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/ItinerariesHelper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/ItinerariesHelper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/mapping/ItinerariesHelper.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/mapping/ItinerariesHelper.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactory.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactory.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactory.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RoutingResponseMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/RoutingResponseMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/mapping/RoutingResponseMapper.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/mapping/RoutingResponseMapper.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/TripPlanMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/TripPlanMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/mapping/TripPlanMapper.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/mapping/TripPlanMapper.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/api/DefaultTripPattern.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/api/DefaultTripPattern.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/api/DefaultTripPattern.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/api/DefaultTripPattern.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/api/SlackProvider.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/api/SlackProvider.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/api/SlackProvider.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/api/SlackProvider.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/path/PathDiff.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/path/PathDiff.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/path/PathDiff.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/path/PathDiff.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/AdditionalSearchDays.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/AdditionalSearchDays.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/AdditionalSearchDays.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/AdditionalSearchDays.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/FilterTransitWhenDirectModeIsEmpty.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/FilterTransitWhenDirectModeIsEmpty.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/FilterTransitWhenDirectModeIsEmpty.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/FilterTransitWhenDirectModeIsEmpty.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouterResult.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouterResult.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouterResult.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouterResult.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/performance/PerformanceTimersForRaptor.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/performance/PerformanceTimersForRaptor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/performance/PerformanceTimersForRaptor.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/performance/PerformanceTimersForRaptor.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecorator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecorator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecorator.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecorator.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressType.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressType.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressType.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgresses.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgresses.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgresses.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgresses.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultRaptorTransfer.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultRaptorTransfer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultRaptorTransfer.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultRaptorTransfer.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RaptorTransferIndex.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RaptorTransferIndex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RaptorTransferIndex.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RaptorTransferIndex.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/SlackProvider.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/SlackProvider.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/SlackProvider.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/SlackProvider.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/Transfer.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/Transfer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/Transfer.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/Transfer.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitTuningParameters.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitTuningParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitTuningParameters.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitTuningParameters.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripSchedule.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripSchedule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripSchedule.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripSchedule.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearch.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearch.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearch.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearch.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearchForward.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearchForward.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearchForward.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearchForward.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearchReverse.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearchReverse.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearchReverse.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearchReverse.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearchStrategy.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearchStrategy.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearchStrategy.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearchStrategy.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedTransferBoarding.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedTransferBoarding.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedTransferBoarding.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedTransferBoarding.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedTransfersForPatterns.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedTransfersForPatterns.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedTransfersForPatterns.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedTransfersForPatterns.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferForPattern.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferForPattern.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferForPattern.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferForPattern.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferForPatternByStopPos.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferForPatternByStopPos.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferForPatternByStopPos.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferForPatternByStopPos.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferIndexGenerator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferIndexGenerator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferIndexGenerator.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferIndexGenerator.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferPointForPatternFactory.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferPointForPatternFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferPointForPatternFactory.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferPointForPatternFactory.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferPointMatcher.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferPointMatcher.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferPointMatcher.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/TransferPointMatcher.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/CostCalculatorFactory.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/CostCalculatorFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/CostCalculatorFactory.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/CostCalculatorFactory.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultCostCalculator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultCostCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultCostCalculator.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultCostCalculator.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTripSchedule.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTripSchedule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTripSchedule.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTripSchedule.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/FactorStrategy.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/FactorStrategy.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/FactorStrategy.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/FactorStrategy.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/GeneralizedCostParameters.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/GeneralizedCostParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/GeneralizedCostParameters.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/GeneralizedCostParameters.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/GeneralizedCostParametersBuilder.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/GeneralizedCostParametersBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/GeneralizedCostParametersBuilder.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/GeneralizedCostParametersBuilder.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/IndexBasedFactorStrategy.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/IndexBasedFactorStrategy.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/IndexBasedFactorStrategy.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/IndexBasedFactorStrategy.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/PatternCostCalculator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/PatternCostCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/PatternCostCalculator.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/PatternCostCalculator.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostConverter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostConverter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostConverter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostConverter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunction.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunction.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunction.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunction.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/SingleValueFactorStrategy.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/SingleValueFactorStrategy.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/SingleValueFactorStrategy.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/SingleValueFactorStrategy.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculator.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculator.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyAlightEvent.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyAlightEvent.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyAlightEvent.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyAlightEvent.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardOrAlightEvent.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardOrAlightEvent.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardOrAlightEvent.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardOrAlightEvent.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardingEvent.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardingEvent.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardingEvent.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardingEvent.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyAlightSearch.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyAlightSearch.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyAlightSearch.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyAlightSearch.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyBoardSearch.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyBoardSearch.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyBoardSearch.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyBoardSearch.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/AccessEgressMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/AccessEgressMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/AccessEgressMapper.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/AccessEgressMapper.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapper.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapper.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallback.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallback.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallback.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallback.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransfersMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransfersMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransfersMapper.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransfersMapper.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapper.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapper.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/BoardAlight.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/BoardAlight.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/BoardAlight.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/BoardAlight.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRequestTransferCache.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRequestTransferCache.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRequestTransferCache.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRequestTransferCache.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RouteRequestTransitDataProviderFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RouteRequestTransitDataProviderFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RouteRequestTransitDataProviderFilter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RouteRequestTransitDataProviderFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TransitDataProviderFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TransitDataProviderFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TransitDataProviderFilter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TransitDataProviderFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripPatternForDates.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripPatternForDates.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripPatternForDates.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripPatternForDates.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleAlightSearch.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleAlightSearch.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleAlightSearch.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleAlightSearch.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleBoardSearch.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleBoardSearch.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleBoardSearch.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleBoardSearch.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleSearchFactory.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleSearchFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleSearchFactory.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleSearchFactory.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripSearchTimetable.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripSearchTimetable.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripSearchTimetable.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripSearchTimetable.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/OptimizeMinSafeTransferCost.png b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/OptimizeMinSafeTransferCost.png
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/OptimizeMinSafeTransferCost.png
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/OptimizeMinSafeTransferCost.png
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/OptimizeTransferService.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/OptimizeTransferService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/OptimizeTransferService.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/OptimizeTransferService.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/TransferOptimizationObjCol.svg b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/TransferOptimizationObjCol.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/TransferOptimizationObjCol.svg
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/TransferOptimizationObjCol.svg
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/api/OptimizedPath.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/api/OptimizedPath.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/api/OptimizedPath.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/api/OptimizedPath.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/api/TransferOptimizationParameters.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/api/TransferOptimizationParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/api/TransferOptimizationParameters.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/api/TransferOptimizationParameters.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/api/TransferOptimized.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/api/TransferOptimized.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/api/TransferOptimized.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/api/TransferOptimized.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/configure/TransferOptimizationServiceConfigurator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/configure/TransferOptimizationServiceConfigurator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/configure/TransferOptimizationServiceConfigurator.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/configure/TransferOptimizationServiceConfigurator.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/BasicStopTime.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/BasicStopTime.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/BasicStopTime.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/BasicStopTime.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/MinSafeTransferTimeCalculator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/MinSafeTransferTimeCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/MinSafeTransferTimeCalculator.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/MinSafeTransferTimeCalculator.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTail.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTail.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTail.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTail.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/PathTailFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/PathTailFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/PathTailFilter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/PathTailFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopPriorityCostCalculator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopPriorityCostCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopPriorityCostCalculator.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopPriorityCostCalculator.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopTime.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopTime.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopTime.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopTime.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TransferWaitTimeCostCalculator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TransferWaitTimeCostCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TransferWaitTimeCostCalculator.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TransferWaitTimeCostCalculator.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripStopTime.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripStopTime.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripStopTime.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripStopTime.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripToTripTransfer.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripToTripTransfer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripToTripTransfer.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripToTripTransfer.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/costfilter/MinCostPathTailFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/costfilter/MinCostPathTailFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/costfilter/MinCostPathTailFilter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/costfilter/MinCostPathTailFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/costfilter/MinCostPathTailFilterFactory.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/costfilter/MinCostPathTailFilterFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/costfilter/MinCostPathTailFilterFactory.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/costfilter/MinCostPathTailFilterFactory.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughPathTailFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughPathTailFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughPathTailFilter.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughPathTailFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughPointsIterator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughPointsIterator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughPointsIterator.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughPointsIterator.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PathTailC2Calculator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PathTailC2Calculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PathTailC2Calculator.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PathTailC2Calculator.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/package-info.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/package-info.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/package-info.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/package-info.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/package.md b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/package.md
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/package.md
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/package.md
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainService.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainService.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainService.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGenerator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGenerator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGenerator.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGenerator.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferServiceAdaptor.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferServiceAdaptor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferServiceAdaptor.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferServiceAdaptor.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransitPathLegSelector.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransitPathLegSelector.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransitPathLegSelector.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransitPathLegSelector.java
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/via/ViaRoutingWorker.java b/application/src/main/java/org/opentripplanner/routing/algorithm/via/ViaRoutingWorker.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/algorithm/via/ViaRoutingWorker.java
rename to application/src/main/java/org/opentripplanner/routing/algorithm/via/ViaRoutingWorker.java
diff --git a/src/main/java/org/opentripplanner/routing/alternativelegs/AlternativeLegs.java b/application/src/main/java/org/opentripplanner/routing/alternativelegs/AlternativeLegs.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/alternativelegs/AlternativeLegs.java
rename to application/src/main/java/org/opentripplanner/routing/alternativelegs/AlternativeLegs.java
diff --git a/src/main/java/org/opentripplanner/routing/alternativelegs/AlternativeLegsFilter.java b/application/src/main/java/org/opentripplanner/routing/alternativelegs/AlternativeLegsFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/alternativelegs/AlternativeLegsFilter.java
rename to application/src/main/java/org/opentripplanner/routing/alternativelegs/AlternativeLegsFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/api/RoutingService.java b/application/src/main/java/org/opentripplanner/routing/api/RoutingService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/RoutingService.java
rename to application/src/main/java/org/opentripplanner/routing/api/RoutingService.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/DebugEventType.java b/application/src/main/java/org/opentripplanner/routing/api/request/DebugEventType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/DebugEventType.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/DebugEventType.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/DebugRaptor.java b/application/src/main/java/org/opentripplanner/routing/api/request/DebugRaptor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/DebugRaptor.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/DebugRaptor.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/RequestModes.java b/application/src/main/java/org/opentripplanner/routing/api/request/RequestModes.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/RequestModes.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/RequestModes.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/RequestModesBuilder.java b/application/src/main/java/org/opentripplanner/routing/api/request/RequestModesBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/RequestModesBuilder.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/RequestModesBuilder.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java b/application/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/RouteViaRequest.java b/application/src/main/java/org/opentripplanner/routing/api/request/RouteViaRequest.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/RouteViaRequest.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/RouteViaRequest.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/RoutingTag.java b/application/src/main/java/org/opentripplanner/routing/api/request/RoutingTag.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/RoutingTag.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/RoutingTag.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java b/application/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/StreetMode.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/ViaLocationDeprecated.java b/application/src/main/java/org/opentripplanner/routing/api/request/ViaLocationDeprecated.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/ViaLocationDeprecated.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/ViaLocationDeprecated.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/framework/AbstractLinearFunction.java b/application/src/main/java/org/opentripplanner/routing/api/request/framework/AbstractLinearFunction.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/framework/AbstractLinearFunction.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/framework/AbstractLinearFunction.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/framework/CostLinearFunction.java b/application/src/main/java/org/opentripplanner/routing/api/request/framework/CostLinearFunction.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/framework/CostLinearFunction.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/framework/CostLinearFunction.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/framework/DurationForEnum.java b/application/src/main/java/org/opentripplanner/routing/api/request/framework/DurationForEnum.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/framework/DurationForEnum.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/framework/DurationForEnum.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerialization.java b/application/src/main/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerialization.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerialization.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerialization.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenalty.java b/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenalty.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenalty.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenalty.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnum.java b/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnum.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnum.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnum.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/framework/TimePenalty.java b/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimePenalty.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/framework/TimePenalty.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/framework/TimePenalty.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/AccessibilityPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/AccessibilityPreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/AccessibilityPreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/AccessibilityPreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/ElevatorPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/ElevatorPreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/ElevatorPreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/ElevatorPreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterDebugProfile.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterDebugProfile.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterDebugProfile.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterDebugProfile.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterPreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterPreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterPreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/RaptorPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/RaptorPreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/RaptorPreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/RaptorPreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/Relax.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/Relax.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/Relax.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/Relax.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/StreetPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/StreetPreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/StreetPreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/StreetPreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/SystemPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/SystemPreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/SystemPreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/SystemPreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangle.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangle.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangle.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangle.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/TransferOptimizationPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/TransferOptimizationPreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/TransferOptimizationPreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/TransferOptimizationPreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/TransitPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/TransitPreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/TransitPreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/TransitPreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/WalkPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/WalkPreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/WalkPreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/WalkPreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/WheelchairPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/WheelchairPreferences.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/WheelchairPreferences.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/WheelchairPreferences.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/filter/VehicleParkingFilter.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/filter/VehicleParkingFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/filter/VehicleParkingFilter.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/filter/VehicleParkingFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/filter/VehicleParkingSelect.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/filter/VehicleParkingSelect.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/preference/filter/VehicleParkingSelect.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/preference/filter/VehicleParkingSelect.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/request/JourneyRequest.java b/application/src/main/java/org/opentripplanner/routing/api/request/request/JourneyRequest.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/request/JourneyRequest.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/request/JourneyRequest.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/request/StreetRequest.java b/application/src/main/java/org/opentripplanner/routing/api/request/request/StreetRequest.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/request/StreetRequest.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/request/StreetRequest.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequest.java b/application/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequest.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/request/TransitRequest.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequest.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/request/filter/AllowAllTransitFilter.java b/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/AllowAllTransitFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/request/filter/AllowAllTransitFilter.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/request/filter/AllowAllTransitFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/request/filter/SelectRequest.java b/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/SelectRequest.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/request/filter/SelectRequest.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/request/filter/SelectRequest.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitFilter.java b/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitFilter.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitFilter.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitFilterRequest.java b/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitFilterRequest.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitFilterRequest.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitFilterRequest.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitGroupSelect.java b/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitGroupSelect.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitGroupSelect.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitGroupSelect.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/via/AbstractViaLocation.java b/application/src/main/java/org/opentripplanner/routing/api/request/via/AbstractViaLocation.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/via/AbstractViaLocation.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/via/AbstractViaLocation.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocation.java b/application/src/main/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocation.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocation.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocation.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/via/ViaLocation.java b/application/src/main/java/org/opentripplanner/routing/api/request/via/ViaLocation.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/via/ViaLocation.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/via/ViaLocation.java
diff --git a/src/main/java/org/opentripplanner/routing/api/request/via/VisitViaLocation.java b/application/src/main/java/org/opentripplanner/routing/api/request/via/VisitViaLocation.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/request/via/VisitViaLocation.java
rename to application/src/main/java/org/opentripplanner/routing/api/request/via/VisitViaLocation.java
diff --git a/src/main/java/org/opentripplanner/routing/api/response/InputField.java b/application/src/main/java/org/opentripplanner/routing/api/response/InputField.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/response/InputField.java
rename to application/src/main/java/org/opentripplanner/routing/api/response/InputField.java
diff --git a/src/main/java/org/opentripplanner/routing/api/response/RoutingError.java b/application/src/main/java/org/opentripplanner/routing/api/response/RoutingError.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/response/RoutingError.java
rename to application/src/main/java/org/opentripplanner/routing/api/response/RoutingError.java
diff --git a/src/main/java/org/opentripplanner/routing/api/response/RoutingErrorCode.java b/application/src/main/java/org/opentripplanner/routing/api/response/RoutingErrorCode.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/response/RoutingErrorCode.java
rename to application/src/main/java/org/opentripplanner/routing/api/response/RoutingErrorCode.java
diff --git a/src/main/java/org/opentripplanner/routing/api/response/RoutingResponse.java b/application/src/main/java/org/opentripplanner/routing/api/response/RoutingResponse.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/response/RoutingResponse.java
rename to application/src/main/java/org/opentripplanner/routing/api/response/RoutingResponse.java
diff --git a/src/main/java/org/opentripplanner/routing/api/response/TripSearchMetadata.java b/application/src/main/java/org/opentripplanner/routing/api/response/TripSearchMetadata.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/response/TripSearchMetadata.java
rename to application/src/main/java/org/opentripplanner/routing/api/response/TripSearchMetadata.java
diff --git a/src/main/java/org/opentripplanner/routing/api/response/ViaRoutingResponse.java b/application/src/main/java/org/opentripplanner/routing/api/response/ViaRoutingResponse.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/response/ViaRoutingResponse.java
rename to application/src/main/java/org/opentripplanner/routing/api/response/ViaRoutingResponse.java
diff --git a/src/main/java/org/opentripplanner/routing/api/response/ViaRoutingResponseConnection.java b/application/src/main/java/org/opentripplanner/routing/api/response/ViaRoutingResponseConnection.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/api/response/ViaRoutingResponseConnection.java
rename to application/src/main/java/org/opentripplanner/routing/api/response/ViaRoutingResponseConnection.java
diff --git a/src/main/java/org/opentripplanner/routing/core/FareType.java b/application/src/main/java/org/opentripplanner/routing/core/FareType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/core/FareType.java
rename to application/src/main/java/org/opentripplanner/routing/core/FareType.java
diff --git a/src/main/java/org/opentripplanner/routing/core/VehicleRoutingOptimizeType.java b/application/src/main/java/org/opentripplanner/routing/core/VehicleRoutingOptimizeType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/core/VehicleRoutingOptimizeType.java
rename to application/src/main/java/org/opentripplanner/routing/core/VehicleRoutingOptimizeType.java
diff --git a/src/main/java/org/opentripplanner/routing/error/GraphNotFoundException.java b/application/src/main/java/org/opentripplanner/routing/error/GraphNotFoundException.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/error/GraphNotFoundException.java
rename to application/src/main/java/org/opentripplanner/routing/error/GraphNotFoundException.java
diff --git a/src/main/java/org/opentripplanner/routing/error/PathNotFoundException.java b/application/src/main/java/org/opentripplanner/routing/error/PathNotFoundException.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/error/PathNotFoundException.java
rename to application/src/main/java/org/opentripplanner/routing/error/PathNotFoundException.java
diff --git a/src/main/java/org/opentripplanner/routing/error/RoutingValidationException.java b/application/src/main/java/org/opentripplanner/routing/error/RoutingValidationException.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/error/RoutingValidationException.java
rename to application/src/main/java/org/opentripplanner/routing/error/RoutingValidationException.java
diff --git a/src/main/java/org/opentripplanner/routing/fares/FareService.java b/application/src/main/java/org/opentripplanner/routing/fares/FareService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/fares/FareService.java
rename to application/src/main/java/org/opentripplanner/routing/fares/FareService.java
diff --git a/src/main/java/org/opentripplanner/routing/fares/FareServiceFactory.java b/application/src/main/java/org/opentripplanner/routing/fares/FareServiceFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/fares/FareServiceFactory.java
rename to application/src/main/java/org/opentripplanner/routing/fares/FareServiceFactory.java
diff --git a/src/main/java/org/opentripplanner/routing/framework/DebugTimingAggregator.java b/application/src/main/java/org/opentripplanner/routing/framework/DebugTimingAggregator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/framework/DebugTimingAggregator.java
rename to application/src/main/java/org/opentripplanner/routing/framework/DebugTimingAggregator.java
diff --git a/src/main/java/org/opentripplanner/routing/framework/MicrometerUtils.java b/application/src/main/java/org/opentripplanner/routing/framework/MicrometerUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/framework/MicrometerUtils.java
rename to application/src/main/java/org/opentripplanner/routing/framework/MicrometerUtils.java
diff --git a/src/main/java/org/opentripplanner/routing/graph/Graph.java b/application/src/main/java/org/opentripplanner/routing/graph/Graph.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/graph/Graph.java
rename to application/src/main/java/org/opentripplanner/routing/graph/Graph.java
diff --git a/src/main/java/org/opentripplanner/routing/graph/SerializedGraphObject.java b/application/src/main/java/org/opentripplanner/routing/graph/SerializedGraphObject.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/graph/SerializedGraphObject.java
rename to application/src/main/java/org/opentripplanner/routing/graph/SerializedGraphObject.java
diff --git a/src/main/java/org/opentripplanner/routing/graph/index/EdgeSpatialIndex.java b/application/src/main/java/org/opentripplanner/routing/graph/index/EdgeSpatialIndex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/graph/index/EdgeSpatialIndex.java
rename to application/src/main/java/org/opentripplanner/routing/graph/index/EdgeSpatialIndex.java
diff --git a/src/main/java/org/opentripplanner/routing/graph/index/StreetIndex.java b/application/src/main/java/org/opentripplanner/routing/graph/index/StreetIndex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/graph/index/StreetIndex.java
rename to application/src/main/java/org/opentripplanner/routing/graph/index/StreetIndex.java
diff --git a/src/main/java/org/opentripplanner/routing/graph/kryosupport/AtomicIntegerSerializer.java b/application/src/main/java/org/opentripplanner/routing/graph/kryosupport/AtomicIntegerSerializer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/graph/kryosupport/AtomicIntegerSerializer.java
rename to application/src/main/java/org/opentripplanner/routing/graph/kryosupport/AtomicIntegerSerializer.java
diff --git a/src/main/java/org/opentripplanner/routing/graph/kryosupport/JavaImmutableListSerializer.java b/application/src/main/java/org/opentripplanner/routing/graph/kryosupport/JavaImmutableListSerializer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/graph/kryosupport/JavaImmutableListSerializer.java
rename to application/src/main/java/org/opentripplanner/routing/graph/kryosupport/JavaImmutableListSerializer.java
diff --git a/src/main/java/org/opentripplanner/routing/graph/kryosupport/JavaImmutableMapSerializer.java b/application/src/main/java/org/opentripplanner/routing/graph/kryosupport/JavaImmutableMapSerializer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/graph/kryosupport/JavaImmutableMapSerializer.java
rename to application/src/main/java/org/opentripplanner/routing/graph/kryosupport/JavaImmutableMapSerializer.java
diff --git a/src/main/java/org/opentripplanner/routing/graph/kryosupport/JavaImmutableSetSerializer.java b/application/src/main/java/org/opentripplanner/routing/graph/kryosupport/JavaImmutableSetSerializer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/graph/kryosupport/JavaImmutableSetSerializer.java
rename to application/src/main/java/org/opentripplanner/routing/graph/kryosupport/JavaImmutableSetSerializer.java
diff --git a/src/main/java/org/opentripplanner/routing/graph/kryosupport/KryoBuilder.java b/application/src/main/java/org/opentripplanner/routing/graph/kryosupport/KryoBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/graph/kryosupport/KryoBuilder.java
rename to application/src/main/java/org/opentripplanner/routing/graph/kryosupport/KryoBuilder.java
diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/DirectGraphFinder.java b/application/src/main/java/org/opentripplanner/routing/graphfinder/DirectGraphFinder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/graphfinder/DirectGraphFinder.java
rename to application/src/main/java/org/opentripplanner/routing/graphfinder/DirectGraphFinder.java
diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/GraphFinder.java b/application/src/main/java/org/opentripplanner/routing/graphfinder/GraphFinder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/graphfinder/GraphFinder.java
rename to application/src/main/java/org/opentripplanner/routing/graphfinder/GraphFinder.java
diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/NearbyStop.java b/application/src/main/java/org/opentripplanner/routing/graphfinder/NearbyStop.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/graphfinder/NearbyStop.java
rename to application/src/main/java/org/opentripplanner/routing/graphfinder/NearbyStop.java
diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/PatternAtStop.java b/application/src/main/java/org/opentripplanner/routing/graphfinder/PatternAtStop.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/graphfinder/PatternAtStop.java
rename to application/src/main/java/org/opentripplanner/routing/graphfinder/PatternAtStop.java
diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/PlaceAtDistance.java b/application/src/main/java/org/opentripplanner/routing/graphfinder/PlaceAtDistance.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/graphfinder/PlaceAtDistance.java
rename to application/src/main/java/org/opentripplanner/routing/graphfinder/PlaceAtDistance.java
diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java b/application/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java
rename to application/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java
diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/PlaceType.java b/application/src/main/java/org/opentripplanner/routing/graphfinder/PlaceType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/graphfinder/PlaceType.java
rename to application/src/main/java/org/opentripplanner/routing/graphfinder/PlaceType.java
diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/StopFinderTraverseVisitor.java b/application/src/main/java/org/opentripplanner/routing/graphfinder/StopFinderTraverseVisitor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/graphfinder/StopFinderTraverseVisitor.java
rename to application/src/main/java/org/opentripplanner/routing/graphfinder/StopFinderTraverseVisitor.java
diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/StreetGraphFinder.java b/application/src/main/java/org/opentripplanner/routing/graphfinder/StreetGraphFinder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/graphfinder/StreetGraphFinder.java
rename to application/src/main/java/org/opentripplanner/routing/graphfinder/StreetGraphFinder.java
diff --git a/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java b/application/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java
rename to application/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java
diff --git a/src/main/java/org/opentripplanner/routing/impl/GraphPathFinder.java b/application/src/main/java/org/opentripplanner/routing/impl/GraphPathFinder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/impl/GraphPathFinder.java
rename to application/src/main/java/org/opentripplanner/routing/impl/GraphPathFinder.java
diff --git a/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java b/application/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java
rename to application/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java
diff --git a/src/main/java/org/opentripplanner/routing/linking/DisposableEdgeCollection.java b/application/src/main/java/org/opentripplanner/routing/linking/DisposableEdgeCollection.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/linking/DisposableEdgeCollection.java
rename to application/src/main/java/org/opentripplanner/routing/linking/DisposableEdgeCollection.java
diff --git a/src/main/java/org/opentripplanner/routing/linking/FlexLocationAdder.java b/application/src/main/java/org/opentripplanner/routing/linking/FlexLocationAdder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/linking/FlexLocationAdder.java
rename to application/src/main/java/org/opentripplanner/routing/linking/FlexLocationAdder.java
diff --git a/src/main/java/org/opentripplanner/routing/linking/LinkingDirection.java b/application/src/main/java/org/opentripplanner/routing/linking/LinkingDirection.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/linking/LinkingDirection.java
rename to application/src/main/java/org/opentripplanner/routing/linking/LinkingDirection.java
diff --git a/src/main/java/org/opentripplanner/routing/linking/SameEdgeAdjuster.java b/application/src/main/java/org/opentripplanner/routing/linking/SameEdgeAdjuster.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/linking/SameEdgeAdjuster.java
rename to application/src/main/java/org/opentripplanner/routing/linking/SameEdgeAdjuster.java
diff --git a/src/main/java/org/opentripplanner/routing/linking/Scope.java b/application/src/main/java/org/opentripplanner/routing/linking/Scope.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/linking/Scope.java
rename to application/src/main/java/org/opentripplanner/routing/linking/Scope.java
diff --git a/src/main/java/org/opentripplanner/routing/linking/VertexLinker.java b/application/src/main/java/org/opentripplanner/routing/linking/VertexLinker.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/linking/VertexLinker.java
rename to application/src/main/java/org/opentripplanner/routing/linking/VertexLinker.java
diff --git a/src/main/java/org/opentripplanner/routing/service/DefaultRoutingService.java b/application/src/main/java/org/opentripplanner/routing/service/DefaultRoutingService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/service/DefaultRoutingService.java
rename to application/src/main/java/org/opentripplanner/routing/service/DefaultRoutingService.java
diff --git a/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java b/application/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/services/TransitAlertService.java
rename to application/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java
diff --git a/src/main/java/org/opentripplanner/routing/services/notes/StreetNoteModel.java b/application/src/main/java/org/opentripplanner/routing/services/notes/StreetNoteModel.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/services/notes/StreetNoteModel.java
rename to application/src/main/java/org/opentripplanner/routing/services/notes/StreetNoteModel.java
diff --git a/src/main/java/org/opentripplanner/routing/services/notes/StreetNotesService.java b/application/src/main/java/org/opentripplanner/routing/services/notes/StreetNotesService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/services/notes/StreetNotesService.java
rename to application/src/main/java/org/opentripplanner/routing/services/notes/StreetNotesService.java
diff --git a/src/main/java/org/opentripplanner/routing/stoptimes/ArrivalDeparture.java b/application/src/main/java/org/opentripplanner/routing/stoptimes/ArrivalDeparture.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/stoptimes/ArrivalDeparture.java
rename to application/src/main/java/org/opentripplanner/routing/stoptimes/ArrivalDeparture.java
diff --git a/src/main/java/org/opentripplanner/routing/stoptimes/StopTimesHelper.java b/application/src/main/java/org/opentripplanner/routing/stoptimes/StopTimesHelper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/stoptimes/StopTimesHelper.java
rename to application/src/main/java/org/opentripplanner/routing/stoptimes/StopTimesHelper.java
diff --git a/src/main/java/org/opentripplanner/routing/util/ConcurrentPublished.java b/application/src/main/java/org/opentripplanner/routing/util/ConcurrentPublished.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/util/ConcurrentPublished.java
rename to application/src/main/java/org/opentripplanner/routing/util/ConcurrentPublished.java
diff --git a/src/main/java/org/opentripplanner/routing/util/DiffEntry.java b/application/src/main/java/org/opentripplanner/routing/util/DiffEntry.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/util/DiffEntry.java
rename to application/src/main/java/org/opentripplanner/routing/util/DiffEntry.java
diff --git a/src/main/java/org/opentripplanner/routing/util/DiffList.java b/application/src/main/java/org/opentripplanner/routing/util/DiffList.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/util/DiffList.java
rename to application/src/main/java/org/opentripplanner/routing/util/DiffList.java
diff --git a/src/main/java/org/opentripplanner/routing/util/DiffTool.java b/application/src/main/java/org/opentripplanner/routing/util/DiffTool.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/util/DiffTool.java
rename to application/src/main/java/org/opentripplanner/routing/util/DiffTool.java
diff --git a/src/main/java/org/opentripplanner/routing/util/ElevationUtils.java b/application/src/main/java/org/opentripplanner/routing/util/ElevationUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/util/ElevationUtils.java
rename to application/src/main/java/org/opentripplanner/routing/util/ElevationUtils.java
diff --git a/src/main/java/org/opentripplanner/routing/util/SlopeCosts.java b/application/src/main/java/org/opentripplanner/routing/util/SlopeCosts.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/util/SlopeCosts.java
rename to application/src/main/java/org/opentripplanner/routing/util/SlopeCosts.java
diff --git a/src/main/java/org/opentripplanner/routing/util/elevation/ToblersHikingFunction.java b/application/src/main/java/org/opentripplanner/routing/util/elevation/ToblersHikingFunction.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/util/elevation/ToblersHikingFunction.java
rename to application/src/main/java/org/opentripplanner/routing/util/elevation/ToblersHikingFunction.java
diff --git a/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java b/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java
rename to application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java
diff --git a/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingEntrance.java b/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingEntrance.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingEntrance.java
rename to application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingEntrance.java
diff --git a/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingGroup.java b/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingGroup.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingGroup.java
rename to application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingGroup.java
diff --git a/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingGroupBuilder.java b/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingGroupBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingGroupBuilder.java
rename to application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingGroupBuilder.java
diff --git a/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelper.java b/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelper.java
rename to application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelper.java
diff --git a/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingService.java b/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingService.java
rename to application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingService.java
diff --git a/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingSpaces.java b/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingSpaces.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingSpaces.java
rename to application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingSpaces.java
diff --git a/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingState.java b/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingState.java
similarity index 100%
rename from src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingState.java
rename to application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingState.java
diff --git a/src/main/java/org/opentripplanner/service/package.md b/application/src/main/java/org/opentripplanner/service/package.md
similarity index 100%
rename from src/main/java/org/opentripplanner/service/package.md
rename to application/src/main/java/org/opentripplanner/service/package.md
diff --git a/src/main/java/org/opentripplanner/service/paging/PagingService.java b/application/src/main/java/org/opentripplanner/service/paging/PagingService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/paging/PagingService.java
rename to application/src/main/java/org/opentripplanner/service/paging/PagingService.java
diff --git a/src/main/java/org/opentripplanner/service/realtimevehicles/RealtimeVehicleRepository.java b/application/src/main/java/org/opentripplanner/service/realtimevehicles/RealtimeVehicleRepository.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/realtimevehicles/RealtimeVehicleRepository.java
rename to application/src/main/java/org/opentripplanner/service/realtimevehicles/RealtimeVehicleRepository.java
diff --git a/src/main/java/org/opentripplanner/service/realtimevehicles/RealtimeVehicleService.java b/application/src/main/java/org/opentripplanner/service/realtimevehicles/RealtimeVehicleService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/realtimevehicles/RealtimeVehicleService.java
rename to application/src/main/java/org/opentripplanner/service/realtimevehicles/RealtimeVehicleService.java
diff --git a/src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleRepositoryModule.java b/application/src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleRepositoryModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleRepositoryModule.java
rename to application/src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleRepositoryModule.java
diff --git a/src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleServiceModule.java b/application/src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleServiceModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleServiceModule.java
rename to application/src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleServiceModule.java
diff --git a/src/main/java/org/opentripplanner/service/realtimevehicles/internal/DefaultRealtimeVehicleService.java b/application/src/main/java/org/opentripplanner/service/realtimevehicles/internal/DefaultRealtimeVehicleService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/realtimevehicles/internal/DefaultRealtimeVehicleService.java
rename to application/src/main/java/org/opentripplanner/service/realtimevehicles/internal/DefaultRealtimeVehicleService.java
diff --git a/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicle.java b/application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicle.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicle.java
rename to application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicle.java
diff --git a/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicleBuilder.java b/application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicleBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicleBuilder.java
rename to application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicleBuilder.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalRepository.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalRepository.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalRepository.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalRepository.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalService.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalService.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalService.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/configure/VehicleRentalRepositoryModule.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/configure/VehicleRentalRepositoryModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/configure/VehicleRentalRepositoryModule.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/configure/VehicleRentalRepositoryModule.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/configure/VehicleRentalServiceModule.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/configure/VehicleRentalServiceModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/configure/VehicleRentalServiceModule.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/configure/VehicleRentalServiceModule.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalService.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalService.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalService.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/model/GeofencingZone.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/model/GeofencingZone.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/model/GeofencingZone.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/model/GeofencingZone.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleEntityCounts.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleEntityCounts.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleEntityCounts.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleEntityCounts.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleType.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleType.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleType.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleTypeCount.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleTypeCount.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleTypeCount.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleTypeCount.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStationUris.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStationUris.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStationUris.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStationUris.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalSystem.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalSystem.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalSystem.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalSystem.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalSystemAppInformation.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalSystemAppInformation.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalSystemAppInformation.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalSystemAppInformation.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/street/BusinessAreaBorder.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/street/BusinessAreaBorder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/street/BusinessAreaBorder.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/street/BusinessAreaBorder.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/street/CompositeRentalRestrictionExtension.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/street/CompositeRentalRestrictionExtension.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/street/CompositeRentalRestrictionExtension.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/street/CompositeRentalRestrictionExtension.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/street/GeofencingZoneExtension.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/street/GeofencingZoneExtension.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/street/GeofencingZoneExtension.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/street/GeofencingZoneExtension.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/street/NoRestriction.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/street/NoRestriction.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/street/NoRestriction.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/street/NoRestriction.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/street/StreetVehicleRentalLink.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/street/StreetVehicleRentalLink.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/street/StreetVehicleRentalLink.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/street/StreetVehicleRentalLink.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java
diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalPlaceVertex.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalPlaceVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalPlaceVertex.java
rename to application/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalPlaceVertex.java
diff --git a/src/main/java/org/opentripplanner/service/worldenvelope/WorldEnvelopeRepository.java b/application/src/main/java/org/opentripplanner/service/worldenvelope/WorldEnvelopeRepository.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/worldenvelope/WorldEnvelopeRepository.java
rename to application/src/main/java/org/opentripplanner/service/worldenvelope/WorldEnvelopeRepository.java
diff --git a/src/main/java/org/opentripplanner/service/worldenvelope/WorldEnvelopeService.java b/application/src/main/java/org/opentripplanner/service/worldenvelope/WorldEnvelopeService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/worldenvelope/WorldEnvelopeService.java
rename to application/src/main/java/org/opentripplanner/service/worldenvelope/WorldEnvelopeService.java
diff --git a/src/main/java/org/opentripplanner/service/worldenvelope/configure/WorldEnvelopeRepositoryModule.java b/application/src/main/java/org/opentripplanner/service/worldenvelope/configure/WorldEnvelopeRepositoryModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/worldenvelope/configure/WorldEnvelopeRepositoryModule.java
rename to application/src/main/java/org/opentripplanner/service/worldenvelope/configure/WorldEnvelopeRepositoryModule.java
diff --git a/src/main/java/org/opentripplanner/service/worldenvelope/configure/WorldEnvelopeServiceModule.java b/application/src/main/java/org/opentripplanner/service/worldenvelope/configure/WorldEnvelopeServiceModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/worldenvelope/configure/WorldEnvelopeServiceModule.java
rename to application/src/main/java/org/opentripplanner/service/worldenvelope/configure/WorldEnvelopeServiceModule.java
diff --git a/src/main/java/org/opentripplanner/service/worldenvelope/internal/DefaultWorldEnvelopeRepository.java b/application/src/main/java/org/opentripplanner/service/worldenvelope/internal/DefaultWorldEnvelopeRepository.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/worldenvelope/internal/DefaultWorldEnvelopeRepository.java
rename to application/src/main/java/org/opentripplanner/service/worldenvelope/internal/DefaultWorldEnvelopeRepository.java
diff --git a/src/main/java/org/opentripplanner/service/worldenvelope/internal/DefaultWorldEnvelopeService.java b/application/src/main/java/org/opentripplanner/service/worldenvelope/internal/DefaultWorldEnvelopeService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/worldenvelope/internal/DefaultWorldEnvelopeService.java
rename to application/src/main/java/org/opentripplanner/service/worldenvelope/internal/DefaultWorldEnvelopeService.java
diff --git a/src/main/java/org/opentripplanner/service/worldenvelope/model/MedianCalcForDoubles.java b/application/src/main/java/org/opentripplanner/service/worldenvelope/model/MedianCalcForDoubles.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/worldenvelope/model/MedianCalcForDoubles.java
rename to application/src/main/java/org/opentripplanner/service/worldenvelope/model/MedianCalcForDoubles.java
diff --git a/src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelope.java b/application/src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelope.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelope.java
rename to application/src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelope.java
diff --git a/src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelopeBuilder.java b/application/src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelopeBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelopeBuilder.java
rename to application/src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelopeBuilder.java
diff --git a/src/main/java/org/opentripplanner/standalone/OTPMain.java b/application/src/main/java/org/opentripplanner/standalone/OTPMain.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/OTPMain.java
rename to application/src/main/java/org/opentripplanner/standalone/OTPMain.java
diff --git a/src/main/java/org/opentripplanner/standalone/OtpStartupInfo.java b/application/src/main/java/org/opentripplanner/standalone/OtpStartupInfo.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/OtpStartupInfo.java
rename to application/src/main/java/org/opentripplanner/standalone/OtpStartupInfo.java
diff --git a/src/main/java/org/opentripplanner/standalone/api/HttpRequestScoped.java b/application/src/main/java/org/opentripplanner/standalone/api/HttpRequestScoped.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/api/HttpRequestScoped.java
rename to application/src/main/java/org/opentripplanner/standalone/api/HttpRequestScoped.java
diff --git a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java b/application/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java
rename to application/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/BuildConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java b/application/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java
rename to application/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java b/application/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/ConfigModel.java
rename to application/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/OtpConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/OtpConfigLoader.java b/application/src/main/java/org/opentripplanner/standalone/config/OtpConfigLoader.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/OtpConfigLoader.java
rename to application/src/main/java/org/opentripplanner/standalone/config/OtpConfigLoader.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/RouterConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/api/TransitServicePeriod.java b/application/src/main/java/org/opentripplanner/standalone/config/api/TransitServicePeriod.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/api/TransitServicePeriod.java
rename to application/src/main/java/org/opentripplanner/standalone/config/api/TransitServicePeriod.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/buildconfig/DemConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/buildconfig/DemConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/buildconfig/DemConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/buildconfig/DemConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/buildconfig/GtfsConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/buildconfig/GtfsConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/buildconfig/GtfsConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/buildconfig/GtfsConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/buildconfig/IslandPruningConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/buildconfig/IslandPruningConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/buildconfig/IslandPruningConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/buildconfig/IslandPruningConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/buildconfig/NetexConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/buildconfig/NetexConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/buildconfig/NetexConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/buildconfig/NetexConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/buildconfig/OsmConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/buildconfig/OsmConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/buildconfig/OsmConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/buildconfig/OsmConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/buildconfig/S3BucketConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/buildconfig/S3BucketConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/buildconfig/S3BucketConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/buildconfig/S3BucketConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/buildconfig/TransferRequestConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/buildconfig/TransferRequestConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/buildconfig/TransferRequestConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/buildconfig/TransferRequestConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/buildconfig/TransitFeedConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/buildconfig/TransitFeedConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/buildconfig/TransitFeedConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/buildconfig/TransitFeedConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/buildconfig/TransitFeeds.java b/application/src/main/java/org/opentripplanner/standalone/config/buildconfig/TransitFeeds.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/buildconfig/TransitFeeds.java
rename to application/src/main/java/org/opentripplanner/standalone/config/buildconfig/TransitFeeds.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/configure/ConfigModule.java b/application/src/main/java/org/opentripplanner/standalone/config/configure/ConfigModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/configure/ConfigModule.java
rename to application/src/main/java/org/opentripplanner/standalone/config/configure/ConfigModule.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/configure/LoadConfigModule.java b/application/src/main/java/org/opentripplanner/standalone/config/configure/LoadConfigModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/configure/LoadConfigModule.java
rename to application/src/main/java/org/opentripplanner/standalone/config/configure/LoadConfigModule.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/file/ConfigFileLoader.java b/application/src/main/java/org/opentripplanner/standalone/config/framework/file/ConfigFileLoader.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/framework/file/ConfigFileLoader.java
rename to application/src/main/java/org/opentripplanner/standalone/config/framework/file/ConfigFileLoader.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/file/IncludeFileDirective.java b/application/src/main/java/org/opentripplanner/standalone/config/framework/file/IncludeFileDirective.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/framework/file/IncludeFileDirective.java
rename to application/src/main/java/org/opentripplanner/standalone/config/framework/file/IncludeFileDirective.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/ConfigType.java b/application/src/main/java/org/opentripplanner/standalone/config/framework/json/ConfigType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/framework/json/ConfigType.java
rename to application/src/main/java/org/opentripplanner/standalone/config/framework/json/ConfigType.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/EnumMapper.java b/application/src/main/java/org/opentripplanner/standalone/config/framework/json/EnumMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/framework/json/EnumMapper.java
rename to application/src/main/java/org/opentripplanner/standalone/config/framework/json/EnumMapper.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java b/application/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java
rename to application/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeInfo.java b/application/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeInfo.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/framework/json/NodeInfo.java
rename to application/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeInfo.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeInfoBuilder.java b/application/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeInfoBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/framework/json/NodeInfoBuilder.java
rename to application/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeInfoBuilder.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/OtpVersion.java b/application/src/main/java/org/opentripplanner/standalone/config/framework/json/OtpVersion.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/framework/json/OtpVersion.java
rename to application/src/main/java/org/opentripplanner/standalone/config/framework/json/OtpVersion.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java b/application/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java
rename to application/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/project/EnvironmentVariableReplacer.java b/application/src/main/java/org/opentripplanner/standalone/config/framework/project/EnvironmentVariableReplacer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/framework/project/EnvironmentVariableReplacer.java
rename to application/src/main/java/org/opentripplanner/standalone/config/framework/project/EnvironmentVariableReplacer.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/package.md b/application/src/main/java/org/opentripplanner/standalone/config/package.md
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/package.md
rename to application/src/main/java/org/opentripplanner/standalone/config/package.md
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/RideHailingServicesConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/RideHailingServicesConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/RideHailingServicesConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/RideHailingServicesConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/ServerConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/ServerConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/ServerConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/ServerConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/TransitRoutingConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/TransitRoutingConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/TransitRoutingConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/TransitRoutingConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/UpdatersConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/UpdatersConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/UpdatersConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/UpdatersConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/services/UberConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/services/UberConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/services/UberConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/services/UberConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/GtfsRealtimeAlertsUpdaterConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/GtfsRealtimeAlertsUpdaterConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/GtfsRealtimeAlertsUpdaterConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/GtfsRealtimeAlertsUpdaterConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/HttpHeadersConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/HttpHeadersConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/HttpHeadersConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/HttpHeadersConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/MqttGtfsRealtimeUpdaterConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/MqttGtfsRealtimeUpdaterConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/MqttGtfsRealtimeUpdaterConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/MqttGtfsRealtimeUpdaterConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/PollingTripUpdaterConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/PollingTripUpdaterConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/PollingTripUpdaterConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/PollingTripUpdaterConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETUpdaterConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETUpdaterConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETUpdaterConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETUpdaterConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriSXUpdaterConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriSXUpdaterConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriSXUpdaterConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriSXUpdaterConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehiclePositionsUpdaterConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehiclePositionsUpdaterConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehiclePositionsUpdaterConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehiclePositionsUpdaterConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleRentalUpdaterConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleRentalUpdaterConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleRentalUpdaterConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleRentalUpdaterConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureETUpdaterConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureETUpdaterConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureETUpdaterConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureETUpdaterConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureSXUpdaterConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureSXUpdaterConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureSXUpdaterConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureSXUpdaterConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureUpdaterConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureUpdaterConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureUpdaterConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureUpdaterConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/sources/VehicleRentalSourceFactory.java b/application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/sources/VehicleRentalSourceFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/sources/VehicleRentalSourceFactory.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/sources/VehicleRentalSourceFactory.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/ItineraryFiltersConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerequest/ItineraryFiltersConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerequest/ItineraryFiltersConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerequest/ItineraryFiltersConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/TimeAndCostPenaltyMapper.java b/application/src/main/java/org/opentripplanner/standalone/config/routerequest/TimeAndCostPenaltyMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerequest/TimeAndCostPenaltyMapper.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerequest/TimeAndCostPenaltyMapper.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/TransitGroupPriorityConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerequest/TransitGroupPriorityConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerequest/TransitGroupPriorityConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerequest/TransitGroupPriorityConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/TriangleOptimizationConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerequest/TriangleOptimizationConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerequest/TriangleOptimizationConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerequest/TriangleOptimizationConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleParkingConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleParkingConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleParkingConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleParkingConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleRentalConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleRentalConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleRentalConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleRentalConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/WheelchairConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerequest/WheelchairConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/routerequest/WheelchairConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/routerequest/WheelchairConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/sandbox/DataOverlayConfigMapper.java b/application/src/main/java/org/opentripplanner/standalone/config/sandbox/DataOverlayConfigMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/sandbox/DataOverlayConfigMapper.java
rename to application/src/main/java/org/opentripplanner/standalone/config/sandbox/DataOverlayConfigMapper.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/sandbox/DataOverlayParametersMapper.java b/application/src/main/java/org/opentripplanner/standalone/config/sandbox/DataOverlayParametersMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/sandbox/DataOverlayParametersMapper.java
rename to application/src/main/java/org/opentripplanner/standalone/config/sandbox/DataOverlayParametersMapper.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/sandbox/FlexConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/sandbox/FlexConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/sandbox/FlexConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/sandbox/FlexConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java
rename to application/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java
diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java
rename to application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java
diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java
rename to application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java
diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java
rename to application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java
diff --git a/src/main/java/org/opentripplanner/standalone/configure/LoadApplication.java b/application/src/main/java/org/opentripplanner/standalone/configure/LoadApplication.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/configure/LoadApplication.java
rename to application/src/main/java/org/opentripplanner/standalone/configure/LoadApplication.java
diff --git a/src/main/java/org/opentripplanner/standalone/configure/LoadApplicationFactory.java b/application/src/main/java/org/opentripplanner/standalone/configure/LoadApplicationFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/configure/LoadApplicationFactory.java
rename to application/src/main/java/org/opentripplanner/standalone/configure/LoadApplicationFactory.java
diff --git a/src/main/java/org/opentripplanner/standalone/server/CorsFilter.java b/application/src/main/java/org/opentripplanner/standalone/server/CorsFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/server/CorsFilter.java
rename to application/src/main/java/org/opentripplanner/standalone/server/CorsFilter.java
diff --git a/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java b/application/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java
rename to application/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java
diff --git a/src/main/java/org/opentripplanner/standalone/server/EtagRequestFilter.java b/application/src/main/java/org/opentripplanner/standalone/server/EtagRequestFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/server/EtagRequestFilter.java
rename to application/src/main/java/org/opentripplanner/standalone/server/EtagRequestFilter.java
diff --git a/src/main/java/org/opentripplanner/standalone/server/GrizzlyServer.java b/application/src/main/java/org/opentripplanner/standalone/server/GrizzlyServer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/server/GrizzlyServer.java
rename to application/src/main/java/org/opentripplanner/standalone/server/GrizzlyServer.java
diff --git a/src/main/java/org/opentripplanner/standalone/server/MetricsLogging.java b/application/src/main/java/org/opentripplanner/standalone/server/MetricsLogging.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/server/MetricsLogging.java
rename to application/src/main/java/org/opentripplanner/standalone/server/MetricsLogging.java
diff --git a/src/main/java/org/opentripplanner/standalone/server/OTPWebApplication.java b/application/src/main/java/org/opentripplanner/standalone/server/OTPWebApplication.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/server/OTPWebApplication.java
rename to application/src/main/java/org/opentripplanner/standalone/server/OTPWebApplication.java
diff --git a/src/main/java/org/opentripplanner/standalone/server/OTPWebApplicationParameters.java b/application/src/main/java/org/opentripplanner/standalone/server/OTPWebApplicationParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/server/OTPWebApplicationParameters.java
rename to application/src/main/java/org/opentripplanner/standalone/server/OTPWebApplicationParameters.java
diff --git a/src/main/java/org/opentripplanner/standalone/server/RequestTraceFilter.java b/application/src/main/java/org/opentripplanner/standalone/server/RequestTraceFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/server/RequestTraceFilter.java
rename to application/src/main/java/org/opentripplanner/standalone/server/RequestTraceFilter.java
diff --git a/src/main/java/org/opentripplanner/standalone/server/RequestTraceParameter.java b/application/src/main/java/org/opentripplanner/standalone/server/RequestTraceParameter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/server/RequestTraceParameter.java
rename to application/src/main/java/org/opentripplanner/standalone/server/RequestTraceParameter.java
diff --git a/src/main/java/org/opentripplanner/standalone/server/VaryRequestFilter.java b/application/src/main/java/org/opentripplanner/standalone/server/VaryRequestFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/standalone/server/VaryRequestFilter.java
rename to application/src/main/java/org/opentripplanner/standalone/server/VaryRequestFilter.java
diff --git a/src/main/java/org/opentripplanner/street/model/RentalFormFactor.java b/application/src/main/java/org/opentripplanner/street/model/RentalFormFactor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/RentalFormFactor.java
rename to application/src/main/java/org/opentripplanner/street/model/RentalFormFactor.java
diff --git a/src/main/java/org/opentripplanner/street/model/RentalRestrictionExtension.java b/application/src/main/java/org/opentripplanner/street/model/RentalRestrictionExtension.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/RentalRestrictionExtension.java
rename to application/src/main/java/org/opentripplanner/street/model/RentalRestrictionExtension.java
diff --git a/src/main/java/org/opentripplanner/street/model/RepeatingTimePeriod.java b/application/src/main/java/org/opentripplanner/street/model/RepeatingTimePeriod.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/RepeatingTimePeriod.java
rename to application/src/main/java/org/opentripplanner/street/model/RepeatingTimePeriod.java
diff --git a/src/main/java/org/opentripplanner/street/model/StreetConstants.java b/application/src/main/java/org/opentripplanner/street/model/StreetConstants.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/StreetConstants.java
rename to application/src/main/java/org/opentripplanner/street/model/StreetConstants.java
diff --git a/src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java b/application/src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java
rename to application/src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java
diff --git a/src/main/java/org/opentripplanner/street/model/StreetTraversalPermission.java b/application/src/main/java/org/opentripplanner/street/model/StreetTraversalPermission.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/StreetTraversalPermission.java
rename to application/src/main/java/org/opentripplanner/street/model/StreetTraversalPermission.java
diff --git a/src/main/java/org/opentripplanner/street/model/TurnRestriction.java b/application/src/main/java/org/opentripplanner/street/model/TurnRestriction.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/TurnRestriction.java
rename to application/src/main/java/org/opentripplanner/street/model/TurnRestriction.java
diff --git a/src/main/java/org/opentripplanner/street/model/TurnRestrictionType.java b/application/src/main/java/org/opentripplanner/street/model/TurnRestrictionType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/TurnRestrictionType.java
rename to application/src/main/java/org/opentripplanner/street/model/TurnRestrictionType.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/AreaEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/AreaEdge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/AreaEdge.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/AreaEdge.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/AreaEdgeBuilder.java b/application/src/main/java/org/opentripplanner/street/model/edge/AreaEdgeBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/AreaEdgeBuilder.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/AreaEdgeBuilder.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/AreaEdgeList.java b/application/src/main/java/org/opentripplanner/street/model/edge/AreaEdgeList.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/AreaEdgeList.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/AreaEdgeList.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/BikeWalkableEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/BikeWalkableEdge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/BikeWalkableEdge.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/BikeWalkableEdge.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/BoardingLocationToStopLink.java b/application/src/main/java/org/opentripplanner/street/model/edge/BoardingLocationToStopLink.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/BoardingLocationToStopLink.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/BoardingLocationToStopLink.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/CarPickupableEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/CarPickupableEdge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/CarPickupableEdge.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/CarPickupableEdge.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/Edge.java b/application/src/main/java/org/opentripplanner/street/model/edge/Edge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/Edge.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/Edge.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/ElevatorAlightEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorAlightEdge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/ElevatorAlightEdge.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/ElevatorAlightEdge.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/ElevatorEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorEdge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/ElevatorEdge.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/ElevatorEdge.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/FreeEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/FreeEdge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/FreeEdge.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/FreeEdge.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/NamedArea.java b/application/src/main/java/org/opentripplanner/street/model/edge/NamedArea.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/NamedArea.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/NamedArea.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/SplitStreetEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/SplitStreetEdge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/SplitStreetEdge.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/SplitStreetEdge.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeBuilder.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/StreetEdgeBuilder.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeBuilder.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeCostExtension.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeCostExtension.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/StreetEdgeCostExtension.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeCostExtension.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeReluctanceCalculator.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeReluctanceCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/StreetEdgeReluctanceCalculator.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeReluctanceCalculator.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetElevationExtension.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetElevationExtension.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/StreetElevationExtension.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/StreetElevationExtension.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetElevationExtensionBuilder.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetElevationExtensionBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/StreetElevationExtensionBuilder.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/StreetElevationExtensionBuilder.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetStationCentroidLink.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetStationCentroidLink.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/StreetStationCentroidLink.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/StreetStationCentroidLink.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLink.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLink.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLink.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLink.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetTransitStopLink.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitStopLink.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/StreetTransitStopLink.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitStopLink.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/TemporaryEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/TemporaryEdge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/TemporaryEdge.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/TemporaryEdge.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/TemporaryFreeEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/TemporaryFreeEdge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/TemporaryFreeEdge.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/TemporaryFreeEdge.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdge.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdge.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeBuilder.java b/application/src/main/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeBuilder.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeBuilder.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java
diff --git a/src/main/java/org/opentripplanner/street/model/edge/WheelchairTraversalInformation.java b/application/src/main/java/org/opentripplanner/street/model/edge/WheelchairTraversalInformation.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/edge/WheelchairTraversalInformation.java
rename to application/src/main/java/org/opentripplanner/street/model/edge/WheelchairTraversalInformation.java
diff --git a/src/main/java/org/opentripplanner/street/model/elevation/ElevationUtils.java b/application/src/main/java/org/opentripplanner/street/model/elevation/ElevationUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/elevation/ElevationUtils.java
rename to application/src/main/java/org/opentripplanner/street/model/elevation/ElevationUtils.java
diff --git a/src/main/java/org/opentripplanner/street/model/note/StreetNote.java b/application/src/main/java/org/opentripplanner/street/model/note/StreetNote.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/note/StreetNote.java
rename to application/src/main/java/org/opentripplanner/street/model/note/StreetNote.java
diff --git a/src/main/java/org/opentripplanner/street/model/note/StreetNoteAndMatcher.java b/application/src/main/java/org/opentripplanner/street/model/note/StreetNoteAndMatcher.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/note/StreetNoteAndMatcher.java
rename to application/src/main/java/org/opentripplanner/street/model/note/StreetNoteAndMatcher.java
diff --git a/src/main/java/org/opentripplanner/street/model/note/StreetNoteMatcher.java b/application/src/main/java/org/opentripplanner/street/model/note/StreetNoteMatcher.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/note/StreetNoteMatcher.java
rename to application/src/main/java/org/opentripplanner/street/model/note/StreetNoteMatcher.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/BarrierVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/BarrierVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/BarrierVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/BarrierVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/ElevatorOffboardVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/ElevatorOffboardVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/ElevatorOffboardVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/ElevatorOffboardVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/ElevatorOnboardVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/ElevatorOnboardVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/ElevatorOnboardVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/ElevatorOnboardVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/ExitVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/ExitVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/ExitVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/ExitVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/IntersectionVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/IntersectionVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/IntersectionVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/IntersectionVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/LabelledIntersectionVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/LabelledIntersectionVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/LabelledIntersectionVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/LabelledIntersectionVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/OsmBoardingLocationVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/OsmBoardingLocationVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/OsmBoardingLocationVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/OsmBoardingLocationVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/OsmVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/OsmVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/OsmVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/OsmVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/OsmVertexOnLevel.java b/application/src/main/java/org/opentripplanner/street/model/vertex/OsmVertexOnLevel.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/OsmVertexOnLevel.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/OsmVertexOnLevel.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/SplitterVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/SplitterVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/SplitterVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/SplitterVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/StationCentroidVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/StationCentroidVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/StationCentroidVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/StationCentroidVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/StationElementVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/StationElementVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/StationElementVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/StationElementVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/StreetLocation.java b/application/src/main/java/org/opentripplanner/street/model/vertex/StreetLocation.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/StreetLocation.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/StreetLocation.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/StreetVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/StreetVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/StreetVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/StreetVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/TemporarySplitterVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/TemporarySplitterVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/TemporarySplitterVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/TemporarySplitterVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/TemporaryStreetLocation.java b/application/src/main/java/org/opentripplanner/street/model/vertex/TemporaryStreetLocation.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/TemporaryStreetLocation.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/TemporaryStreetLocation.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/TemporaryVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/TemporaryVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/TemporaryVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/TemporaryVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/TemporaryVertexDispose.java b/application/src/main/java/org/opentripplanner/street/model/vertex/TemporaryVertexDispose.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/TemporaryVertexDispose.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/TemporaryVertexDispose.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/TransitBoardingAreaVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/TransitBoardingAreaVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/TransitBoardingAreaVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/TransitBoardingAreaVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/TransitEntranceVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/TransitEntranceVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/TransitEntranceVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/TransitEntranceVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/TransitPathwayNodeVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/TransitPathwayNodeVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/TransitPathwayNodeVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/TransitPathwayNodeVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertexBuilder.java b/application/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertexBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertexBuilder.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertexBuilder.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/Vertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/Vertex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/Vertex.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/Vertex.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/VertexFactory.java b/application/src/main/java/org/opentripplanner/street/model/vertex/VertexFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/VertexFactory.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/VertexFactory.java
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/VertexLabel.java b/application/src/main/java/org/opentripplanner/street/model/vertex/VertexLabel.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/model/vertex/VertexLabel.java
rename to application/src/main/java/org/opentripplanner/street/model/vertex/VertexLabel.java
diff --git a/src/main/java/org/opentripplanner/street/search/StreetSearchBuilder.java b/application/src/main/java/org/opentripplanner/street/search/StreetSearchBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/StreetSearchBuilder.java
rename to application/src/main/java/org/opentripplanner/street/search/StreetSearchBuilder.java
diff --git a/src/main/java/org/opentripplanner/street/search/TemporaryVerticesContainer.java b/application/src/main/java/org/opentripplanner/street/search/TemporaryVerticesContainer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/TemporaryVerticesContainer.java
rename to application/src/main/java/org/opentripplanner/street/search/TemporaryVerticesContainer.java
diff --git a/src/main/java/org/opentripplanner/street/search/TraverseMode.java b/application/src/main/java/org/opentripplanner/street/search/TraverseMode.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/TraverseMode.java
rename to application/src/main/java/org/opentripplanner/street/search/TraverseMode.java
diff --git a/src/main/java/org/opentripplanner/street/search/TraverseModeSet.java b/application/src/main/java/org/opentripplanner/street/search/TraverseModeSet.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/TraverseModeSet.java
rename to application/src/main/java/org/opentripplanner/street/search/TraverseModeSet.java
diff --git a/src/main/java/org/opentripplanner/street/search/intersection_model/AbstractIntersectionTraversalCalculator.java b/application/src/main/java/org/opentripplanner/street/search/intersection_model/AbstractIntersectionTraversalCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/intersection_model/AbstractIntersectionTraversalCalculator.java
rename to application/src/main/java/org/opentripplanner/street/search/intersection_model/AbstractIntersectionTraversalCalculator.java
diff --git a/src/main/java/org/opentripplanner/street/search/intersection_model/ConstantIntersectionTraversalCalculator.java b/application/src/main/java/org/opentripplanner/street/search/intersection_model/ConstantIntersectionTraversalCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/intersection_model/ConstantIntersectionTraversalCalculator.java
rename to application/src/main/java/org/opentripplanner/street/search/intersection_model/ConstantIntersectionTraversalCalculator.java
diff --git a/src/main/java/org/opentripplanner/street/search/intersection_model/DrivingDirection.java b/application/src/main/java/org/opentripplanner/street/search/intersection_model/DrivingDirection.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/intersection_model/DrivingDirection.java
rename to application/src/main/java/org/opentripplanner/street/search/intersection_model/DrivingDirection.java
diff --git a/src/main/java/org/opentripplanner/street/search/intersection_model/IntersectionTraversalCalculator.java b/application/src/main/java/org/opentripplanner/street/search/intersection_model/IntersectionTraversalCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/intersection_model/IntersectionTraversalCalculator.java
rename to application/src/main/java/org/opentripplanner/street/search/intersection_model/IntersectionTraversalCalculator.java
diff --git a/src/main/java/org/opentripplanner/street/search/intersection_model/IntersectionTraversalModel.java b/application/src/main/java/org/opentripplanner/street/search/intersection_model/IntersectionTraversalModel.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/intersection_model/IntersectionTraversalModel.java
rename to application/src/main/java/org/opentripplanner/street/search/intersection_model/IntersectionTraversalModel.java
diff --git a/src/main/java/org/opentripplanner/street/search/intersection_model/SimpleIntersectionTraversalCalculator.java b/application/src/main/java/org/opentripplanner/street/search/intersection_model/SimpleIntersectionTraversalCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/intersection_model/SimpleIntersectionTraversalCalculator.java
rename to application/src/main/java/org/opentripplanner/street/search/intersection_model/SimpleIntersectionTraversalCalculator.java
diff --git a/src/main/java/org/opentripplanner/street/search/request/StreetSearchRequest.java b/application/src/main/java/org/opentripplanner/street/search/request/StreetSearchRequest.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/request/StreetSearchRequest.java
rename to application/src/main/java/org/opentripplanner/street/search/request/StreetSearchRequest.java
diff --git a/src/main/java/org/opentripplanner/street/search/request/StreetSearchRequestBuilder.java b/application/src/main/java/org/opentripplanner/street/search/request/StreetSearchRequestBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/request/StreetSearchRequestBuilder.java
rename to application/src/main/java/org/opentripplanner/street/search/request/StreetSearchRequestBuilder.java
diff --git a/src/main/java/org/opentripplanner/street/search/request/StreetSearchRequestMapper.java b/application/src/main/java/org/opentripplanner/street/search/request/StreetSearchRequestMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/request/StreetSearchRequestMapper.java
rename to application/src/main/java/org/opentripplanner/street/search/request/StreetSearchRequestMapper.java
diff --git a/src/main/java/org/opentripplanner/street/search/state/CarPickupState.java b/application/src/main/java/org/opentripplanner/street/search/state/CarPickupState.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/state/CarPickupState.java
rename to application/src/main/java/org/opentripplanner/street/search/state/CarPickupState.java
diff --git a/src/main/java/org/opentripplanner/street/search/state/EdgeTraverser.java b/application/src/main/java/org/opentripplanner/street/search/state/EdgeTraverser.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/state/EdgeTraverser.java
rename to application/src/main/java/org/opentripplanner/street/search/state/EdgeTraverser.java
diff --git a/src/main/java/org/opentripplanner/street/search/state/State.java b/application/src/main/java/org/opentripplanner/street/search/state/State.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/state/State.java
rename to application/src/main/java/org/opentripplanner/street/search/state/State.java
diff --git a/src/main/java/org/opentripplanner/street/search/state/StateData.java b/application/src/main/java/org/opentripplanner/street/search/state/StateData.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/state/StateData.java
rename to application/src/main/java/org/opentripplanner/street/search/state/StateData.java
diff --git a/src/main/java/org/opentripplanner/street/search/state/StateEditor.java b/application/src/main/java/org/opentripplanner/street/search/state/StateEditor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/state/StateEditor.java
rename to application/src/main/java/org/opentripplanner/street/search/state/StateEditor.java
diff --git a/src/main/java/org/opentripplanner/street/search/state/VehicleRentalState.java b/application/src/main/java/org/opentripplanner/street/search/state/VehicleRentalState.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/state/VehicleRentalState.java
rename to application/src/main/java/org/opentripplanner/street/search/state/VehicleRentalState.java
diff --git a/src/main/java/org/opentripplanner/street/search/strategy/DominanceFunctions.java b/application/src/main/java/org/opentripplanner/street/search/strategy/DominanceFunctions.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/strategy/DominanceFunctions.java
rename to application/src/main/java/org/opentripplanner/street/search/strategy/DominanceFunctions.java
diff --git a/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java b/application/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java
rename to application/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java
diff --git a/src/main/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersService.java b/application/src/main/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersService.java
rename to application/src/main/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersService.java
diff --git a/src/main/java/org/opentripplanner/street/service/StreetLimitationParametersService.java b/application/src/main/java/org/opentripplanner/street/service/StreetLimitationParametersService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/service/StreetLimitationParametersService.java
rename to application/src/main/java/org/opentripplanner/street/service/StreetLimitationParametersService.java
diff --git a/src/main/java/org/opentripplanner/street/service/StreetLimitationParametersServiceModule.java b/application/src/main/java/org/opentripplanner/street/service/StreetLimitationParametersServiceModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/street/service/StreetLimitationParametersServiceModule.java
rename to application/src/main/java/org/opentripplanner/street/service/StreetLimitationParametersServiceModule.java
diff --git a/src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequest.java b/application/src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequest.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequest.java
rename to application/src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequest.java
diff --git a/src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequestBuilder.java b/application/src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequestBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequestBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequestBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/configure/TransitModule.java b/application/src/main/java/org/opentripplanner/transit/configure/TransitModule.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/configure/TransitModule.java
rename to application/src/main/java/org/opentripplanner/transit/configure/TransitModule.java
diff --git a/src/main/java/org/opentripplanner/transit/model/basic/Accessibility.java b/application/src/main/java/org/opentripplanner/transit/model/basic/Accessibility.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/basic/Accessibility.java
rename to application/src/main/java/org/opentripplanner/transit/model/basic/Accessibility.java
diff --git a/src/main/java/org/opentripplanner/transit/model/basic/Locales.java b/application/src/main/java/org/opentripplanner/transit/model/basic/Locales.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/basic/Locales.java
rename to application/src/main/java/org/opentripplanner/transit/model/basic/Locales.java
diff --git a/src/main/java/org/opentripplanner/transit/model/basic/LocalizedMoney.java b/application/src/main/java/org/opentripplanner/transit/model/basic/LocalizedMoney.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/basic/LocalizedMoney.java
rename to application/src/main/java/org/opentripplanner/transit/model/basic/LocalizedMoney.java
diff --git a/src/main/java/org/opentripplanner/transit/model/basic/MainAndSubMode.java b/application/src/main/java/org/opentripplanner/transit/model/basic/MainAndSubMode.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/basic/MainAndSubMode.java
rename to application/src/main/java/org/opentripplanner/transit/model/basic/MainAndSubMode.java
diff --git a/src/main/java/org/opentripplanner/transit/model/basic/Money.java b/application/src/main/java/org/opentripplanner/transit/model/basic/Money.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/basic/Money.java
rename to application/src/main/java/org/opentripplanner/transit/model/basic/Money.java
diff --git a/src/main/java/org/opentripplanner/transit/model/basic/Notice.java b/application/src/main/java/org/opentripplanner/transit/model/basic/Notice.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/basic/Notice.java
rename to application/src/main/java/org/opentripplanner/transit/model/basic/Notice.java
diff --git a/src/main/java/org/opentripplanner/transit/model/basic/NoticeBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/basic/NoticeBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/basic/NoticeBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/basic/NoticeBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/basic/SubMode.java b/application/src/main/java/org/opentripplanner/transit/model/basic/SubMode.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/basic/SubMode.java
rename to application/src/main/java/org/opentripplanner/transit/model/basic/SubMode.java
diff --git a/src/main/java/org/opentripplanner/transit/model/basic/TransitMode.java b/application/src/main/java/org/opentripplanner/transit/model/basic/TransitMode.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/basic/TransitMode.java
rename to application/src/main/java/org/opentripplanner/transit/model/basic/TransitMode.java
diff --git a/src/main/java/org/opentripplanner/transit/model/filter/expr/AndMatcher.java b/application/src/main/java/org/opentripplanner/transit/model/filter/expr/AndMatcher.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/filter/expr/AndMatcher.java
rename to application/src/main/java/org/opentripplanner/transit/model/filter/expr/AndMatcher.java
diff --git a/src/main/java/org/opentripplanner/transit/model/filter/expr/BinaryOperator.java b/application/src/main/java/org/opentripplanner/transit/model/filter/expr/BinaryOperator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/filter/expr/BinaryOperator.java
rename to application/src/main/java/org/opentripplanner/transit/model/filter/expr/BinaryOperator.java
diff --git a/src/main/java/org/opentripplanner/transit/model/filter/expr/ContainsMatcher.java b/application/src/main/java/org/opentripplanner/transit/model/filter/expr/ContainsMatcher.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/filter/expr/ContainsMatcher.java
rename to application/src/main/java/org/opentripplanner/transit/model/filter/expr/ContainsMatcher.java
diff --git a/src/main/java/org/opentripplanner/transit/model/filter/expr/EqualityMatcher.java b/application/src/main/java/org/opentripplanner/transit/model/filter/expr/EqualityMatcher.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/filter/expr/EqualityMatcher.java
rename to application/src/main/java/org/opentripplanner/transit/model/filter/expr/EqualityMatcher.java
diff --git a/src/main/java/org/opentripplanner/transit/model/filter/expr/ExpressionBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/filter/expr/ExpressionBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/filter/expr/ExpressionBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/filter/expr/ExpressionBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/filter/expr/Matcher.java b/application/src/main/java/org/opentripplanner/transit/model/filter/expr/Matcher.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/filter/expr/Matcher.java
rename to application/src/main/java/org/opentripplanner/transit/model/filter/expr/Matcher.java
diff --git a/src/main/java/org/opentripplanner/transit/model/filter/expr/OrMatcher.java b/application/src/main/java/org/opentripplanner/transit/model/filter/expr/OrMatcher.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/filter/expr/OrMatcher.java
rename to application/src/main/java/org/opentripplanner/transit/model/filter/expr/OrMatcher.java
diff --git a/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactory.java b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactory.java
rename to application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactory.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/AbstractBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/AbstractBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/AbstractBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/AbstractEntityBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractEntityBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/AbstractEntityBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/AbstractEntityBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/AbstractTransitEntity.java b/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractTransitEntity.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/AbstractTransitEntity.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/AbstractTransitEntity.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/DataValidationException.java b/application/src/main/java/org/opentripplanner/transit/model/framework/DataValidationException.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/DataValidationException.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/DataValidationException.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/Deduplicator.java b/application/src/main/java/org/opentripplanner/transit/model/framework/Deduplicator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/Deduplicator.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/Deduplicator.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/DeduplicatorNoop.java b/application/src/main/java/org/opentripplanner/transit/model/framework/DeduplicatorNoop.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/DeduplicatorNoop.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/DeduplicatorNoop.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/DeduplicatorService.java b/application/src/main/java/org/opentripplanner/transit/model/framework/DeduplicatorService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/DeduplicatorService.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/DeduplicatorService.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/DefaultEntityById.java b/application/src/main/java/org/opentripplanner/transit/model/framework/DefaultEntityById.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/DefaultEntityById.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/DefaultEntityById.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/DefaultEntityContext.java b/application/src/main/java/org/opentripplanner/transit/model/framework/DefaultEntityContext.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/DefaultEntityContext.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/DefaultEntityContext.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/EntityById.java b/application/src/main/java/org/opentripplanner/transit/model/framework/EntityById.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/EntityById.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/EntityById.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/EntityContext.java b/application/src/main/java/org/opentripplanner/transit/model/framework/EntityContext.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/EntityContext.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/EntityContext.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/EntityNotFoundException.java b/application/src/main/java/org/opentripplanner/transit/model/framework/EntityNotFoundException.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/EntityNotFoundException.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/EntityNotFoundException.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/FeedScopedId.java b/application/src/main/java/org/opentripplanner/transit/model/framework/FeedScopedId.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/FeedScopedId.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/FeedScopedId.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/ImmutableEntityById.java b/application/src/main/java/org/opentripplanner/transit/model/framework/ImmutableEntityById.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/ImmutableEntityById.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/ImmutableEntityById.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/LogInfo.java b/application/src/main/java/org/opentripplanner/transit/model/framework/LogInfo.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/LogInfo.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/LogInfo.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/Result.java b/application/src/main/java/org/opentripplanner/transit/model/framework/Result.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/Result.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/Result.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/TransitBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/framework/TransitBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/TransitBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/TransitBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/TransitEntity.java b/application/src/main/java/org/opentripplanner/transit/model/framework/TransitEntity.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/TransitEntity.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/TransitEntity.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/TransitEntityBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/framework/TransitEntityBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/TransitEntityBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/TransitEntityBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/framework/TransitObject.java b/application/src/main/java/org/opentripplanner/transit/model/framework/TransitObject.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/framework/TransitObject.java
rename to application/src/main/java/org/opentripplanner/transit/model/framework/TransitObject.java
diff --git a/src/main/java/org/opentripplanner/transit/model/network/BikeAccess.java b/application/src/main/java/org/opentripplanner/transit/model/network/BikeAccess.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/network/BikeAccess.java
rename to application/src/main/java/org/opentripplanner/transit/model/network/BikeAccess.java
diff --git a/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutes.java b/application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutes.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutes.java
rename to application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutes.java
diff --git a/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutesBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutesBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutesBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutesBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/network/Route.java b/application/src/main/java/org/opentripplanner/transit/model/network/Route.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/network/Route.java
rename to application/src/main/java/org/opentripplanner/transit/model/network/Route.java
diff --git a/src/main/java/org/opentripplanner/transit/model/network/RouteBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/network/RouteBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/network/RouteBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/network/RouteBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/network/RoutingTripPattern.java b/application/src/main/java/org/opentripplanner/transit/model/network/RoutingTripPattern.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/network/RoutingTripPattern.java
rename to application/src/main/java/org/opentripplanner/transit/model/network/RoutingTripPattern.java
diff --git a/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java b/application/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/network/StopPattern.java
rename to application/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java
diff --git a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java b/application/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/network/TripPattern.java
rename to application/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java
diff --git a/src/main/java/org/opentripplanner/transit/model/network/TripPatternBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/network/TripPatternBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/network/TripPatternBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/network/TripPatternBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/BinarySetOperator.java b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/BinarySetOperator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/network/grouppriority/BinarySetOperator.java
rename to application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/BinarySetOperator.java
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupPriorityCalculator.java b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupPriorityCalculator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupPriorityCalculator.java
rename to application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupPriorityCalculator.java
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java
rename to application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matcher.java b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matcher.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matcher.java
rename to application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matcher.java
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java
rename to application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32n.java b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32n.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32n.java
rename to application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32n.java
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java
rename to application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapter.java b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapter.java
rename to application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapter.java
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripPatternAdapter.java b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripPatternAdapter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripPatternAdapter.java
rename to application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripPatternAdapter.java
diff --git a/src/main/java/org/opentripplanner/transit/model/organization/Agency.java b/application/src/main/java/org/opentripplanner/transit/model/organization/Agency.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/organization/Agency.java
rename to application/src/main/java/org/opentripplanner/transit/model/organization/Agency.java
diff --git a/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/organization/Branding.java b/application/src/main/java/org/opentripplanner/transit/model/organization/Branding.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/organization/Branding.java
rename to application/src/main/java/org/opentripplanner/transit/model/organization/Branding.java
diff --git a/src/main/java/org/opentripplanner/transit/model/organization/BrandingBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/organization/BrandingBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/organization/BrandingBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/organization/BrandingBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/organization/ContactInfo.java b/application/src/main/java/org/opentripplanner/transit/model/organization/ContactInfo.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/organization/ContactInfo.java
rename to application/src/main/java/org/opentripplanner/transit/model/organization/ContactInfo.java
diff --git a/src/main/java/org/opentripplanner/transit/model/organization/ContactInfoBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/organization/ContactInfoBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/organization/ContactInfoBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/organization/ContactInfoBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/organization/Operator.java b/application/src/main/java/org/opentripplanner/transit/model/organization/Operator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/organization/Operator.java
rename to application/src/main/java/org/opentripplanner/transit/model/organization/Operator.java
diff --git a/src/main/java/org/opentripplanner/transit/model/organization/OperatorBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/organization/OperatorBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/organization/OperatorBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/organization/OperatorBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/package.md b/application/src/main/java/org/opentripplanner/transit/model/package.md
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/package.md
rename to application/src/main/java/org/opentripplanner/transit/model/package.md
diff --git a/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java b/application/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/AreaStop.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/AreaStopBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/AreaStopBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/AreaStopBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/AreaStopBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/BoardingArea.java b/application/src/main/java/org/opentripplanner/transit/model/site/BoardingArea.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/BoardingArea.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/BoardingArea.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/BoardingAreaBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/BoardingAreaBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/BoardingAreaBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/BoardingAreaBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/Entrance.java b/application/src/main/java/org/opentripplanner/transit/model/site/Entrance.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/Entrance.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/Entrance.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/EntranceBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/EntranceBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/EntranceBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/EntranceBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/FareZone.java b/application/src/main/java/org/opentripplanner/transit/model/site/FareZone.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/FareZone.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/FareZone.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/FareZoneBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/FareZoneBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/FareZoneBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/FareZoneBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java b/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupOfStationsBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStationsBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/GroupOfStationsBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStationsBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupOfStationsPurpose.java b/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStationsPurpose.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/GroupOfStationsPurpose.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStationsPurpose.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java b/application/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/GroupStop.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/MultiModalStation.java b/application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStation.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/MultiModalStation.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStation.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/MultiModalStationBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStationBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/MultiModalStationBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStationBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/Pathway.java b/application/src/main/java/org/opentripplanner/transit/model/site/Pathway.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/Pathway.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/Pathway.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/PathwayBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/PathwayBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/PathwayBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/PathwayBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/PathwayMode.java b/application/src/main/java/org/opentripplanner/transit/model/site/PathwayMode.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/PathwayMode.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/PathwayMode.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/PathwayNode.java b/application/src/main/java/org/opentripplanner/transit/model/site/PathwayNode.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/PathwayNode.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/PathwayNode.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/PathwayNodeBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/PathwayNodeBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/PathwayNodeBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/PathwayNodeBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java b/application/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/RegularStop.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/RegularStopBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/RegularStopBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/RegularStopBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/RegularStopBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/Station.java b/application/src/main/java/org/opentripplanner/transit/model/site/Station.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/Station.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/Station.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/StationBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/StationBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/StationBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/StationBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/StationElement.java b/application/src/main/java/org/opentripplanner/transit/model/site/StationElement.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/StationElement.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/StationElement.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/StationElementBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/StationElementBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/StationElementBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/StationElementBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/StopLevel.java b/application/src/main/java/org/opentripplanner/transit/model/site/StopLevel.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/StopLevel.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/StopLevel.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java b/application/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/StopLocation.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/StopLocationsGroup.java b/application/src/main/java/org/opentripplanner/transit/model/site/StopLocationsGroup.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/StopLocationsGroup.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/StopLocationsGroup.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/StopTransferPriority.java b/application/src/main/java/org/opentripplanner/transit/model/site/StopTransferPriority.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/StopTransferPriority.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/StopTransferPriority.java
diff --git a/src/main/java/org/opentripplanner/transit/model/site/StopType.java b/application/src/main/java/org/opentripplanner/transit/model/site/StopType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/site/StopType.java
rename to application/src/main/java/org/opentripplanner/transit/model/site/StopType.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/Direction.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/Direction.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/Direction.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/Direction.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/FrequencyEntry.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/FrequencyEntry.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/FrequencyEntry.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/FrequencyEntry.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/OccupancyStatus.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/OccupancyStatus.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/OccupancyStatus.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/OccupancyStatus.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeState.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeState.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/RealTimeState.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeState.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/StopRealTimeState.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/StopRealTimeState.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/StopRealTimeState.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/StopRealTimeState.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKey.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKey.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKey.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKey.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKeyBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKeyBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKeyBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKeyBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/TimetableValidationError.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TimetableValidationError.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/TimetableValidationError.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/TimetableValidationError.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/Trip.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/Trip.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/Trip.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/Trip.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/TripAlteration.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripAlteration.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/TripAlteration.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/TripAlteration.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/TripBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/TripBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/TripBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/TripIdAndServiceDate.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripIdAndServiceDate.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/TripIdAndServiceDate.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/TripIdAndServiceDate.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDate.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDate.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDate.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDate.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDateBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDateBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDateBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDateBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesFactory.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/TripTimesFactory.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesFactory.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesStringBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesStringBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/TripTimesStringBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesStringBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingMethod.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingMethod.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingMethod.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingMethod.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingTime.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingTime.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingTime.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingTime.java
diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java
rename to application/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java
diff --git a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java b/application/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
rename to application/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
diff --git a/src/main/java/org/opentripplanner/transit/service/PatternByServiceDatesFilter.java b/application/src/main/java/org/opentripplanner/transit/service/PatternByServiceDatesFilter.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/service/PatternByServiceDatesFilter.java
rename to application/src/main/java/org/opentripplanner/transit/service/PatternByServiceDatesFilter.java
diff --git a/src/main/java/org/opentripplanner/transit/service/StopModel.java b/application/src/main/java/org/opentripplanner/transit/service/StopModel.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/service/StopModel.java
rename to application/src/main/java/org/opentripplanner/transit/service/StopModel.java
diff --git a/src/main/java/org/opentripplanner/transit/service/StopModelBuilder.java b/application/src/main/java/org/opentripplanner/transit/service/StopModelBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/service/StopModelBuilder.java
rename to application/src/main/java/org/opentripplanner/transit/service/StopModelBuilder.java
diff --git a/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java b/application/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/service/StopModelIndex.java
rename to application/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java
diff --git a/src/main/java/org/opentripplanner/transit/service/TransitEditorService.java b/application/src/main/java/org/opentripplanner/transit/service/TransitEditorService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/service/TransitEditorService.java
rename to application/src/main/java/org/opentripplanner/transit/service/TransitEditorService.java
diff --git a/src/main/java/org/opentripplanner/transit/service/TransitModel.java b/application/src/main/java/org/opentripplanner/transit/service/TransitModel.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/service/TransitModel.java
rename to application/src/main/java/org/opentripplanner/transit/service/TransitModel.java
diff --git a/src/main/java/org/opentripplanner/transit/service/TransitModelIndex.java b/application/src/main/java/org/opentripplanner/transit/service/TransitModelIndex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/service/TransitModelIndex.java
rename to application/src/main/java/org/opentripplanner/transit/service/TransitModelIndex.java
diff --git a/src/main/java/org/opentripplanner/transit/service/TransitService.java b/application/src/main/java/org/opentripplanner/transit/service/TransitService.java
similarity index 100%
rename from src/main/java/org/opentripplanner/transit/service/TransitService.java
rename to application/src/main/java/org/opentripplanner/transit/service/TransitService.java
diff --git a/src/main/java/org/opentripplanner/updater/DefaultRealTimeUpdateContext.java b/application/src/main/java/org/opentripplanner/updater/DefaultRealTimeUpdateContext.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/DefaultRealTimeUpdateContext.java
rename to application/src/main/java/org/opentripplanner/updater/DefaultRealTimeUpdateContext.java
diff --git a/src/main/java/org/opentripplanner/updater/GraphUpdaterManager.java b/application/src/main/java/org/opentripplanner/updater/GraphUpdaterManager.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/GraphUpdaterManager.java
rename to application/src/main/java/org/opentripplanner/updater/GraphUpdaterManager.java
diff --git a/src/main/java/org/opentripplanner/updater/GraphUpdaterStatus.java b/application/src/main/java/org/opentripplanner/updater/GraphUpdaterStatus.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/GraphUpdaterStatus.java
rename to application/src/main/java/org/opentripplanner/updater/GraphUpdaterStatus.java
diff --git a/src/main/java/org/opentripplanner/updater/GraphWriterRunnable.java b/application/src/main/java/org/opentripplanner/updater/GraphWriterRunnable.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/GraphWriterRunnable.java
rename to application/src/main/java/org/opentripplanner/updater/GraphWriterRunnable.java
diff --git a/src/main/java/org/opentripplanner/updater/GtfsRealtimeFuzzyTripMatcher.java b/application/src/main/java/org/opentripplanner/updater/GtfsRealtimeFuzzyTripMatcher.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/GtfsRealtimeFuzzyTripMatcher.java
rename to application/src/main/java/org/opentripplanner/updater/GtfsRealtimeFuzzyTripMatcher.java
diff --git a/src/main/java/org/opentripplanner/updater/GtfsRealtimeMapper.java b/application/src/main/java/org/opentripplanner/updater/GtfsRealtimeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/GtfsRealtimeMapper.java
rename to application/src/main/java/org/opentripplanner/updater/GtfsRealtimeMapper.java
diff --git a/src/main/java/org/opentripplanner/updater/RealTimeUpdateContext.java b/application/src/main/java/org/opentripplanner/updater/RealTimeUpdateContext.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/RealTimeUpdateContext.java
rename to application/src/main/java/org/opentripplanner/updater/RealTimeUpdateContext.java
diff --git a/src/main/java/org/opentripplanner/updater/TimetableSnapshotSourceParameters.java b/application/src/main/java/org/opentripplanner/updater/TimetableSnapshotSourceParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/TimetableSnapshotSourceParameters.java
rename to application/src/main/java/org/opentripplanner/updater/TimetableSnapshotSourceParameters.java
diff --git a/src/main/java/org/opentripplanner/updater/UpdatersParameters.java b/application/src/main/java/org/opentripplanner/updater/UpdatersParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/UpdatersParameters.java
rename to application/src/main/java/org/opentripplanner/updater/UpdatersParameters.java
diff --git a/src/main/java/org/opentripplanner/updater/alert/AlertsUpdateHandler.java b/application/src/main/java/org/opentripplanner/updater/alert/AlertsUpdateHandler.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/alert/AlertsUpdateHandler.java
rename to application/src/main/java/org/opentripplanner/updater/alert/AlertsUpdateHandler.java
diff --git a/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java b/application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java
rename to application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java
diff --git a/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdaterParameters.java b/application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdaterParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdaterParameters.java
rename to application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdaterParameters.java
diff --git a/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeCauseMapper.java b/application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeCauseMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeCauseMapper.java
rename to application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeCauseMapper.java
diff --git a/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeEffectMapper.java b/application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeEffectMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeEffectMapper.java
rename to application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeEffectMapper.java
diff --git a/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeSeverityMapper.java b/application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeSeverityMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeSeverityMapper.java
rename to application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeSeverityMapper.java
diff --git a/src/main/java/org/opentripplanner/updater/alert/TransitAlertProvider.java b/application/src/main/java/org/opentripplanner/updater/alert/TransitAlertProvider.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/alert/TransitAlertProvider.java
rename to application/src/main/java/org/opentripplanner/updater/alert/TransitAlertProvider.java
diff --git a/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java b/application/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java
rename to application/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java
diff --git a/src/main/java/org/opentripplanner/updater/images/snapshot-manager-1.excalidraw b/application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-1.excalidraw
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/snapshot-manager-1.excalidraw
rename to application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-1.excalidraw
diff --git a/src/main/java/org/opentripplanner/updater/images/snapshot-manager-1.svg b/application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-1.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/snapshot-manager-1.svg
rename to application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-1.svg
diff --git a/src/main/java/org/opentripplanner/updater/images/snapshot-manager-2.excalidraw b/application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-2.excalidraw
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/snapshot-manager-2.excalidraw
rename to application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-2.excalidraw
diff --git a/src/main/java/org/opentripplanner/updater/images/snapshot-manager-2.svg b/application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-2.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/snapshot-manager-2.svg
rename to application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-2.svg
diff --git a/src/main/java/org/opentripplanner/updater/images/snapshot-manager-3.excalidraw b/application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-3.excalidraw
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/snapshot-manager-3.excalidraw
rename to application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-3.excalidraw
diff --git a/src/main/java/org/opentripplanner/updater/images/snapshot-manager-3.svg b/application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-3.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/snapshot-manager-3.svg
rename to application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-3.svg
diff --git a/src/main/java/org/opentripplanner/updater/images/snapshot-manager-4.excalidraw b/application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-4.excalidraw
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/snapshot-manager-4.excalidraw
rename to application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-4.excalidraw
diff --git a/src/main/java/org/opentripplanner/updater/images/snapshot-manager-4.svg b/application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-4.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/snapshot-manager-4.svg
rename to application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-4.svg
diff --git a/src/main/java/org/opentripplanner/updater/images/snapshot-manager-5.excalidraw b/application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-5.excalidraw
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/snapshot-manager-5.excalidraw
rename to application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-5.excalidraw
diff --git a/src/main/java/org/opentripplanner/updater/images/snapshot-manager-5.svg b/application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-5.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/snapshot-manager-5.svg
rename to application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-5.svg
diff --git a/src/main/java/org/opentripplanner/updater/images/snapshot-manager-6.excalidraw b/application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-6.excalidraw
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/snapshot-manager-6.excalidraw
rename to application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-6.excalidraw
diff --git a/src/main/java/org/opentripplanner/updater/images/snapshot-manager-6.svg b/application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-6.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/snapshot-manager-6.svg
rename to application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-6.svg
diff --git a/src/main/java/org/opentripplanner/updater/images/snapshot-manager-7.excalidraw b/application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-7.excalidraw
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/snapshot-manager-7.excalidraw
rename to application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-7.excalidraw
diff --git a/src/main/java/org/opentripplanner/updater/images/snapshot-manager-7.svg b/application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-7.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/snapshot-manager-7.svg
rename to application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-7.svg
diff --git a/src/main/java/org/opentripplanner/updater/images/snapshot-manager-8.excalidraw b/application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-8.excalidraw
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/snapshot-manager-8.excalidraw
rename to application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-8.excalidraw
diff --git a/src/main/java/org/opentripplanner/updater/images/snapshot-manager-8.svg b/application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-8.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/snapshot-manager-8.svg
rename to application/src/main/java/org/opentripplanner/updater/images/snapshot-manager-8.svg
diff --git a/src/main/java/org/opentripplanner/updater/images/timetable-lookup.excalidraw b/application/src/main/java/org/opentripplanner/updater/images/timetable-lookup.excalidraw
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/timetable-lookup.excalidraw
rename to application/src/main/java/org/opentripplanner/updater/images/timetable-lookup.excalidraw
diff --git a/src/main/java/org/opentripplanner/updater/images/timetable-lookup.svg b/application/src/main/java/org/opentripplanner/updater/images/timetable-lookup.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/timetable-lookup.svg
rename to application/src/main/java/org/opentripplanner/updater/images/timetable-lookup.svg
diff --git a/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.excalidraw b/application/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.excalidraw
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/updater-threads-queues.excalidraw
rename to application/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.excalidraw
diff --git a/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.svg b/application/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.svg
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/images/updater-threads-queues.svg
rename to application/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.svg
diff --git a/src/main/java/org/opentripplanner/updater/package.md b/application/src/main/java/org/opentripplanner/updater/package.md
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/package.md
rename to application/src/main/java/org/opentripplanner/updater/package.md
diff --git a/src/main/java/org/opentripplanner/updater/siri/AddedTripBuilder.java b/application/src/main/java/org/opentripplanner/updater/siri/AddedTripBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/AddedTripBuilder.java
rename to application/src/main/java/org/opentripplanner/updater/siri/AddedTripBuilder.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/CallWrapper.java b/application/src/main/java/org/opentripplanner/updater/siri/CallWrapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/CallWrapper.java
rename to application/src/main/java/org/opentripplanner/updater/siri/CallWrapper.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/DebugString.java b/application/src/main/java/org/opentripplanner/updater/siri/DebugString.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/DebugString.java
rename to application/src/main/java/org/opentripplanner/updater/siri/DebugString.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/EntityResolver.java b/application/src/main/java/org/opentripplanner/updater/siri/EntityResolver.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/EntityResolver.java
rename to application/src/main/java/org/opentripplanner/updater/siri/EntityResolver.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/ModifiedTripBuilder.java b/application/src/main/java/org/opentripplanner/updater/siri/ModifiedTripBuilder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/ModifiedTripBuilder.java
rename to application/src/main/java/org/opentripplanner/updater/siri/ModifiedTripBuilder.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/SiriAlertsUpdateHandler.java b/application/src/main/java/org/opentripplanner/updater/siri/SiriAlertsUpdateHandler.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/SiriAlertsUpdateHandler.java
rename to application/src/main/java/org/opentripplanner/updater/siri/SiriAlertsUpdateHandler.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/SiriFuzzyTripMatcher.java b/application/src/main/java/org/opentripplanner/updater/siri/SiriFuzzyTripMatcher.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/SiriFuzzyTripMatcher.java
rename to application/src/main/java/org/opentripplanner/updater/siri/SiriFuzzyTripMatcher.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/SiriTimetableSnapshotSource.java b/application/src/main/java/org/opentripplanner/updater/siri/SiriTimetableSnapshotSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/SiriTimetableSnapshotSource.java
rename to application/src/main/java/org/opentripplanner/updater/siri/SiriTimetableSnapshotSource.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/SiriTripPatternCache.java b/application/src/main/java/org/opentripplanner/updater/siri/SiriTripPatternCache.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/SiriTripPatternCache.java
rename to application/src/main/java/org/opentripplanner/updater/siri/SiriTripPatternCache.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/SiriTripPatternIdGenerator.java b/application/src/main/java/org/opentripplanner/updater/siri/SiriTripPatternIdGenerator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/SiriTripPatternIdGenerator.java
rename to application/src/main/java/org/opentripplanner/updater/siri/SiriTripPatternIdGenerator.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/TimetableHelper.java b/application/src/main/java/org/opentripplanner/updater/siri/TimetableHelper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/TimetableHelper.java
rename to application/src/main/java/org/opentripplanner/updater/siri/TimetableHelper.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/TripAndPattern.java b/application/src/main/java/org/opentripplanner/updater/siri/TripAndPattern.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/TripAndPattern.java
rename to application/src/main/java/org/opentripplanner/updater/siri/TripAndPattern.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/TripUpdate.java b/application/src/main/java/org/opentripplanner/updater/siri/TripUpdate.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/TripUpdate.java
rename to application/src/main/java/org/opentripplanner/updater/siri/TripUpdate.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/mapper/AffectsMapper.java b/application/src/main/java/org/opentripplanner/updater/siri/mapper/AffectsMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/mapper/AffectsMapper.java
rename to application/src/main/java/org/opentripplanner/updater/siri/mapper/AffectsMapper.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/mapper/OccupancyMapper.java b/application/src/main/java/org/opentripplanner/updater/siri/mapper/OccupancyMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/mapper/OccupancyMapper.java
rename to application/src/main/java/org/opentripplanner/updater/siri/mapper/OccupancyMapper.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/mapper/PickDropMapper.java b/application/src/main/java/org/opentripplanner/updater/siri/mapper/PickDropMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/mapper/PickDropMapper.java
rename to application/src/main/java/org/opentripplanner/updater/siri/mapper/PickDropMapper.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/mapper/SiriSeverityMapper.java b/application/src/main/java/org/opentripplanner/updater/siri/mapper/SiriSeverityMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/mapper/SiriSeverityMapper.java
rename to application/src/main/java/org/opentripplanner/updater/siri/mapper/SiriSeverityMapper.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/mapper/SiriTransportModeMapper.java b/application/src/main/java/org/opentripplanner/updater/siri/mapper/SiriTransportModeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/mapper/SiriTransportModeMapper.java
rename to application/src/main/java/org/opentripplanner/updater/siri/mapper/SiriTransportModeMapper.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/updater/AsyncEstimatedTimetableProcessor.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/AsyncEstimatedTimetableProcessor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/updater/AsyncEstimatedTimetableProcessor.java
rename to application/src/main/java/org/opentripplanner/updater/siri/updater/AsyncEstimatedTimetableProcessor.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/updater/AsyncEstimatedTimetableSource.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/AsyncEstimatedTimetableSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/updater/AsyncEstimatedTimetableSource.java
rename to application/src/main/java/org/opentripplanner/updater/siri/updater/AsyncEstimatedTimetableSource.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/updater/EstimatedTimetableHandler.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/EstimatedTimetableHandler.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/updater/EstimatedTimetableHandler.java
rename to application/src/main/java/org/opentripplanner/updater/siri/updater/EstimatedTimetableHandler.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/updater/EstimatedTimetableSource.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/EstimatedTimetableSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/updater/EstimatedTimetableSource.java
rename to application/src/main/java/org/opentripplanner/updater/siri/updater/EstimatedTimetableSource.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/updater/SiriETHttpTripUpdateSource.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/SiriETHttpTripUpdateSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/updater/SiriETHttpTripUpdateSource.java
rename to application/src/main/java/org/opentripplanner/updater/siri/updater/SiriETHttpTripUpdateSource.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/updater/SiriETUpdater.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/SiriETUpdater.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/updater/SiriETUpdater.java
rename to application/src/main/java/org/opentripplanner/updater/siri/updater/SiriETUpdater.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/updater/SiriETUpdaterParameters.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/SiriETUpdaterParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/updater/SiriETUpdaterParameters.java
rename to application/src/main/java/org/opentripplanner/updater/siri/updater/SiriETUpdaterParameters.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/updater/SiriFileLoader.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/SiriFileLoader.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/updater/SiriFileLoader.java
rename to application/src/main/java/org/opentripplanner/updater/siri/updater/SiriFileLoader.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/updater/SiriHelper.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/SiriHelper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/updater/SiriHelper.java
rename to application/src/main/java/org/opentripplanner/updater/siri/updater/SiriHelper.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/updater/SiriHttpLoader.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/SiriHttpLoader.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/updater/SiriHttpLoader.java
rename to application/src/main/java/org/opentripplanner/updater/siri/updater/SiriHttpLoader.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/updater/SiriLoader.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/SiriLoader.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/updater/SiriLoader.java
rename to application/src/main/java/org/opentripplanner/updater/siri/updater/SiriLoader.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/updater/SiriSXUpdater.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/SiriSXUpdater.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/updater/SiriSXUpdater.java
rename to application/src/main/java/org/opentripplanner/updater/siri/updater/SiriSXUpdater.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/updater/SiriSXUpdaterParameters.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/SiriSXUpdaterParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/updater/SiriSXUpdaterParameters.java
rename to application/src/main/java/org/opentripplanner/updater/siri/updater/SiriSXUpdaterParameters.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/updater/google/GooglePubsubEstimatedTimetableSource.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/google/GooglePubsubEstimatedTimetableSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/updater/google/GooglePubsubEstimatedTimetableSource.java
rename to application/src/main/java/org/opentripplanner/updater/siri/updater/google/GooglePubsubEstimatedTimetableSource.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/updater/google/SiriETGooglePubsubUpdater.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/google/SiriETGooglePubsubUpdater.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/updater/google/SiriETGooglePubsubUpdater.java
rename to application/src/main/java/org/opentripplanner/updater/siri/updater/google/SiriETGooglePubsubUpdater.java
diff --git a/src/main/java/org/opentripplanner/updater/siri/updater/google/SiriETGooglePubsubUpdaterParameters.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/google/SiriETGooglePubsubUpdaterParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/siri/updater/google/SiriETGooglePubsubUpdaterParameters.java
rename to application/src/main/java/org/opentripplanner/updater/siri/updater/google/SiriETGooglePubsubUpdaterParameters.java
diff --git a/src/main/java/org/opentripplanner/updater/spi/DataSource.java b/application/src/main/java/org/opentripplanner/updater/spi/DataSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/spi/DataSource.java
rename to application/src/main/java/org/opentripplanner/updater/spi/DataSource.java
diff --git a/src/main/java/org/opentripplanner/updater/spi/DataValidationExceptionMapper.java b/application/src/main/java/org/opentripplanner/updater/spi/DataValidationExceptionMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/spi/DataValidationExceptionMapper.java
rename to application/src/main/java/org/opentripplanner/updater/spi/DataValidationExceptionMapper.java
diff --git a/src/main/java/org/opentripplanner/updater/spi/GenericJsonDataSource.java b/application/src/main/java/org/opentripplanner/updater/spi/GenericJsonDataSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/spi/GenericJsonDataSource.java
rename to application/src/main/java/org/opentripplanner/updater/spi/GenericJsonDataSource.java
diff --git a/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java b/application/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java
rename to application/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java
diff --git a/src/main/java/org/opentripplanner/updater/spi/HttpHeaders.java b/application/src/main/java/org/opentripplanner/updater/spi/HttpHeaders.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/spi/HttpHeaders.java
rename to application/src/main/java/org/opentripplanner/updater/spi/HttpHeaders.java
diff --git a/src/main/java/org/opentripplanner/updater/spi/PollingGraphUpdater.java b/application/src/main/java/org/opentripplanner/updater/spi/PollingGraphUpdater.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/spi/PollingGraphUpdater.java
rename to application/src/main/java/org/opentripplanner/updater/spi/PollingGraphUpdater.java
diff --git a/src/main/java/org/opentripplanner/updater/spi/PollingGraphUpdaterParameters.java b/application/src/main/java/org/opentripplanner/updater/spi/PollingGraphUpdaterParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/spi/PollingGraphUpdaterParameters.java
rename to application/src/main/java/org/opentripplanner/updater/spi/PollingGraphUpdaterParameters.java
diff --git a/src/main/java/org/opentripplanner/updater/spi/ResultLogger.java b/application/src/main/java/org/opentripplanner/updater/spi/ResultLogger.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/spi/ResultLogger.java
rename to application/src/main/java/org/opentripplanner/updater/spi/ResultLogger.java
diff --git a/src/main/java/org/opentripplanner/updater/spi/TimetableSnapshotFlush.java b/application/src/main/java/org/opentripplanner/updater/spi/TimetableSnapshotFlush.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/spi/TimetableSnapshotFlush.java
rename to application/src/main/java/org/opentripplanner/updater/spi/TimetableSnapshotFlush.java
diff --git a/src/main/java/org/opentripplanner/updater/spi/UpdateError.java b/application/src/main/java/org/opentripplanner/updater/spi/UpdateError.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/spi/UpdateError.java
rename to application/src/main/java/org/opentripplanner/updater/spi/UpdateError.java
diff --git a/src/main/java/org/opentripplanner/updater/spi/UpdateResult.java b/application/src/main/java/org/opentripplanner/updater/spi/UpdateResult.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/spi/UpdateResult.java
rename to application/src/main/java/org/opentripplanner/updater/spi/UpdateResult.java
diff --git a/src/main/java/org/opentripplanner/updater/spi/UpdateSuccess.java b/application/src/main/java/org/opentripplanner/updater/spi/UpdateSuccess.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/spi/UpdateSuccess.java
rename to application/src/main/java/org/opentripplanner/updater/spi/UpdateSuccess.java
diff --git a/src/main/java/org/opentripplanner/updater/spi/UpdaterConstructionException.java b/application/src/main/java/org/opentripplanner/updater/spi/UpdaterConstructionException.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/spi/UpdaterConstructionException.java
rename to application/src/main/java/org/opentripplanner/updater/spi/UpdaterConstructionException.java
diff --git a/src/main/java/org/opentripplanner/updater/spi/WriteToGraphCallback.java b/application/src/main/java/org/opentripplanner/updater/spi/WriteToGraphCallback.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/spi/WriteToGraphCallback.java
rename to application/src/main/java/org/opentripplanner/updater/spi/WriteToGraphCallback.java
diff --git a/src/main/java/org/opentripplanner/updater/trip/AddedRoute.java b/application/src/main/java/org/opentripplanner/updater/trip/AddedRoute.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/trip/AddedRoute.java
rename to application/src/main/java/org/opentripplanner/updater/trip/AddedRoute.java
diff --git a/src/main/java/org/opentripplanner/updater/trip/AddedStopTime.java b/application/src/main/java/org/opentripplanner/updater/trip/AddedStopTime.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/trip/AddedStopTime.java
rename to application/src/main/java/org/opentripplanner/updater/trip/AddedStopTime.java
diff --git a/src/main/java/org/opentripplanner/updater/trip/BackwardsDelayPropagationType.java b/application/src/main/java/org/opentripplanner/updater/trip/BackwardsDelayPropagationType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/trip/BackwardsDelayPropagationType.java
rename to application/src/main/java/org/opentripplanner/updater/trip/BackwardsDelayPropagationType.java
diff --git a/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java b/application/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java
rename to application/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java
diff --git a/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java b/application/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java
rename to application/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java
diff --git a/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdaterParameters.java b/application/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdaterParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdaterParameters.java
rename to application/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdaterParameters.java
diff --git a/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java b/application/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java
rename to application/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java
diff --git a/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdaterParameters.java b/application/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdaterParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/trip/PollingTripUpdaterParameters.java
rename to application/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdaterParameters.java
diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java b/application/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
rename to application/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/application/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
rename to application/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
diff --git a/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java b/application/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java
rename to application/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java
diff --git a/src/main/java/org/opentripplanner/updater/trip/TripUpdateGraphWriterRunnable.java b/application/src/main/java/org/opentripplanner/updater/trip/TripUpdateGraphWriterRunnable.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/trip/TripUpdateGraphWriterRunnable.java
rename to application/src/main/java/org/opentripplanner/updater/trip/TripUpdateGraphWriterRunnable.java
diff --git a/src/main/java/org/opentripplanner/updater/trip/UpdateIncrementality.java b/application/src/main/java/org/opentripplanner/updater/trip/UpdateIncrementality.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/trip/UpdateIncrementality.java
rename to application/src/main/java/org/opentripplanner/updater/trip/UpdateIncrementality.java
diff --git a/src/main/java/org/opentripplanner/updater/trip/UrlUpdaterParameters.java b/application/src/main/java/org/opentripplanner/updater/trip/UrlUpdaterParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/trip/UrlUpdaterParameters.java
rename to application/src/main/java/org/opentripplanner/updater/trip/UrlUpdaterParameters.java
diff --git a/src/main/java/org/opentripplanner/updater/trip/metrics/BatchTripUpdateMetrics.java b/application/src/main/java/org/opentripplanner/updater/trip/metrics/BatchTripUpdateMetrics.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/trip/metrics/BatchTripUpdateMetrics.java
rename to application/src/main/java/org/opentripplanner/updater/trip/metrics/BatchTripUpdateMetrics.java
diff --git a/src/main/java/org/opentripplanner/updater/trip/metrics/StreamingTripUpdateMetrics.java b/application/src/main/java/org/opentripplanner/updater/trip/metrics/StreamingTripUpdateMetrics.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/trip/metrics/StreamingTripUpdateMetrics.java
rename to application/src/main/java/org/opentripplanner/updater/trip/metrics/StreamingTripUpdateMetrics.java
diff --git a/src/main/java/org/opentripplanner/updater/trip/metrics/TripUpdateMetrics.java b/application/src/main/java/org/opentripplanner/updater/trip/metrics/TripUpdateMetrics.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/trip/metrics/TripUpdateMetrics.java
rename to application/src/main/java/org/opentripplanner/updater/trip/metrics/TripUpdateMetrics.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_parking/AvailabilityDatasourceFactory.java b/application/src/main/java/org/opentripplanner/updater/vehicle_parking/AvailabilityDatasourceFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_parking/AvailabilityDatasourceFactory.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_parking/AvailabilityDatasourceFactory.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_parking/AvailabiltyUpdate.java b/application/src/main/java/org/opentripplanner/updater/vehicle_parking/AvailabiltyUpdate.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_parking/AvailabiltyUpdate.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_parking/AvailabiltyUpdate.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdater.java b/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdater.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdater.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdater.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingDataSourceFactory.java b/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingDataSourceFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingDataSourceFactory.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingDataSourceFactory.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingSourceType.java b/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingSourceType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingSourceType.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingSourceType.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java b/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterParameters.java b/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterParameters.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterParameters.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_position/GtfsRealtimeHttpVehiclePositionSource.java b/application/src/main/java/org/opentripplanner/updater/vehicle_position/GtfsRealtimeHttpVehiclePositionSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_position/GtfsRealtimeHttpVehiclePositionSource.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_position/GtfsRealtimeHttpVehiclePositionSource.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java b/application/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_position/RealtimeVehiclePatternMatcher.java b/application/src/main/java/org/opentripplanner/updater/vehicle_position/RealtimeVehiclePatternMatcher.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_position/RealtimeVehiclePatternMatcher.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_position/RealtimeVehiclePatternMatcher.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_position/VehiclePositionUpdaterRunnable.java b/application/src/main/java/org/opentripplanner/updater/vehicle_position/VehiclePositionUpdaterRunnable.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_position/VehiclePositionUpdaterRunnable.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_position/VehiclePositionUpdaterRunnable.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_position/VehiclePositionsUpdaterParameters.java b/application/src/main/java/org/opentripplanner/updater/vehicle_position/VehiclePositionsUpdaterParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_position/VehiclePositionsUpdaterParameters.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_position/VehiclePositionsUpdaterParameters.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/GeofencingVertexUpdater.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/GeofencingVertexUpdater.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_rental/GeofencingVertexUpdater.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_rental/GeofencingVertexUpdater.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalSourceType.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalSourceType.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalSourceType.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalSourceType.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdater.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdater.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdater.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdater.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdaterParameters.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdaterParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdaterParameters.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdaterParameters.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoader.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoader.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoader.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoader.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapper.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapper.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapper.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsStationInformationMapper.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsStationInformationMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsStationInformationMapper.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsStationInformationMapper.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsStationStatusMapper.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsStationStatusMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsStationStatusMapper.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsStationStatusMapper.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsSystemInformationMapper.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsSystemInformationMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsSystemInformationMapper.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsSystemInformationMapper.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSource.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSource.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSource.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleTypeMapper.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleTypeMapper.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleTypeMapper.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleTypeMapper.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/VehicleRentalDataSourceFactory.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/VehicleRentalDataSourceFactory.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/VehicleRentalDataSourceFactory.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/VehicleRentalDataSourceFactory.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/VehicleRentalDatasource.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/VehicleRentalDatasource.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/VehicleRentalDatasource.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/VehicleRentalDatasource.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/params/GbfsVehicleRentalDataSourceParameters.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/params/GbfsVehicleRentalDataSourceParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/params/GbfsVehicleRentalDataSourceParameters.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/params/GbfsVehicleRentalDataSourceParameters.java
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/params/VehicleRentalDataSourceParameters.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/params/VehicleRentalDataSourceParameters.java
similarity index 100%
rename from src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/params/VehicleRentalDataSourceParameters.java
rename to application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/params/VehicleRentalDataSourceParameters.java
diff --git a/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java b/application/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java
rename to application/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java
diff --git a/src/main/java/org/opentripplanner/visualizer/RouteDialog.java b/application/src/main/java/org/opentripplanner/visualizer/RouteDialog.java
similarity index 100%
rename from src/main/java/org/opentripplanner/visualizer/RouteDialog.java
rename to application/src/main/java/org/opentripplanner/visualizer/RouteDialog.java
diff --git a/src/main/java/org/opentripplanner/visualizer/ShowGraph.java b/application/src/main/java/org/opentripplanner/visualizer/ShowGraph.java
similarity index 100%
rename from src/main/java/org/opentripplanner/visualizer/ShowGraph.java
rename to application/src/main/java/org/opentripplanner/visualizer/ShowGraph.java
diff --git a/src/main/java/org/opentripplanner/visualizer/VertexSelectionListener.java b/application/src/main/java/org/opentripplanner/visualizer/VertexSelectionListener.java
similarity index 100%
rename from src/main/java/org/opentripplanner/visualizer/VertexSelectionListener.java
rename to application/src/main/java/org/opentripplanner/visualizer/VertexSelectionListener.java
diff --git a/src/main/java/org/opentripplanner/visualizer/VisualTraverseVisitor.java b/application/src/main/java/org/opentripplanner/visualizer/VisualTraverseVisitor.java
similarity index 100%
rename from src/main/java/org/opentripplanner/visualizer/VisualTraverseVisitor.java
rename to application/src/main/java/org/opentripplanner/visualizer/VisualTraverseVisitor.java
diff --git a/src/main/java/org/opentripplanner/visualizer/package-info.java b/application/src/main/java/org/opentripplanner/visualizer/package-info.java
similarity index 100%
rename from src/main/java/org/opentripplanner/visualizer/package-info.java
rename to application/src/main/java/org/opentripplanner/visualizer/package-info.java
diff --git a/src/main/jib/docker-entrypoint.sh b/application/src/main/jib/docker-entrypoint.sh
similarity index 100%
rename from src/main/jib/docker-entrypoint.sh
rename to application/src/main/jib/docker-entrypoint.sh
diff --git a/src/main/proto/gtfs-realtime.proto b/application/src/main/proto/gtfs-realtime.proto
similarity index 100%
rename from src/main/proto/gtfs-realtime.proto
rename to application/src/main/proto/gtfs-realtime.proto
diff --git a/src/main/proto/mfdz-realtime-extensions.proto b/application/src/main/proto/mfdz-realtime-extensions.proto
similarity index 100%
rename from src/main/proto/mfdz-realtime-extensions.proto
rename to application/src/main/proto/mfdz-realtime-extensions.proto
diff --git a/src/main/resources/Message.properties b/application/src/main/resources/Message.properties
similarity index 100%
rename from src/main/resources/Message.properties
rename to application/src/main/resources/Message.properties
diff --git a/src/main/resources/Message_de.properties b/application/src/main/resources/Message_de.properties
similarity index 100%
rename from src/main/resources/Message_de.properties
rename to application/src/main/resources/Message_de.properties
diff --git a/src/main/resources/Message_es.properties b/application/src/main/resources/Message_es.properties
similarity index 100%
rename from src/main/resources/Message_es.properties
rename to application/src/main/resources/Message_es.properties
diff --git a/src/main/resources/Message_fr.properties b/application/src/main/resources/Message_fr.properties
similarity index 100%
rename from src/main/resources/Message_fr.properties
rename to application/src/main/resources/Message_fr.properties
diff --git a/src/main/resources/Message_hu.properties b/application/src/main/resources/Message_hu.properties
similarity index 100%
rename from src/main/resources/Message_hu.properties
rename to application/src/main/resources/Message_hu.properties
diff --git a/src/main/resources/Message_nl.properties b/application/src/main/resources/Message_nl.properties
similarity index 100%
rename from src/main/resources/Message_nl.properties
rename to application/src/main/resources/Message_nl.properties
diff --git a/src/main/resources/WayProperties.properties b/application/src/main/resources/WayProperties.properties
similarity index 100%
rename from src/main/resources/WayProperties.properties
rename to application/src/main/resources/WayProperties.properties
diff --git a/src/main/resources/WayProperties_de.properties b/application/src/main/resources/WayProperties_de.properties
similarity index 100%
rename from src/main/resources/WayProperties_de.properties
rename to application/src/main/resources/WayProperties_de.properties
diff --git a/src/main/resources/WayProperties_fi.properties b/application/src/main/resources/WayProperties_fi.properties
similarity index 100%
rename from src/main/resources/WayProperties_fi.properties
rename to application/src/main/resources/WayProperties_fi.properties
diff --git a/src/main/resources/WayProperties_fr.properties b/application/src/main/resources/WayProperties_fr.properties
similarity index 100%
rename from src/main/resources/WayProperties_fr.properties
rename to application/src/main/resources/WayProperties_fr.properties
diff --git a/src/main/resources/WayProperties_hu.properties b/application/src/main/resources/WayProperties_hu.properties
similarity index 100%
rename from src/main/resources/WayProperties_hu.properties
rename to application/src/main/resources/WayProperties_hu.properties
diff --git a/src/main/resources/WayProperties_nl.properties b/application/src/main/resources/WayProperties_nl.properties
similarity index 100%
rename from src/main/resources/WayProperties_nl.properties
rename to application/src/main/resources/WayProperties_nl.properties
diff --git a/src/main/resources/WayProperties_no.properties b/application/src/main/resources/WayProperties_no.properties
similarity index 100%
rename from src/main/resources/WayProperties_no.properties
rename to application/src/main/resources/WayProperties_no.properties
diff --git a/src/main/resources/WayProperties_sv.properties b/application/src/main/resources/WayProperties_sv.properties
similarity index 100%
rename from src/main/resources/WayProperties_sv.properties
rename to application/src/main/resources/WayProperties_sv.properties
diff --git a/src/main/resources/internals.properties b/application/src/main/resources/internals.properties
similarity index 100%
rename from src/main/resources/internals.properties
rename to application/src/main/resources/internals.properties
diff --git a/src/main/resources/internals_de.properties b/application/src/main/resources/internals_de.properties
similarity index 100%
rename from src/main/resources/internals_de.properties
rename to application/src/main/resources/internals_de.properties
diff --git a/src/main/resources/internals_fi.properties b/application/src/main/resources/internals_fi.properties
similarity index 100%
rename from src/main/resources/internals_fi.properties
rename to application/src/main/resources/internals_fi.properties
diff --git a/src/main/resources/internals_fr.properties b/application/src/main/resources/internals_fr.properties
similarity index 100%
rename from src/main/resources/internals_fr.properties
rename to application/src/main/resources/internals_fr.properties
diff --git a/src/main/resources/internals_hu.properties b/application/src/main/resources/internals_hu.properties
similarity index 100%
rename from src/main/resources/internals_hu.properties
rename to application/src/main/resources/internals_hu.properties
diff --git a/src/main/resources/internals_no.properties b/application/src/main/resources/internals_no.properties
similarity index 100%
rename from src/main/resources/internals_no.properties
rename to application/src/main/resources/internals_no.properties
diff --git a/src/main/resources/internals_sv.properties b/application/src/main/resources/internals_sv.properties
similarity index 100%
rename from src/main/resources/internals_sv.properties
rename to application/src/main/resources/internals_sv.properties
diff --git a/src/main/resources/logback.xml b/application/src/main/resources/logback.xml
similarity index 100%
rename from src/main/resources/logback.xml
rename to application/src/main/resources/logback.xml
diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/application/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
similarity index 100%
rename from src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
rename to application/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/application/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
similarity index 100%
rename from src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
rename to application/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
diff --git a/src/main/resources/otp-project-info.properties b/application/src/main/resources/otp-project-info.properties
similarity index 100%
rename from src/main/resources/otp-project-info.properties
rename to application/src/main/resources/otp-project-info.properties
diff --git a/src/test/java/org/opentripplanner/ConstantsForTests.java b/application/src/test/java/org/opentripplanner/ConstantsForTests.java
similarity index 100%
rename from src/test/java/org/opentripplanner/ConstantsForTests.java
rename to application/src/test/java/org/opentripplanner/ConstantsForTests.java
diff --git a/src/test/java/org/opentripplanner/DateTimeHelper.java b/application/src/test/java/org/opentripplanner/DateTimeHelper.java
similarity index 100%
rename from src/test/java/org/opentripplanner/DateTimeHelper.java
rename to application/src/test/java/org/opentripplanner/DateTimeHelper.java
diff --git a/src/test/java/org/opentripplanner/GtfsTest.java b/application/src/test/java/org/opentripplanner/GtfsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/GtfsTest.java
rename to application/src/test/java/org/opentripplanner/GtfsTest.java
diff --git a/src/test/java/org/opentripplanner/OtpArchitectureModules.java b/application/src/test/java/org/opentripplanner/OtpArchitectureModules.java
similarity index 100%
rename from src/test/java/org/opentripplanner/OtpArchitectureModules.java
rename to application/src/test/java/org/opentripplanner/OtpArchitectureModules.java
diff --git a/src/test/java/org/opentripplanner/TestOtpModel.java b/application/src/test/java/org/opentripplanner/TestOtpModel.java
similarity index 100%
rename from src/test/java/org/opentripplanner/TestOtpModel.java
rename to application/src/test/java/org/opentripplanner/TestOtpModel.java
diff --git a/src/test/java/org/opentripplanner/TestServerContext.java b/application/src/test/java/org/opentripplanner/TestServerContext.java
similarity index 100%
rename from src/test/java/org/opentripplanner/TestServerContext.java
rename to application/src/test/java/org/opentripplanner/TestServerContext.java
diff --git a/src/test/java/org/opentripplanner/_support/arch/ArchComponent.java b/application/src/test/java/org/opentripplanner/_support/arch/ArchComponent.java
similarity index 100%
rename from src/test/java/org/opentripplanner/_support/arch/ArchComponent.java
rename to application/src/test/java/org/opentripplanner/_support/arch/ArchComponent.java
diff --git a/src/test/java/org/opentripplanner/_support/arch/Module.java b/application/src/test/java/org/opentripplanner/_support/arch/Module.java
similarity index 100%
rename from src/test/java/org/opentripplanner/_support/arch/Module.java
rename to application/src/test/java/org/opentripplanner/_support/arch/Module.java
diff --git a/src/test/java/org/opentripplanner/_support/arch/Package.java b/application/src/test/java/org/opentripplanner/_support/arch/Package.java
similarity index 100%
rename from src/test/java/org/opentripplanner/_support/arch/Package.java
rename to application/src/test/java/org/opentripplanner/_support/arch/Package.java
diff --git a/src/test/java/org/opentripplanner/_support/asserts/AssertEqualsAndHashCode.java b/application/src/test/java/org/opentripplanner/_support/asserts/AssertEqualsAndHashCode.java
similarity index 100%
rename from src/test/java/org/opentripplanner/_support/asserts/AssertEqualsAndHashCode.java
rename to application/src/test/java/org/opentripplanner/_support/asserts/AssertEqualsAndHashCode.java
diff --git a/src/test/java/org/opentripplanner/_support/debug/TestDebug.java b/application/src/test/java/org/opentripplanner/_support/debug/TestDebug.java
similarity index 100%
rename from src/test/java/org/opentripplanner/_support/debug/TestDebug.java
rename to application/src/test/java/org/opentripplanner/_support/debug/TestDebug.java
diff --git a/src/test/java/org/opentripplanner/_support/geometry/Coordinates.java b/application/src/test/java/org/opentripplanner/_support/geometry/Coordinates.java
similarity index 100%
rename from src/test/java/org/opentripplanner/_support/geometry/Coordinates.java
rename to application/src/test/java/org/opentripplanner/_support/geometry/Coordinates.java
diff --git a/src/test/java/org/opentripplanner/_support/geometry/LineStrings.java b/application/src/test/java/org/opentripplanner/_support/geometry/LineStrings.java
similarity index 100%
rename from src/test/java/org/opentripplanner/_support/geometry/LineStrings.java
rename to application/src/test/java/org/opentripplanner/_support/geometry/LineStrings.java
diff --git a/src/test/java/org/opentripplanner/_support/geometry/Polygons.java b/application/src/test/java/org/opentripplanner/_support/geometry/Polygons.java
similarity index 100%
rename from src/test/java/org/opentripplanner/_support/geometry/Polygons.java
rename to application/src/test/java/org/opentripplanner/_support/geometry/Polygons.java
diff --git a/src/test/java/org/opentripplanner/_support/text/I18NStrings.java b/application/src/test/java/org/opentripplanner/_support/text/I18NStrings.java
similarity index 100%
rename from src/test/java/org/opentripplanner/_support/text/I18NStrings.java
rename to application/src/test/java/org/opentripplanner/_support/text/I18NStrings.java
diff --git a/src/test/java/org/opentripplanner/_support/time/ZoneIds.java b/application/src/test/java/org/opentripplanner/_support/time/ZoneIds.java
similarity index 100%
rename from src/test/java/org/opentripplanner/_support/time/ZoneIds.java
rename to application/src/test/java/org/opentripplanner/_support/time/ZoneIds.java
diff --git a/src/test/java/org/opentripplanner/api/common/LocationStringParserTest.java b/application/src/test/java/org/opentripplanner/api/common/LocationStringParserTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/api/common/LocationStringParserTest.java
rename to application/src/test/java/org/opentripplanner/api/common/LocationStringParserTest.java
diff --git a/src/test/java/org/opentripplanner/api/resource/MessageTest.java b/application/src/test/java/org/opentripplanner/api/resource/MessageTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/api/resource/MessageTest.java
rename to application/src/test/java/org/opentripplanner/api/resource/MessageTest.java
diff --git a/src/test/java/org/opentripplanner/api/resource/WebMercatorTileTest.java b/application/src/test/java/org/opentripplanner/api/resource/WebMercatorTileTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/api/resource/WebMercatorTileTest.java
rename to application/src/test/java/org/opentripplanner/api/resource/WebMercatorTileTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/CoordinateValueScalarTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/CoordinateValueScalarTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/CoordinateValueScalarTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/CoordinateValueScalarTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/CostScalarTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/CostScalarTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/CostScalarTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/CostScalarTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/DurationScalarTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/DurationScalarTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/DurationScalarTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/DurationScalarTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GeoJsonScalarTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/GeoJsonScalarTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/GeoJsonScalarTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/GeoJsonScalarTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLFormattingTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLFormattingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/GraphQLFormattingTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLFormattingTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIndexTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIndexTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/GraphQLIndexTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIndexTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/OffsetDateTimeScalarTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/OffsetDateTimeScalarTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/OffsetDateTimeScalarTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/OffsetDateTimeScalarTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/RatioScalarTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/RatioScalarTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/RatioScalarTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/RatioScalarTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/ReluctanceScalarTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/ReluctanceScalarTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/ReluctanceScalarTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/ReluctanceScalarTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/TestRoutingService.java b/application/src/test/java/org/opentripplanner/apis/gtfs/TestRoutingService.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/TestRoutingService.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/TestRoutingService.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImplTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImplTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImplTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImplTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/BikesAllowedMapperTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/BikesAllowedMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/mapping/BikesAllowedMapperTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/mapping/BikesAllowedMapperTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/DirectionMapperTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/DirectionMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/mapping/DirectionMapperTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/mapping/DirectionMapperTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/StreetNoteMapperTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/StreetNoteMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/mapping/StreetNoteMapperTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/mapping/StreetNoteMapperTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperAccessibilityTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperAccessibilityTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperAccessibilityTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperAccessibilityTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperModesTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperModesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperModesTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperModesTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperWalkTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperWalkTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperWalkTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperWalkTest.java
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/model/LocalDateRangeTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/model/LocalDateRangeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/gtfs/model/LocalDateRangeTest.java
rename to application/src/test/java/org/opentripplanner/apis/gtfs/model/LocalDateRangeTest.java
diff --git a/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java b/application/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/support/TileJsonTest.java
rename to application/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java
diff --git a/src/test/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaTest.java
rename to application/src/test/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaTest.java
diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java
rename to application/src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java
diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TransitIdMapperTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/TransitIdMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/transmodel/mapping/TransitIdMapperTest.java
rename to application/src/test/java/org/opentripplanner/apis/transmodel/mapping/TransitIdMapperTest.java
diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java
rename to application/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java
diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripViaLocationMapperTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripViaLocationMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/transmodel/mapping/TripViaLocationMapperTest.java
rename to application/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripViaLocationMapperTest.java
diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapperTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapperTest.java
rename to application/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapperTest.java
diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/CarPreferencesMapperTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/CarPreferencesMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/CarPreferencesMapperTest.java
rename to application/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/CarPreferencesMapperTest.java
diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/ScooterPreferencesMapperTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/ScooterPreferencesMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/ScooterPreferencesMapperTest.java
rename to application/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/ScooterPreferencesMapperTest.java
diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/WalkPreferencesMapperTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/WalkPreferencesMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/WalkPreferencesMapperTest.java
rename to application/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/WalkPreferencesMapperTest.java
diff --git a/src/test/java/org/opentripplanner/apis/transmodel/model/EnumTypesTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/model/EnumTypesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/transmodel/model/EnumTypesTest.java
rename to application/src/test/java/org/opentripplanner/apis/transmodel/model/EnumTypesTest.java
diff --git a/src/test/java/org/opentripplanner/apis/transmodel/model/TransportModeSlackTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/model/TransportModeSlackTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/transmodel/model/TransportModeSlackTest.java
rename to application/src/test/java/org/opentripplanner/apis/transmodel/model/TransportModeSlackTest.java
diff --git a/src/test/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostTypeTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostTypeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostTypeTest.java
rename to application/src/test/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostTypeTest.java
diff --git a/src/test/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDtoTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDtoTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDtoTest.java
rename to application/src/test/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDtoTest.java
diff --git a/src/test/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactoryTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactoryTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactoryTest.java
rename to application/src/test/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactoryTest.java
diff --git a/src/test/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapperTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapperTest.java
rename to application/src/test/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapperTest.java
diff --git a/src/test/java/org/opentripplanner/apis/transmodel/support/GqlUtilTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/support/GqlUtilTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/transmodel/support/GqlUtilTest.java
rename to application/src/test/java/org/opentripplanner/apis/transmodel/support/GqlUtilTest.java
diff --git a/src/test/java/org/opentripplanner/apis/transmodel/support/OneOfInputValidatorTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/support/OneOfInputValidatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/transmodel/support/OneOfInputValidatorTest.java
rename to application/src/test/java/org/opentripplanner/apis/transmodel/support/OneOfInputValidatorTest.java
diff --git a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java b/application/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java
rename to application/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java
diff --git a/src/test/java/org/opentripplanner/astar/AStarArchitectureTest.java b/application/src/test/java/org/opentripplanner/astar/AStarArchitectureTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/astar/AStarArchitectureTest.java
rename to application/src/test/java/org/opentripplanner/astar/AStarArchitectureTest.java
diff --git a/src/test/java/org/opentripplanner/astar/AStarTest.java b/application/src/test/java/org/opentripplanner/astar/AStarTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/astar/AStarTest.java
rename to application/src/test/java/org/opentripplanner/astar/AStarTest.java
diff --git a/src/test/java/org/opentripplanner/astar/model/BinHeapTest.java b/application/src/test/java/org/opentripplanner/astar/model/BinHeapTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/astar/model/BinHeapTest.java
rename to application/src/test/java/org/opentripplanner/astar/model/BinHeapTest.java
diff --git a/src/test/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategyTest.java b/application/src/test/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategyTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategyTest.java
rename to application/src/test/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategyTest.java
diff --git a/src/test/java/org/opentripplanner/astar/strategy/PathComparatorTest.java b/application/src/test/java/org/opentripplanner/astar/strategy/PathComparatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/astar/strategy/PathComparatorTest.java
rename to application/src/test/java/org/opentripplanner/astar/strategy/PathComparatorTest.java
diff --git a/src/test/java/org/opentripplanner/datastore/DataStoreArchitectureTest.java b/application/src/test/java/org/opentripplanner/datastore/DataStoreArchitectureTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/datastore/DataStoreArchitectureTest.java
rename to application/src/test/java/org/opentripplanner/datastore/DataStoreArchitectureTest.java
diff --git a/src/test/java/org/opentripplanner/datastore/OtpDataStoreTest.java b/application/src/test/java/org/opentripplanner/datastore/OtpDataStoreTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/datastore/OtpDataStoreTest.java
rename to application/src/test/java/org/opentripplanner/datastore/OtpDataStoreTest.java
diff --git a/src/test/java/org/opentripplanner/datastore/base/ByteArrayDataSourceTest.java b/application/src/test/java/org/opentripplanner/datastore/base/ByteArrayDataSourceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/datastore/base/ByteArrayDataSourceTest.java
rename to application/src/test/java/org/opentripplanner/datastore/base/ByteArrayDataSourceTest.java
diff --git a/src/test/java/org/opentripplanner/datastore/file/DirectoryDataSourceTest.java b/application/src/test/java/org/opentripplanner/datastore/file/DirectoryDataSourceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/datastore/file/DirectoryDataSourceTest.java
rename to application/src/test/java/org/opentripplanner/datastore/file/DirectoryDataSourceTest.java
diff --git a/src/test/java/org/opentripplanner/datastore/file/FileDataSourceTest.java b/application/src/test/java/org/opentripplanner/datastore/file/FileDataSourceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/datastore/file/FileDataSourceTest.java
rename to application/src/test/java/org/opentripplanner/datastore/file/FileDataSourceTest.java
diff --git a/src/test/java/org/opentripplanner/datastore/file/ZipFileDataSourceTest.java b/application/src/test/java/org/opentripplanner/datastore/file/ZipFileDataSourceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/datastore/file/ZipFileDataSourceTest.java
rename to application/src/test/java/org/opentripplanner/datastore/file/ZipFileDataSourceTest.java
diff --git a/src/test/java/org/opentripplanner/datastore/file/ZipStreamDataSourceDecoratorTest.java b/application/src/test/java/org/opentripplanner/datastore/file/ZipStreamDataSourceDecoratorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/datastore/file/ZipStreamDataSourceDecoratorTest.java
rename to application/src/test/java/org/opentripplanner/datastore/file/ZipStreamDataSourceDecoratorTest.java
diff --git a/src/test/java/org/opentripplanner/datastore/https/HttpsDataSourceRepositoryTest.java b/application/src/test/java/org/opentripplanner/datastore/https/HttpsDataSourceRepositoryTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/datastore/https/HttpsDataSourceRepositoryTest.java
rename to application/src/test/java/org/opentripplanner/datastore/https/HttpsDataSourceRepositoryTest.java
diff --git a/src/test/java/org/opentripplanner/datastore/https/HttpsFileDataSourceTest.java b/application/src/test/java/org/opentripplanner/datastore/https/HttpsFileDataSourceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/datastore/https/HttpsFileDataSourceTest.java
rename to application/src/test/java/org/opentripplanner/datastore/https/HttpsFileDataSourceTest.java
diff --git a/src/test/java/org/opentripplanner/ext/restapi/resources/PlannerResourceTest.java b/application/src/test/java/org/opentripplanner/ext/restapi/resources/PlannerResourceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/ext/restapi/resources/PlannerResourceTest.java
rename to application/src/test/java/org/opentripplanner/ext/restapi/resources/PlannerResourceTest.java
diff --git a/src/test/java/org/opentripplanner/ext/transmodelapi/_support/TestDataFetcherDecorator.java b/application/src/test/java/org/opentripplanner/ext/transmodelapi/_support/TestDataFetcherDecorator.java
similarity index 100%
rename from src/test/java/org/opentripplanner/ext/transmodelapi/_support/TestDataFetcherDecorator.java
rename to application/src/test/java/org/opentripplanner/ext/transmodelapi/_support/TestDataFetcherDecorator.java
diff --git a/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java b/application/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java
rename to application/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java
diff --git a/src/test/java/org/opentripplanner/framework/application/OTPFeatureTest.java b/application/src/test/java/org/opentripplanner/framework/application/OTPFeatureTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/application/OTPFeatureTest.java
rename to application/src/test/java/org/opentripplanner/framework/application/OTPFeatureTest.java
diff --git a/src/test/java/org/opentripplanner/framework/application/OtpAppExceptionTest.java b/application/src/test/java/org/opentripplanner/framework/application/OtpAppExceptionTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/application/OtpAppExceptionTest.java
rename to application/src/test/java/org/opentripplanner/framework/application/OtpAppExceptionTest.java
diff --git a/src/test/java/org/opentripplanner/framework/application/OtpFileNamesTest.java b/application/src/test/java/org/opentripplanner/framework/application/OtpFileNamesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/application/OtpFileNamesTest.java
rename to application/src/test/java/org/opentripplanner/framework/application/OtpFileNamesTest.java
diff --git a/src/test/java/org/opentripplanner/framework/collection/CollectionUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/collection/CollectionUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/collection/CollectionUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/collection/CollectionUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/collection/CollectionsViewTest.java b/application/src/test/java/org/opentripplanner/framework/collection/CollectionsViewTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/collection/CollectionsViewTest.java
rename to application/src/test/java/org/opentripplanner/framework/collection/CollectionsViewTest.java
diff --git a/src/test/java/org/opentripplanner/framework/collection/CompositeComparatorTest.java b/application/src/test/java/org/opentripplanner/framework/collection/CompositeComparatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/collection/CompositeComparatorTest.java
rename to application/src/test/java/org/opentripplanner/framework/collection/CompositeComparatorTest.java
diff --git a/src/test/java/org/opentripplanner/framework/collection/ListSectionTest.java b/application/src/test/java/org/opentripplanner/framework/collection/ListSectionTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/collection/ListSectionTest.java
rename to application/src/test/java/org/opentripplanner/framework/collection/ListSectionTest.java
diff --git a/src/test/java/org/opentripplanner/framework/collection/ListUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/collection/ListUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/collection/ListUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/collection/ListUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/collection/MapUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/collection/MapUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/collection/MapUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/collection/MapUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/collection/SetUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/collection/SetUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/collection/SetUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/collection/SetUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/doc/DocumentedEnumTestHelper.java b/application/src/test/java/org/opentripplanner/framework/doc/DocumentedEnumTestHelper.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/doc/DocumentedEnumTestHelper.java
rename to application/src/test/java/org/opentripplanner/framework/doc/DocumentedEnumTestHelper.java
diff --git a/src/test/java/org/opentripplanner/framework/geometry/CompactElevationProfileTest.java b/application/src/test/java/org/opentripplanner/framework/geometry/CompactElevationProfileTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/geometry/CompactElevationProfileTest.java
rename to application/src/test/java/org/opentripplanner/framework/geometry/CompactElevationProfileTest.java
diff --git a/src/test/java/org/opentripplanner/framework/geometry/CompactLineStringUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/geometry/CompactLineStringUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/geometry/CompactLineStringUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/geometry/CompactLineStringUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/geometry/DirectionUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/geometry/DirectionUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/geometry/DirectionUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/geometry/DirectionUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/geometry/DistanceLibTest.java b/application/src/test/java/org/opentripplanner/framework/geometry/DistanceLibTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/geometry/DistanceLibTest.java
rename to application/src/test/java/org/opentripplanner/framework/geometry/DistanceLibTest.java
diff --git a/src/test/java/org/opentripplanner/framework/geometry/GeometryUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/geometry/GeometryUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/geometry/GeometryUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/geometry/GeometryUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/geometry/HashGridTest.java b/application/src/test/java/org/opentripplanner/framework/geometry/HashGridTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/geometry/HashGridTest.java
rename to application/src/test/java/org/opentripplanner/framework/geometry/HashGridTest.java
diff --git a/src/test/java/org/opentripplanner/framework/geometry/PolylineEncoderTest.java b/application/src/test/java/org/opentripplanner/framework/geometry/PolylineEncoderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/geometry/PolylineEncoderTest.java
rename to application/src/test/java/org/opentripplanner/framework/geometry/PolylineEncoderTest.java
diff --git a/src/test/java/org/opentripplanner/framework/geometry/SphericalDistanceLibraryTest.java b/application/src/test/java/org/opentripplanner/framework/geometry/SphericalDistanceLibraryTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/geometry/SphericalDistanceLibraryTest.java
rename to application/src/test/java/org/opentripplanner/framework/geometry/SphericalDistanceLibraryTest.java
diff --git a/src/test/java/org/opentripplanner/framework/geometry/WgsCoordinateTest.java b/application/src/test/java/org/opentripplanner/framework/geometry/WgsCoordinateTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/geometry/WgsCoordinateTest.java
rename to application/src/test/java/org/opentripplanner/framework/geometry/WgsCoordinateTest.java
diff --git a/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java b/application/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java
rename to application/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java
diff --git a/src/test/java/org/opentripplanner/framework/i18n/LocalizedStringTest.java b/application/src/test/java/org/opentripplanner/framework/i18n/LocalizedStringTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/i18n/LocalizedStringTest.java
rename to application/src/test/java/org/opentripplanner/framework/i18n/LocalizedStringTest.java
diff --git a/src/test/java/org/opentripplanner/framework/i18n/TranslatedStringTest.java b/application/src/test/java/org/opentripplanner/framework/i18n/TranslatedStringTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/i18n/TranslatedStringTest.java
rename to application/src/test/java/org/opentripplanner/framework/i18n/TranslatedStringTest.java
diff --git a/src/test/java/org/opentripplanner/framework/io/HttpUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/io/HttpUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/io/HttpUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/io/HttpUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/json/JsonUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/json/JsonUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/json/JsonUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/json/JsonUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/lang/ArrayUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/lang/ArrayUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/lang/ArrayUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/lang/ArrayUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/lang/BitSetUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/lang/BitSetUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/lang/BitSetUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/lang/BitSetUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/lang/BoxTest.java b/application/src/test/java/org/opentripplanner/framework/lang/BoxTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/lang/BoxTest.java
rename to application/src/test/java/org/opentripplanner/framework/lang/BoxTest.java
diff --git a/src/test/java/org/opentripplanner/framework/lang/DoubleUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/lang/DoubleUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/lang/DoubleUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/lang/DoubleUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/lang/IntBoxTest.java b/application/src/test/java/org/opentripplanner/framework/lang/IntBoxTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/lang/IntBoxTest.java
rename to application/src/test/java/org/opentripplanner/framework/lang/IntBoxTest.java
diff --git a/src/test/java/org/opentripplanner/framework/lang/IntRangeTest.java b/application/src/test/java/org/opentripplanner/framework/lang/IntRangeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/lang/IntRangeTest.java
rename to application/src/test/java/org/opentripplanner/framework/lang/IntRangeTest.java
diff --git a/src/test/java/org/opentripplanner/framework/lang/IntUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/lang/IntUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/lang/IntUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/lang/IntUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilderTest.java b/application/src/test/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilderTest.java
rename to application/src/test/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/framework/lang/ObjectUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/lang/ObjectUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/lang/ObjectUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/lang/ObjectUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/lang/OtpNumberFormatTest.java b/application/src/test/java/org/opentripplanner/framework/lang/OtpNumberFormatTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/lang/OtpNumberFormatTest.java
rename to application/src/test/java/org/opentripplanner/framework/lang/OtpNumberFormatTest.java
diff --git a/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/logging/ProgressTrackerTest.java b/application/src/test/java/org/opentripplanner/framework/logging/ProgressTrackerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/logging/ProgressTrackerTest.java
rename to application/src/test/java/org/opentripplanner/framework/logging/ProgressTrackerTest.java
diff --git a/src/test/java/org/opentripplanner/framework/logging/ThrottleTest.java b/application/src/test/java/org/opentripplanner/framework/logging/ThrottleTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/logging/ThrottleTest.java
rename to application/src/test/java/org/opentripplanner/framework/logging/ThrottleTest.java
diff --git a/src/test/java/org/opentripplanner/framework/model/CostTest.java b/application/src/test/java/org/opentripplanner/framework/model/CostTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/model/CostTest.java
rename to application/src/test/java/org/opentripplanner/framework/model/CostTest.java
diff --git a/src/test/java/org/opentripplanner/framework/model/TimeAndCostTest.java b/application/src/test/java/org/opentripplanner/framework/model/TimeAndCostTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/model/TimeAndCostTest.java
rename to application/src/test/java/org/opentripplanner/framework/model/TimeAndCostTest.java
diff --git a/src/test/java/org/opentripplanner/framework/model/UnitsTest.java b/application/src/test/java/org/opentripplanner/framework/model/UnitsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/model/UnitsTest.java
rename to application/src/test/java/org/opentripplanner/framework/model/UnitsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/resources/ResourceBundleSingletonTest.java b/application/src/test/java/org/opentripplanner/framework/resources/ResourceBundleSingletonTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/resources/ResourceBundleSingletonTest.java
rename to application/src/test/java/org/opentripplanner/framework/resources/ResourceBundleSingletonTest.java
diff --git a/src/test/java/org/opentripplanner/framework/retry/OtpRetryTest.java b/application/src/test/java/org/opentripplanner/framework/retry/OtpRetryTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/retry/OtpRetryTest.java
rename to application/src/test/java/org/opentripplanner/framework/retry/OtpRetryTest.java
diff --git a/src/test/java/org/opentripplanner/framework/text/CharacterEscapeFormatterTest.java b/application/src/test/java/org/opentripplanner/framework/text/CharacterEscapeFormatterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/text/CharacterEscapeFormatterTest.java
rename to application/src/test/java/org/opentripplanner/framework/text/CharacterEscapeFormatterTest.java
diff --git a/src/test/java/org/opentripplanner/framework/text/FileSizeToTextConverterTest.java b/application/src/test/java/org/opentripplanner/framework/text/FileSizeToTextConverterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/text/FileSizeToTextConverterTest.java
rename to application/src/test/java/org/opentripplanner/framework/text/FileSizeToTextConverterTest.java
diff --git a/src/test/java/org/opentripplanner/framework/text/HexStringTest.java b/application/src/test/java/org/opentripplanner/framework/text/HexStringTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/text/HexStringTest.java
rename to application/src/test/java/org/opentripplanner/framework/text/HexStringTest.java
diff --git a/src/test/java/org/opentripplanner/framework/text/MarkdownFormatterTest.java b/application/src/test/java/org/opentripplanner/framework/text/MarkdownFormatterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/text/MarkdownFormatterTest.java
rename to application/src/test/java/org/opentripplanner/framework/text/MarkdownFormatterTest.java
diff --git a/src/test/java/org/opentripplanner/framework/text/TableTest.java b/application/src/test/java/org/opentripplanner/framework/text/TableTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/text/TableTest.java
rename to application/src/test/java/org/opentripplanner/framework/text/TableTest.java
diff --git a/src/test/java/org/opentripplanner/framework/time/CountdownTimerTest.java b/application/src/test/java/org/opentripplanner/framework/time/CountdownTimerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/time/CountdownTimerTest.java
rename to application/src/test/java/org/opentripplanner/framework/time/CountdownTimerTest.java
diff --git a/src/test/java/org/opentripplanner/framework/time/DateUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/time/DateUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/time/DateUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/time/DateUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/time/LocalDateUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/time/LocalDateUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/time/LocalDateUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/time/LocalDateUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java b/application/src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java
rename to application/src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java
diff --git a/src/test/java/org/opentripplanner/framework/time/ServiceDateUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/time/ServiceDateUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/time/ServiceDateUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/time/ServiceDateUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java
rename to application/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java
diff --git a/src/test/java/org/opentripplanner/framework/time/ZoneIdFallbackTest.java b/application/src/test/java/org/opentripplanner/framework/time/ZoneIdFallbackTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/time/ZoneIdFallbackTest.java
rename to application/src/test/java/org/opentripplanner/framework/time/ZoneIdFallbackTest.java
diff --git a/src/test/java/org/opentripplanner/framework/token/AdvancedTokenSchemaTest.java b/application/src/test/java/org/opentripplanner/framework/token/AdvancedTokenSchemaTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/token/AdvancedTokenSchemaTest.java
rename to application/src/test/java/org/opentripplanner/framework/token/AdvancedTokenSchemaTest.java
diff --git a/src/test/java/org/opentripplanner/framework/token/FieldDefinitionTest.java b/application/src/test/java/org/opentripplanner/framework/token/FieldDefinitionTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/token/FieldDefinitionTest.java
rename to application/src/test/java/org/opentripplanner/framework/token/FieldDefinitionTest.java
diff --git a/src/test/java/org/opentripplanner/framework/token/TestTokenSchemaConstants.java b/application/src/test/java/org/opentripplanner/framework/token/TestTokenSchemaConstants.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/token/TestTokenSchemaConstants.java
rename to application/src/test/java/org/opentripplanner/framework/token/TestTokenSchemaConstants.java
diff --git a/src/test/java/org/opentripplanner/framework/token/TokenSchemaTest.java b/application/src/test/java/org/opentripplanner/framework/token/TokenSchemaTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/token/TokenSchemaTest.java
rename to application/src/test/java/org/opentripplanner/framework/token/TokenSchemaTest.java
diff --git a/src/test/java/org/opentripplanner/framework/token/TokenTypeTest.java b/application/src/test/java/org/opentripplanner/framework/token/TokenTypeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/token/TokenTypeTest.java
rename to application/src/test/java/org/opentripplanner/framework/token/TokenTypeTest.java
diff --git a/src/test/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilderTest.java b/application/src/test/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilderTest.java
rename to application/src/test/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/framework/tostring/ToStringBuilderTest.java b/application/src/test/java/org/opentripplanner/framework/tostring/ToStringBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/tostring/ToStringBuilderTest.java
rename to application/src/test/java/org/opentripplanner/framework/tostring/ToStringBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilderTest.java b/application/src/test/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilderTest.java
rename to application/src/test/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/BuildConfigurationDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/BuildConfigurationDocTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/BuildConfigurationDocTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/BuildConfigurationDocTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/ConfigurationDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/ConfigurationDocTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/ConfigurationDocTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/ConfigurationDocTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/EmissionsConfigurationDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/EmissionsConfigurationDocTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/EmissionsConfigurationDocTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/EmissionsConfigurationDocTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/FlexConfigurationDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/FlexConfigurationDocTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/FlexConfigurationDocTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/FlexConfigurationDocTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/GraphQLTutorialDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/GraphQLTutorialDocTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/GraphQLTutorialDocTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/GraphQLTutorialDocTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/NetexTutorialDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/NetexTutorialDocTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/NetexTutorialDocTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/NetexTutorialDocTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/RideHailingDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/RideHailingDocTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/RideHailingDocTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/RideHailingDocTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/RouteRequestDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/RouteRequestDocTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/RouteRequestDocTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/RouteRequestDocTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/RouterConfigurationDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/RouterConfigurationDocTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/RouterConfigurationDocTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/RouterConfigurationDocTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/RoutingModeDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/RoutingModeDocTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/RoutingModeDocTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/RoutingModeDocTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/SiriAzureConfigDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/SiriAzureConfigDocTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/SiriAzureConfigDocTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/SiriAzureConfigDocTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/SiriConfigDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/SiriConfigDocTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/SiriConfigDocTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/SiriConfigDocTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/SiriGooglePubSubConfigDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/SiriGooglePubSubConfigDocTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/SiriGooglePubSubConfigDocTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/SiriGooglePubSubConfigDocTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/StopConsolidationDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/StopConsolidationDocTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/StopConsolidationDocTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/StopConsolidationDocTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/VehicleParkingDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/VehicleParkingDocTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/VehicleParkingDocTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/VehicleParkingDocTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/framework/AbstractTable.java b/application/src/test/java/org/opentripplanner/generate/doc/framework/AbstractTable.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/framework/AbstractTable.java
rename to application/src/test/java/org/opentripplanner/generate/doc/framework/AbstractTable.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/framework/DocBuilder.java b/application/src/test/java/org/opentripplanner/generate/doc/framework/DocBuilder.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/framework/DocBuilder.java
rename to application/src/test/java/org/opentripplanner/generate/doc/framework/DocBuilder.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/framework/DocBuilderTest.java b/application/src/test/java/org/opentripplanner/generate/doc/framework/DocBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/framework/DocBuilderTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/framework/DocBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/framework/DocsTestConstants.java b/application/src/test/java/org/opentripplanner/generate/doc/framework/DocsTestConstants.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/framework/DocsTestConstants.java
rename to application/src/test/java/org/opentripplanner/generate/doc/framework/DocsTestConstants.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/framework/GeneratesDocumentation.java b/application/src/test/java/org/opentripplanner/generate/doc/framework/GeneratesDocumentation.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/framework/GeneratesDocumentation.java
rename to application/src/test/java/org/opentripplanner/generate/doc/framework/GeneratesDocumentation.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/framework/JsonExampleBuilder.java b/application/src/test/java/org/opentripplanner/generate/doc/framework/JsonExampleBuilder.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/framework/JsonExampleBuilder.java
rename to application/src/test/java/org/opentripplanner/generate/doc/framework/JsonExampleBuilder.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/framework/NodeAdapterHelper.java b/application/src/test/java/org/opentripplanner/generate/doc/framework/NodeAdapterHelper.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/framework/NodeAdapterHelper.java
rename to application/src/test/java/org/opentripplanner/generate/doc/framework/NodeAdapterHelper.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/framework/ParameterDetailsList.java b/application/src/test/java/org/opentripplanner/generate/doc/framework/ParameterDetailsList.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/framework/ParameterDetailsList.java
rename to application/src/test/java/org/opentripplanner/generate/doc/framework/ParameterDetailsList.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/framework/ParameterSummaryTable.java b/application/src/test/java/org/opentripplanner/generate/doc/framework/ParameterSummaryTable.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/framework/ParameterSummaryTable.java
rename to application/src/test/java/org/opentripplanner/generate/doc/framework/ParameterSummaryTable.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/framework/SkipNodes.java b/application/src/test/java/org/opentripplanner/generate/doc/framework/SkipNodes.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/framework/SkipNodes.java
rename to application/src/test/java/org/opentripplanner/generate/doc/framework/SkipNodes.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/framework/TemplateUtil.java b/application/src/test/java/org/opentripplanner/generate/doc/framework/TemplateUtil.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/framework/TemplateUtil.java
rename to application/src/test/java/org/opentripplanner/generate/doc/framework/TemplateUtil.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/framework/TemplateUtilTest.java b/application/src/test/java/org/opentripplanner/generate/doc/framework/TemplateUtilTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/framework/TemplateUtilTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/framework/TemplateUtilTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/support/ConfigTypeTable.java b/application/src/test/java/org/opentripplanner/generate/doc/support/ConfigTypeTable.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/support/ConfigTypeTable.java
rename to application/src/test/java/org/opentripplanner/generate/doc/support/ConfigTypeTable.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/support/ConfigTypeTableTest.java b/application/src/test/java/org/opentripplanner/generate/doc/support/ConfigTypeTableTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/support/ConfigTypeTableTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/support/ConfigTypeTableTest.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/support/OTPFeatureTable.java b/application/src/test/java/org/opentripplanner/generate/doc/support/OTPFeatureTable.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/support/OTPFeatureTable.java
rename to application/src/test/java/org/opentripplanner/generate/doc/support/OTPFeatureTable.java
diff --git a/src/test/java/org/opentripplanner/generate/doc/support/OTPFeatureTableTest.java b/application/src/test/java/org/opentripplanner/generate/doc/support/OTPFeatureTableTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/generate/doc/support/OTPFeatureTableTest.java
rename to application/src/test/java/org/opentripplanner/generate/doc/support/OTPFeatureTableTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/issue/api/DataImportIssueSummaryTest.java b/application/src/test/java/org/opentripplanner/graph_builder/issue/api/DataImportIssueSummaryTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/issue/api/DataImportIssueSummaryTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/issue/api/DataImportIssueSummaryTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/issue/report/DataImportIssueReporterTest.java b/application/src/test/java/org/opentripplanner/graph_builder/issue/report/DataImportIssueReporterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/issue/report/DataImportIssueReporterTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/issue/report/DataImportIssueReporterTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/DirectTransferGeneratorTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/DirectTransferGeneratorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/DirectTransferGeneratorTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/DirectTransferGeneratorTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/ElevationModuleTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/ElevationModuleTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/ElevationModuleTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/ElevationModuleTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/GtfsFeedIdTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/GtfsFeedIdTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/GtfsFeedIdTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/GtfsFeedIdTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/GtfsModuleTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/GtfsModuleTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/GtfsModuleTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/GtfsModuleTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/TestStreetLinkerModule.java b/application/src/test/java/org/opentripplanner/graph_builder/module/TestStreetLinkerModule.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/TestStreetLinkerModule.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/TestStreetLinkerModule.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/VehicleParkingLinkingTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/VehicleParkingLinkingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/VehicleParkingLinkingTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/VehicleParkingLinkingTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModuleTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModuleTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModuleTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModuleTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/AdaptivePruningTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/AdaptivePruningTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/islandpruning/AdaptivePruningTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/AdaptivePruningTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java b/application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/PruneNoThruIslandsTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/PruneNoThruIslandsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/islandpruning/PruneNoThruIslandsTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/PruneNoThruIslandsTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/TestNamer.java b/application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/TestNamer.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/islandpruning/TestNamer.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/TestNamer.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/linking/LinkingTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/linking/LinkingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/linking/LinkingTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/linking/LinkingTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/linking/TestGraph.java b/application/src/test/java/org/opentripplanner/graph_builder/module/linking/TestGraph.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/linking/TestGraph.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/linking/TestGraph.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/nearbystops/StreetNearbyStopFinderTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/nearbystops/StreetNearbyStopFinderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/nearbystops/StreetNearbyStopFinderTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/nearbystops/StreetNearbyStopFinderTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandlerTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandlerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandlerTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandlerTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/osm/DisjointSetTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/DisjointSetTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/osm/DisjointSetTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/osm/DisjointSetTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmDatabaseTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmDatabaseTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/osm/OsmDatabaseTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmDatabaseTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmModuleTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmModuleTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/osm/OsmModuleTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmModuleTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmParserTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmParserTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/osm/OsmParserTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmParserTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/osm/PlatformLinkerTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/PlatformLinkerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/osm/PlatformLinkerTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/osm/PlatformLinkerTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/osm/RingTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/RingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/osm/RingTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/osm/RingTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/osm/TriangleInequalityTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/TriangleInequalityTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/osm/TriangleInequalityTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/osm/TriangleInequalityTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/osm/UnconnectedAreasTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/UnconnectedAreasTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/osm/UnconnectedAreasTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/osm/UnconnectedAreasTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/osm/UnroutableTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/UnroutableTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/osm/UnroutableTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/osm/UnroutableTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilderTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilderTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamerTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamerTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamerTest.java
diff --git a/src/test/java/org/opentripplanner/graph_builder/services/osm/EdgeNamerTest.java b/application/src/test/java/org/opentripplanner/graph_builder/services/osm/EdgeNamerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/graph_builder/services/osm/EdgeNamerTest.java
rename to application/src/test/java/org/opentripplanner/graph_builder/services/osm/EdgeNamerTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/GenerateTripPatternsOperationTest.java b/application/src/test/java/org/opentripplanner/gtfs/GenerateTripPatternsOperationTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/GenerateTripPatternsOperationTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/GenerateTripPatternsOperationTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/GtfsContext.java b/application/src/test/java/org/opentripplanner/gtfs/GtfsContext.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/GtfsContext.java
rename to application/src/test/java/org/opentripplanner/gtfs/GtfsContext.java
diff --git a/src/test/java/org/opentripplanner/gtfs/GtfsContextBuilder.java b/application/src/test/java/org/opentripplanner/gtfs/GtfsContextBuilder.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/GtfsContextBuilder.java
rename to application/src/test/java/org/opentripplanner/gtfs/GtfsContextBuilder.java
diff --git a/src/test/java/org/opentripplanner/gtfs/GtfsImport.java b/application/src/test/java/org/opentripplanner/gtfs/GtfsImport.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/GtfsImport.java
rename to application/src/test/java/org/opentripplanner/gtfs/GtfsImport.java
diff --git a/src/test/java/org/opentripplanner/gtfs/integration/InterliningTest.java b/application/src/test/java/org/opentripplanner/gtfs/integration/InterliningTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/integration/InterliningTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/integration/InterliningTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java b/application/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/AgencyMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/AgencyMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/AgencyMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/AgencyMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/BikeAccessMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/BikeAccessMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/BikeAccessMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/BikeAccessMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/EntranceMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/EntranceMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/EntranceMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/EntranceMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/FareAttributeMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/FareAttributeMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/FareAttributeMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/FareAttributeMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/FareProductMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/FareProductMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/FareProductMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/FareProductMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/FareRuleMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/FareRuleMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/FareRuleMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/FareRuleMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/FeedInfoMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/FeedInfoMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/FeedInfoMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/FeedInfoMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/FeedScopedIdMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/FeedScopedIdMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/FeedScopedIdMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/FeedScopedIdMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/FrequencyMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/FrequencyMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/FrequencyMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/FrequencyMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/GtfsTestData.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/GtfsTestData.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/GtfsTestData.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/GtfsTestData.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/LocationMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/LocationMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/LocationMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/LocationMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/PathwayMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/PathwayMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/PathwayMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/PathwayMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/RouteMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/RouteMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/RouteMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/RouteMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/ServiceDateMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/ServiceDateMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/ServiceDateMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/ServiceDateMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/ShapePointMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/ShapePointMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/ShapePointMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/ShapePointMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/StationMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/StationMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/StationMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/StationMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/StopAndStationMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/StopAndStationMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/StopAndStationMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/StopAndStationMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/TransferMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/TransferMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/TransferMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/TransferMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/TransitModeMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/TransitModeMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/TransitModeMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/TransitModeMapperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/TranslationHelperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/TranslationHelperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/TranslationHelperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/TranslationHelperTest.java
diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java
rename to application/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java
diff --git a/src/test/java/org/opentripplanner/inspector/vector/VectorTileResponseFactoryTest.java b/application/src/test/java/org/opentripplanner/inspector/vector/VectorTileResponseFactoryTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/inspector/vector/VectorTileResponseFactoryTest.java
rename to application/src/test/java/org/opentripplanner/inspector/vector/VectorTileResponseFactoryTest.java
diff --git a/src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java b/application/src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java
rename to application/src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/mmri/BeneficialChangesTest.java b/application/src/test/java/org/opentripplanner/mmri/BeneficialChangesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/mmri/BeneficialChangesTest.java
rename to application/src/test/java/org/opentripplanner/mmri/BeneficialChangesTest.java
diff --git a/src/test/java/org/opentripplanner/mmri/ExcludedRoutesTest.java b/application/src/test/java/org/opentripplanner/mmri/ExcludedRoutesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/mmri/ExcludedRoutesTest.java
rename to application/src/test/java/org/opentripplanner/mmri/ExcludedRoutesTest.java
diff --git a/src/test/java/org/opentripplanner/mmri/ExcludedTripsTest.java b/application/src/test/java/org/opentripplanner/mmri/ExcludedTripsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/mmri/ExcludedTripsTest.java
rename to application/src/test/java/org/opentripplanner/mmri/ExcludedTripsTest.java
diff --git a/src/test/java/org/opentripplanner/mmri/FirstForbiddenTripToTripTransferTest.java b/application/src/test/java/org/opentripplanner/mmri/FirstForbiddenTripToTripTransferTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/mmri/FirstForbiddenTripToTripTransferTest.java
rename to application/src/test/java/org/opentripplanner/mmri/FirstForbiddenTripToTripTransferTest.java
diff --git a/src/test/java/org/opentripplanner/mmri/FirstPreferredTripToTripTransferTest.java b/application/src/test/java/org/opentripplanner/mmri/FirstPreferredTripToTripTransferTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/mmri/FirstPreferredTripToTripTransferTest.java
rename to application/src/test/java/org/opentripplanner/mmri/FirstPreferredTripToTripTransferTest.java
diff --git a/src/test/java/org/opentripplanner/mmri/FirstUnpreferredTransferTest.java b/application/src/test/java/org/opentripplanner/mmri/FirstUnpreferredTransferTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/mmri/FirstUnpreferredTransferTest.java
rename to application/src/test/java/org/opentripplanner/mmri/FirstUnpreferredTransferTest.java
diff --git a/src/test/java/org/opentripplanner/mmri/MMRI Testdocument.pdf b/application/src/test/java/org/opentripplanner/mmri/MMRI Testdocument.pdf
similarity index 100%
rename from src/test/java/org/opentripplanner/mmri/MMRI Testdocument.pdf
rename to application/src/test/java/org/opentripplanner/mmri/MMRI Testdocument.pdf
diff --git a/src/test/java/org/opentripplanner/mmri/OptimizationTest.java b/application/src/test/java/org/opentripplanner/mmri/OptimizationTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/mmri/OptimizationTest.java
rename to application/src/test/java/org/opentripplanner/mmri/OptimizationTest.java
diff --git a/src/test/java/org/opentripplanner/mmri/PreferencesTest.java b/application/src/test/java/org/opentripplanner/mmri/PreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/mmri/PreferencesTest.java
rename to application/src/test/java/org/opentripplanner/mmri/PreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/mmri/SecondForbiddenTripToTripTransferTest.java b/application/src/test/java/org/opentripplanner/mmri/SecondForbiddenTripToTripTransferTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/mmri/SecondForbiddenTripToTripTransferTest.java
rename to application/src/test/java/org/opentripplanner/mmri/SecondForbiddenTripToTripTransferTest.java
diff --git a/src/test/java/org/opentripplanner/mmri/SecondPreferredTripToTripTransferTest.java b/application/src/test/java/org/opentripplanner/mmri/SecondPreferredTripToTripTransferTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/mmri/SecondPreferredTripToTripTransferTest.java
rename to application/src/test/java/org/opentripplanner/mmri/SecondPreferredTripToTripTransferTest.java
diff --git a/src/test/java/org/opentripplanner/mmri/SecondUnpreferredTransferTest.java b/application/src/test/java/org/opentripplanner/mmri/SecondUnpreferredTransferTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/mmri/SecondUnpreferredTransferTest.java
rename to application/src/test/java/org/opentripplanner/mmri/SecondUnpreferredTransferTest.java
diff --git a/src/test/java/org/opentripplanner/mmri/StopToStopTransfersTest.java b/application/src/test/java/org/opentripplanner/mmri/StopToStopTransfersTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/mmri/StopToStopTransfersTest.java
rename to application/src/test/java/org/opentripplanner/mmri/StopToStopTransfersTest.java
diff --git a/src/test/java/org/opentripplanner/mmri/TimeTest.java b/application/src/test/java/org/opentripplanner/mmri/TimeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/mmri/TimeTest.java
rename to application/src/test/java/org/opentripplanner/mmri/TimeTest.java
diff --git a/src/test/java/org/opentripplanner/mmri/UnplannedChangesTest.java b/application/src/test/java/org/opentripplanner/mmri/UnplannedChangesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/mmri/UnplannedChangesTest.java
rename to application/src/test/java/org/opentripplanner/mmri/UnplannedChangesTest.java
diff --git a/src/test/java/org/opentripplanner/mmri/WheelchairTest.java b/application/src/test/java/org/opentripplanner/mmri/WheelchairTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/mmri/WheelchairTest.java
rename to application/src/test/java/org/opentripplanner/mmri/WheelchairTest.java
diff --git a/src/test/java/org/opentripplanner/mmri/package-info.java b/application/src/test/java/org/opentripplanner/mmri/package-info.java
similarity index 100%
rename from src/test/java/org/opentripplanner/mmri/package-info.java
rename to application/src/test/java/org/opentripplanner/mmri/package-info.java
diff --git a/src/test/java/org/opentripplanner/model/ShapeGeometryTest.java b/application/src/test/java/org/opentripplanner/model/ShapeGeometryTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/ShapeGeometryTest.java
rename to application/src/test/java/org/opentripplanner/model/ShapeGeometryTest.java
diff --git a/src/test/java/org/opentripplanner/model/TimetableSnapshotTest.java b/application/src/test/java/org/opentripplanner/model/TimetableSnapshotTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/TimetableSnapshotTest.java
rename to application/src/test/java/org/opentripplanner/model/TimetableSnapshotTest.java
diff --git a/src/test/java/org/opentripplanner/model/TimetableTest.java b/application/src/test/java/org/opentripplanner/model/TimetableTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/TimetableTest.java
rename to application/src/test/java/org/opentripplanner/model/TimetableTest.java
diff --git a/src/test/java/org/opentripplanner/model/TripPatternTest.java b/application/src/test/java/org/opentripplanner/model/TripPatternTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/TripPatternTest.java
rename to application/src/test/java/org/opentripplanner/model/TripPatternTest.java
diff --git a/src/test/java/org/opentripplanner/model/TripTimeOnDateTest.java b/application/src/test/java/org/opentripplanner/model/TripTimeOnDateTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/TripTimeOnDateTest.java
rename to application/src/test/java/org/opentripplanner/model/TripTimeOnDateTest.java
diff --git a/src/test/java/org/opentripplanner/model/calendar/ServiceDateIntervalTest.java b/application/src/test/java/org/opentripplanner/model/calendar/ServiceDateIntervalTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/calendar/ServiceDateIntervalTest.java
rename to application/src/test/java/org/opentripplanner/model/calendar/ServiceDateIntervalTest.java
diff --git a/src/test/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImplTest.java b/application/src/test/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImplTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImplTest.java
rename to application/src/test/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImplTest.java
diff --git a/src/test/java/org/opentripplanner/model/calendar/openinghours/OHCalendarTest.java b/application/src/test/java/org/opentripplanner/model/calendar/openinghours/OHCalendarTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/calendar/openinghours/OHCalendarTest.java
rename to application/src/test/java/org/opentripplanner/model/calendar/openinghours/OHCalendarTest.java
diff --git a/src/test/java/org/opentripplanner/model/impl/OtpTransitServiceBuilderLimitPeriodTest.java b/application/src/test/java/org/opentripplanner/model/impl/OtpTransitServiceBuilderLimitPeriodTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/impl/OtpTransitServiceBuilderLimitPeriodTest.java
rename to application/src/test/java/org/opentripplanner/model/impl/OtpTransitServiceBuilderLimitPeriodTest.java
diff --git a/src/test/java/org/opentripplanner/model/impl/OtpTransitServiceBuilderTest.java b/application/src/test/java/org/opentripplanner/model/impl/OtpTransitServiceBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/impl/OtpTransitServiceBuilderTest.java
rename to application/src/test/java/org/opentripplanner/model/impl/OtpTransitServiceBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/model/impl/OtpTransitServiceImplTest.java b/application/src/test/java/org/opentripplanner/model/impl/OtpTransitServiceImplTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/impl/OtpTransitServiceImplTest.java
rename to application/src/test/java/org/opentripplanner/model/impl/OtpTransitServiceImplTest.java
diff --git a/src/test/java/org/opentripplanner/model/modes/AllowAllModesFilterTest.java b/application/src/test/java/org/opentripplanner/model/modes/AllowAllModesFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/modes/AllowAllModesFilterTest.java
rename to application/src/test/java/org/opentripplanner/model/modes/AllowAllModesFilterTest.java
diff --git a/src/test/java/org/opentripplanner/model/modes/AllowMainAndSubModeFilterTest.java b/application/src/test/java/org/opentripplanner/model/modes/AllowMainAndSubModeFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/modes/AllowMainAndSubModeFilterTest.java
rename to application/src/test/java/org/opentripplanner/model/modes/AllowMainAndSubModeFilterTest.java
diff --git a/src/test/java/org/opentripplanner/model/modes/AllowMainAndSubModesFilterTest.java b/application/src/test/java/org/opentripplanner/model/modes/AllowMainAndSubModesFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/modes/AllowMainAndSubModesFilterTest.java
rename to application/src/test/java/org/opentripplanner/model/modes/AllowMainAndSubModesFilterTest.java
diff --git a/src/test/java/org/opentripplanner/model/modes/AllowMainModeFilterTest.java b/application/src/test/java/org/opentripplanner/model/modes/AllowMainModeFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/modes/AllowMainModeFilterTest.java
rename to application/src/test/java/org/opentripplanner/model/modes/AllowMainModeFilterTest.java
diff --git a/src/test/java/org/opentripplanner/model/modes/AllowMainModesFilterTest.java b/application/src/test/java/org/opentripplanner/model/modes/AllowMainModesFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/modes/AllowMainModesFilterTest.java
rename to application/src/test/java/org/opentripplanner/model/modes/AllowMainModesFilterTest.java
diff --git a/src/test/java/org/opentripplanner/model/modes/PathTailFilterFactoryTest.java b/application/src/test/java/org/opentripplanner/model/modes/PathTailFilterFactoryTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/modes/PathTailFilterFactoryTest.java
rename to application/src/test/java/org/opentripplanner/model/modes/PathTailFilterFactoryTest.java
diff --git a/src/test/java/org/opentripplanner/model/plan/ElevationProfileTest.java b/application/src/test/java/org/opentripplanner/model/plan/ElevationProfileTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/plan/ElevationProfileTest.java
rename to application/src/test/java/org/opentripplanner/model/plan/ElevationProfileTest.java
diff --git a/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java b/application/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/plan/ItineraryTest.java
rename to application/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java
diff --git a/src/test/java/org/opentripplanner/model/plan/LegTest.java b/application/src/test/java/org/opentripplanner/model/plan/LegTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/plan/LegTest.java
rename to application/src/test/java/org/opentripplanner/model/plan/LegTest.java
diff --git a/src/test/java/org/opentripplanner/model/plan/PlaceTest.java b/application/src/test/java/org/opentripplanner/model/plan/PlaceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/plan/PlaceTest.java
rename to application/src/test/java/org/opentripplanner/model/plan/PlaceTest.java
diff --git a/src/test/java/org/opentripplanner/model/plan/PlanTestConstants.java b/application/src/test/java/org/opentripplanner/model/plan/PlanTestConstants.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/plan/PlanTestConstants.java
rename to application/src/test/java/org/opentripplanner/model/plan/PlanTestConstants.java
diff --git a/src/test/java/org/opentripplanner/model/plan/RelativeDirectionTest.java b/application/src/test/java/org/opentripplanner/model/plan/RelativeDirectionTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/plan/RelativeDirectionTest.java
rename to application/src/test/java/org/opentripplanner/model/plan/RelativeDirectionTest.java
diff --git a/src/test/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilderTest.java b/application/src/test/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilderTest.java
rename to application/src/test/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/model/plan/ScheduledTransitLegTest.java b/application/src/test/java/org/opentripplanner/model/plan/ScheduledTransitLegTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/plan/ScheduledTransitLegTest.java
rename to application/src/test/java/org/opentripplanner/model/plan/ScheduledTransitLegTest.java
diff --git a/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java b/application/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java
rename to application/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java
diff --git a/src/test/java/org/opentripplanner/model/plan/WalkStepTest.java b/application/src/test/java/org/opentripplanner/model/plan/WalkStepTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/plan/WalkStepTest.java
rename to application/src/test/java/org/opentripplanner/model/plan/WalkStepTest.java
diff --git a/src/test/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializerTest.java b/application/src/test/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializerTest.java
rename to application/src/test/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializerTest.java
diff --git a/src/test/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReferenceTest.java b/application/src/test/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReferenceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReferenceTest.java
rename to application/src/test/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReferenceTest.java
diff --git a/src/test/java/org/opentripplanner/model/plan/paging/PagingSearchWindowAdjusterTest.java b/application/src/test/java/org/opentripplanner/model/plan/paging/PagingSearchWindowAdjusterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/plan/paging/PagingSearchWindowAdjusterTest.java
rename to application/src/test/java/org/opentripplanner/model/plan/paging/PagingSearchWindowAdjusterTest.java
diff --git a/src/test/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCutTest.java b/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCutTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCutTest.java
rename to application/src/test/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCutTest.java
diff --git a/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorFactoryTest.java b/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorFactoryTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorFactoryTest.java
rename to application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorFactoryTest.java
diff --git a/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializerTest.java b/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializerTest.java
rename to application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializerTest.java
diff --git a/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorTest.java b/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorTest.java
rename to application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorTest.java
diff --git a/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageTypeTest.java b/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageTypeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/plan/paging/cursor/PageTypeTest.java
rename to application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageTypeTest.java
diff --git a/src/test/java/org/opentripplanner/model/projectinfo/GraphFileHeaderTest.java b/application/src/test/java/org/opentripplanner/model/projectinfo/GraphFileHeaderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/projectinfo/GraphFileHeaderTest.java
rename to application/src/test/java/org/opentripplanner/model/projectinfo/GraphFileHeaderTest.java
diff --git a/src/test/java/org/opentripplanner/model/projectinfo/MavenProjectVersionTest.java b/application/src/test/java/org/opentripplanner/model/projectinfo/MavenProjectVersionTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/projectinfo/MavenProjectVersionTest.java
rename to application/src/test/java/org/opentripplanner/model/projectinfo/MavenProjectVersionTest.java
diff --git a/src/test/java/org/opentripplanner/model/projectinfo/OtpProjectInfoTest.java b/application/src/test/java/org/opentripplanner/model/projectinfo/OtpProjectInfoTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/projectinfo/OtpProjectInfoTest.java
rename to application/src/test/java/org/opentripplanner/model/projectinfo/OtpProjectInfoTest.java
diff --git a/src/test/java/org/opentripplanner/model/routing/TripSearchMetadataTest.java b/application/src/test/java/org/opentripplanner/model/routing/TripSearchMetadataTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/routing/TripSearchMetadataTest.java
rename to application/src/test/java/org/opentripplanner/model/routing/TripSearchMetadataTest.java
diff --git a/src/test/java/org/opentripplanner/model/transfer/ConstrainedTransferTest.java b/application/src/test/java/org/opentripplanner/model/transfer/ConstrainedTransferTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/transfer/ConstrainedTransferTest.java
rename to application/src/test/java/org/opentripplanner/model/transfer/ConstrainedTransferTest.java
diff --git a/src/test/java/org/opentripplanner/model/transfer/TransferConstraintTest.java b/application/src/test/java/org/opentripplanner/model/transfer/TransferConstraintTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/transfer/TransferConstraintTest.java
rename to application/src/test/java/org/opentripplanner/model/transfer/TransferConstraintTest.java
diff --git a/src/test/java/org/opentripplanner/model/transfer/TransferPointMapTest.java b/application/src/test/java/org/opentripplanner/model/transfer/TransferPointMapTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/transfer/TransferPointMapTest.java
rename to application/src/test/java/org/opentripplanner/model/transfer/TransferPointMapTest.java
diff --git a/src/test/java/org/opentripplanner/model/transfer/TransferPointTest.java b/application/src/test/java/org/opentripplanner/model/transfer/TransferPointTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/transfer/TransferPointTest.java
rename to application/src/test/java/org/opentripplanner/model/transfer/TransferPointTest.java
diff --git a/src/test/java/org/opentripplanner/model/transfer/TransferPriorityTest.java b/application/src/test/java/org/opentripplanner/model/transfer/TransferPriorityTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/transfer/TransferPriorityTest.java
rename to application/src/test/java/org/opentripplanner/model/transfer/TransferPriorityTest.java
diff --git a/src/test/java/org/opentripplanner/model/transfer/TransferServiceTest.java b/application/src/test/java/org/opentripplanner/model/transfer/TransferServiceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/transfer/TransferServiceTest.java
rename to application/src/test/java/org/opentripplanner/model/transfer/TransferServiceTest.java
diff --git a/src/test/java/org/opentripplanner/model/transfer/TransferTestData.java b/application/src/test/java/org/opentripplanner/model/transfer/TransferTestData.java
similarity index 100%
rename from src/test/java/org/opentripplanner/model/transfer/TransferTestData.java
rename to application/src/test/java/org/opentripplanner/model/transfer/TransferTestData.java
diff --git a/src/test/java/org/opentripplanner/netex/NetexEpipBundleSmokeTest.java b/application/src/test/java/org/opentripplanner/netex/NetexEpipBundleSmokeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/NetexEpipBundleSmokeTest.java
rename to application/src/test/java/org/opentripplanner/netex/NetexEpipBundleSmokeTest.java
diff --git a/src/test/java/org/opentripplanner/netex/NetexNordicBundleSmokeTest.java b/application/src/test/java/org/opentripplanner/netex/NetexNordicBundleSmokeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/NetexNordicBundleSmokeTest.java
rename to application/src/test/java/org/opentripplanner/netex/NetexNordicBundleSmokeTest.java
diff --git a/src/test/java/org/opentripplanner/netex/NetexTestDataSupport.java b/application/src/test/java/org/opentripplanner/netex/NetexTestDataSupport.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/NetexTestDataSupport.java
rename to application/src/test/java/org/opentripplanner/netex/NetexTestDataSupport.java
diff --git a/src/test/java/org/opentripplanner/netex/config/NetexFeedParametersTest.java b/application/src/test/java/org/opentripplanner/netex/config/NetexFeedParametersTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/config/NetexFeedParametersTest.java
rename to application/src/test/java/org/opentripplanner/netex/config/NetexFeedParametersTest.java
diff --git a/src/test/java/org/opentripplanner/netex/index/hierarchy/E.java b/application/src/test/java/org/opentripplanner/netex/index/hierarchy/E.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/index/hierarchy/E.java
rename to application/src/test/java/org/opentripplanner/netex/index/hierarchy/E.java
diff --git a/src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalElementTest.java b/application/src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalElementTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalElementTest.java
rename to application/src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalElementTest.java
diff --git a/src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMapByIdTest.java b/application/src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMapByIdTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMapByIdTest.java
rename to application/src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMapByIdTest.java
diff --git a/src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMapTest.java b/application/src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMapTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMapTest.java
rename to application/src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMapTest.java
diff --git a/src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMultimapTest.java b/application/src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMultimapTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMultimapTest.java
rename to application/src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalMultimapTest.java
diff --git a/src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalVersionMapByIdTest.java b/application/src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalVersionMapByIdTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalVersionMapByIdTest.java
rename to application/src/test/java/org/opentripplanner/netex/index/hierarchy/HierarchicalVersionMapByIdTest.java
diff --git a/src/test/java/org/opentripplanner/netex/index/hierarchy/SetSupport.java b/application/src/test/java/org/opentripplanner/netex/index/hierarchy/SetSupport.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/index/hierarchy/SetSupport.java
rename to application/src/test/java/org/opentripplanner/netex/index/hierarchy/SetSupport.java
diff --git a/src/test/java/org/opentripplanner/netex/index/hierarchy/ValidOnDateTest.java b/application/src/test/java/org/opentripplanner/netex/index/hierarchy/ValidOnDateTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/index/hierarchy/ValidOnDateTest.java
rename to application/src/test/java/org/opentripplanner/netex/index/hierarchy/ValidOnDateTest.java
diff --git a/src/test/java/org/opentripplanner/netex/loader/NetexEntityIndexTest.java b/application/src/test/java/org/opentripplanner/netex/loader/NetexEntityIndexTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/loader/NetexEntityIndexTest.java
rename to application/src/test/java/org/opentripplanner/netex/loader/NetexEntityIndexTest.java
diff --git a/src/test/java/org/opentripplanner/netex/loader/parser/ResourceFrameParserTest.java b/application/src/test/java/org/opentripplanner/netex/loader/parser/ResourceFrameParserTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/loader/parser/ResourceFrameParserTest.java
rename to application/src/test/java/org/opentripplanner/netex/loader/parser/ResourceFrameParserTest.java
diff --git a/src/test/java/org/opentripplanner/netex/loader/parser/ServiceCalendarFrameParserTest.java b/application/src/test/java/org/opentripplanner/netex/loader/parser/ServiceCalendarFrameParserTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/loader/parser/ServiceCalendarFrameParserTest.java
rename to application/src/test/java/org/opentripplanner/netex/loader/parser/ServiceCalendarFrameParserTest.java
diff --git a/src/test/java/org/opentripplanner/netex/loader/parser/SiteFrameParserTest.java b/application/src/test/java/org/opentripplanner/netex/loader/parser/SiteFrameParserTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/loader/parser/SiteFrameParserTest.java
rename to application/src/test/java/org/opentripplanner/netex/loader/parser/SiteFrameParserTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/BookingInfoMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/BookingInfoMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/BookingInfoMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/BookingInfoMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/BrandingMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/BrandingMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/BrandingMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/BrandingMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/DurationMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/DurationMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/DurationMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/DurationMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/FeedScopedIdFactoryTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/FeedScopedIdFactoryTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/FeedScopedIdFactoryTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/FeedScopedIdFactoryTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/FlexStopsMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/FlexStopsMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/FlexStopsMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/FlexStopsMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/GroupOfRoutesMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/GroupOfRoutesMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/GroupOfRoutesMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/GroupOfRoutesMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/MappingSupport.java b/application/src/test/java/org/opentripplanner/netex/mapping/MappingSupport.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/MappingSupport.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/MappingSupport.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/MultiModalStationMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/MultiModalStationMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/MultiModalStationMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/MultiModalStationMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/NetexTestDataSample.java b/application/src/test/java/org/opentripplanner/netex/mapping/NetexTestDataSample.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/NetexTestDataSample.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/NetexTestDataSample.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/NoticeAssignmentMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/NoticeAssignmentMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/NoticeAssignmentMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/NoticeAssignmentMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/NoticeMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/NoticeMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/NoticeMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/NoticeMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/OperatorToAgencyMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/OperatorToAgencyMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/OperatorToAgencyMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/OperatorToAgencyMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/RouteMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/RouteMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/RouteMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/RouteMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/ServiceLinkMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/ServiceLinkMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/ServiceLinkMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/ServiceLinkMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/StationMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/StationMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/StationMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/StationMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/StopAndStationMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/StopAndStationMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/StopAndStationMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/StopAndStationMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/StopPlaceTypeMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/StopPlaceTypeMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/StopPlaceTypeMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/StopPlaceTypeMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/StopTimesMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/StopTimesMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/StopTimesMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/StopTimesMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/StopTransferPriorityMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/StopTransferPriorityMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/StopTransferPriorityMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/StopTransferPriorityMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/TransportModeMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/TransportModeMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/TransportModeMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/TransportModeMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/TripCalendarBuilderTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/TripCalendarBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/TripCalendarBuilderTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/TripCalendarBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/TripMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/TripMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/TripMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/TripMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/WgsCoordinateMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/WgsCoordinateMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/WgsCoordinateMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/WgsCoordinateMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilderTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilderTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/calendar/DatedServiceJourneyMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/calendar/DatedServiceJourneyMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/calendar/DatedServiceJourneyMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/calendar/DatedServiceJourneyMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/calendar/DayOfWeekMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/calendar/DayOfWeekMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/calendar/DayOfWeekMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/calendar/DayOfWeekMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/calendar/DayTypeAssignmentMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/calendar/DayTypeAssignmentMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/calendar/DayTypeAssignmentMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/calendar/DayTypeAssignmentMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/calendar/OperatingDayMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/calendar/OperatingDayMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/calendar/OperatingDayMapperTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/calendar/OperatingDayMapperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/support/NetexMapperIndexesTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/support/NetexMapperIndexesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/support/NetexMapperIndexesTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/support/NetexMapperIndexesTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/support/NetexObjectDecoratorTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/support/NetexObjectDecoratorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/support/NetexObjectDecoratorTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/support/NetexObjectDecoratorTest.java
diff --git a/src/test/java/org/opentripplanner/netex/mapping/support/ValidityComparatorTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/support/ValidityComparatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/mapping/support/ValidityComparatorTest.java
rename to application/src/test/java/org/opentripplanner/netex/mapping/support/ValidityComparatorTest.java
diff --git a/src/test/java/org/opentripplanner/netex/support/NetexVersionHelperTest.java b/application/src/test/java/org/opentripplanner/netex/support/NetexVersionHelperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/support/NetexVersionHelperTest.java
rename to application/src/test/java/org/opentripplanner/netex/support/NetexVersionHelperTest.java
diff --git a/src/test/java/org/opentripplanner/netex/validation/JourneyPatternSJMismatchTest.java b/application/src/test/java/org/opentripplanner/netex/validation/JourneyPatternSJMismatchTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/validation/JourneyPatternSJMismatchTest.java
rename to application/src/test/java/org/opentripplanner/netex/validation/JourneyPatternSJMismatchTest.java
diff --git a/src/test/java/org/opentripplanner/netex/validation/ServiceJourneyNonIncreasingPassingTimeTest.java b/application/src/test/java/org/opentripplanner/netex/validation/ServiceJourneyNonIncreasingPassingTimeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/netex/validation/ServiceJourneyNonIncreasingPassingTimeTest.java
rename to application/src/test/java/org/opentripplanner/netex/validation/ServiceJourneyNonIncreasingPassingTimeTest.java
diff --git a/src/test/java/org/opentripplanner/osm/OsmOpeningHoursParserTest.java b/application/src/test/java/org/opentripplanner/osm/OsmOpeningHoursParserTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/OsmOpeningHoursParserTest.java
rename to application/src/test/java/org/opentripplanner/osm/OsmOpeningHoursParserTest.java
diff --git a/src/test/java/org/opentripplanner/osm/model/OsmNodeTest.java b/application/src/test/java/org/opentripplanner/osm/model/OsmNodeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/model/OsmNodeTest.java
rename to application/src/test/java/org/opentripplanner/osm/model/OsmNodeTest.java
diff --git a/src/test/java/org/opentripplanner/osm/model/OsmWayTest.java b/application/src/test/java/org/opentripplanner/osm/model/OsmWayTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/model/OsmWayTest.java
rename to application/src/test/java/org/opentripplanner/osm/model/OsmWayTest.java
diff --git a/src/test/java/org/opentripplanner/osm/model/OsmWithTagsTest.java b/application/src/test/java/org/opentripplanner/osm/model/OsmWithTagsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/model/OsmWithTagsTest.java
rename to application/src/test/java/org/opentripplanner/osm/model/OsmWithTagsTest.java
diff --git a/src/test/java/org/opentripplanner/osm/tagmapping/AtlantaMapperTest.java b/application/src/test/java/org/opentripplanner/osm/tagmapping/AtlantaMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/tagmapping/AtlantaMapperTest.java
rename to application/src/test/java/org/opentripplanner/osm/tagmapping/AtlantaMapperTest.java
diff --git a/src/test/java/org/opentripplanner/osm/tagmapping/DefaultMapperTest.java b/application/src/test/java/org/opentripplanner/osm/tagmapping/DefaultMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/tagmapping/DefaultMapperTest.java
rename to application/src/test/java/org/opentripplanner/osm/tagmapping/DefaultMapperTest.java
diff --git a/src/test/java/org/opentripplanner/osm/tagmapping/FinlandMapperTest.java b/application/src/test/java/org/opentripplanner/osm/tagmapping/FinlandMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/tagmapping/FinlandMapperTest.java
rename to application/src/test/java/org/opentripplanner/osm/tagmapping/FinlandMapperTest.java
diff --git a/src/test/java/org/opentripplanner/osm/tagmapping/GermanyMapperTest.java b/application/src/test/java/org/opentripplanner/osm/tagmapping/GermanyMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/tagmapping/GermanyMapperTest.java
rename to application/src/test/java/org/opentripplanner/osm/tagmapping/GermanyMapperTest.java
diff --git a/src/test/java/org/opentripplanner/osm/tagmapping/HamburgMapperTest.java b/application/src/test/java/org/opentripplanner/osm/tagmapping/HamburgMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/tagmapping/HamburgMapperTest.java
rename to application/src/test/java/org/opentripplanner/osm/tagmapping/HamburgMapperTest.java
diff --git a/src/test/java/org/opentripplanner/osm/tagmapping/HoustonMapperTest.java b/application/src/test/java/org/opentripplanner/osm/tagmapping/HoustonMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/tagmapping/HoustonMapperTest.java
rename to application/src/test/java/org/opentripplanner/osm/tagmapping/HoustonMapperTest.java
diff --git a/src/test/java/org/opentripplanner/osm/tagmapping/NorwayMapperTest.java b/application/src/test/java/org/opentripplanner/osm/tagmapping/NorwayMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/tagmapping/NorwayMapperTest.java
rename to application/src/test/java/org/opentripplanner/osm/tagmapping/NorwayMapperTest.java
diff --git a/src/test/java/org/opentripplanner/osm/tagmapping/OsmTagMapperTest.java b/application/src/test/java/org/opentripplanner/osm/tagmapping/OsmTagMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/tagmapping/OsmTagMapperTest.java
rename to application/src/test/java/org/opentripplanner/osm/tagmapping/OsmTagMapperTest.java
diff --git a/src/test/java/org/opentripplanner/osm/tagmapping/PortlandMapperTest.java b/application/src/test/java/org/opentripplanner/osm/tagmapping/PortlandMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/tagmapping/PortlandMapperTest.java
rename to application/src/test/java/org/opentripplanner/osm/tagmapping/PortlandMapperTest.java
diff --git a/src/test/java/org/opentripplanner/osm/wayproperty/MixinPropertiesBuilderTest.java b/application/src/test/java/org/opentripplanner/osm/wayproperty/MixinPropertiesBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/wayproperty/MixinPropertiesBuilderTest.java
rename to application/src/test/java/org/opentripplanner/osm/wayproperty/MixinPropertiesBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/osm/wayproperty/WayPropertySetTest.java b/application/src/test/java/org/opentripplanner/osm/wayproperty/WayPropertySetTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/wayproperty/WayPropertySetTest.java
rename to application/src/test/java/org/opentripplanner/osm/wayproperty/WayPropertySetTest.java
diff --git a/src/test/java/org/opentripplanner/osm/wayproperty/specifier/BestMatchSpecifierTest.java b/application/src/test/java/org/opentripplanner/osm/wayproperty/specifier/BestMatchSpecifierTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/wayproperty/specifier/BestMatchSpecifierTest.java
rename to application/src/test/java/org/opentripplanner/osm/wayproperty/specifier/BestMatchSpecifierTest.java
diff --git a/src/test/java/org/opentripplanner/osm/wayproperty/specifier/ConditionTest.java b/application/src/test/java/org/opentripplanner/osm/wayproperty/specifier/ConditionTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/wayproperty/specifier/ConditionTest.java
rename to application/src/test/java/org/opentripplanner/osm/wayproperty/specifier/ConditionTest.java
diff --git a/src/test/java/org/opentripplanner/osm/wayproperty/specifier/ExactMatchSpecifierTest.java b/application/src/test/java/org/opentripplanner/osm/wayproperty/specifier/ExactMatchSpecifierTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/wayproperty/specifier/ExactMatchSpecifierTest.java
rename to application/src/test/java/org/opentripplanner/osm/wayproperty/specifier/ExactMatchSpecifierTest.java
diff --git a/src/test/java/org/opentripplanner/osm/wayproperty/specifier/LogicalOrSpecifierTest.java b/application/src/test/java/org/opentripplanner/osm/wayproperty/specifier/LogicalOrSpecifierTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/wayproperty/specifier/LogicalOrSpecifierTest.java
rename to application/src/test/java/org/opentripplanner/osm/wayproperty/specifier/LogicalOrSpecifierTest.java
diff --git a/src/test/java/org/opentripplanner/osm/wayproperty/specifier/OsmSpecifierTest.java b/application/src/test/java/org/opentripplanner/osm/wayproperty/specifier/OsmSpecifierTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/wayproperty/specifier/OsmSpecifierTest.java
rename to application/src/test/java/org/opentripplanner/osm/wayproperty/specifier/OsmSpecifierTest.java
diff --git a/src/test/java/org/opentripplanner/osm/wayproperty/specifier/SpecifierTest.java b/application/src/test/java/org/opentripplanner/osm/wayproperty/specifier/SpecifierTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/wayproperty/specifier/SpecifierTest.java
rename to application/src/test/java/org/opentripplanner/osm/wayproperty/specifier/SpecifierTest.java
diff --git a/src/test/java/org/opentripplanner/osm/wayproperty/specifier/WayTestData.java b/application/src/test/java/org/opentripplanner/osm/wayproperty/specifier/WayTestData.java
similarity index 100%
rename from src/test/java/org/opentripplanner/osm/wayproperty/specifier/WayTestData.java
rename to application/src/test/java/org/opentripplanner/osm/wayproperty/specifier/WayTestData.java
diff --git a/src/test/java/org/opentripplanner/raptor/RaptorArchitectureTest.java b/application/src/test/java/org/opentripplanner/raptor/RaptorArchitectureTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/RaptorArchitectureTest.java
rename to application/src/test/java/org/opentripplanner/raptor/RaptorArchitectureTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java b/application/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/api/PathUtils.java b/application/src/test/java/org/opentripplanner/raptor/_data/api/PathUtils.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/api/PathUtils.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/api/PathUtils.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilder.java b/application/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilder.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilder.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilder.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilderTestRaptor.java b/application/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilderTestRaptor.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilderTestRaptor.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilderTestRaptor.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/api/TestRaptorPath.java b/application/src/test/java/org/opentripplanner/raptor/_data/api/TestRaptorPath.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/api/TestRaptorPath.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/api/TestRaptorPath.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/multicriteria/ride/TestPatterRideBuilder.java b/application/src/test/java/org/opentripplanner/raptor/_data/multicriteria/ride/TestPatterRideBuilder.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/multicriteria/ride/TestPatterRideBuilder.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/multicriteria/ride/TestPatterRideBuilder.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/stoparrival/AbstractStopArrival.java b/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/AbstractStopArrival.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/stoparrival/AbstractStopArrival.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/AbstractStopArrival.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Access.java b/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Access.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/stoparrival/Access.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Access.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/stoparrival/BasicPathTestCase.java b/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/BasicPathTestCase.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/stoparrival/BasicPathTestCase.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/BasicPathTestCase.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Egress.java b/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Egress.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/stoparrival/Egress.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Egress.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/stoparrival/FlexAccessAndEgressPathTestCase.java b/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/FlexAccessAndEgressPathTestCase.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/stoparrival/FlexAccessAndEgressPathTestCase.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/FlexAccessAndEgressPathTestCase.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/stoparrival/TestArrivals.java b/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/TestArrivals.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/stoparrival/TestArrivals.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/TestArrivals.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Transfer.java b/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Transfer.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/stoparrival/Transfer.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Transfer.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Transit.java b/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Transit.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/stoparrival/Transit.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Transit.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedBoardingSearch.java b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedBoardingSearch.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedBoardingSearch.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedBoardingSearch.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedTransfer.java b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedTransfer.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedTransfer.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedTransfer.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/transit/TestRoute.java b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestRoute.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/transit/TestRoute.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/transit/TestRoute.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransfer.java b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransfer.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/transit/TestTransfer.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransfer.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransferPoint.java b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransferPoint.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/transit/TestTransferPoint.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransferPoint.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransitData.java b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransitData.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/transit/TestTransitData.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransitData.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripPattern.java b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripPattern.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/transit/TestTripPattern.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripPattern.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripSchedule.java b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripSchedule.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/transit/TestTripSchedule.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripSchedule.java
diff --git a/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripSearchTimetable.java b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripSearchTimetable.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/_data/transit/TestTripSearchTimetable.java
rename to application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripSearchTimetable.java
diff --git a/src/test/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunctionTest.java b/application/src/test/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunctionTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunctionTest.java
rename to application/src/test/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunctionTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/api/path/PathTest.java b/application/src/test/java/org/opentripplanner/raptor/api/path/PathTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/api/path/PathTest.java
rename to application/src/test/java/org/opentripplanner/raptor/api/path/PathTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/api/path/RaptorPathTest.java b/application/src/test/java/org/opentripplanner/raptor/api/path/RaptorPathTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/api/path/RaptorPathTest.java
rename to application/src/test/java/org/opentripplanner/raptor/api/path/RaptorPathTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequestTest.java b/application/src/test/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequestTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequestTest.java
rename to application/src/test/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequestTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/api/request/PassThroughPointTest.java b/application/src/test/java/org/opentripplanner/raptor/api/request/PassThroughPointTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/api/request/PassThroughPointTest.java
rename to application/src/test/java/org/opentripplanner/raptor/api/request/PassThroughPointTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/api/request/RaptorRequestTest.java b/application/src/test/java/org/opentripplanner/raptor/api/request/RaptorRequestTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/api/request/RaptorRequestTest.java
rename to application/src/test/java/org/opentripplanner/raptor/api/request/RaptorRequestTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/api/request/SearchParamsTest.java b/application/src/test/java/org/opentripplanner/raptor/api/request/SearchParamsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/api/request/SearchParamsTest.java
rename to application/src/test/java/org/opentripplanner/raptor/api/request/SearchParamsTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/api/request/ViaLocationTest.java b/application/src/test/java/org/opentripplanner/raptor/api/request/ViaLocationTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/api/request/ViaLocationTest.java
rename to application/src/test/java/org/opentripplanner/raptor/api/request/ViaLocationTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/api/view/BoardAndAlightTimeTest.java b/application/src/test/java/org/opentripplanner/raptor/api/view/BoardAndAlightTimeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/api/view/BoardAndAlightTimeTest.java
rename to application/src/test/java/org/opentripplanner/raptor/api/view/BoardAndAlightTimeTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/A01_SingleRouteTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/A01_SingleRouteTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/A01_SingleRouteTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/A01_SingleRouteTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/A04_BoardingTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/A04_BoardingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/A04_BoardingTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/A04_BoardingTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/B01_AccessTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/B01_AccessTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/B01_AccessTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/B01_AccessTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/B02_EgressTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/B02_EgressTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/B02_EgressTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/B02_EgressTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/B03_AccessEgressTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/B03_AccessEgressTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/B03_AccessEgressTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/B03_AccessEgressTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/B04_AccessEgressBoardingTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/B04_AccessEgressBoardingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/B04_AccessEgressBoardingTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/B04_AccessEgressBoardingTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/B05_EgressStopBoardAlightTransferCostTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/B05_EgressStopBoardAlightTransferCostTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/B05_EgressStopBoardAlightTransferCostTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/B05_EgressStopBoardAlightTransferCostTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/C01_TransferBoardAndAlightSlackTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/C01_TransferBoardAndAlightSlackTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/C01_TransferBoardAndAlightSlackTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/C01_TransferBoardAndAlightSlackTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/C02_OnStreetTransfersTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/C02_OnStreetTransfersTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/C02_OnStreetTransfersTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/C02_OnStreetTransfersTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/C03_OnBoardArrivalDominateTransfersTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/C03_OnBoardArrivalDominateTransfersTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/C03_OnBoardArrivalDominateTransfersTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/C03_OnBoardArrivalDominateTransfersTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/D01_SingeRouteBoardAlightRestrictionsTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/D01_SingeRouteBoardAlightRestrictionsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/D01_SingeRouteBoardAlightRestrictionsTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/D01_SingeRouteBoardAlightRestrictionsTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/D02_TransitModeReluctanceTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/D02_TransitModeReluctanceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/D02_TransitModeReluctanceTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/D02_TransitModeReluctanceTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/D03_UnpreferredRouteTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/D03_UnpreferredRouteTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/D03_UnpreferredRouteTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/D03_UnpreferredRouteTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/E01_StaySeatedTransferTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/E01_StaySeatedTransferTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/E01_StaySeatedTransferTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/E01_StaySeatedTransferTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/E02_GuaranteedWalkTransferTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/E02_GuaranteedWalkTransferTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/E02_GuaranteedWalkTransferTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/E02_GuaranteedWalkTransferTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/E03_NotAllowedConstrainedTransferTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/E03_NotAllowedConstrainedTransferTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/E03_NotAllowedConstrainedTransferTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/E03_NotAllowedConstrainedTransferTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/F01_AccessWithRidesTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/F01_AccessWithRidesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/F01_AccessWithRidesTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/F01_AccessWithRidesTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/F02_EgressWithRidesTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/F02_EgressWithRidesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/F02_EgressWithRidesTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/F02_EgressWithRidesTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/F03_AccessEgressWithRidesBoardAndAlightSlackTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/F03_AccessEgressWithRidesBoardAndAlightSlackTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/F03_AccessEgressWithRidesBoardAndAlightSlackTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/F03_AccessEgressWithRidesBoardAndAlightSlackTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/F04_AccessEgressWithRidesNoTransitTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/F04_AccessEgressWithRidesNoTransitTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/F04_AccessEgressWithRidesNoTransitTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/F04_AccessEgressWithRidesNoTransitTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/F05_OnBoardAccessEgressAndTransfersTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/F05_OnBoardAccessEgressAndTransfersTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/F05_OnBoardAccessEgressAndTransfersTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/F05_OnBoardAccessEgressAndTransfersTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/F11_AccessWithRidesMultipleOptimalPathsTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/F11_AccessWithRidesMultipleOptimalPathsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/F11_AccessWithRidesMultipleOptimalPathsTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/F11_AccessWithRidesMultipleOptimalPathsTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/F12_EgressWithRidesMultipleOptimalPathsTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/F12_EgressWithRidesMultipleOptimalPathsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/F12_EgressWithRidesMultipleOptimalPathsTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/F12_EgressWithRidesMultipleOptimalPathsTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/G01_AccessWithOpeningHoursTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/G01_AccessWithOpeningHoursTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/G01_AccessWithOpeningHoursTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/G01_AccessWithOpeningHoursTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/G02_EgressWithOpeningHoursTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/G02_EgressWithOpeningHoursTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/G02_EgressWithOpeningHoursTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/G02_EgressWithOpeningHoursTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/G03_AccessWithOpeningHoursMultipleOptionsTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/G03_AccessWithOpeningHoursMultipleOptionsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/G03_AccessWithOpeningHoursMultipleOptionsTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/G03_AccessWithOpeningHoursMultipleOptionsTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/G04_EgressWithOpeningHoursMultipleOptionsTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/G04_EgressWithOpeningHoursMultipleOptionsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/G04_EgressWithOpeningHoursMultipleOptionsTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/G04_EgressWithOpeningHoursMultipleOptionsTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/G05_ClosedAccessOpeningHoursTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/G05_ClosedAccessOpeningHoursTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/G05_ClosedAccessOpeningHoursTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/G05_ClosedAccessOpeningHoursTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/G06_ClosedEgressOpeningHoursTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/G06_ClosedEgressOpeningHoursTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/G06_ClosedEgressOpeningHoursTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/G06_ClosedEgressOpeningHoursTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/H11_GuaranteedTransferWithFlexAccessTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/H11_GuaranteedTransferWithFlexAccessTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/H11_GuaranteedTransferWithFlexAccessTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/H11_GuaranteedTransferWithFlexAccessTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/I01_HeuristicTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/I01_HeuristicTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/I01_HeuristicTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/I01_HeuristicTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/J01_PassThroughTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/J01_PassThroughTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/J01_PassThroughTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/J01_PassThroughTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/J02_ViaSearchTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/J02_ViaSearchTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/J02_ViaSearchTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/J02_ViaSearchTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyAccessTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyAccessTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyAccessTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyAccessTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyEgressTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyEgressTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyEgressTest.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyEgressTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/images/F11.svg b/application/src/test/java/org/opentripplanner/raptor/moduletests/images/F11.svg
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/images/F11.svg
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/images/F11.svg
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/images/F12.svg b/application/src/test/java/org/opentripplanner/raptor/moduletests/images/F12.svg
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/images/F12.svg
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/images/F12.svg
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/images/Samples.excalidraw b/application/src/test/java/org/opentripplanner/raptor/moduletests/images/Samples.excalidraw
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/images/Samples.excalidraw
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/images/Samples.excalidraw
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/package-info.md b/application/src/test/java/org/opentripplanner/raptor/moduletests/package-info.md
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/package-info.md
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/package-info.md
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/support/ExpectedList.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/support/ExpectedList.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/support/ExpectedList.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/support/ExpectedList.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/support/ModuleTestDebugLogging.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/support/ModuleTestDebugLogging.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/support/ModuleTestDebugLogging.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/support/ModuleTestDebugLogging.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCase.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCase.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCase.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCase.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCaseFactory.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCaseFactory.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCaseFactory.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCaseFactory.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestConfig.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestConfig.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestConfig.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestConfig.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestConfigSetBuilder.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestConfigSetBuilder.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestConfigSetBuilder.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestConfigSetBuilder.java
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/support/TestGroupPriorityCalculator.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/support/TestGroupPriorityCalculator.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/moduletests/support/TestGroupPriorityCalculator.java
rename to application/src/test/java/org/opentripplanner/raptor/moduletests/support/TestGroupPriorityCalculator.java
diff --git a/src/test/java/org/opentripplanner/raptor/package-info.md b/application/src/test/java/org/opentripplanner/raptor/package-info.md
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/package-info.md
rename to application/src/test/java/org/opentripplanner/raptor/package-info.md
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/internalapi/NoopPassThroughPointsServiceTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/internalapi/NoopPassThroughPointsServiceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/internalapi/NoopPassThroughPointsServiceTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/internalapi/NoopPassThroughPointsServiceTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/StopArrivalStateParetoSetTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/StopArrivalStateParetoSetTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/StopArrivalStateParetoSetTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/StopArrivalStateParetoSetTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/ArrivalParetoSetComparatorFactoryTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/ArrivalParetoSetComparatorFactoryTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/ArrivalParetoSetComparatorFactoryTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/ArrivalParetoSetComparatorFactoryTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McStopArrivalTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McStopArrivalTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McStopArrivalTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McStopArrivalTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/AccessStopArrivalTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/AccessStopArrivalTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/AccessStopArrivalTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/AccessStopArrivalTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/StopArrivalFactoryC1Test.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/StopArrivalFactoryC1Test.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/StopArrivalFactoryC1Test.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/StopArrivalFactoryC1Test.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/TransferStopArrivalTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/TransferStopArrivalTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/TransferStopArrivalTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/TransferStopArrivalTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/TransitStopArrivalTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/TransitStopArrivalTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/TransitStopArrivalTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/TransitStopArrivalTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/AccessStopArrivalC2Test.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/AccessStopArrivalC2Test.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/AccessStopArrivalC2Test.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/AccessStopArrivalC2Test.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/StopArrivalFactoryC2Test.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/StopArrivalFactoryC2Test.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/StopArrivalFactoryC2Test.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/StopArrivalFactoryC2Test.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/TransferStopArrivalC2Test.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/TransferStopArrivalC2Test.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/TransferStopArrivalC2Test.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/TransferStopArrivalC2Test.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/TransitStopArrivalC2Test.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/TransitStopArrivalC2Test.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/TransitStopArrivalC2Test.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/TransitStopArrivalC2Test.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/passthrough/BitSetPassThroughPointsServiceTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/passthrough/BitSetPassThroughPointsServiceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/passthrough/BitSetPassThroughPointsServiceTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/passthrough/BitSetPassThroughPointsServiceTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c1/PatternRideC1Test.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c1/PatternRideC1Test.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c1/PatternRideC1Test.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c1/PatternRideC1Test.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PatternRideC2Test.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PatternRideC2Test.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PatternRideC2Test.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PatternRideC2Test.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/path/PathMapperTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/path/PathMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/path/PathMapperTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/path/PathMapperTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparatorsTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparatorsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparatorsTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparatorsTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleArrivedAtDestinationCheckTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleArrivedAtDestinationCheckTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleArrivedAtDestinationCheckTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleArrivedAtDestinationCheckTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/support/IntArraySingleCriteriaArrivalsTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/support/IntArraySingleCriteriaArrivalsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/support/IntArraySingleCriteriaArrivalsTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/support/IntArraySingleCriteriaArrivalsTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctionsTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctionsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctionsTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctionsTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenaltyTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenaltyTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenaltyTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenaltyTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPathsTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPathsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPathsTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPathsTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenaltyTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenaltyTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenaltyTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenaltyTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculatorTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculatorTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculatorTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTimeCalculatorTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTimeCalculatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTimeCalculatorTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTimeCalculatorTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculatorTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculatorTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculatorTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorSearchWindowCalculatorTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorSearchWindowCalculatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorSearchWindowCalculatorTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorSearchWindowCalculatorTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculatorTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculatorTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculatorTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTimeCalculatorTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTimeCalculatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTimeCalculatorTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTimeCalculatorTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTransitCalculatorTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTransitCalculatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTransitCalculatorTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTransitCalculatorTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/RoundTrackerTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/RoundTrackerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/transit/RoundTrackerTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/RoundTrackerTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/SlackProviderAdapterTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/SlackProviderAdapterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/transit/SlackProviderAdapterTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/SlackProviderAdapterTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearchTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearchTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearchTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearchTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearchTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearchTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearchTest.java
rename to application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearchTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/service/HeuristicToRunResolverTest.java b/application/src/test/java/org/opentripplanner/raptor/service/HeuristicToRunResolverTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/service/HeuristicToRunResolverTest.java
rename to application/src/test/java/org/opentripplanner/raptor/service/HeuristicToRunResolverTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/spi/EmptyBoardOrAlightEventTest.java b/application/src/test/java/org/opentripplanner/raptor/spi/EmptyBoardOrAlightEventTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/spi/EmptyBoardOrAlightEventTest.java
rename to application/src/test/java/org/opentripplanner/raptor/spi/EmptyBoardOrAlightEventTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/spi/RaptorSlackProviderTest.java b/application/src/test/java/org/opentripplanner/raptor/spi/RaptorSlackProviderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/spi/RaptorSlackProviderTest.java
rename to application/src/test/java/org/opentripplanner/raptor/spi/RaptorSlackProviderTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/spi/RaptorTripPatternTest.java b/application/src/test/java/org/opentripplanner/raptor/spi/RaptorTripPatternTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/spi/RaptorTripPatternTest.java
rename to application/src/test/java/org/opentripplanner/raptor/spi/RaptorTripPatternTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/spi/RaptorTripScheduleTest.java b/application/src/test/java/org/opentripplanner/raptor/spi/RaptorTripScheduleTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/spi/RaptorTripScheduleTest.java
rename to application/src/test/java/org/opentripplanner/raptor/spi/RaptorTripScheduleTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/spi/UnknownPathTest.java b/application/src/test/java/org/opentripplanner/raptor/spi/UnknownPathTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/spi/UnknownPathTest.java
rename to application/src/test/java/org/opentripplanner/raptor/spi/UnknownPathTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/util/BitSetIteratorTest.java b/application/src/test/java/org/opentripplanner/raptor/util/BitSetIteratorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/util/BitSetIteratorTest.java
rename to application/src/test/java/org/opentripplanner/raptor/util/BitSetIteratorTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/util/IntIteratorsTest.java b/application/src/test/java/org/opentripplanner/raptor/util/IntIteratorsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/util/IntIteratorsTest.java
rename to application/src/test/java/org/opentripplanner/raptor/util/IntIteratorsTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/util/PathStringBuilderTest.java b/application/src/test/java/org/opentripplanner/raptor/util/PathStringBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/util/PathStringBuilderTest.java
rename to application/src/test/java/org/opentripplanner/raptor/util/PathStringBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/util/composite/CompositeUtilTest.java b/application/src/test/java/org/opentripplanner/raptor/util/composite/CompositeUtilTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/util/composite/CompositeUtilTest.java
rename to application/src/test/java/org/opentripplanner/raptor/util/composite/CompositeUtilTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerCompositeTest.java b/application/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerCompositeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerCompositeTest.java
rename to application/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerCompositeTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerTest.java b/application/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerTest.java
rename to application/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetTest.java b/application/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetTest.java
rename to application/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetWithMarkerTest.java b/application/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetWithMarkerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetWithMarkerTest.java
rename to application/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetWithMarkerTest.java
diff --git a/src/test/java/org/opentripplanner/raptor/util/paretoset/TestParetoSetEventListener.java b/application/src/test/java/org/opentripplanner/raptor/util/paretoset/TestParetoSetEventListener.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/util/paretoset/TestParetoSetEventListener.java
rename to application/src/test/java/org/opentripplanner/raptor/util/paretoset/TestParetoSetEventListener.java
diff --git a/src/test/java/org/opentripplanner/raptor/util/paretoset/TestVector.java b/application/src/test/java/org/opentripplanner/raptor/util/paretoset/TestVector.java
similarity index 100%
rename from src/test/java/org/opentripplanner/raptor/util/paretoset/TestVector.java
rename to application/src/test/java/org/opentripplanner/raptor/util/paretoset/TestVector.java
diff --git a/src/test/java/org/opentripplanner/routing/TestHalfEdges.java b/application/src/test/java/org/opentripplanner/routing/TestHalfEdges.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/TestHalfEdges.java
rename to application/src/test/java/org/opentripplanner/routing/TestHalfEdges.java
diff --git a/src/test/java/org/opentripplanner/routing/alertpatch/EntitySelectorTest.java b/application/src/test/java/org/opentripplanner/routing/alertpatch/EntitySelectorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/alertpatch/EntitySelectorTest.java
rename to application/src/test/java/org/opentripplanner/routing/alertpatch/EntitySelectorTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/FilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/FilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/FilterTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/FilterTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/GraphRoutingTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/GraphRoutingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/GraphRoutingTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/GraphRoutingTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/MultiTargetTerminationStrategy.java b/application/src/test/java/org/opentripplanner/routing/algorithm/MultiTargetTerminationStrategy.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/MultiTargetTerminationStrategy.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/MultiTargetTerminationStrategy.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/StreetModeLinkingTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/StreetModeLinkingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/StreetModeLinkingTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/StreetModeLinkingTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/TestBanning.java b/application/src/test/java/org/opentripplanner/routing/algorithm/TestBanning.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/TestBanning.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/TestBanning.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/TurnCostTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/TurnCostTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/TurnCostTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/TurnCostTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveBikeRentalWithMostlyWalkingTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveBikeRentalWithMostlyWalkingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveBikeRentalWithMostlyWalkingTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveBikeRentalWithMostlyWalkingTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveParkAndRideWithMostlyWalkingTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveParkAndRideWithMostlyWalkingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveParkAndRideWithMostlyWalkingTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveParkAndRideWithMostlyWalkingTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveWalkOnlyFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveWalkOnlyFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveWalkOnlyFilterTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveWalkOnlyFilterTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/FlexSearchWindowFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/FlexSearchWindowFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/FlexSearchWindowFilterTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/FlexSearchWindowFilterTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilterTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilterTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilterTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilterTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingleCriteriaComparatorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingleCriteriaComparatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingleCriteriaComparatorTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingleCriteriaComparatorTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/ItemTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/ItemTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/ItemTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/ItemTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLegTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLegTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLegTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLegTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetterTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetterTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitAlertFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitAlertFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitAlertFilterTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitAlertFilterTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilterTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilterTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveIfFirstOrLastTripIsTheSameTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveIfFirstOrLastTripIsTheSameTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveIfFirstOrLastTripIsTheSameTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveIfFirstOrLastTripIsTheSameTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCostTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCostTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCostTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCostTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilterTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilterTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilterTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilterTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/SortingFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/SortingFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/SortingFilterTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/SortingFilterTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandlerTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandlerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandlerTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandlerTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacherTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacherTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacherTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacherTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStationsTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStationsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStationsTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStationsTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistanceTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistanceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistanceTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistanceTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTripTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTripTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTripTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTripTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStopsTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStopsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStopsTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStopsTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnGeneralizedCostTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnGeneralizedCostTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnGeneralizedCostTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnGeneralizedCostTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnNumberOfTransfersTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnNumberOfTransfersTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnNumberOfTransfersTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnNumberOfTransfersTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparatorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparatorTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparatorTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/BikeRentalSnapshotTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/BikeRentalSnapshotTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/mapping/BikeRentalSnapshotTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/mapping/BikeRentalSnapshotTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/CarSnapshotTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/CarSnapshotTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/mapping/CarSnapshotTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/mapping/CarSnapshotTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/ElevationSnapshotTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/ElevationSnapshotTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/mapping/ElevationSnapshotTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/mapping/ElevationSnapshotTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/GraphPathToItineraryMapperTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/GraphPathToItineraryMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/mapping/GraphPathToItineraryMapperTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/mapping/GraphPathToItineraryMapperTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactoryTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactoryTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactoryTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactoryTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/SnapshotTestBase.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/SnapshotTestBase.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/mapping/SnapshotTestBase.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/mapping/SnapshotTestBase.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapperTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapperTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapperTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/TransitSnapshotTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/TransitSnapshotTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/mapping/TransitSnapshotTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/mapping/TransitSnapshotTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap
rename to application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap
rename to application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap
rename to application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap
rename to application/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/AdditionalSearchDaysTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/AdditionalSearchDaysTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/AdditionalSearchDaysTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/AdditionalSearchDaysTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/FilterTransitWhenDirectModeIsEmptyTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/FilterTransitWhenDirectModeIsEmptyTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/FilterTransitWhenDirectModeIsEmptyTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/FilterTransitWhenDirectModeIsEmptyTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecoratorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecoratorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecoratorTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecoratorTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressTypeTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressTypeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressTypeTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressTypeTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransferTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransferTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransferTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransferTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayerTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayerTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayerTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDateTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDateTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDateTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDateTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearchTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearchTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearchTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedBoardingSearchTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultCostCalculatorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultCostCalculatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultCostCalculatorTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultCostCalculatorTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/PatternCostCalculatorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/PatternCostCalculatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/PatternCostCalculatorTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/PatternCostCalculatorTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostConverterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostConverterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostConverterTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostConverterTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunctionTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunctionTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunctionTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunctionTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculatorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculatorTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculatorTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapperTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapperTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapperTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallbackTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallbackTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallbackTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallbackTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TestLookupStopIndexCallback.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TestLookupStopIndexCallback.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TestLookupStopIndexCallback.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TestLookupStopIndexCallback.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapperTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapperTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapperTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapperTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapperTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapperTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RouteRequestTransitDataProviderFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RouteRequestTransitDataProviderFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RouteRequestTransitDataProviderFilterTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RouteRequestTransitDataProviderFilterTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TestRouteData.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TestRouteData.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TestRouteData.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TestRouteData.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TestTransitCaseData.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TestTransitCaseData.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TestTransitCaseData.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TestTransitCaseData.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripAssert.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripAssert.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripAssert.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripAssert.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleAlightSearchTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleAlightSearchTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleAlightSearchTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleAlightSearchTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleBoardSearchTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleBoardSearchTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleBoardSearchTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleBoardSearchTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/api/OptimizedPathTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/api/OptimizedPathTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/api/OptimizedPathTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/api/OptimizedPathTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/MinSafeTransferTimeCalculatorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/MinSafeTransferTimeCalculatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/MinSafeTransferTimeCalculatorTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/MinSafeTransferTimeCalculatorTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTailTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTailTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTailTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTailTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopPriorityCostCalculatorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopPriorityCostCalculatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopPriorityCostCalculatorTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopPriorityCostCalculatorTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopTimeTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopTimeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopTimeTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopTimeTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TransferWaitTimeCostCalculatorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TransferWaitTimeCostCalculatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TransferWaitTimeCostCalculatorTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TransferWaitTimeCostCalculatorTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripStopTimeTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripStopTimeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripStopTimeTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripStopTimeTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/costfilter/MinCostPathTailFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/costfilter/MinCostPathTailFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/costfilter/MinCostPathTailFilterTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/costfilter/MinCostPathTailFilterTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughNoTransfersTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughNoTransfersTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughNoTransfersTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughNoTransfersTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughOneTransferTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughOneTransferTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughOneTransferTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughOneTransferTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughTwoTransfersTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughTwoTransfersTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughTwoTransfersTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughTwoTransfersTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/StopPair.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/StopPair.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/StopPair.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/StopPair.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/TestCase.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/TestCase.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/TestCase.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/TestCase.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/TestCaseBuilder.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/TestCaseBuilder.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/TestCaseBuilder.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/TestCaseBuilder.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/TestUtils.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/TestUtils.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/TestUtils.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/TestUtils.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/WalkDurationForStopCombinations.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/WalkDurationForStopCombinations.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/WalkDurationForStopCombinations.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/WalkDurationForStopCombinations.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainServiceConstrainedTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainServiceConstrainedTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainServiceConstrainedTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainServiceConstrainedTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainServiceTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainServiceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainServiceTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainServiceTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TestTransferBuilder.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TestTransferBuilder.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TestTransferBuilder.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TestTransferBuilder.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGeneratorDummy.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGeneratorDummy.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGeneratorDummy.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGeneratorDummy.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGeneratorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGeneratorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGeneratorTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGeneratorTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransitPathLegSelectorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransitPathLegSelectorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransitPathLegSelectorTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransitPathLegSelectorTest.java
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/via/ViaRoutingWorkerTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/via/ViaRoutingWorkerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/algorithm/via/ViaRoutingWorkerTest.java
rename to application/src/test/java/org/opentripplanner/routing/algorithm/via/ViaRoutingWorkerTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/DebugRaptorTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/DebugRaptorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/DebugRaptorTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/DebugRaptorTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/WheelchairPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/WheelchairPreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/WheelchairPreferencesTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/WheelchairPreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/framework/CostLinearFunctionTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/framework/CostLinearFunctionTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/framework/CostLinearFunctionTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/framework/CostLinearFunctionTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/framework/DurationForEnumTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/framework/DurationForEnumTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/framework/DurationForEnumTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/framework/DurationForEnumTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerializationTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerializationTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerializationTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerializationTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnumTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnumTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnumTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnumTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/framework/TimePenaltyTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/framework/TimePenaltyTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/framework/TimePenaltyTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/framework/TimePenaltyTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/AccessibilityPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/AccessibilityPreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/AccessibilityPreferencesTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/AccessibilityPreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/ElevatorPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/ElevatorPreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/ElevatorPreferencesTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/ElevatorPreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/ImmutablePreferencesAsserts.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/ImmutablePreferencesAsserts.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/ImmutablePreferencesAsserts.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/ImmutablePreferencesAsserts.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterDebugProfileTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterDebugProfileTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterDebugProfileTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterDebugProfileTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterPreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterPreferencesTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterPreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/RaptorPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/RaptorPreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/RaptorPreferencesTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/RaptorPreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/RelaxTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/RelaxTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/RelaxTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/RelaxTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/ScooterPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/ScooterPreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/ScooterPreferencesTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/ScooterPreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/StreetPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/StreetPreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/StreetPreferencesTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/StreetPreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/SystemPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/SystemPreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/SystemPreferencesTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/SystemPreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangleTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangleTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangleTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangleTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/TransferOptimizationPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/TransferOptimizationPreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/TransferOptimizationPreferencesTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/TransferOptimizationPreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/TransferPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/TransferPreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/TransferPreferencesTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/TransferPreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferencesTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferencesTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/WalkPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/WalkPreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/preference/WalkPreferencesTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/preference/WalkPreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/request/filter/SelectRequestTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/request/filter/SelectRequestTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/request/filter/SelectRequestTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/request/filter/SelectRequestTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocationTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocationTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocationTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocationTest.java
diff --git a/src/test/java/org/opentripplanner/routing/api/request/via/VisitViaLocationTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/via/VisitViaLocationTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/api/request/via/VisitViaLocationTest.java
rename to application/src/test/java/org/opentripplanner/routing/api/request/via/VisitViaLocationTest.java
diff --git a/src/test/java/org/opentripplanner/routing/core/GraphTest.java b/application/src/test/java/org/opentripplanner/routing/core/GraphTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/core/GraphTest.java
rename to application/src/test/java/org/opentripplanner/routing/core/GraphTest.java
diff --git a/src/test/java/org/opentripplanner/routing/core/ItineraryFaresTest.java b/application/src/test/java/org/opentripplanner/routing/core/ItineraryFaresTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/core/ItineraryFaresTest.java
rename to application/src/test/java/org/opentripplanner/routing/core/ItineraryFaresTest.java
diff --git a/src/test/java/org/opentripplanner/routing/core/MoneyTest.java b/application/src/test/java/org/opentripplanner/routing/core/MoneyTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/core/MoneyTest.java
rename to application/src/test/java/org/opentripplanner/routing/core/MoneyTest.java
diff --git a/src/test/java/org/opentripplanner/routing/core/RouteRequestTest.java b/application/src/test/java/org/opentripplanner/routing/core/RouteRequestTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/core/RouteRequestTest.java
rename to application/src/test/java/org/opentripplanner/routing/core/RouteRequestTest.java
diff --git a/src/test/java/org/opentripplanner/routing/core/RoutingPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/core/RoutingPreferencesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/core/RoutingPreferencesTest.java
rename to application/src/test/java/org/opentripplanner/routing/core/RoutingPreferencesTest.java
diff --git a/src/test/java/org/opentripplanner/routing/core/TemporaryVerticesContainerTest.java b/application/src/test/java/org/opentripplanner/routing/core/TemporaryVerticesContainerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/core/TemporaryVerticesContainerTest.java
rename to application/src/test/java/org/opentripplanner/routing/core/TemporaryVerticesContainerTest.java
diff --git a/src/test/java/org/opentripplanner/routing/core/TurnsTest.java b/application/src/test/java/org/opentripplanner/routing/core/TurnsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/core/TurnsTest.java
rename to application/src/test/java/org/opentripplanner/routing/core/TurnsTest.java
diff --git a/src/test/java/org/opentripplanner/routing/graph/DefaultRoutingServiceTest.java b/application/src/test/java/org/opentripplanner/routing/graph/DefaultRoutingServiceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/graph/DefaultRoutingServiceTest.java
rename to application/src/test/java/org/opentripplanner/routing/graph/DefaultRoutingServiceTest.java
diff --git a/src/test/java/org/opentripplanner/routing/graph/EdgeTest.java b/application/src/test/java/org/opentripplanner/routing/graph/EdgeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/graph/EdgeTest.java
rename to application/src/test/java/org/opentripplanner/routing/graph/EdgeTest.java
diff --git a/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java b/application/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java
rename to application/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java
diff --git a/src/test/java/org/opentripplanner/routing/graph/SimpleConcreteEdge.java b/application/src/test/java/org/opentripplanner/routing/graph/SimpleConcreteEdge.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/graph/SimpleConcreteEdge.java
rename to application/src/test/java/org/opentripplanner/routing/graph/SimpleConcreteEdge.java
diff --git a/src/test/java/org/opentripplanner/routing/graph/TemporaryConcreteEdge.java b/application/src/test/java/org/opentripplanner/routing/graph/TemporaryConcreteEdge.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/graph/TemporaryConcreteEdge.java
rename to application/src/test/java/org/opentripplanner/routing/graph/TemporaryConcreteEdge.java
diff --git a/src/test/java/org/opentripplanner/routing/graphfinder/DirectGraphFinderTest.java b/application/src/test/java/org/opentripplanner/routing/graphfinder/DirectGraphFinderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/graphfinder/DirectGraphFinderTest.java
rename to application/src/test/java/org/opentripplanner/routing/graphfinder/DirectGraphFinderTest.java
diff --git a/src/test/java/org/opentripplanner/routing/graphfinder/NearbyStopTest.java b/application/src/test/java/org/opentripplanner/routing/graphfinder/NearbyStopTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/graphfinder/NearbyStopTest.java
rename to application/src/test/java/org/opentripplanner/routing/graphfinder/NearbyStopTest.java
diff --git a/src/test/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitorTest.java b/application/src/test/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitorTest.java
rename to application/src/test/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitorTest.java
diff --git a/src/test/java/org/opentripplanner/routing/graphfinder/StopFinderTraverseVisitorTest.java b/application/src/test/java/org/opentripplanner/routing/graphfinder/StopFinderTraverseVisitorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/graphfinder/StopFinderTraverseVisitorTest.java
rename to application/src/test/java/org/opentripplanner/routing/graphfinder/StopFinderTraverseVisitorTest.java
diff --git a/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java b/application/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java
rename to application/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java
diff --git a/src/test/java/org/opentripplanner/routing/linking/LinkStopToPlatformTest.java b/application/src/test/java/org/opentripplanner/routing/linking/LinkStopToPlatformTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/linking/LinkStopToPlatformTest.java
rename to application/src/test/java/org/opentripplanner/routing/linking/LinkStopToPlatformTest.java
diff --git a/src/test/java/org/opentripplanner/routing/stoptimes/AlternativeLegsTest.java b/application/src/test/java/org/opentripplanner/routing/stoptimes/AlternativeLegsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/stoptimes/AlternativeLegsTest.java
rename to application/src/test/java/org/opentripplanner/routing/stoptimes/AlternativeLegsTest.java
diff --git a/src/test/java/org/opentripplanner/routing/stoptimes/StopTimesHelperTest.java b/application/src/test/java/org/opentripplanner/routing/stoptimes/StopTimesHelperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/stoptimes/StopTimesHelperTest.java
rename to application/src/test/java/org/opentripplanner/routing/stoptimes/StopTimesHelperTest.java
diff --git a/src/test/java/org/opentripplanner/routing/trippattern/DeduplicatorTest.java b/application/src/test/java/org/opentripplanner/routing/trippattern/DeduplicatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/trippattern/DeduplicatorTest.java
rename to application/src/test/java/org/opentripplanner/routing/trippattern/DeduplicatorTest.java
diff --git a/src/test/java/org/opentripplanner/routing/trippattern/FrequencyEntryTest.java b/application/src/test/java/org/opentripplanner/routing/trippattern/FrequencyEntryTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/trippattern/FrequencyEntryTest.java
rename to application/src/test/java/org/opentripplanner/routing/trippattern/FrequencyEntryTest.java
diff --git a/src/test/java/org/opentripplanner/routing/util/DiffToolTest.java b/application/src/test/java/org/opentripplanner/routing/util/DiffToolTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/util/DiffToolTest.java
rename to application/src/test/java/org/opentripplanner/routing/util/DiffToolTest.java
diff --git a/src/test/java/org/opentripplanner/routing/util/FastDistanceTest.java b/application/src/test/java/org/opentripplanner/routing/util/FastDistanceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/util/FastDistanceTest.java
rename to application/src/test/java/org/opentripplanner/routing/util/FastDistanceTest.java
diff --git a/src/test/java/org/opentripplanner/routing/util/TestElevationUtils.java b/application/src/test/java/org/opentripplanner/routing/util/TestElevationUtils.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/util/TestElevationUtils.java
rename to application/src/test/java/org/opentripplanner/routing/util/TestElevationUtils.java
diff --git a/src/test/java/org/opentripplanner/routing/util/elevation/ToblersHikingFunctionTest.java b/application/src/test/java/org/opentripplanner/routing/util/elevation/ToblersHikingFunctionTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/util/elevation/ToblersHikingFunctionTest.java
rename to application/src/test/java/org/opentripplanner/routing/util/elevation/ToblersHikingFunctionTest.java
diff --git a/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelperTest.java b/application/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelperTest.java
rename to application/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelperTest.java
diff --git a/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingTestGraphData.java b/application/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingTestGraphData.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingTestGraphData.java
rename to application/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingTestGraphData.java
diff --git a/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingTestUtil.java b/application/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingTestUtil.java
similarity index 100%
rename from src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingTestUtil.java
rename to application/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingTestUtil.java
diff --git a/src/test/java/org/opentripplanner/service/paging/PS1_LegacyMetaDataTest.java b/application/src/test/java/org/opentripplanner/service/paging/PS1_LegacyMetaDataTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/service/paging/PS1_LegacyMetaDataTest.java
rename to application/src/test/java/org/opentripplanner/service/paging/PS1_LegacyMetaDataTest.java
diff --git a/src/test/java/org/opentripplanner/service/paging/PS2_ManyParetoOptimalItinerariesTest.java b/application/src/test/java/org/opentripplanner/service/paging/PS2_ManyParetoOptimalItinerariesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/service/paging/PS2_ManyParetoOptimalItinerariesTest.java
rename to application/src/test/java/org/opentripplanner/service/paging/PS2_ManyParetoOptimalItinerariesTest.java
diff --git a/src/test/java/org/opentripplanner/service/paging/PS3_FewItinerariesOnSearchWindowLimitTest.java b/application/src/test/java/org/opentripplanner/service/paging/PS3_FewItinerariesOnSearchWindowLimitTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/service/paging/PS3_FewItinerariesOnSearchWindowLimitTest.java
rename to application/src/test/java/org/opentripplanner/service/paging/PS3_FewItinerariesOnSearchWindowLimitTest.java
diff --git a/src/test/java/org/opentripplanner/service/paging/TestDriver.java b/application/src/test/java/org/opentripplanner/service/paging/TestDriver.java
similarity index 100%
rename from src/test/java/org/opentripplanner/service/paging/TestDriver.java
rename to application/src/test/java/org/opentripplanner/service/paging/TestDriver.java
diff --git a/src/test/java/org/opentripplanner/service/paging/TestPagingModel.java b/application/src/test/java/org/opentripplanner/service/paging/TestPagingModel.java
similarity index 100%
rename from src/test/java/org/opentripplanner/service/paging/TestPagingModel.java
rename to application/src/test/java/org/opentripplanner/service/paging/TestPagingModel.java
diff --git a/src/test/java/org/opentripplanner/service/paging/TestPagingUtils.java b/application/src/test/java/org/opentripplanner/service/paging/TestPagingUtils.java
similarity index 100%
rename from src/test/java/org/opentripplanner/service/paging/TestPagingUtils.java
rename to application/src/test/java/org/opentripplanner/service/paging/TestPagingUtils.java
diff --git a/src/test/java/org/opentripplanner/service/realtimevehicles/internal/DefaultRealtimeVehicleServiceTest.java b/application/src/test/java/org/opentripplanner/service/realtimevehicles/internal/DefaultRealtimeVehicleServiceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/service/realtimevehicles/internal/DefaultRealtimeVehicleServiceTest.java
rename to application/src/test/java/org/opentripplanner/service/realtimevehicles/internal/DefaultRealtimeVehicleServiceTest.java
diff --git a/src/test/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalServiceTest.java b/application/src/test/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalServiceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalServiceTest.java
rename to application/src/test/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalServiceTest.java
diff --git a/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java b/application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java
similarity index 100%
rename from src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java
rename to application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java
diff --git a/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java b/application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java
similarity index 100%
rename from src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java
rename to application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java
diff --git a/src/test/java/org/opentripplanner/service/worldenvelope/internal/WorldEnvelopeRepositoryTest.java b/application/src/test/java/org/opentripplanner/service/worldenvelope/internal/WorldEnvelopeRepositoryTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/service/worldenvelope/internal/WorldEnvelopeRepositoryTest.java
rename to application/src/test/java/org/opentripplanner/service/worldenvelope/internal/WorldEnvelopeRepositoryTest.java
diff --git a/src/test/java/org/opentripplanner/service/worldenvelope/internal/WorldEnvelopeServiceTest.java b/application/src/test/java/org/opentripplanner/service/worldenvelope/internal/WorldEnvelopeServiceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/service/worldenvelope/internal/WorldEnvelopeServiceTest.java
rename to application/src/test/java/org/opentripplanner/service/worldenvelope/internal/WorldEnvelopeServiceTest.java
diff --git a/src/test/java/org/opentripplanner/service/worldenvelope/model/MedianCalcForDoublesTest.java b/application/src/test/java/org/opentripplanner/service/worldenvelope/model/MedianCalcForDoublesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/service/worldenvelope/model/MedianCalcForDoublesTest.java
rename to application/src/test/java/org/opentripplanner/service/worldenvelope/model/MedianCalcForDoublesTest.java
diff --git a/src/test/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelopeTest.java b/application/src/test/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelopeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelopeTest.java
rename to application/src/test/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelopeTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/BuildConfigTest.java b/application/src/test/java/org/opentripplanner/standalone/config/BuildConfigTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/BuildConfigTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/BuildConfigTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/CommandLineParametersTest.java b/application/src/test/java/org/opentripplanner/standalone/config/CommandLineParametersTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/CommandLineParametersTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/CommandLineParametersTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/ExampleConfigTest.java b/application/src/test/java/org/opentripplanner/standalone/config/ExampleConfigTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/ExampleConfigTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/ExampleConfigTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/OtpConfigLoaderTest.java b/application/src/test/java/org/opentripplanner/standalone/config/OtpConfigLoaderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/OtpConfigLoaderTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/OtpConfigLoaderTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/RouterConfigDocTest.java b/application/src/test/java/org/opentripplanner/standalone/config/RouterConfigDocTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/RouterConfigDocTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/RouterConfigDocTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/RouterConfigTest.java b/application/src/test/java/org/opentripplanner/standalone/config/RouterConfigTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/RouterConfigTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/RouterConfigTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/buildconfig/DemConfigTest.java b/application/src/test/java/org/opentripplanner/standalone/config/buildconfig/DemConfigTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/buildconfig/DemConfigTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/buildconfig/DemConfigTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/buildconfig/GtfsConfigTest.java b/application/src/test/java/org/opentripplanner/standalone/config/buildconfig/GtfsConfigTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/buildconfig/GtfsConfigTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/buildconfig/GtfsConfigTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/buildconfig/NetexConfigTest.java b/application/src/test/java/org/opentripplanner/standalone/config/buildconfig/NetexConfigTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/buildconfig/NetexConfigTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/buildconfig/NetexConfigTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/buildconfig/OsmConfigTest.java b/application/src/test/java/org/opentripplanner/standalone/config/buildconfig/OsmConfigTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/buildconfig/OsmConfigTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/buildconfig/OsmConfigTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/framework/file/ConfigFileLoaderTest.java b/application/src/test/java/org/opentripplanner/standalone/config/framework/file/ConfigFileLoaderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/framework/file/ConfigFileLoaderTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/framework/file/ConfigFileLoaderTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/framework/file/IncludeFileDirectiveTest.java b/application/src/test/java/org/opentripplanner/standalone/config/framework/file/IncludeFileDirectiveTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/framework/file/IncludeFileDirectiveTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/framework/file/IncludeFileDirectiveTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/framework/json/ConfigTypeTest.java b/application/src/test/java/org/opentripplanner/standalone/config/framework/json/ConfigTypeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/framework/json/ConfigTypeTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/framework/json/ConfigTypeTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/framework/json/EnumMapperTest.java b/application/src/test/java/org/opentripplanner/standalone/config/framework/json/EnumMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/framework/json/EnumMapperTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/framework/json/EnumMapperTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/framework/json/JsonSupport.java b/application/src/test/java/org/opentripplanner/standalone/config/framework/json/JsonSupport.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/framework/json/JsonSupport.java
rename to application/src/test/java/org/opentripplanner/standalone/config/framework/json/JsonSupport.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java b/application/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeInfoTest.java b/application/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeInfoTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/framework/json/NodeInfoTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeInfoTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/framework/project/EnvironmentVariableReplacerTest.java b/application/src/test/java/org/opentripplanner/standalone/config/framework/project/EnvironmentVariableReplacerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/framework/project/EnvironmentVariableReplacerTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/framework/project/EnvironmentVariableReplacerTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/routerconfig/ServerConfigTest.java b/application/src/test/java/org/opentripplanner/standalone/config/routerconfig/ServerConfigTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/routerconfig/ServerConfigTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/routerconfig/ServerConfigTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfigTest.java b/application/src/test/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfigTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfigTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfigTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/routerequest/TimeAndCostPenaltyMapperTest.java b/application/src/test/java/org/opentripplanner/standalone/config/routerequest/TimeAndCostPenaltyMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/routerequest/TimeAndCostPenaltyMapperTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/routerequest/TimeAndCostPenaltyMapperTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/routerequest/WheelchairConfigTest.java b/application/src/test/java/org/opentripplanner/standalone/config/routerequest/WheelchairConfigTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/routerequest/WheelchairConfigTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/routerequest/WheelchairConfigTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/sandbox/DataOverlayConfigMapperTest.java b/application/src/test/java/org/opentripplanner/standalone/config/sandbox/DataOverlayConfigMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/sandbox/DataOverlayConfigMapperTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/sandbox/DataOverlayConfigMapperTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/config/services/RideHailingServicesConfigTest.java b/application/src/test/java/org/opentripplanner/standalone/config/services/RideHailingServicesConfigTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/config/services/RideHailingServicesConfigTest.java
rename to application/src/test/java/org/opentripplanner/standalone/config/services/RideHailingServicesConfigTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/server/EtagRequestFilterTest.java b/application/src/test/java/org/opentripplanner/standalone/server/EtagRequestFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/server/EtagRequestFilterTest.java
rename to application/src/test/java/org/opentripplanner/standalone/server/EtagRequestFilterTest.java
diff --git a/src/test/java/org/opentripplanner/standalone/server/RequestTraceFilterTest.java b/application/src/test/java/org/opentripplanner/standalone/server/RequestTraceFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/standalone/server/RequestTraceFilterTest.java
rename to application/src/test/java/org/opentripplanner/standalone/server/RequestTraceFilterTest.java
diff --git a/src/test/java/org/opentripplanner/street/integration/BarrierRoutingTest.java b/application/src/test/java/org/opentripplanner/street/integration/BarrierRoutingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/integration/BarrierRoutingTest.java
rename to application/src/test/java/org/opentripplanner/street/integration/BarrierRoutingTest.java
diff --git a/src/test/java/org/opentripplanner/street/integration/BicycleParkAndRideTest.java b/application/src/test/java/org/opentripplanner/street/integration/BicycleParkAndRideTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/integration/BicycleParkAndRideTest.java
rename to application/src/test/java/org/opentripplanner/street/integration/BicycleParkAndRideTest.java
diff --git a/src/test/java/org/opentripplanner/street/integration/BicycleRoutingTest.java b/application/src/test/java/org/opentripplanner/street/integration/BicycleRoutingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/integration/BicycleRoutingTest.java
rename to application/src/test/java/org/opentripplanner/street/integration/BicycleRoutingTest.java
diff --git a/src/test/java/org/opentripplanner/street/integration/BikeRentalTest.java b/application/src/test/java/org/opentripplanner/street/integration/BikeRentalTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/integration/BikeRentalTest.java
rename to application/src/test/java/org/opentripplanner/street/integration/BikeRentalTest.java
diff --git a/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java b/application/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java
rename to application/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java
diff --git a/src/test/java/org/opentripplanner/street/integration/CarParkAndRideTest.java b/application/src/test/java/org/opentripplanner/street/integration/CarParkAndRideTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/integration/CarParkAndRideTest.java
rename to application/src/test/java/org/opentripplanner/street/integration/CarParkAndRideTest.java
diff --git a/src/test/java/org/opentripplanner/street/integration/CarPickupTest.java b/application/src/test/java/org/opentripplanner/street/integration/CarPickupTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/integration/CarPickupTest.java
rename to application/src/test/java/org/opentripplanner/street/integration/CarPickupTest.java
diff --git a/src/test/java/org/opentripplanner/street/integration/CarRoutingTest.java b/application/src/test/java/org/opentripplanner/street/integration/CarRoutingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/integration/CarRoutingTest.java
rename to application/src/test/java/org/opentripplanner/street/integration/CarRoutingTest.java
diff --git a/src/test/java/org/opentripplanner/street/integration/ParkAndRideTest.java b/application/src/test/java/org/opentripplanner/street/integration/ParkAndRideTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/integration/ParkAndRideTest.java
rename to application/src/test/java/org/opentripplanner/street/integration/ParkAndRideTest.java
diff --git a/src/test/java/org/opentripplanner/street/integration/SplitEdgeTurnRestrictionsTest.java b/application/src/test/java/org/opentripplanner/street/integration/SplitEdgeTurnRestrictionsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/integration/SplitEdgeTurnRestrictionsTest.java
rename to application/src/test/java/org/opentripplanner/street/integration/SplitEdgeTurnRestrictionsTest.java
diff --git a/src/test/java/org/opentripplanner/street/integration/WalkRoutingTest.java b/application/src/test/java/org/opentripplanner/street/integration/WalkRoutingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/integration/WalkRoutingTest.java
rename to application/src/test/java/org/opentripplanner/street/integration/WalkRoutingTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/StreetTraversalPermissionTest.java b/application/src/test/java/org/opentripplanner/street/model/StreetTraversalPermissionTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/StreetTraversalPermissionTest.java
rename to application/src/test/java/org/opentripplanner/street/model/StreetTraversalPermissionTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/TurnRestrictionTest.java b/application/src/test/java/org/opentripplanner/street/model/TurnRestrictionTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/TurnRestrictionTest.java
rename to application/src/test/java/org/opentripplanner/street/model/TurnRestrictionTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java b/application/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java
rename to application/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/AreaEdgeBuilderTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/AreaEdgeBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/AreaEdgeBuilderTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/AreaEdgeBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/ElevatorHopEdgeTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/ElevatorHopEdgeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/ElevatorHopEdgeTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/ElevatorHopEdgeTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/EscalatorEdgeTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/EscalatorEdgeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/EscalatorEdgeTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/EscalatorEdgeTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/RentalRestrictionExtensionTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/RentalRestrictionExtensionTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/RentalRestrictionExtensionTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/RentalRestrictionExtensionTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeBuilderTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/StreetEdgeBuilderTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeCostTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeCostTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/StreetEdgeCostTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeCostTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeGeofencingTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeGeofencingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/StreetEdgeGeofencingTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeGeofencingTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeRentalTraversalTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeRentalTraversalTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/StreetEdgeRentalTraversalTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeRentalTraversalTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeScooterTraversalTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeScooterTraversalTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/StreetEdgeScooterTraversalTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeScooterTraversalTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeSplittingTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeSplittingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/StreetEdgeSplittingTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeSplittingTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeWheelchairCostTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeWheelchairCostTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/StreetEdgeWheelchairCostTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeWheelchairCostTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetElevationExtensionBuilderTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/StreetElevationExtensionBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/StreetElevationExtensionBuilderTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/StreetElevationExtensionBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLinkTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLinkTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLinkTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLinkTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeBuilderTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeBuilderTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java b/application/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java
rename to application/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/vertex/BarrierVertexTest.java b/application/src/test/java/org/opentripplanner/street/model/vertex/BarrierVertexTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/vertex/BarrierVertexTest.java
rename to application/src/test/java/org/opentripplanner/street/model/vertex/BarrierVertexTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/vertex/IntersectionVertexTest.java b/application/src/test/java/org/opentripplanner/street/model/vertex/IntersectionVertexTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/vertex/IntersectionVertexTest.java
rename to application/src/test/java/org/opentripplanner/street/model/vertex/IntersectionVertexTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/vertex/OsmVertexTest.java b/application/src/test/java/org/opentripplanner/street/model/vertex/OsmVertexTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/vertex/OsmVertexTest.java
rename to application/src/test/java/org/opentripplanner/street/model/vertex/OsmVertexTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/vertex/RentalRestrictionExtensionTest.java b/application/src/test/java/org/opentripplanner/street/model/vertex/RentalRestrictionExtensionTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/vertex/RentalRestrictionExtensionTest.java
rename to application/src/test/java/org/opentripplanner/street/model/vertex/RentalRestrictionExtensionTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/vertex/SimpleVertex.java b/application/src/test/java/org/opentripplanner/street/model/vertex/SimpleVertex.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/vertex/SimpleVertex.java
rename to application/src/test/java/org/opentripplanner/street/model/vertex/SimpleVertex.java
diff --git a/src/test/java/org/opentripplanner/street/model/vertex/TemporaryVertexDisposeTest.java b/application/src/test/java/org/opentripplanner/street/model/vertex/TemporaryVertexDisposeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/vertex/TemporaryVertexDisposeTest.java
rename to application/src/test/java/org/opentripplanner/street/model/vertex/TemporaryVertexDisposeTest.java
diff --git a/src/test/java/org/opentripplanner/street/model/vertex/VertexTest.java b/application/src/test/java/org/opentripplanner/street/model/vertex/VertexTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/model/vertex/VertexTest.java
rename to application/src/test/java/org/opentripplanner/street/model/vertex/VertexTest.java
diff --git a/src/test/java/org/opentripplanner/street/search/TraverseModeSetTest.java b/application/src/test/java/org/opentripplanner/street/search/TraverseModeSetTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/search/TraverseModeSetTest.java
rename to application/src/test/java/org/opentripplanner/street/search/TraverseModeSetTest.java
diff --git a/src/test/java/org/opentripplanner/street/search/intersection_model/SimpleIntersectionTraversalCalculatorTest.java b/application/src/test/java/org/opentripplanner/street/search/intersection_model/SimpleIntersectionTraversalCalculatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/search/intersection_model/SimpleIntersectionTraversalCalculatorTest.java
rename to application/src/test/java/org/opentripplanner/street/search/intersection_model/SimpleIntersectionTraversalCalculatorTest.java
diff --git a/src/test/java/org/opentripplanner/street/search/request/StreetSearchRequestMapperTest.java b/application/src/test/java/org/opentripplanner/street/search/request/StreetSearchRequestMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/search/request/StreetSearchRequestMapperTest.java
rename to application/src/test/java/org/opentripplanner/street/search/request/StreetSearchRequestMapperTest.java
diff --git a/src/test/java/org/opentripplanner/street/search/state/StateDataTest.java b/application/src/test/java/org/opentripplanner/street/search/state/StateDataTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/search/state/StateDataTest.java
rename to application/src/test/java/org/opentripplanner/street/search/state/StateDataTest.java
diff --git a/src/test/java/org/opentripplanner/street/search/state/StateEditorTest.java b/application/src/test/java/org/opentripplanner/street/search/state/StateEditorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/search/state/StateEditorTest.java
rename to application/src/test/java/org/opentripplanner/street/search/state/StateEditorTest.java
diff --git a/src/test/java/org/opentripplanner/street/search/state/StateTest.java b/application/src/test/java/org/opentripplanner/street/search/state/StateTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/search/state/StateTest.java
rename to application/src/test/java/org/opentripplanner/street/search/state/StateTest.java
diff --git a/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java b/application/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java
rename to application/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java
diff --git a/src/test/java/org/opentripplanner/street/search/strategy/DominanceFunctionTest.java b/application/src/test/java/org/opentripplanner/street/search/strategy/DominanceFunctionTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/search/strategy/DominanceFunctionTest.java
rename to application/src/test/java/org/opentripplanner/street/search/strategy/DominanceFunctionTest.java
diff --git a/src/test/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersServiceTest.java b/application/src/test/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersServiceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersServiceTest.java
rename to application/src/test/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersServiceTest.java
diff --git a/src/test/java/org/opentripplanner/test/support/FilePatternArgumentsProvider.java b/application/src/test/java/org/opentripplanner/test/support/FilePatternArgumentsProvider.java
similarity index 100%
rename from src/test/java/org/opentripplanner/test/support/FilePatternArgumentsProvider.java
rename to application/src/test/java/org/opentripplanner/test/support/FilePatternArgumentsProvider.java
diff --git a/src/test/java/org/opentripplanner/test/support/FilePatternSource.java b/application/src/test/java/org/opentripplanner/test/support/FilePatternSource.java
similarity index 100%
rename from src/test/java/org/opentripplanner/test/support/FilePatternSource.java
rename to application/src/test/java/org/opentripplanner/test/support/FilePatternSource.java
diff --git a/src/test/java/org/opentripplanner/test/support/GeoJsonIo.java b/application/src/test/java/org/opentripplanner/test/support/GeoJsonIo.java
similarity index 100%
rename from src/test/java/org/opentripplanner/test/support/GeoJsonIo.java
rename to application/src/test/java/org/opentripplanner/test/support/GeoJsonIo.java
diff --git a/src/test/java/org/opentripplanner/test/support/HttpForTest.java b/application/src/test/java/org/opentripplanner/test/support/HttpForTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/test/support/HttpForTest.java
rename to application/src/test/java/org/opentripplanner/test/support/HttpForTest.java
diff --git a/src/test/java/org/opentripplanner/test/support/JsonAssertions.java b/application/src/test/java/org/opentripplanner/test/support/JsonAssertions.java
similarity index 100%
rename from src/test/java/org/opentripplanner/test/support/JsonAssertions.java
rename to application/src/test/java/org/opentripplanner/test/support/JsonAssertions.java
diff --git a/src/test/java/org/opentripplanner/test/support/PolylineAssert.java b/application/src/test/java/org/opentripplanner/test/support/PolylineAssert.java
similarity index 100%
rename from src/test/java/org/opentripplanner/test/support/PolylineAssert.java
rename to application/src/test/java/org/opentripplanner/test/support/PolylineAssert.java
diff --git a/src/test/java/org/opentripplanner/test/support/ResourceLoader.java b/application/src/test/java/org/opentripplanner/test/support/ResourceLoader.java
similarity index 100%
rename from src/test/java/org/opentripplanner/test/support/ResourceLoader.java
rename to application/src/test/java/org/opentripplanner/test/support/ResourceLoader.java
diff --git a/src/test/java/org/opentripplanner/test/support/TestTableParser.java b/application/src/test/java/org/opentripplanner/test/support/TestTableParser.java
similarity index 100%
rename from src/test/java/org/opentripplanner/test/support/TestTableParser.java
rename to application/src/test/java/org/opentripplanner/test/support/TestTableParser.java
diff --git a/src/test/java/org/opentripplanner/transit/model/TransitModelArchitectureTest.java b/application/src/test/java/org/opentripplanner/transit/model/TransitModelArchitectureTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/TransitModelArchitectureTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/TransitModelArchitectureTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/_data/PatternTestModel.java b/application/src/test/java/org/opentripplanner/transit/model/_data/PatternTestModel.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/_data/PatternTestModel.java
rename to application/src/test/java/org/opentripplanner/transit/model/_data/PatternTestModel.java
diff --git a/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java b/application/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/basic/MainAndSubModeTest.java b/application/src/test/java/org/opentripplanner/transit/model/basic/MainAndSubModeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/basic/MainAndSubModeTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/basic/MainAndSubModeTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/basic/NoticeTest.java b/application/src/test/java/org/opentripplanner/transit/model/basic/NoticeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/basic/NoticeTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/basic/NoticeTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/filter/expr/AndMatcherTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/expr/AndMatcherTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/filter/expr/AndMatcherTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/filter/expr/AndMatcherTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/filter/expr/ContainsMatcherTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/expr/ContainsMatcherTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/filter/expr/ContainsMatcherTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/filter/expr/ContainsMatcherTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/filter/expr/EqualityMatcherTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/expr/EqualityMatcherTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/filter/expr/EqualityMatcherTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/filter/expr/EqualityMatcherTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/filter/expr/OrMatcherTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/expr/OrMatcherTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/filter/expr/OrMatcherTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/filter/expr/OrMatcherTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactoryTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactoryTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactoryTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactoryTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/framework/EntityByIdTest.java b/application/src/test/java/org/opentripplanner/transit/model/framework/EntityByIdTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/framework/EntityByIdTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/framework/EntityByIdTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/framework/EntityNotFoundExceptionTest.java b/application/src/test/java/org/opentripplanner/transit/model/framework/EntityNotFoundExceptionTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/framework/EntityNotFoundExceptionTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/framework/EntityNotFoundExceptionTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/framework/FeedScopedIdTest.java b/application/src/test/java/org/opentripplanner/transit/model/framework/FeedScopedIdTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/framework/FeedScopedIdTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/framework/FeedScopedIdTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/framework/ResultTest.java b/application/src/test/java/org/opentripplanner/transit/model/framework/ResultTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/framework/ResultTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/framework/ResultTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/network/GroupOfRoutesTest.java b/application/src/test/java/org/opentripplanner/transit/model/network/GroupOfRoutesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/network/GroupOfRoutesTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/network/GroupOfRoutesTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/network/RouteTest.java b/application/src/test/java/org/opentripplanner/transit/model/network/RouteTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/network/RouteTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/network/RouteTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/network/StopPatternTest.java b/application/src/test/java/org/opentripplanner/transit/model/network/StopPatternTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/network/StopPatternTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/network/StopPatternTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/network/SubModeTest.java b/application/src/test/java/org/opentripplanner/transit/model/network/SubModeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/network/SubModeTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/network/SubModeTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/network/TripPatternTest.java b/application/src/test/java/org/opentripplanner/transit/model/network/TripPatternTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/network/TripPatternTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/network/TripPatternTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupPriorityCalculatorTest.java b/application/src/test/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupPriorityCalculatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupPriorityCalculatorTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupPriorityCalculatorTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java b/application/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32nTest.java b/application/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32nTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32nTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32nTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java b/application/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapterTest.java b/application/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapterTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapterTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/organization/AgencyTest.java b/application/src/test/java/org/opentripplanner/transit/model/organization/AgencyTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/organization/AgencyTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/organization/AgencyTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/organization/BrandingTest.java b/application/src/test/java/org/opentripplanner/transit/model/organization/BrandingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/organization/BrandingTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/organization/BrandingTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/organization/ContactInfoTest.java b/application/src/test/java/org/opentripplanner/transit/model/organization/ContactInfoTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/organization/ContactInfoTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/organization/ContactInfoTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/organization/OperatorTest.java b/application/src/test/java/org/opentripplanner/transit/model/organization/OperatorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/organization/OperatorTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/organization/OperatorTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/site/BoardingAreaTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/BoardingAreaTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/site/BoardingAreaTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/site/BoardingAreaTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/site/EntranceTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/EntranceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/site/EntranceTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/site/EntranceTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/site/FareZoneTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/FareZoneTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/site/FareZoneTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/site/FareZoneTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/site/GroupOfStationsTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/GroupOfStationsTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/site/GroupOfStationsTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/site/GroupOfStationsTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/site/MultiModalStationTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/MultiModalStationTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/site/MultiModalStationTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/site/MultiModalStationTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/site/PathwayNodeTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/PathwayNodeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/site/PathwayNodeTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/site/PathwayNodeTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/site/PathwayTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/PathwayTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/site/PathwayTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/site/PathwayTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/site/RegularStopTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/RegularStopTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/site/RegularStopTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/site/RegularStopTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/site/StationTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/StationTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/site/StationTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/site/StationTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesTest.java b/application/src/test/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesTest.java b/application/src/test/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/timetable/StopTimeKeyTest.java b/application/src/test/java/org/opentripplanner/transit/model/timetable/StopTimeKeyTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/timetable/StopTimeKeyTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/timetable/StopTimeKeyTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/timetable/TimetableValidationErrorTest.java b/application/src/test/java/org/opentripplanner/transit/model/timetable/TimetableValidationErrorTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/timetable/TimetableValidationErrorTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/timetable/TimetableValidationErrorTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/timetable/TripOnServiceDateTest.java b/application/src/test/java/org/opentripplanner/transit/model/timetable/TripOnServiceDateTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/timetable/TripOnServiceDateTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/timetable/TripOnServiceDateTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/timetable/TripTest.java b/application/src/test/java/org/opentripplanner/transit/model/timetable/TripTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/timetable/TripTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/timetable/TripTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoTest.java b/application/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingTimeTest.java b/application/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingTimeTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingTimeTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingTimeTest.java
diff --git a/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java b/application/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java
rename to application/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java
diff --git a/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java b/application/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java
rename to application/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java
diff --git a/src/test/java/org/opentripplanner/transit/service/PatternByServiceDatesFilterTest.java b/application/src/test/java/org/opentripplanner/transit/service/PatternByServiceDatesFilterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/service/PatternByServiceDatesFilterTest.java
rename to application/src/test/java/org/opentripplanner/transit/service/PatternByServiceDatesFilterTest.java
diff --git a/src/test/java/org/opentripplanner/transit/service/StopModelMock.java b/application/src/test/java/org/opentripplanner/transit/service/StopModelMock.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/service/StopModelMock.java
rename to application/src/test/java/org/opentripplanner/transit/service/StopModelMock.java
diff --git a/src/test/java/org/opentripplanner/transit/service/StopModelTest.java b/application/src/test/java/org/opentripplanner/transit/service/StopModelTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/service/StopModelTest.java
rename to application/src/test/java/org/opentripplanner/transit/service/StopModelTest.java
diff --git a/src/test/java/org/opentripplanner/transit/service/TransitModelTest.java b/application/src/test/java/org/opentripplanner/transit/service/TransitModelTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/service/TransitModelTest.java
rename to application/src/test/java/org/opentripplanner/transit/service/TransitModelTest.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/ResultPrinter.java b/application/src/test/java/org/opentripplanner/transit/speed_test/ResultPrinter.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/ResultPrinter.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/ResultPrinter.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/SpeedIntegrationTest.java b/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedIntegrationTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/SpeedIntegrationTest.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/SpeedIntegrationTest.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java b/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/SpeedTestRequest.java b/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTestRequest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/SpeedTestRequest.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTestRequest.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/model/SpeedTestProfile.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/SpeedTestProfile.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/model/SpeedTestProfile.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/model/SpeedTestProfile.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/CsvFileSupport.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/CsvFileSupport.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/model/testcase/CsvFileSupport.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/CsvFileSupport.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/ExpectedResults.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/ExpectedResults.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/model/testcase/ExpectedResults.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/ExpectedResults.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/ItineraryResultMapper.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/ItineraryResultMapper.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/model/testcase/ItineraryResultMapper.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/ItineraryResultMapper.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/Result.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/Result.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/model/testcase/Result.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/Result.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TableTestReport.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TableTestReport.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TableTestReport.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TableTestReport.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCase.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCase.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCase.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCase.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCaseDefinition.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCaseDefinition.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCaseDefinition.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCaseDefinition.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCaseFailedException.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCaseFailedException.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCaseFailedException.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCaseFailedException.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCaseResults.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCaseResults.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCaseResults.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCaseResults.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCases.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCases.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCases.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCases.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestStatus.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestStatus.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestStatus.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestStatus.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestStatusTest.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestStatusTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestStatusTest.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestStatusTest.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/AbstractCsvFile.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/AbstractCsvFile.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/AbstractCsvFile.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/AbstractCsvFile.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/ResultCsvFile.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/ResultCsvFile.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/ResultCsvFile.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/ResultCsvFile.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/TestCaseDefinitionCsvFile.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/TestCaseDefinitionCsvFile.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/TestCaseDefinitionCsvFile.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/TestCaseDefinitionCsvFile.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/model/timer/MeterRegistrySetup.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/timer/MeterRegistrySetup.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/model/timer/MeterRegistrySetup.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/model/timer/MeterRegistrySetup.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/model/timer/SpeedTestTimer.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/timer/SpeedTestTimer.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/model/timer/SpeedTestTimer.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/model/timer/SpeedTestTimer.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/options/SpeedTestCmdLineOpts.java b/application/src/test/java/org/opentripplanner/transit/speed_test/options/SpeedTestCmdLineOpts.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/options/SpeedTestCmdLineOpts.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/options/SpeedTestCmdLineOpts.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/options/SpeedTestCmdLineOptsBuilder.java b/application/src/test/java/org/opentripplanner/transit/speed_test/options/SpeedTestCmdLineOptsBuilder.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/options/SpeedTestCmdLineOptsBuilder.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/options/SpeedTestCmdLineOptsBuilder.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/options/SpeedTestConfig.java b/application/src/test/java/org/opentripplanner/transit/speed_test/options/SpeedTestConfig.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/options/SpeedTestConfig.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/options/SpeedTestConfig.java
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/package.md b/application/src/test/java/org/opentripplanner/transit/speed_test/package.md
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/package.md
rename to application/src/test/java/org/opentripplanner/transit/speed_test/package.md
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/support/AssertSpeedTestSetup.java b/application/src/test/java/org/opentripplanner/transit/speed_test/support/AssertSpeedTestSetup.java
similarity index 100%
rename from src/test/java/org/opentripplanner/transit/speed_test/support/AssertSpeedTestSetup.java
rename to application/src/test/java/org/opentripplanner/transit/speed_test/support/AssertSpeedTestSetup.java
diff --git a/src/test/java/org/opentripplanner/updater/GtfsRealtimeFuzzyTripMatcherTest.java b/application/src/test/java/org/opentripplanner/updater/GtfsRealtimeFuzzyTripMatcherTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/GtfsRealtimeFuzzyTripMatcherTest.java
rename to application/src/test/java/org/opentripplanner/updater/GtfsRealtimeFuzzyTripMatcherTest.java
diff --git a/src/test/java/org/opentripplanner/updater/alert/AlertsUpdateHandlerTest.java b/application/src/test/java/org/opentripplanner/updater/alert/AlertsUpdateHandlerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/alert/AlertsUpdateHandlerTest.java
rename to application/src/test/java/org/opentripplanner/updater/alert/AlertsUpdateHandlerTest.java
diff --git a/src/test/java/org/opentripplanner/updater/siri/AddedTripBuilderTest.java b/application/src/test/java/org/opentripplanner/updater/siri/AddedTripBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/siri/AddedTripBuilderTest.java
rename to application/src/test/java/org/opentripplanner/updater/siri/AddedTripBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/updater/siri/ModifiedTripBuilderTest.java b/application/src/test/java/org/opentripplanner/updater/siri/ModifiedTripBuilderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/siri/ModifiedTripBuilderTest.java
rename to application/src/test/java/org/opentripplanner/updater/siri/ModifiedTripBuilderTest.java
diff --git a/src/test/java/org/opentripplanner/updater/siri/SiriAlertsUpdateHandlerTest.java b/application/src/test/java/org/opentripplanner/updater/siri/SiriAlertsUpdateHandlerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/siri/SiriAlertsUpdateHandlerTest.java
rename to application/src/test/java/org/opentripplanner/updater/siri/SiriAlertsUpdateHandlerTest.java
diff --git a/src/test/java/org/opentripplanner/updater/siri/SiriEtBuilder.java b/application/src/test/java/org/opentripplanner/updater/siri/SiriEtBuilder.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/siri/SiriEtBuilder.java
rename to application/src/test/java/org/opentripplanner/updater/siri/SiriEtBuilder.java
diff --git a/src/test/java/org/opentripplanner/updater/siri/SiriTimetableSnapshotSourceTest.java b/application/src/test/java/org/opentripplanner/updater/siri/SiriTimetableSnapshotSourceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/siri/SiriTimetableSnapshotSourceTest.java
rename to application/src/test/java/org/opentripplanner/updater/siri/SiriTimetableSnapshotSourceTest.java
diff --git a/src/test/java/org/opentripplanner/updater/siri/TestCall.java b/application/src/test/java/org/opentripplanner/updater/siri/TestCall.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/siri/TestCall.java
rename to application/src/test/java/org/opentripplanner/updater/siri/TestCall.java
diff --git a/src/test/java/org/opentripplanner/updater/siri/TimetableHelperTest.java b/application/src/test/java/org/opentripplanner/updater/siri/TimetableHelperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/siri/TimetableHelperTest.java
rename to application/src/test/java/org/opentripplanner/updater/siri/TimetableHelperTest.java
diff --git a/src/test/java/org/opentripplanner/updater/siri/mapper/PickDropMapperTest.java b/application/src/test/java/org/opentripplanner/updater/siri/mapper/PickDropMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/siri/mapper/PickDropMapperTest.java
rename to application/src/test/java/org/opentripplanner/updater/siri/mapper/PickDropMapperTest.java
diff --git a/src/test/java/org/opentripplanner/updater/spi/HttpHeadersTest.java b/application/src/test/java/org/opentripplanner/updater/spi/HttpHeadersTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/spi/HttpHeadersTest.java
rename to application/src/test/java/org/opentripplanner/updater/spi/HttpHeadersTest.java
diff --git a/src/test/java/org/opentripplanner/updater/spi/UpdateResultAssertions.java b/application/src/test/java/org/opentripplanner/updater/spi/UpdateResultAssertions.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/spi/UpdateResultAssertions.java
rename to application/src/test/java/org/opentripplanner/updater/spi/UpdateResultAssertions.java
diff --git a/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSourceTest.java b/application/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSourceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSourceTest.java
rename to application/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSourceTest.java
diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestConstants.java b/application/src/test/java/org/opentripplanner/updater/trip/RealtimeTestConstants.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/trip/RealtimeTestConstants.java
rename to application/src/test/java/org/opentripplanner/updater/trip/RealtimeTestConstants.java
diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/application/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
rename to application/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironmentBuilder.java b/application/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironmentBuilder.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironmentBuilder.java
rename to application/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironmentBuilder.java
diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotManagerTest.java b/application/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotManagerTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotManagerTest.java
rename to application/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotManagerTest.java
diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/application/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
rename to application/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
diff --git a/src/test/java/org/opentripplanner/updater/trip/TripInput.java b/application/src/test/java/org/opentripplanner/updater/trip/TripInput.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/trip/TripInput.java
rename to application/src/test/java/org/opentripplanner/updater/trip/TripInput.java
diff --git a/src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java b/application/src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java
rename to application/src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java
diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java b/application/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java
rename to application/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java
diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java b/application/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java
rename to application/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java
diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java b/application/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java
rename to application/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java
diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/application/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java
rename to application/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java
diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java b/application/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java
rename to application/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java
diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java b/application/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java
rename to application/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java
diff --git a/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdaterTest.java b/application/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdaterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdaterTest.java
rename to application/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdaterTest.java
diff --git a/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterTest.java b/application/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterTest.java
rename to application/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterTest.java
diff --git a/src/test/java/org/opentripplanner/updater/vehicle_position/RealtimeVehicleMatcherTest.java b/application/src/test/java/org/opentripplanner/updater/vehicle_position/RealtimeVehicleMatcherTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/vehicle_position/RealtimeVehicleMatcherTest.java
rename to application/src/test/java/org/opentripplanner/updater/vehicle_position/RealtimeVehicleMatcherTest.java
diff --git a/src/test/java/org/opentripplanner/updater/vehicle_position/VehiclePositionParsingTest.java b/application/src/test/java/org/opentripplanner/updater/vehicle_position/VehiclePositionParsingTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/vehicle_position/VehiclePositionParsingTest.java
rename to application/src/test/java/org/opentripplanner/updater/vehicle_position/VehiclePositionParsingTest.java
diff --git a/src/test/java/org/opentripplanner/updater/vehicle_rental/GeofencingVertexUpdaterTest.java b/application/src/test/java/org/opentripplanner/updater/vehicle_rental/GeofencingVertexUpdaterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/vehicle_rental/GeofencingVertexUpdaterTest.java
rename to application/src/test/java/org/opentripplanner/updater/vehicle_rental/GeofencingVertexUpdaterTest.java
diff --git a/src/test/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdaterTest.java b/application/src/test/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdaterTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdaterTest.java
rename to application/src/test/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdaterTest.java
diff --git a/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoaderTest.java b/application/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoaderTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoaderTest.java
rename to application/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoaderTest.java
diff --git a/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapperTest.java b/application/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapperTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapperTest.java
rename to application/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapperTest.java
diff --git a/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSourceTest.java b/application/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSourceTest.java
similarity index 100%
rename from src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSourceTest.java
rename to application/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSourceTest.java
diff --git a/src/test/resources/gbfs/helsinki/gbfs.json b/application/src/test/resources/gbfs/helsinki/gbfs.json
similarity index 100%
rename from src/test/resources/gbfs/helsinki/gbfs.json
rename to application/src/test/resources/gbfs/helsinki/gbfs.json
diff --git a/src/test/resources/gbfs/helsinki/station_information.json b/application/src/test/resources/gbfs/helsinki/station_information.json
similarity index 100%
rename from src/test/resources/gbfs/helsinki/station_information.json
rename to application/src/test/resources/gbfs/helsinki/station_information.json
diff --git a/src/test/resources/gbfs/helsinki/station_status.json b/application/src/test/resources/gbfs/helsinki/station_status.json
similarity index 100%
rename from src/test/resources/gbfs/helsinki/station_status.json
rename to application/src/test/resources/gbfs/helsinki/station_status.json
diff --git a/src/test/resources/gbfs/helsinki/system_information.json b/application/src/test/resources/gbfs/helsinki/system_information.json
similarity index 100%
rename from src/test/resources/gbfs/helsinki/system_information.json
rename to application/src/test/resources/gbfs/helsinki/system_information.json
diff --git a/src/test/resources/gbfs/lillestrombysykkel/gbfs.json b/application/src/test/resources/gbfs/lillestrombysykkel/gbfs.json
similarity index 100%
rename from src/test/resources/gbfs/lillestrombysykkel/gbfs.json
rename to application/src/test/resources/gbfs/lillestrombysykkel/gbfs.json
diff --git a/src/test/resources/gbfs/lillestrombysykkel/station_information.json b/application/src/test/resources/gbfs/lillestrombysykkel/station_information.json
similarity index 100%
rename from src/test/resources/gbfs/lillestrombysykkel/station_information.json
rename to application/src/test/resources/gbfs/lillestrombysykkel/station_information.json
diff --git a/src/test/resources/gbfs/lillestrombysykkel/station_status.json b/application/src/test/resources/gbfs/lillestrombysykkel/station_status.json
similarity index 100%
rename from src/test/resources/gbfs/lillestrombysykkel/station_status.json
rename to application/src/test/resources/gbfs/lillestrombysykkel/station_status.json
diff --git a/src/test/resources/gbfs/lillestrombysykkel/system_information.json b/application/src/test/resources/gbfs/lillestrombysykkel/system_information.json
similarity index 100%
rename from src/test/resources/gbfs/lillestrombysykkel/system_information.json
rename to application/src/test/resources/gbfs/lillestrombysykkel/system_information.json
diff --git a/src/test/resources/gbfs/lillestrombysykkel/system_pricing_plans.json b/application/src/test/resources/gbfs/lillestrombysykkel/system_pricing_plans.json
similarity index 100%
rename from src/test/resources/gbfs/lillestrombysykkel/system_pricing_plans.json
rename to application/src/test/resources/gbfs/lillestrombysykkel/system_pricing_plans.json
diff --git a/src/test/resources/gbfs/lillestrombysykkel/vehicle_types.json b/application/src/test/resources/gbfs/lillestrombysykkel/vehicle_types.json
similarity index 100%
rename from src/test/resources/gbfs/lillestrombysykkel/vehicle_types.json
rename to application/src/test/resources/gbfs/lillestrombysykkel/vehicle_types.json
diff --git a/src/test/resources/gbfs/tieroslo/gbfs.json b/application/src/test/resources/gbfs/tieroslo/gbfs.json
similarity index 100%
rename from src/test/resources/gbfs/tieroslo/gbfs.json
rename to application/src/test/resources/gbfs/tieroslo/gbfs.json
diff --git a/src/test/resources/gbfs/tieroslo/geofencing_zones.json b/application/src/test/resources/gbfs/tieroslo/geofencing_zones.json
similarity index 100%
rename from src/test/resources/gbfs/tieroslo/geofencing_zones.json
rename to application/src/test/resources/gbfs/tieroslo/geofencing_zones.json
diff --git a/src/test/resources/gbfs/tieroslo/system_information.json b/application/src/test/resources/gbfs/tieroslo/system_information.json
similarity index 100%
rename from src/test/resources/gbfs/tieroslo/system_information.json
rename to application/src/test/resources/gbfs/tieroslo/system_information.json
diff --git a/src/test/resources/gtfs/caltrain_gtfs.zip b/application/src/test/resources/gtfs/caltrain_gtfs.zip
similarity index 100%
rename from src/test/resources/gtfs/caltrain_gtfs.zip
rename to application/src/test/resources/gtfs/caltrain_gtfs.zip
diff --git a/src/test/resources/gtfs/interlining/agency.txt b/application/src/test/resources/gtfs/interlining/agency.txt
similarity index 100%
rename from src/test/resources/gtfs/interlining/agency.txt
rename to application/src/test/resources/gtfs/interlining/agency.txt
diff --git a/src/test/resources/gtfs/interlining/calendar_dates.txt b/application/src/test/resources/gtfs/interlining/calendar_dates.txt
similarity index 100%
rename from src/test/resources/gtfs/interlining/calendar_dates.txt
rename to application/src/test/resources/gtfs/interlining/calendar_dates.txt
diff --git a/src/test/resources/gtfs/interlining/description.txt b/application/src/test/resources/gtfs/interlining/description.txt
similarity index 100%
rename from src/test/resources/gtfs/interlining/description.txt
rename to application/src/test/resources/gtfs/interlining/description.txt
diff --git a/src/test/resources/gtfs/interlining/routes.txt b/application/src/test/resources/gtfs/interlining/routes.txt
similarity index 100%
rename from src/test/resources/gtfs/interlining/routes.txt
rename to application/src/test/resources/gtfs/interlining/routes.txt
diff --git a/src/test/resources/gtfs/interlining/stop_times.txt b/application/src/test/resources/gtfs/interlining/stop_times.txt
similarity index 100%
rename from src/test/resources/gtfs/interlining/stop_times.txt
rename to application/src/test/resources/gtfs/interlining/stop_times.txt
diff --git a/src/test/resources/gtfs/interlining/stops.txt b/application/src/test/resources/gtfs/interlining/stops.txt
similarity index 100%
rename from src/test/resources/gtfs/interlining/stops.txt
rename to application/src/test/resources/gtfs/interlining/stops.txt
diff --git a/src/test/resources/gtfs/interlining/transfers.txt b/application/src/test/resources/gtfs/interlining/transfers.txt
similarity index 100%
rename from src/test/resources/gtfs/interlining/transfers.txt
rename to application/src/test/resources/gtfs/interlining/transfers.txt
diff --git a/src/test/resources/gtfs/interlining/trips.txt b/application/src/test/resources/gtfs/interlining/trips.txt
similarity index 100%
rename from src/test/resources/gtfs/interlining/trips.txt
rename to application/src/test/resources/gtfs/interlining/trips.txt
diff --git a/src/test/resources/gtfs/shape_dist_traveled/agency.txt b/application/src/test/resources/gtfs/shape_dist_traveled/agency.txt
similarity index 100%
rename from src/test/resources/gtfs/shape_dist_traveled/agency.txt
rename to application/src/test/resources/gtfs/shape_dist_traveled/agency.txt
diff --git a/src/test/resources/gtfs/shape_dist_traveled/calendar.txt b/application/src/test/resources/gtfs/shape_dist_traveled/calendar.txt
similarity index 100%
rename from src/test/resources/gtfs/shape_dist_traveled/calendar.txt
rename to application/src/test/resources/gtfs/shape_dist_traveled/calendar.txt
diff --git a/src/test/resources/gtfs/shape_dist_traveled/routes.txt b/application/src/test/resources/gtfs/shape_dist_traveled/routes.txt
similarity index 100%
rename from src/test/resources/gtfs/shape_dist_traveled/routes.txt
rename to application/src/test/resources/gtfs/shape_dist_traveled/routes.txt
diff --git a/src/test/resources/gtfs/shape_dist_traveled/shapes.txt b/application/src/test/resources/gtfs/shape_dist_traveled/shapes.txt
similarity index 100%
rename from src/test/resources/gtfs/shape_dist_traveled/shapes.txt
rename to application/src/test/resources/gtfs/shape_dist_traveled/shapes.txt
diff --git a/src/test/resources/gtfs/shape_dist_traveled/stop_times.txt b/application/src/test/resources/gtfs/shape_dist_traveled/stop_times.txt
similarity index 100%
rename from src/test/resources/gtfs/shape_dist_traveled/stop_times.txt
rename to application/src/test/resources/gtfs/shape_dist_traveled/stop_times.txt
diff --git a/src/test/resources/gtfs/shape_dist_traveled/stops.txt b/application/src/test/resources/gtfs/shape_dist_traveled/stops.txt
similarity index 100%
rename from src/test/resources/gtfs/shape_dist_traveled/stops.txt
rename to application/src/test/resources/gtfs/shape_dist_traveled/stops.txt
diff --git a/src/test/resources/gtfs/shape_dist_traveled/trips.txt b/application/src/test/resources/gtfs/shape_dist_traveled/trips.txt
similarity index 100%
rename from src/test/resources/gtfs/shape_dist_traveled/trips.txt
rename to application/src/test/resources/gtfs/shape_dist_traveled/trips.txt
diff --git a/src/test/resources/gtfs/simple/agency.txt b/application/src/test/resources/gtfs/simple/agency.txt
similarity index 100%
rename from src/test/resources/gtfs/simple/agency.txt
rename to application/src/test/resources/gtfs/simple/agency.txt
diff --git a/src/test/resources/gtfs/simple/calendar.txt b/application/src/test/resources/gtfs/simple/calendar.txt
similarity index 100%
rename from src/test/resources/gtfs/simple/calendar.txt
rename to application/src/test/resources/gtfs/simple/calendar.txt
diff --git a/src/test/resources/gtfs/simple/frequencies.txt b/application/src/test/resources/gtfs/simple/frequencies.txt
similarity index 100%
rename from src/test/resources/gtfs/simple/frequencies.txt
rename to application/src/test/resources/gtfs/simple/frequencies.txt
diff --git a/src/test/resources/gtfs/simple/pathways.txt b/application/src/test/resources/gtfs/simple/pathways.txt
similarity index 100%
rename from src/test/resources/gtfs/simple/pathways.txt
rename to application/src/test/resources/gtfs/simple/pathways.txt
diff --git a/src/test/resources/gtfs/simple/routes.txt b/application/src/test/resources/gtfs/simple/routes.txt
similarity index 100%
rename from src/test/resources/gtfs/simple/routes.txt
rename to application/src/test/resources/gtfs/simple/routes.txt
diff --git a/src/test/resources/gtfs/simple/shapes.txt b/application/src/test/resources/gtfs/simple/shapes.txt
similarity index 100%
rename from src/test/resources/gtfs/simple/shapes.txt
rename to application/src/test/resources/gtfs/simple/shapes.txt
diff --git a/src/test/resources/gtfs/simple/stop_times.txt b/application/src/test/resources/gtfs/simple/stop_times.txt
similarity index 100%
rename from src/test/resources/gtfs/simple/stop_times.txt
rename to application/src/test/resources/gtfs/simple/stop_times.txt
diff --git a/src/test/resources/gtfs/simple/stops.txt b/application/src/test/resources/gtfs/simple/stops.txt
similarity index 100%
rename from src/test/resources/gtfs/simple/stops.txt
rename to application/src/test/resources/gtfs/simple/stops.txt
diff --git a/src/test/resources/gtfs/simple/transfers.txt b/application/src/test/resources/gtfs/simple/transfers.txt
similarity index 100%
rename from src/test/resources/gtfs/simple/transfers.txt
rename to application/src/test/resources/gtfs/simple/transfers.txt
diff --git a/src/test/resources/gtfs/simple/trips.txt b/application/src/test/resources/gtfs/simple/trips.txt
similarity index 100%
rename from src/test/resources/gtfs/simple/trips.txt
rename to application/src/test/resources/gtfs/simple/trips.txt
diff --git a/src/test/resources/gtfs/stopgen.py b/application/src/test/resources/gtfs/stopgen.py
similarity index 100%
rename from src/test/resources/gtfs/stopgen.py
rename to application/src/test/resources/gtfs/stopgen.py
diff --git a/src/test/resources/logback.xml b/application/src/test/resources/logback.xml
similarity index 100%
rename from src/test/resources/logback.xml
rename to application/src/test/resources/logback.xml
diff --git a/src/test/resources/mmri/1g/agency.txt b/application/src/test/resources/mmri/1g/agency.txt
similarity index 100%
rename from src/test/resources/mmri/1g/agency.txt
rename to application/src/test/resources/mmri/1g/agency.txt
diff --git a/src/test/resources/mmri/1g/calendar_dates.txt b/application/src/test/resources/mmri/1g/calendar_dates.txt
similarity index 100%
rename from src/test/resources/mmri/1g/calendar_dates.txt
rename to application/src/test/resources/mmri/1g/calendar_dates.txt
diff --git a/src/test/resources/mmri/1g/routes.txt b/application/src/test/resources/mmri/1g/routes.txt
similarity index 100%
rename from src/test/resources/mmri/1g/routes.txt
rename to application/src/test/resources/mmri/1g/routes.txt
diff --git a/src/test/resources/mmri/1g/stop_times.txt b/application/src/test/resources/mmri/1g/stop_times.txt
similarity index 100%
rename from src/test/resources/mmri/1g/stop_times.txt
rename to application/src/test/resources/mmri/1g/stop_times.txt
diff --git a/src/test/resources/mmri/1g/stops.txt b/application/src/test/resources/mmri/1g/stops.txt
similarity index 100%
rename from src/test/resources/mmri/1g/stops.txt
rename to application/src/test/resources/mmri/1g/stops.txt
diff --git a/src/test/resources/mmri/1g/trips.txt b/application/src/test/resources/mmri/1g/trips.txt
similarity index 100%
rename from src/test/resources/mmri/1g/trips.txt
rename to application/src/test/resources/mmri/1g/trips.txt
diff --git a/src/test/resources/mmri/2a1/agency.txt b/application/src/test/resources/mmri/2a1/agency.txt
similarity index 100%
rename from src/test/resources/mmri/2a1/agency.txt
rename to application/src/test/resources/mmri/2a1/agency.txt
diff --git a/src/test/resources/mmri/2a1/calendar_dates.txt b/application/src/test/resources/mmri/2a1/calendar_dates.txt
similarity index 100%
rename from src/test/resources/mmri/2a1/calendar_dates.txt
rename to application/src/test/resources/mmri/2a1/calendar_dates.txt
diff --git a/src/test/resources/mmri/2a1/routes.txt b/application/src/test/resources/mmri/2a1/routes.txt
similarity index 100%
rename from src/test/resources/mmri/2a1/routes.txt
rename to application/src/test/resources/mmri/2a1/routes.txt
diff --git a/src/test/resources/mmri/2a1/stop_times.txt b/application/src/test/resources/mmri/2a1/stop_times.txt
similarity index 100%
rename from src/test/resources/mmri/2a1/stop_times.txt
rename to application/src/test/resources/mmri/2a1/stop_times.txt
diff --git a/src/test/resources/mmri/2a1/stops.txt b/application/src/test/resources/mmri/2a1/stops.txt
similarity index 100%
rename from src/test/resources/mmri/2a1/stops.txt
rename to application/src/test/resources/mmri/2a1/stops.txt
diff --git a/src/test/resources/mmri/2a1/trips.txt b/application/src/test/resources/mmri/2a1/trips.txt
similarity index 100%
rename from src/test/resources/mmri/2a1/trips.txt
rename to application/src/test/resources/mmri/2a1/trips.txt
diff --git a/src/test/resources/mmri/2b/agency.txt b/application/src/test/resources/mmri/2b/agency.txt
similarity index 100%
rename from src/test/resources/mmri/2b/agency.txt
rename to application/src/test/resources/mmri/2b/agency.txt
diff --git a/src/test/resources/mmri/2b/calendar_dates.txt b/application/src/test/resources/mmri/2b/calendar_dates.txt
similarity index 100%
rename from src/test/resources/mmri/2b/calendar_dates.txt
rename to application/src/test/resources/mmri/2b/calendar_dates.txt
diff --git a/src/test/resources/mmri/2b/routes.txt b/application/src/test/resources/mmri/2b/routes.txt
similarity index 100%
rename from src/test/resources/mmri/2b/routes.txt
rename to application/src/test/resources/mmri/2b/routes.txt
diff --git a/src/test/resources/mmri/2b/stop_times.txt b/application/src/test/resources/mmri/2b/stop_times.txt
similarity index 100%
rename from src/test/resources/mmri/2b/stop_times.txt
rename to application/src/test/resources/mmri/2b/stop_times.txt
diff --git a/src/test/resources/mmri/2b/stops.txt b/application/src/test/resources/mmri/2b/stops.txt
similarity index 100%
rename from src/test/resources/mmri/2b/stops.txt
rename to application/src/test/resources/mmri/2b/stops.txt
diff --git a/src/test/resources/mmri/2b/trips.txt b/application/src/test/resources/mmri/2b/trips.txt
similarity index 100%
rename from src/test/resources/mmri/2b/trips.txt
rename to application/src/test/resources/mmri/2b/trips.txt
diff --git a/src/test/resources/mmri/2c/agency.txt b/application/src/test/resources/mmri/2c/agency.txt
similarity index 100%
rename from src/test/resources/mmri/2c/agency.txt
rename to application/src/test/resources/mmri/2c/agency.txt
diff --git a/src/test/resources/mmri/2c/calendar_dates.txt b/application/src/test/resources/mmri/2c/calendar_dates.txt
similarity index 100%
rename from src/test/resources/mmri/2c/calendar_dates.txt
rename to application/src/test/resources/mmri/2c/calendar_dates.txt
diff --git a/src/test/resources/mmri/2c/routes.txt b/application/src/test/resources/mmri/2c/routes.txt
similarity index 100%
rename from src/test/resources/mmri/2c/routes.txt
rename to application/src/test/resources/mmri/2c/routes.txt
diff --git a/src/test/resources/mmri/2c/stop_times.txt b/application/src/test/resources/mmri/2c/stop_times.txt
similarity index 100%
rename from src/test/resources/mmri/2c/stop_times.txt
rename to application/src/test/resources/mmri/2c/stop_times.txt
diff --git a/src/test/resources/mmri/2c/stops.txt b/application/src/test/resources/mmri/2c/stops.txt
similarity index 100%
rename from src/test/resources/mmri/2c/stops.txt
rename to application/src/test/resources/mmri/2c/stops.txt
diff --git a/src/test/resources/mmri/2c/transfers.txt b/application/src/test/resources/mmri/2c/transfers.txt
similarity index 100%
rename from src/test/resources/mmri/2c/transfers.txt
rename to application/src/test/resources/mmri/2c/transfers.txt
diff --git a/src/test/resources/mmri/2c/trips.txt b/application/src/test/resources/mmri/2c/trips.txt
similarity index 100%
rename from src/test/resources/mmri/2c/trips.txt
rename to application/src/test/resources/mmri/2c/trips.txt
diff --git a/src/test/resources/mmri/2d/agency.txt b/application/src/test/resources/mmri/2d/agency.txt
similarity index 100%
rename from src/test/resources/mmri/2d/agency.txt
rename to application/src/test/resources/mmri/2d/agency.txt
diff --git a/src/test/resources/mmri/2d/calendar_dates.txt b/application/src/test/resources/mmri/2d/calendar_dates.txt
similarity index 100%
rename from src/test/resources/mmri/2d/calendar_dates.txt
rename to application/src/test/resources/mmri/2d/calendar_dates.txt
diff --git a/src/test/resources/mmri/2d/routes.txt b/application/src/test/resources/mmri/2d/routes.txt
similarity index 100%
rename from src/test/resources/mmri/2d/routes.txt
rename to application/src/test/resources/mmri/2d/routes.txt
diff --git a/src/test/resources/mmri/2d/stop_times.txt b/application/src/test/resources/mmri/2d/stop_times.txt
similarity index 100%
rename from src/test/resources/mmri/2d/stop_times.txt
rename to application/src/test/resources/mmri/2d/stop_times.txt
diff --git a/src/test/resources/mmri/2d/stops.txt b/application/src/test/resources/mmri/2d/stops.txt
similarity index 100%
rename from src/test/resources/mmri/2d/stops.txt
rename to application/src/test/resources/mmri/2d/stops.txt
diff --git a/src/test/resources/mmri/2d/transfers.txt b/application/src/test/resources/mmri/2d/transfers.txt
similarity index 100%
rename from src/test/resources/mmri/2d/transfers.txt
rename to application/src/test/resources/mmri/2d/transfers.txt
diff --git a/src/test/resources/mmri/2d/trips.txt b/application/src/test/resources/mmri/2d/trips.txt
similarity index 100%
rename from src/test/resources/mmri/2d/trips.txt
rename to application/src/test/resources/mmri/2d/trips.txt
diff --git a/src/test/resources/mmri/2e1/agency.txt b/application/src/test/resources/mmri/2e1/agency.txt
similarity index 100%
rename from src/test/resources/mmri/2e1/agency.txt
rename to application/src/test/resources/mmri/2e1/agency.txt
diff --git a/src/test/resources/mmri/2e1/calendar_dates.txt b/application/src/test/resources/mmri/2e1/calendar_dates.txt
similarity index 100%
rename from src/test/resources/mmri/2e1/calendar_dates.txt
rename to application/src/test/resources/mmri/2e1/calendar_dates.txt
diff --git a/src/test/resources/mmri/2e1/routes.txt b/application/src/test/resources/mmri/2e1/routes.txt
similarity index 100%
rename from src/test/resources/mmri/2e1/routes.txt
rename to application/src/test/resources/mmri/2e1/routes.txt
diff --git a/src/test/resources/mmri/2e1/stop_times.txt b/application/src/test/resources/mmri/2e1/stop_times.txt
similarity index 100%
rename from src/test/resources/mmri/2e1/stop_times.txt
rename to application/src/test/resources/mmri/2e1/stop_times.txt
diff --git a/src/test/resources/mmri/2e1/stops.txt b/application/src/test/resources/mmri/2e1/stops.txt
similarity index 100%
rename from src/test/resources/mmri/2e1/stops.txt
rename to application/src/test/resources/mmri/2e1/stops.txt
diff --git a/src/test/resources/mmri/2e1/transfers.txt b/application/src/test/resources/mmri/2e1/transfers.txt
similarity index 100%
rename from src/test/resources/mmri/2e1/transfers.txt
rename to application/src/test/resources/mmri/2e1/transfers.txt
diff --git a/src/test/resources/mmri/2e1/trips.txt b/application/src/test/resources/mmri/2e1/trips.txt
similarity index 100%
rename from src/test/resources/mmri/2e1/trips.txt
rename to application/src/test/resources/mmri/2e1/trips.txt
diff --git a/src/test/resources/mmri/2e2/agency.txt b/application/src/test/resources/mmri/2e2/agency.txt
similarity index 100%
rename from src/test/resources/mmri/2e2/agency.txt
rename to application/src/test/resources/mmri/2e2/agency.txt
diff --git a/src/test/resources/mmri/2e2/calendar_dates.txt b/application/src/test/resources/mmri/2e2/calendar_dates.txt
similarity index 100%
rename from src/test/resources/mmri/2e2/calendar_dates.txt
rename to application/src/test/resources/mmri/2e2/calendar_dates.txt
diff --git a/src/test/resources/mmri/2e2/routes.txt b/application/src/test/resources/mmri/2e2/routes.txt
similarity index 100%
rename from src/test/resources/mmri/2e2/routes.txt
rename to application/src/test/resources/mmri/2e2/routes.txt
diff --git a/src/test/resources/mmri/2e2/stop_times.txt b/application/src/test/resources/mmri/2e2/stop_times.txt
similarity index 100%
rename from src/test/resources/mmri/2e2/stop_times.txt
rename to application/src/test/resources/mmri/2e2/stop_times.txt
diff --git a/src/test/resources/mmri/2e2/stops.txt b/application/src/test/resources/mmri/2e2/stops.txt
similarity index 100%
rename from src/test/resources/mmri/2e2/stops.txt
rename to application/src/test/resources/mmri/2e2/stops.txt
diff --git a/src/test/resources/mmri/2e2/transfers.txt b/application/src/test/resources/mmri/2e2/transfers.txt
similarity index 100%
rename from src/test/resources/mmri/2e2/transfers.txt
rename to application/src/test/resources/mmri/2e2/transfers.txt
diff --git a/src/test/resources/mmri/2e2/trips.txt b/application/src/test/resources/mmri/2e2/trips.txt
similarity index 100%
rename from src/test/resources/mmri/2e2/trips.txt
rename to application/src/test/resources/mmri/2e2/trips.txt
diff --git a/src/test/resources/mmri/2e3/agency.txt b/application/src/test/resources/mmri/2e3/agency.txt
similarity index 100%
rename from src/test/resources/mmri/2e3/agency.txt
rename to application/src/test/resources/mmri/2e3/agency.txt
diff --git a/src/test/resources/mmri/2e3/calendar_dates.txt b/application/src/test/resources/mmri/2e3/calendar_dates.txt
similarity index 100%
rename from src/test/resources/mmri/2e3/calendar_dates.txt
rename to application/src/test/resources/mmri/2e3/calendar_dates.txt
diff --git a/src/test/resources/mmri/2e3/routes.txt b/application/src/test/resources/mmri/2e3/routes.txt
similarity index 100%
rename from src/test/resources/mmri/2e3/routes.txt
rename to application/src/test/resources/mmri/2e3/routes.txt
diff --git a/src/test/resources/mmri/2e3/stop_times.txt b/application/src/test/resources/mmri/2e3/stop_times.txt
similarity index 100%
rename from src/test/resources/mmri/2e3/stop_times.txt
rename to application/src/test/resources/mmri/2e3/stop_times.txt
diff --git a/src/test/resources/mmri/2e3/stops.txt b/application/src/test/resources/mmri/2e3/stops.txt
similarity index 100%
rename from src/test/resources/mmri/2e3/stops.txt
rename to application/src/test/resources/mmri/2e3/stops.txt
diff --git a/src/test/resources/mmri/2e3/transfers.txt b/application/src/test/resources/mmri/2e3/transfers.txt
similarity index 100%
rename from src/test/resources/mmri/2e3/transfers.txt
rename to application/src/test/resources/mmri/2e3/transfers.txt
diff --git a/src/test/resources/mmri/2e3/trips.txt b/application/src/test/resources/mmri/2e3/trips.txt
similarity index 100%
rename from src/test/resources/mmri/2e3/trips.txt
rename to application/src/test/resources/mmri/2e3/trips.txt
diff --git a/src/test/resources/mmri/2e4/agency.txt b/application/src/test/resources/mmri/2e4/agency.txt
similarity index 100%
rename from src/test/resources/mmri/2e4/agency.txt
rename to application/src/test/resources/mmri/2e4/agency.txt
diff --git a/src/test/resources/mmri/2e4/calendar_dates.txt b/application/src/test/resources/mmri/2e4/calendar_dates.txt
similarity index 100%
rename from src/test/resources/mmri/2e4/calendar_dates.txt
rename to application/src/test/resources/mmri/2e4/calendar_dates.txt
diff --git a/src/test/resources/mmri/2e4/routes.txt b/application/src/test/resources/mmri/2e4/routes.txt
similarity index 100%
rename from src/test/resources/mmri/2e4/routes.txt
rename to application/src/test/resources/mmri/2e4/routes.txt
diff --git a/src/test/resources/mmri/2e4/stop_times.txt b/application/src/test/resources/mmri/2e4/stop_times.txt
similarity index 100%
rename from src/test/resources/mmri/2e4/stop_times.txt
rename to application/src/test/resources/mmri/2e4/stop_times.txt
diff --git a/src/test/resources/mmri/2e4/stops.txt b/application/src/test/resources/mmri/2e4/stops.txt
similarity index 100%
rename from src/test/resources/mmri/2e4/stops.txt
rename to application/src/test/resources/mmri/2e4/stops.txt
diff --git a/src/test/resources/mmri/2e4/transfers.txt b/application/src/test/resources/mmri/2e4/transfers.txt
similarity index 100%
rename from src/test/resources/mmri/2e4/transfers.txt
rename to application/src/test/resources/mmri/2e4/transfers.txt
diff --git a/src/test/resources/mmri/2e4/trips.txt b/application/src/test/resources/mmri/2e4/trips.txt
similarity index 100%
rename from src/test/resources/mmri/2e4/trips.txt
rename to application/src/test/resources/mmri/2e4/trips.txt
diff --git a/src/test/resources/mmri/3b.pb b/application/src/test/resources/mmri/3b.pb
similarity index 100%
rename from src/test/resources/mmri/3b.pb
rename to application/src/test/resources/mmri/3b.pb
diff --git a/src/test/resources/mmri/3b/agency.txt b/application/src/test/resources/mmri/3b/agency.txt
similarity index 100%
rename from src/test/resources/mmri/3b/agency.txt
rename to application/src/test/resources/mmri/3b/agency.txt
diff --git a/src/test/resources/mmri/3b/calendar_dates.txt b/application/src/test/resources/mmri/3b/calendar_dates.txt
similarity index 100%
rename from src/test/resources/mmri/3b/calendar_dates.txt
rename to application/src/test/resources/mmri/3b/calendar_dates.txt
diff --git a/src/test/resources/mmri/3b/routes.txt b/application/src/test/resources/mmri/3b/routes.txt
similarity index 100%
rename from src/test/resources/mmri/3b/routes.txt
rename to application/src/test/resources/mmri/3b/routes.txt
diff --git a/src/test/resources/mmri/3b/stop_times.txt b/application/src/test/resources/mmri/3b/stop_times.txt
similarity index 100%
rename from src/test/resources/mmri/3b/stop_times.txt
rename to application/src/test/resources/mmri/3b/stop_times.txt
diff --git a/src/test/resources/mmri/3b/stops.txt b/application/src/test/resources/mmri/3b/stops.txt
similarity index 100%
rename from src/test/resources/mmri/3b/stops.txt
rename to application/src/test/resources/mmri/3b/stops.txt
diff --git a/src/test/resources/mmri/3b/trips.txt b/application/src/test/resources/mmri/3b/trips.txt
similarity index 100%
rename from src/test/resources/mmri/3b/trips.txt
rename to application/src/test/resources/mmri/3b/trips.txt
diff --git a/src/test/resources/mmri/3c.pb b/application/src/test/resources/mmri/3c.pb
similarity index 100%
rename from src/test/resources/mmri/3c.pb
rename to application/src/test/resources/mmri/3c.pb
diff --git a/src/test/resources/mmri/3c/agency.txt b/application/src/test/resources/mmri/3c/agency.txt
similarity index 100%
rename from src/test/resources/mmri/3c/agency.txt
rename to application/src/test/resources/mmri/3c/agency.txt
diff --git a/src/test/resources/mmri/3c/calendar_dates.txt b/application/src/test/resources/mmri/3c/calendar_dates.txt
similarity index 100%
rename from src/test/resources/mmri/3c/calendar_dates.txt
rename to application/src/test/resources/mmri/3c/calendar_dates.txt
diff --git a/src/test/resources/mmri/3c/routes.txt b/application/src/test/resources/mmri/3c/routes.txt
similarity index 100%
rename from src/test/resources/mmri/3c/routes.txt
rename to application/src/test/resources/mmri/3c/routes.txt
diff --git a/src/test/resources/mmri/3c/stop_times.txt b/application/src/test/resources/mmri/3c/stop_times.txt
similarity index 100%
rename from src/test/resources/mmri/3c/stop_times.txt
rename to application/src/test/resources/mmri/3c/stop_times.txt
diff --git a/src/test/resources/mmri/3c/stops.txt b/application/src/test/resources/mmri/3c/stops.txt
similarity index 100%
rename from src/test/resources/mmri/3c/stops.txt
rename to application/src/test/resources/mmri/3c/stops.txt
diff --git a/src/test/resources/mmri/3c/trips.txt b/application/src/test/resources/mmri/3c/trips.txt
similarity index 100%
rename from src/test/resources/mmri/3c/trips.txt
rename to application/src/test/resources/mmri/3c/trips.txt
diff --git a/src/test/resources/mmri/3d/agency.txt b/application/src/test/resources/mmri/3d/agency.txt
similarity index 100%
rename from src/test/resources/mmri/3d/agency.txt
rename to application/src/test/resources/mmri/3d/agency.txt
diff --git a/src/test/resources/mmri/3d/calendar_dates.txt b/application/src/test/resources/mmri/3d/calendar_dates.txt
similarity index 100%
rename from src/test/resources/mmri/3d/calendar_dates.txt
rename to application/src/test/resources/mmri/3d/calendar_dates.txt
diff --git a/src/test/resources/mmri/3d/routes.txt b/application/src/test/resources/mmri/3d/routes.txt
similarity index 100%
rename from src/test/resources/mmri/3d/routes.txt
rename to application/src/test/resources/mmri/3d/routes.txt
diff --git a/src/test/resources/mmri/3d/stop_times.txt b/application/src/test/resources/mmri/3d/stop_times.txt
similarity index 100%
rename from src/test/resources/mmri/3d/stop_times.txt
rename to application/src/test/resources/mmri/3d/stop_times.txt
diff --git a/src/test/resources/mmri/3d/stops.txt b/application/src/test/resources/mmri/3d/stops.txt
similarity index 100%
rename from src/test/resources/mmri/3d/stops.txt
rename to application/src/test/resources/mmri/3d/stops.txt
diff --git a/src/test/resources/mmri/3d/trips.txt b/application/src/test/resources/mmri/3d/trips.txt
similarity index 100%
rename from src/test/resources/mmri/3d/trips.txt
rename to application/src/test/resources/mmri/3d/trips.txt
diff --git a/src/test/resources/mmri/3e.pb b/application/src/test/resources/mmri/3e.pb
similarity index 100%
rename from src/test/resources/mmri/3e.pb
rename to application/src/test/resources/mmri/3e.pb
diff --git a/src/test/resources/mmri/3e/agency.txt b/application/src/test/resources/mmri/3e/agency.txt
similarity index 100%
rename from src/test/resources/mmri/3e/agency.txt
rename to application/src/test/resources/mmri/3e/agency.txt
diff --git a/src/test/resources/mmri/3e/calendar_dates.txt b/application/src/test/resources/mmri/3e/calendar_dates.txt
similarity index 100%
rename from src/test/resources/mmri/3e/calendar_dates.txt
rename to application/src/test/resources/mmri/3e/calendar_dates.txt
diff --git a/src/test/resources/mmri/3e/routes.txt b/application/src/test/resources/mmri/3e/routes.txt
similarity index 100%
rename from src/test/resources/mmri/3e/routes.txt
rename to application/src/test/resources/mmri/3e/routes.txt
diff --git a/src/test/resources/mmri/3e/stop_times.txt b/application/src/test/resources/mmri/3e/stop_times.txt
similarity index 100%
rename from src/test/resources/mmri/3e/stop_times.txt
rename to application/src/test/resources/mmri/3e/stop_times.txt
diff --git a/src/test/resources/mmri/3e/stops.txt b/application/src/test/resources/mmri/3e/stops.txt
similarity index 100%
rename from src/test/resources/mmri/3e/stops.txt
rename to application/src/test/resources/mmri/3e/stops.txt
diff --git a/src/test/resources/mmri/3e/trips.txt b/application/src/test/resources/mmri/3e/trips.txt
similarity index 100%
rename from src/test/resources/mmri/3e/trips.txt
rename to application/src/test/resources/mmri/3e/trips.txt
diff --git a/src/test/resources/mmri/3g1/agency.txt b/application/src/test/resources/mmri/3g1/agency.txt
similarity index 100%
rename from src/test/resources/mmri/3g1/agency.txt
rename to application/src/test/resources/mmri/3g1/agency.txt
diff --git a/src/test/resources/mmri/3g1/calendar_dates.txt b/application/src/test/resources/mmri/3g1/calendar_dates.txt
similarity index 100%
rename from src/test/resources/mmri/3g1/calendar_dates.txt
rename to application/src/test/resources/mmri/3g1/calendar_dates.txt
diff --git a/src/test/resources/mmri/3g1/routes.txt b/application/src/test/resources/mmri/3g1/routes.txt
similarity index 100%
rename from src/test/resources/mmri/3g1/routes.txt
rename to application/src/test/resources/mmri/3g1/routes.txt
diff --git a/src/test/resources/mmri/3g1/stop_times.txt b/application/src/test/resources/mmri/3g1/stop_times.txt
similarity index 100%
rename from src/test/resources/mmri/3g1/stop_times.txt
rename to application/src/test/resources/mmri/3g1/stop_times.txt
diff --git a/src/test/resources/mmri/3g1/stops.txt b/application/src/test/resources/mmri/3g1/stops.txt
similarity index 100%
rename from src/test/resources/mmri/3g1/stops.txt
rename to application/src/test/resources/mmri/3g1/stops.txt
diff --git a/src/test/resources/mmri/3g1/transfers.txt b/application/src/test/resources/mmri/3g1/transfers.txt
similarity index 100%
rename from src/test/resources/mmri/3g1/transfers.txt
rename to application/src/test/resources/mmri/3g1/transfers.txt
diff --git a/src/test/resources/mmri/3g1/trips.txt b/application/src/test/resources/mmri/3g1/trips.txt
similarity index 100%
rename from src/test/resources/mmri/3g1/trips.txt
rename to application/src/test/resources/mmri/3g1/trips.txt
diff --git a/src/test/resources/mmri/3g2/agency.txt b/application/src/test/resources/mmri/3g2/agency.txt
similarity index 100%
rename from src/test/resources/mmri/3g2/agency.txt
rename to application/src/test/resources/mmri/3g2/agency.txt
diff --git a/src/test/resources/mmri/3g2/calendar_dates.txt b/application/src/test/resources/mmri/3g2/calendar_dates.txt
similarity index 100%
rename from src/test/resources/mmri/3g2/calendar_dates.txt
rename to application/src/test/resources/mmri/3g2/calendar_dates.txt
diff --git a/src/test/resources/mmri/3g2/routes.txt b/application/src/test/resources/mmri/3g2/routes.txt
similarity index 100%
rename from src/test/resources/mmri/3g2/routes.txt
rename to application/src/test/resources/mmri/3g2/routes.txt
diff --git a/src/test/resources/mmri/3g2/stop_times.txt b/application/src/test/resources/mmri/3g2/stop_times.txt
similarity index 100%
rename from src/test/resources/mmri/3g2/stop_times.txt
rename to application/src/test/resources/mmri/3g2/stop_times.txt
diff --git a/src/test/resources/mmri/3g2/stops.txt b/application/src/test/resources/mmri/3g2/stops.txt
similarity index 100%
rename from src/test/resources/mmri/3g2/stops.txt
rename to application/src/test/resources/mmri/3g2/stops.txt
diff --git a/src/test/resources/mmri/3g2/transfers.txt b/application/src/test/resources/mmri/3g2/transfers.txt
similarity index 100%
rename from src/test/resources/mmri/3g2/transfers.txt
rename to application/src/test/resources/mmri/3g2/transfers.txt
diff --git a/src/test/resources/mmri/3g2/trips.txt b/application/src/test/resources/mmri/3g2/trips.txt
similarity index 100%
rename from src/test/resources/mmri/3g2/trips.txt
rename to application/src/test/resources/mmri/3g2/trips.txt
diff --git a/src/test/resources/netex/epip/build-config.json b/application/src/test/resources/netex/epip/build-config.json
similarity index 100%
rename from src/test/resources/netex/epip/build-config.json
rename to application/src/test/resources/netex/epip/build-config.json
diff --git a/src/test/resources/netex/epip/netex_epip_minimal/NX-PI-01_DE_NAP_LINE_HHA-B-HHA-B-X86_20230203.xml b/application/src/test/resources/netex/epip/netex_epip_minimal/NX-PI-01_DE_NAP_LINE_HHA-B-HHA-B-X86_20230203.xml
similarity index 100%
rename from src/test/resources/netex/epip/netex_epip_minimal/NX-PI-01_DE_NAP_LINE_HHA-B-HHA-B-X86_20230203.xml
rename to application/src/test/resources/netex/epip/netex_epip_minimal/NX-PI-01_DE_NAP_LINE_HHA-B-HHA-B-X86_20230203.xml
diff --git a/src/test/resources/netex/epip/netex_epip_minimal/NX-PI-01_DE_NAP_LINE_VHH-VHH-688_20230203.xml b/application/src/test/resources/netex/epip/netex_epip_minimal/NX-PI-01_DE_NAP_LINE_VHH-VHH-688_20230203.xml
similarity index 100%
rename from src/test/resources/netex/epip/netex_epip_minimal/NX-PI-01_DE_NAP_LINE_VHH-VHH-688_20230203.xml
rename to application/src/test/resources/netex/epip/netex_epip_minimal/NX-PI-01_DE_NAP_LINE_VHH-VHH-688_20230203.xml
diff --git a/src/test/resources/netex/nordic/build-config.json b/application/src/test/resources/netex/nordic/build-config.json
similarity index 100%
rename from src/test/resources/netex/nordic/build-config.json
rename to application/src/test/resources/netex/nordic/build-config.json
diff --git a/src/test/resources/netex/nordic/netex_minimal.zip b/application/src/test/resources/netex/nordic/netex_minimal.zip
similarity index 100%
rename from src/test/resources/netex/nordic/netex_minimal.zip
rename to application/src/test/resources/netex/nordic/netex_minimal.zip
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/alerts.json b/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/alerts.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/expectations/alerts.json
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/alerts.json
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/feedinfo.json b/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/feedinfo.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/expectations/feedinfo.json
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/feedinfo.json
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/nearest.json b/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/nearest.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/expectations/nearest.json
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/nearest.json
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/patterns.json b/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/patterns.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/expectations/patterns.json
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/patterns.json
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json b/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection-extended.json b/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection-extended.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection-extended.json
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection-extended.json
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection-fares.json b/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection-fares.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection-fares.json
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection-fares.json
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection-stop-positions.json b/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection-stop-positions.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection-stop-positions.json
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection-stop-positions.json
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection-tutorial.json b/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection-tutorial.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection-tutorial.json
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection-tutorial.json
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/rental-vehicle.json b/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/rental-vehicle.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/expectations/rental-vehicle.json
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/rental-vehicle.json
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-extended.json b/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-extended.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-extended.json
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-extended.json
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-tutorial.json b/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-tutorial.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-tutorial.json
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-tutorial.json
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/stops.json b/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/stops.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/expectations/stops.json
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/stops.json
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-parking.json b/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-parking.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-parking.json
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-parking.json
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-rental-station.json b/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-rental-station.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-rental-station.json
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-rental-station.json
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/walk-steps.json b/application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/walk-steps.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/expectations/walk-steps.json
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/walk-steps.json
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/alerts.graphql b/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/alerts.graphql
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/queries/alerts.graphql
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/queries/alerts.graphql
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/feedinfo.graphql b/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/feedinfo.graphql
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/queries/feedinfo.graphql
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/queries/feedinfo.graphql
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/nearest.graphql b/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/nearest.graphql
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/queries/nearest.graphql
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/queries/nearest.graphql
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/patterns.graphql b/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/patterns.graphql
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/queries/patterns.graphql
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/queries/patterns.graphql
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql b/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection-extended.graphql b/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection-extended.graphql
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection-extended.graphql
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection-extended.graphql
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection-fares.graphql b/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection-fares.graphql
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection-fares.graphql
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection-fares.graphql
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection-stop-positions.graphql b/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection-stop-positions.graphql
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection-stop-positions.graphql
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection-stop-positions.graphql
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection-tutorial.graphql b/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection-tutorial.graphql
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection-tutorial.graphql
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection-tutorial.graphql
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/rental-vehicle.graphql b/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/rental-vehicle.graphql
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/queries/rental-vehicle.graphql
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/queries/rental-vehicle.graphql
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql b/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-tutorial.graphql b/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-tutorial.graphql
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-tutorial.graphql
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-tutorial.graphql
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/stops.graphql b/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/stops.graphql
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/queries/stops.graphql
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/queries/stops.graphql
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-parking.graphql b/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-parking.graphql
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-parking.graphql
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-parking.graphql
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-rental-station.graphql b/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-rental-station.graphql
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-rental-station.graphql
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-rental-station.graphql
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/walk-steps.graphql b/application/src/test/resources/org/opentripplanner/apis/gtfs/queries/walk-steps.graphql
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/queries/walk-steps.graphql
rename to application/src/test/resources/org/opentripplanner/apis/gtfs/queries/walk-steps.graphql
diff --git a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json b/application/src/test/resources/org/opentripplanner/apis/vectortiles/style.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/vectortiles/style.json
rename to application/src/test/resources/org/opentripplanner/apis/vectortiles/style.json
diff --git a/src/test/resources/org/opentripplanner/datastore/file/umlaut-cp437.zip b/application/src/test/resources/org/opentripplanner/datastore/file/umlaut-cp437.zip
similarity index 100%
rename from src/test/resources/org/opentripplanner/datastore/file/umlaut-cp437.zip
rename to application/src/test/resources/org/opentripplanner/datastore/file/umlaut-cp437.zip
diff --git a/src/test/resources/org/opentripplanner/datastore/file/umlaut-utf8-no-efs.zip b/application/src/test/resources/org/opentripplanner/datastore/file/umlaut-utf8-no-efs.zip
similarity index 100%
rename from src/test/resources/org/opentripplanner/datastore/file/umlaut-utf8-no-efs.zip
rename to application/src/test/resources/org/opentripplanner/datastore/file/umlaut-utf8-no-efs.zip
diff --git a/src/test/resources/org/opentripplanner/datastore/file/umlaut-utf8.zip b/application/src/test/resources/org/opentripplanner/datastore/file/umlaut-utf8.zip
similarity index 100%
rename from src/test/resources/org/opentripplanner/datastore/file/umlaut-utf8.zip
rename to application/src/test/resources/org/opentripplanner/datastore/file/umlaut-utf8.zip
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/herrenberg-minimal.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/herrenberg-minimal.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/herrenberg-minimal.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/herrenberg-minimal.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/islandpruning/herrenberg-island-prune-nothru.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/islandpruning/herrenberg-island-prune-nothru.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/islandpruning/herrenberg-island-prune-nothru.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/islandpruning/herrenberg-island-prune-nothru.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/islandpruning/isoiiluoto.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/islandpruning/isoiiluoto.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/islandpruning/isoiiluoto.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/islandpruning/isoiiluoto.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/islandpruning/matinkyla-escalator.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/islandpruning/matinkyla-escalator.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/islandpruning/matinkyla-escalator.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/islandpruning/matinkyla-escalator.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/linking/columbus.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/linking/columbus.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/linking/columbus.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/linking/columbus.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/osm/B+R.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/osm/B+R.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/osm/B+R.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/osm/B+R.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/osm/NYC_small.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/osm/NYC_small.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/osm/NYC_small.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/osm/NYC_small.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/osm/P+R.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/osm/P+R.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/osm/P+R.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/osm/P+R.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/osm/accessno-at-end.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/osm/accessno-at-end.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/osm/accessno-at-end.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/osm/accessno-at-end.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/osm/brenner-invalid-relation-reference.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/osm/brenner-invalid-relation-reference.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/osm/brenner-invalid-relation-reference.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/osm/brenner-invalid-relation-reference.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/osm/bridge_construction.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/osm/bridge_construction.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/osm/bridge_construction.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/osm/bridge_construction.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/osm/coincident_pr.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/osm/coincident_pr.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/osm/coincident_pr.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/osm/coincident_pr.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/osm/coincident_pr_dupl.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/osm/coincident_pr_dupl.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/osm/coincident_pr_dupl.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/osm/coincident_pr_dupl.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/osm/coincident_pr_overlap.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/osm/coincident_pr_overlap.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/osm/coincident_pr_overlap.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/osm/coincident_pr_overlap.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/osm/coincident_pr_reverse.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/osm/coincident_pr_reverse.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/osm/coincident_pr_reverse.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/osm/coincident_pr_reverse.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/osm/ehningen-minimal.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/osm/ehningen-minimal.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/osm/ehningen-minimal.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/osm/ehningen-minimal.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/osm/hackett_pr.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/osm/hackett_pr.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/osm/hackett_pr.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/osm/hackett_pr.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/osm/lund-station-sweden.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/osm/lund-station-sweden.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/osm/lund-station-sweden.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/osm/lund-station-sweden.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/osm/map.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/osm/map.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/osm/map.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/osm/map.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/osm/skoyen.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/osm/skoyen.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/osm/skoyen.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/osm/skoyen.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/osm/stopareas.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/osm/stopareas.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/osm/stopareas.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/osm/stopareas.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/osm/usf_area.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/osm/usf_area.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/osm/usf_area.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/osm/usf_area.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/graph_builder/module/osm/wendlingen-bahnhof.osm.pbf b/application/src/test/resources/org/opentripplanner/graph_builder/module/osm/wendlingen-bahnhof.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/graph_builder/module/osm/wendlingen-bahnhof.osm.pbf
rename to application/src/test/resources/org/opentripplanner/graph_builder/module/osm/wendlingen-bahnhof.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/oslo-east-filtered.osm.pbf b/application/src/test/resources/org/opentripplanner/oslo-east-filtered.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/oslo-east-filtered.osm.pbf
rename to application/src/test/resources/org/opentripplanner/oslo-east-filtered.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/street/integration/boeblingen-minimal.osm.pbf b/application/src/test/resources/org/opentripplanner/street/integration/boeblingen-minimal.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/street/integration/boeblingen-minimal.osm.pbf
rename to application/src/test/resources/org/opentripplanner/street/integration/boeblingen-minimal.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/street/integration/deufringen-minimal.osm.pbf b/application/src/test/resources/org/opentripplanner/street/integration/deufringen-minimal.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/street/integration/deufringen-minimal.osm.pbf
rename to application/src/test/resources/org/opentripplanner/street/integration/deufringen-minimal.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/street/integration/herrenberg-barrier-gates.osm.pbf b/application/src/test/resources/org/opentripplanner/street/integration/herrenberg-barrier-gates.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/street/integration/herrenberg-barrier-gates.osm.pbf
rename to application/src/test/resources/org/opentripplanner/street/integration/herrenberg-barrier-gates.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/street/integration/herrenberg-hindenburgstr-under-construction.osm.pbf b/application/src/test/resources/org/opentripplanner/street/integration/herrenberg-hindenburgstr-under-construction.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/street/integration/herrenberg-hindenburgstr-under-construction.osm.pbf
rename to application/src/test/resources/org/opentripplanner/street/integration/herrenberg-hindenburgstr-under-construction.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/street/integration/herrenberg-minimal.osm.pbf b/application/src/test/resources/org/opentripplanner/street/integration/herrenberg-minimal.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/street/integration/herrenberg-minimal.osm.pbf
rename to application/src/test/resources/org/opentripplanner/street/integration/herrenberg-minimal.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/street/integration/roundabout.osm.pbf b/application/src/test/resources/org/opentripplanner/street/integration/roundabout.osm.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/street/integration/roundabout.osm.pbf
rename to application/src/test/resources/org/opentripplanner/street/integration/roundabout.osm.pbf
diff --git a/src/test/resources/org/opentripplanner/street/integration/vvs-bus-751-only.gtfs.zip b/application/src/test/resources/org/opentripplanner/street/integration/vvs-bus-751-only.gtfs.zip
similarity index 100%
rename from src/test/resources/org/opentripplanner/street/integration/vvs-bus-751-only.gtfs.zip
rename to application/src/test/resources/org/opentripplanner/street/integration/vvs-bus-751-only.gtfs.zip
diff --git a/src/test/resources/org/opentripplanner/street/integration/vvs-bus-764-only.gtfs.zip b/application/src/test/resources/org/opentripplanner/street/integration/vvs-bus-764-only.gtfs.zip
similarity index 100%
rename from src/test/resources/org/opentripplanner/street/integration/vvs-bus-764-only.gtfs.zip
rename to application/src/test/resources/org/opentripplanner/street/integration/vvs-bus-764-only.gtfs.zip
diff --git a/src/test/resources/org/opentripplanner/transit/service/kcm_gtfs.zip b/application/src/test/resources/org/opentripplanner/transit/service/kcm_gtfs.zip
similarity index 100%
rename from src/test/resources/org/opentripplanner/transit/service/kcm_gtfs.zip
rename to application/src/test/resources/org/opentripplanner/transit/service/kcm_gtfs.zip
diff --git a/src/test/resources/org/opentripplanner/updater/trip/septa.pbf b/application/src/test/resources/org/opentripplanner/updater/trip/septa.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/updater/trip/septa.pbf
rename to application/src/test/resources/org/opentripplanner/updater/trip/septa.pbf
diff --git a/src/test/resources/org/opentripplanner/updater/vehicle_position/king-county-metro-1.pbf b/application/src/test/resources/org/opentripplanner/updater/vehicle_position/king-county-metro-1.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/updater/vehicle_position/king-county-metro-1.pbf
rename to application/src/test/resources/org/opentripplanner/updater/vehicle_position/king-county-metro-1.pbf
diff --git a/src/test/resources/org/opentripplanner/updater/vehicle_position/king-county-metro-2.pbf b/application/src/test/resources/org/opentripplanner/updater/vehicle_position/king-county-metro-2.pbf
similarity index 100%
rename from src/test/resources/org/opentripplanner/updater/vehicle_position/king-county-metro-2.pbf
rename to application/src/test/resources/org/opentripplanner/updater/vehicle_position/king-county-metro-2.pbf
diff --git a/src/test/resources/portland/build-config.json b/application/src/test/resources/portland/build-config.json
similarity index 100%
rename from src/test/resources/portland/build-config.json
rename to application/src/test/resources/portland/build-config.json
diff --git a/src/test/resources/portland/portland-central-filtered.osm.pbf b/application/src/test/resources/portland/portland-central-filtered.osm.pbf
similarity index 100%
rename from src/test/resources/portland/portland-central-filtered.osm.pbf
rename to application/src/test/resources/portland/portland-central-filtered.osm.pbf
diff --git a/src/test/resources/portland/portland-ned-nodata.tif b/application/src/test/resources/portland/portland-ned-nodata.tif
similarity index 100%
rename from src/test/resources/portland/portland-ned-nodata.tif
rename to application/src/test/resources/portland/portland-ned-nodata.tif
diff --git a/src/test/resources/portland/portland-ned.tif b/application/src/test/resources/portland/portland-ned.tif
similarity index 100%
rename from src/test/resources/portland/portland-ned.tif
rename to application/src/test/resources/portland/portland-ned.tif
diff --git a/src/test/resources/portland/portland-vehicle-rental.csv b/application/src/test/resources/portland/portland-vehicle-rental.csv
similarity index 100%
rename from src/test/resources/portland/portland-vehicle-rental.csv
rename to application/src/test/resources/portland/portland-vehicle-rental.csv
diff --git a/src/test/resources/portland/portland.gtfs.zip b/application/src/test/resources/portland/portland.gtfs.zip
similarity index 100%
rename from src/test/resources/portland/portland.gtfs.zip
rename to application/src/test/resources/portland/portland.gtfs.zip
diff --git a/src/test/resources/portland/router-config.json b/application/src/test/resources/portland/router-config.json
similarity index 100%
rename from src/test/resources/portland/router-config.json
rename to application/src/test/resources/portland/router-config.json
diff --git a/src/test/resources/speedtest/speed-test-config.json b/application/src/test/resources/speedtest/speed-test-config.json
similarity index 100%
rename from src/test/resources/speedtest/speed-test-config.json
rename to application/src/test/resources/speedtest/speed-test-config.json
diff --git a/src/test/resources/speedtest/travelSearch-expected-results-bd.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-bd.csv
similarity index 100%
rename from src/test/resources/speedtest/travelSearch-expected-results-bd.csv
rename to application/src/test/resources/speedtest/travelSearch-expected-results-bd.csv
diff --git a/src/test/resources/speedtest/travelSearch-expected-results-bdr.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-bdr.csv
similarity index 100%
rename from src/test/resources/speedtest/travelSearch-expected-results-bdr.csv
rename to application/src/test/resources/speedtest/travelSearch-expected-results-bdr.csv
diff --git a/src/test/resources/speedtest/travelSearch-expected-results-bt.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-bt.csv
similarity index 100%
rename from src/test/resources/speedtest/travelSearch-expected-results-bt.csv
rename to application/src/test/resources/speedtest/travelSearch-expected-results-bt.csv
diff --git a/src/test/resources/speedtest/travelSearch-expected-results-btr.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-btr.csv
similarity index 100%
rename from src/test/resources/speedtest/travelSearch-expected-results-btr.csv
rename to application/src/test/resources/speedtest/travelSearch-expected-results-btr.csv
diff --git a/src/test/resources/speedtest/travelSearch-expected-results-mc.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-mc.csv
similarity index 100%
rename from src/test/resources/speedtest/travelSearch-expected-results-mc.csv
rename to application/src/test/resources/speedtest/travelSearch-expected-results-mc.csv
diff --git a/src/test/resources/speedtest/travelSearch-expected-results-md.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-md.csv
similarity index 100%
rename from src/test/resources/speedtest/travelSearch-expected-results-md.csv
rename to application/src/test/resources/speedtest/travelSearch-expected-results-md.csv
diff --git a/src/test/resources/speedtest/travelSearch-expected-results-rr.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-rr.csv
similarity index 100%
rename from src/test/resources/speedtest/travelSearch-expected-results-rr.csv
rename to application/src/test/resources/speedtest/travelSearch-expected-results-rr.csv
diff --git a/src/test/resources/speedtest/travelSearch-expected-results-sr.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-sr.csv
similarity index 100%
rename from src/test/resources/speedtest/travelSearch-expected-results-sr.csv
rename to application/src/test/resources/speedtest/travelSearch-expected-results-sr.csv
diff --git a/src/test/resources/speedtest/travelSearch-expected-results-srr.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-srr.csv
similarity index 100%
rename from src/test/resources/speedtest/travelSearch-expected-results-srr.csv
rename to application/src/test/resources/speedtest/travelSearch-expected-results-srr.csv
diff --git a/src/test/resources/speedtest/travelSearch-expected-results-tb.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-tb.csv
similarity index 100%
rename from src/test/resources/speedtest/travelSearch-expected-results-tb.csv
rename to application/src/test/resources/speedtest/travelSearch-expected-results-tb.csv
diff --git a/src/test/resources/speedtest/travelSearch-expected-results-td.csv b/application/src/test/resources/speedtest/travelSearch-expected-results-td.csv
similarity index 100%
rename from src/test/resources/speedtest/travelSearch-expected-results-td.csv
rename to application/src/test/resources/speedtest/travelSearch-expected-results-td.csv
diff --git a/src/test/resources/speedtest/travelSearch-results.csv b/application/src/test/resources/speedtest/travelSearch-results.csv
similarity index 100%
rename from src/test/resources/speedtest/travelSearch-results.csv
rename to application/src/test/resources/speedtest/travelSearch-results.csv
diff --git a/src/test/resources/speedtest/travelSearch.csv b/application/src/test/resources/speedtest/travelSearch.csv
similarity index 100%
rename from src/test/resources/speedtest/travelSearch.csv
rename to application/src/test/resources/speedtest/travelSearch.csv
diff --git a/src/test/resources/standalone/config/build-config.json b/application/src/test/resources/standalone/config/build-config.json
similarity index 100%
rename from src/test/resources/standalone/config/build-config.json
rename to application/src/test/resources/standalone/config/build-config.json
diff --git a/src/test/resources/standalone/config/invalid-config.json b/application/src/test/resources/standalone/config/invalid-config.json
similarity index 100%
rename from src/test/resources/standalone/config/invalid-config.json
rename to application/src/test/resources/standalone/config/invalid-config.json
diff --git a/src/test/resources/standalone/config/netex-tutorial/build-config.json b/application/src/test/resources/standalone/config/netex-tutorial/build-config.json
similarity index 100%
rename from src/test/resources/standalone/config/netex-tutorial/build-config.json
rename to application/src/test/resources/standalone/config/netex-tutorial/build-config.json
diff --git a/src/test/resources/standalone/config/netex-tutorial/router-config.json b/application/src/test/resources/standalone/config/netex-tutorial/router-config.json
similarity index 100%
rename from src/test/resources/standalone/config/netex-tutorial/router-config.json
rename to application/src/test/resources/standalone/config/netex-tutorial/router-config.json
diff --git a/src/test/resources/standalone/config/router-config.json b/application/src/test/resources/standalone/config/router-config.json
similarity index 100%
rename from src/test/resources/standalone/config/router-config.json
rename to application/src/test/resources/standalone/config/router-config.json
diff --git a/src/test/resources/standalone/config/sandbox/build-config-data-overlay.json b/application/src/test/resources/standalone/config/sandbox/build-config-data-overlay.json
similarity index 100%
rename from src/test/resources/standalone/config/sandbox/build-config-data-overlay.json
rename to application/src/test/resources/standalone/config/sandbox/build-config-data-overlay.json
diff --git a/magidoc.mjs b/magidoc.mjs
index dc6bac815ba..d43945f976c 100644
--- a/magidoc.mjs
+++ b/magidoc.mjs
@@ -1,7 +1,7 @@
 export default {
   introspection: {
     type: 'sdl',
-    paths: ['src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls'],
+    paths: ['application/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls'],
   },
   website: {
     template: 'carbon-multi-page',
diff --git a/pom.xml b/pom.xml
index 4bc3110c397..34a76961872 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.opentripplanner</groupId>
+    <artifactId>otp-root</artifactId>
+    <version>2.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-    <name>OpenTripPlanner</name>
+    <name>OpenTripPlanner - Root</name>
     <description>The OpenTripPlanner multimodal journey planning system</description>
     <url>https://opentripplanner.org</url>
-    <groupId>org.opentripplanner</groupId>
-    <artifactId>otp</artifactId>
-    <version>2.7.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
 
     <licenses>
         <license>
@@ -80,7 +82,7 @@
         <argLine/>
         <plugin.prettier.version>0.22</plugin.prettier.version>
         <plugin.prettier.goal>write</plugin.prettier.goal>
-
+        <plugin.prettier.skip>false</plugin.prettier.skip>
     </properties>
 
     <distributionManagement>
@@ -91,43 +93,11 @@
         </repository>
     </distributionManagement>
 
+    <modules>
+        <module>application</module>
+    </modules>
+
     <build>
-        <!--
-        Filtering will perform substitution on otp-project-info.properties,
-        see git commit id plugin below.
-        -->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-            <resource>
-                <directory>src/ext/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-            <resource>
-                <directory>src/client</directory>
-                <targetPath>client</targetPath>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-            <testResource>
-                <directory>src/ext-test/resources</directory>
-            </testResource>
-            <testResource>
-                <!-- Shell scripts to start up OTP, need to be filtered to insert the JAR file name. -->
-                <!-- These are treated as testResources rather than resources to keep them out of the JAR. -->
-                <!-- The staging repo will reject a JAR containing them as they use traversal paths (../..). -->
-                <directory>src/scripts</directory>
-                <filtering>true</filtering>
-                <!-- Copy the scripts up into the root of the repo, not /target/classes -->
-                <targetPath>../..</targetPath>
-            </testResource>
-        </testResources>
         <extensions>
             <!-- makes build variables like os.detected.classifier available.
                  use to select the correct protoc instance for the OS.
@@ -174,7 +144,9 @@
                         <!-- OTP includes an empty javadoc.jar file. See doc/javadoc/README.md -->
                         <id>package-javadoc</id>
                         <phase>package</phase>
-                        <goals><goal>jar</goal></goals>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
                         <configuration>
                             <classesDirectory>${basedir}/doc/javadoc</classesDirectory>
                             <classifier>javadoc</classifier>
@@ -206,39 +178,6 @@
                     <propertiesEncoding>UTF-8</propertiesEncoding>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.6.0</version>
-                <executions>
-                    <execution>
-                        <id>build-helper-generate-sources</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/main/java</source>
-                                <source>src/ext/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>build-helper-generate-test-sources</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/test/java</source>
-                                <source>src/ext-test/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -344,91 +283,16 @@
                 </configuration>
             </plugin>
 
-            <!-- There used to be a dependency-plugin:copy-dependencies plugin entry
-              here, but the shade-plugin will explode the dependencies even if they aren't
-              manually copied in. -->
-            <plugin>
-                <!-- We want to create a standalone jar that can be run on the command
-                  line. Java does not really allow this - you cannot place jars inside of jars.
-                  You must either provide all the dependency jars to the user (usually lib/
-                  under the directory containing the runnable jar) or explode all the jars
-                  and repackage them into a single jar. The problem is that while class files
-                  are nicely organized into the package namespace and should not collide, the
-                  META-INF directories of the jars will collide. Maven's standard assembly
-                  plugin does not account for this and will just clobber metadata. This then
-                  causes runtime errors, particularly with Spring. Instead, we use the shade
-                  plugin which has transformers that will for example append files of the same
-                  name rather than overwrite them in the combined JAR. NB: Don't use a version
-                  of the shade plugin older than 1.3.2, as it fixed MSHADE-76 (files not merged
-                  properly if some input files are missing a terminating newline) -->
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.0</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <filters>
-                                <filter>
-                                    <!-- exclude signatures from merged JAR to avoid invalid signature messages -->
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <!-- The shaded JAR will not be the main artifact for the project, it will be attached
-                              for deployment in the way source and docs are. -->
-                            <shadedArtifactAttached>true</shadedArtifactAttached>
-                            <shadedClassifierName>shaded</shadedClassifierName>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <!-- MinimizeJar removes unused classes, (classes not imported explicitly by name).
-                              We have eliminated most Jersey auto-scanning, but there is still some need for include
-                              filters to force-include classes that are dynamically loaded by name/auto-scanned. -->
-                            <!-- This roughly halves the size of the OTP JAR, bringing it down to around 20 MB.
-                              <minimizeJar>true</minimizeJar>
-                              <filters> <filter> <artifact>com.sun.jersey:*</artifact> <includes> <include>**</include>
-                              </includes> </filter> <filter> <artifact>org.opentripplanner:*</artifact>
-                              <includes> <include>**</include> </includes> </filter> </filters> -->
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <manifestEntries>
-                                        <Main-Class>org.opentripplanner.standalone.OTPMain</Main-Class>
-                                        <!-- The ImageIO lines allow some image reader plugins to work
-                                             https://stackoverflow.com/questions/7051603/jai-vendorname-null#18495658 -->
-                                        <Specification-Title>Java Advanced Imaging Image I/O
-                                            Tools
-                                        </Specification-Title>
-                                        <Specification-Version>1.1</Specification-Version>
-                                        <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
-                                        <Implementation-Title>com.sun.media.imageio</Implementation-Title>
-                                        <Implementation-Version>1.1</Implementation-Version>
-                                        <Implementation-Vendor>Sun Microsystems, Inc.</Implementation-Vendor>
-                                        <Extension-Name>com.sun.media.imageio</Extension-Name>
-                                    </manifestEntries>
-                                </transformer>
-                            </transformers>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>com.hubspot.maven.plugins</groupId>
                 <artifactId>prettier-maven-plugin</artifactId>
                 <version>${plugin.prettier.version}</version>
                 <configuration>
+                    <skip>${plugin.prettier.skip}</skip>
                     <prettierJavaVersion>2.0.0</prettierJavaVersion>
                     <inputGlobs>
                         <inputGlob>src/main/java/**/*.java</inputGlob>
                         <inputGlob>src/test/java/**/*.java</inputGlob>
-                        <inputGlob>src/ext/java/**/*.java</inputGlob>
-                        <inputGlob>src/ext-test/java/**/*.java</inputGlob>
                         <inputGlob>src/test/resources/org/opentripplanner/apis/**/*.graphql</inputGlob>
                     </inputGlobs>
                 </configuration>
@@ -440,7 +304,6 @@
                         </goals>
                     </execution>
                 </executions>
-
             </plugin>
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
@@ -524,9 +387,9 @@
           Maven tries to download from every other repository and fails before checking central.
           Do not change the id from central2 to central, otherwise the entry will be ignored. -->
         <repository>
-          <id>central2</id>
-          <name>Check central first to avoid a lot of not found warnings</name>
-          <url>https://repo.maven.apache.org/maven2</url>
+            <id>central2</id>
+            <name>Check central first to avoid a lot of not found warnings</name>
+            <url>https://repo.maven.apache.org/maven2</url>
         </repository>
         <repository>
             <id>osgeo</id>
@@ -546,376 +409,97 @@
                 <scope>import</scope>
             </dependency>
 
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <!-- Logging API -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-        <!-- Jersey uses java.util logging, redirect it to slf4j API (we use the Logback implementation) -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jul-to-slf4j</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-        <!-- Logging library, implements slf4j logging API -->
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
-        </dependency>
-        <!-- JSON-formatted logging -->
-        <dependency>
-            <groupId>net.logstash.logback</groupId>
-            <artifactId>logstash-logback-encoder</artifactId>
-            <version>8.0</version>
-        </dependency>
-
-        <!-- dependency injection -->
-        <dependency>
-            <groupId>com.google.dagger</groupId>
-            <artifactId>dagger</artifactId>
-            <version>${google.dagger.version}</version>
-        </dependency>
-
-        <!-- GEOTOOLS AND JTS TOPOLOGY: geometry, rasters and projections. -->
-        <!-- GEOTOOLS includes JTS as a transitive dependency. -->
-
-        <dependency>
-            <groupId>org.geotools</groupId>
-            <artifactId>gt-coverage</artifactId>
-            <version>${geotools.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.geotools</groupId>
-            <artifactId>gt-geotiff</artifactId>
-            <version>${geotools.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.geotools</groupId>
-            <artifactId>gt-api</artifactId>
-            <version>${geotools.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.geotools</groupId>
-            <artifactId>gt-geojson-core</artifactId>
-            <version>${geotools.version}</version>
-        </dependency>
-
-        <!-- Lucene is used by the Debug Client Geocode API -->
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-core</artifactId>
-            <version>${lucene.version}</version>
-        </dependency>
-        <dependency>
-             <groupId>org.apache.lucene</groupId>
-             <artifactId>lucene-queryparser</artifactId>
-             <version>${lucene.version}</version>
-        </dependency>
-        <dependency>
-             <groupId>org.apache.lucene</groupId>
-             <artifactId>lucene-suggest</artifactId>
-             <version>${lucene.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-registry-prometheus</artifactId>
-            <version>${micrometer.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-registry-influx</artifactId>
-            <version>${micrometer.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- netcdf4 -->
-
-        <dependency>
-            <groupId>edu.ucar</groupId>
-            <artifactId>netcdf4</artifactId>
-            <version>${netcdf4.version}</version>
-        </dependency>
-        <!--
-            Netex XML document - JAXB generated Java model.
-            This is generated using the official Netex schema(v1.0) and support the entire model,
-            not just the Nordic/Norwegian profile which is currently supported by OTP.
-         -->
-        <dependency>
-            <groupId>org.entur</groupId>
-            <artifactId>netex-java-model</artifactId>
-            <version>${netex-java-model.version}</version>
-        </dependency>
-
-        <!-- SIRI -->
-        <dependency>
-            <groupId>org.entur</groupId>
-            <artifactId>siri-java-model</artifactId>
-            <version>${siri-java-model.version}</version>
-        </dependency>
-
-        <!-- XML <-> protobuf-mapper for SIRI-->
-        <dependency>
-            <groupId>org.entur</groupId>
-            <artifactId>siri-protobuf-mapper</artifactId>
-            <version>1.0.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mobilitydata</groupId>
-            <artifactId>gbfs-java-model</artifactId>
-            <version>1.0.7</version>
-        </dependency>
-
-        <!-- TESTING -->
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.truth</groupId>
-            <artifactId>truth</artifactId>
-            <version>1.4.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.tngtech.archunit</groupId>
-            <artifactId>archunit</artifactId>
-            <version>1.3.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>5.13.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.github.origin-energy</groupId>
-            <artifactId>java-snapshot-testing-junit5</artifactId>
-            <version>2.3.0</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- Provides some shared serializers for Kryo. Introduces transitive dependencies on Trove, and Kryo. -->
-        <!-- Also provides classes for testing that a round trip through serialization reproduces the same network. -->
-        <dependency>
-            <groupId>com.conveyal</groupId>
-            <artifactId>kryo-tools</artifactId>
-            <version>1.6.0</version>
-        </dependency>
-        <!-- kryo serializers for Guava types !-->
-        <dependency>
-            <groupId>de.javakaffee</groupId>
-            <artifactId>kryo-serializers</artifactId>
-            <version>0.45</version>
-        </dependency>
-        <!-- Direct dependency with -jre version, in order to not resolve to the limited -android version -->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>33.2.1-jre</version>
-        </dependency>
-        <!-- Jersey annotation-driven REST web services (JAX-RS implementation) -->
-        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-server</artifactId>
-            <version>${jersey.version}</version>
-        </dependency>
-        <!-- Deploy Jersey apps in stand-alone Grizzly server instead of a servlet container. -->
-        <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <artifactId>jersey-container-grizzly2-http</artifactId>
-            <version>${jersey.version}</version>
-        </dependency>
-        <!-- Jackson modules to serialize Jersey response objects to JSON. -->
-        <dependency>
-            <groupId>org.glassfish.jersey.media</groupId>
-            <artifactId>jersey-media-json-jackson</artifactId>
-            <version>${jersey.version}</version>
-        </dependency>
-        <!-- HK2 dependency injection framework for injecting context -->
-        <dependency>
-            <groupId>org.glassfish.jersey.inject</groupId>
-            <artifactId>jersey-hk2</artifactId>
-            <version>${jersey.version}</version>
-        </dependency>
-
-        <!-- JAXB API Implementation no longer supplied with Java 11+ -->
-        <dependency>
-            <groupId>org.glassfish.jaxb</groupId>
-            <artifactId>jaxb-runtime</artifactId>
-            <version>${jaxb-runtime.version}</version>
-        </dependency>
-
-        <!-- Jackson modules. -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jdk8</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <!--
-            jersey pulls in older versions of this dependency which are binary-incompatible
-            with the latest jackson version, so we need to explicitly define them here
-         -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-
-        <!--
-          Google library imports
-          The version is imported using google libraries-bom, see dep.management
-        -->
+            <!-- Logging API -->
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
 
-        <!-- Google Cloud Storage - as OTP DataSource -->
-        <dependency>
-            <groupId>com.google.cloud</groupId>
-            <artifactId>google-cloud-storage</artifactId>
-        </dependency>
+            <dependency>
+                <!--
+                 This is implicitly used in the current OTP codebase. Should be disallowed and
+                 replaced with the standard annotation JARs. Leaving this for now to reduce number
+                 of changes.
+                -->
+                <groupId>com.google.code.findbugs</groupId>
+                <artifactId>jsr305</artifactId>
+                <version>3.0.2</version>
+            </dependency>
+            <dependency>
+                <groupId>net.sf.trove4j</groupId>
+                <artifactId>trove4j</artifactId>
+                <version>3.0.3</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>33.2.1-jre</version>
+            </dependency>
 
-        <!-- Google Cloud Pubsub for SIRI-updater-->
-        <dependency>
-            <groupId>com.google.cloud</groupId>
-            <artifactId>google-cloud-pubsub</artifactId>
-        </dependency>
+            <!-- GEOTOOLS AND JTS TOPOLOGY: geometry, rasters and projections. -->
+            <!-- GEOTOOLS includes JTS as a transitive dependency. -->
+            <dependency>
+                <groupId>org.geotools</groupId>
+                <artifactId>gt-coverage</artifactId>
+                <version>${geotools.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.geotools</groupId>
+                <artifactId>gt-geotiff</artifactId>
+                <version>${geotools.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.geotools</groupId>
+                <artifactId>gt-api</artifactId>
+                <version>${geotools.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.geotools</groupId>
+                <artifactId>gt-geojson-core</artifactId>
+                <version>${geotools.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>de.grundid.opendatalab</groupId>
+                <artifactId>geojson-jackson</artifactId>
+                <version>1.14</version>
+            </dependency>
 
-        <!-- Google Protocol Buffers compact binary serialization format -->
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-        </dependency>
+            <!-- Testing -->
 
-        <!-- OBA GTFS loader -->
-        <dependency>
-            <groupId>org.onebusaway</groupId>
-            <artifactId>onebusaway-gtfs</artifactId>
-            <version>3.2.4</version>
-        </dependency>
-        <!-- Processing is used for the debug GUI (though we could probably use just Java2D) -->
-        <dependency>
-            <groupId>org.processing</groupId>
-            <artifactId>core</artifactId>
-            <version>2.2.1</version>
-        </dependency>
-        <!-- Used in DegreeGridNEDTileSource to fetch tiles from Amazon S3 -->
-        <dependency>
-            <groupId>net.java.dev.jets3t</groupId>
-            <artifactId>jets3t</artifactId>
-            <version>0.9.4</version>
-        </dependency>
-        <!-- OpenStreetMap protobuf (PBF) definitions and parser -->
-        <dependency>
-            <groupId>org.openstreetmap.osmosis</groupId>
-            <artifactId>osmosis-osm-binary</artifactId>
-            <version>0.48.3</version>
-        </dependency>
-        <!-- Command line parameter parsing -->
-        <dependency>
-            <groupId>com.beust</groupId>
-            <artifactId>jcommander</artifactId>
-            <version>1.82</version>
-        </dependency>
-        <dependency>
-            <groupId>com.graphql-java</groupId>
-            <artifactId>graphql-java</artifactId>
-            <version>22.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.graphql-java</groupId>
-            <artifactId>graphql-java-extended-scalars</artifactId>
-            <version>22.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents.client5</groupId>
-            <artifactId>httpclient5</artifactId>
-            <version>5.4</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.5.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.sourceforge.javacsv</groupId>
-            <artifactId>javacsv</artifactId>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.paho</groupId>
-            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-            <version>1.2.5</version>
-        </dependency>
-        <dependency>
-            <groupId>io.github.ci-cmg</groupId>
-            <artifactId>mapbox-vector-tile</artifactId>
-            <version>4.0.6</version>
-        </dependency>
-        <dependency>
-            <groupId>net.objecthunter</groupId>
-            <artifactId>exp4j</artifactId>
-            <version>0.4.8</version>
-        </dependency>
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-core</artifactId>
-            <version>1.46.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-messaging-servicebus</artifactId>
-            <version>7.15.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-identity</artifactId>
-            <version>1.11.2</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.poole</groupId>
-            <artifactId>OpeningHoursParser</artifactId>
-            <version>0.28.2</version>
-        </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-api</artifactId>
+                <version>${junit.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-params</artifactId>
+                <version>${junit.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.truth</groupId>
+                <artifactId>truth</artifactId>
+                <version>1.4.4</version>
+            </dependency>
+            <dependency>
+                <groupId>com.tngtech.archunit</groupId>
+                <artifactId>archunit</artifactId>
+                <version>1.3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>5.13.0</version>
+            </dependency>
+            <dependency>
+                <groupId>io.github.origin-energy</groupId>
+                <artifactId>java-snapshot-testing-junit5</artifactId>
+                <version>2.3.0</version>
+            </dependency>
 
-        <!-- create zip test files-->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
-            <version>1.27.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+        </dependencies>
+    </dependencyManagement>
 
     <profiles>
         <profile>
@@ -938,18 +522,9 @@
                     <value/>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.hubspot.maven.plugins</groupId>
-                        <artifactId>prettier-maven-plugin</artifactId>
-                        <version>${plugin.prettier.version}</version>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
+            <properties>
+                <plugin.prettier.skip>true</plugin.prettier.skip>
+            </properties>
         </profile>
         <profile>
             <id>clean-test-snapshots</id>
diff --git a/src/scripts/otp b/script/otp
similarity index 100%
rename from src/scripts/otp
rename to script/otp
diff --git a/src/scripts/otp-ui b/script/otp-ui
similarity index 100%
rename from src/scripts/otp-ui
rename to script/otp-ui