diff --git a/src/main/java/de/schildbach/pte/service/ConnectionController.java b/src/main/java/de/schildbach/pte/service/ConnectionController.java
new file mode 100644
index 00000000..ba43dbf7
--- /dev/null
+++ b/src/main/java/de/schildbach/pte/service/ConnectionController.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2012 the original author or authors.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.schildbach.pte.service;
+
+import java.io.IOException;
+import java.util.Date;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import de.schildbach.pte.NetworkProvider.Accessibility;
+import de.schildbach.pte.NetworkProvider.WalkSpeed;
+import de.schildbach.pte.RtProvider;
+import de.schildbach.pte.dto.Location;
+import de.schildbach.pte.dto.LocationType;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+
+/**
+ * @author Andreas Schildbach
+ */
+@Controller
+public class ConnectionController
+{
+	private final RtProvider provider = new RtProvider();
+
+	@RequestMapping(value = "/connection", method = RequestMethod.GET)
+	@ResponseBody
+	public QueryConnectionsResult connection(@RequestParam(value = "fromType", required = false, defaultValue = "ANY") final LocationType fromType,
+			@RequestParam(value = "from", required = false) final String from,
+			@RequestParam(value = "fromId", required = false, defaultValue = "0") final int fromId,
+			@RequestParam(value = "toType", required = false, defaultValue = "ANY") final LocationType toType,
+			@RequestParam(value = "to", required = false) final String to,
+			@RequestParam(value = "toId", required = false, defaultValue = "0") final int toId) throws IOException
+	{
+		final Location fromLocation = new Location(fromType, fromId, null, from);
+		final Location toLocation = new Location(toType, toId, null, to);
+		final String products = "IRSUTBFC";
+		return provider.queryConnections(fromLocation, null, toLocation, new Date(), true, products, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
+	}
+}
diff --git a/src/main/java/de/schildbach/pte/service/LocationController.java b/src/main/java/de/schildbach/pte/service/LocationController.java
index 3cedb302..889e508a 100644
--- a/src/main/java/de/schildbach/pte/service/LocationController.java
+++ b/src/main/java/de/schildbach/pte/service/LocationController.java
@@ -18,7 +18,6 @@
 package de.schildbach.pte.service;
 
 import java.io.IOException;
-import java.util.Date;
 import java.util.List;
 
 import org.springframework.stereotype.Controller;
@@ -27,13 +26,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import de.schildbach.pte.NetworkProvider.Accessibility;
-import de.schildbach.pte.NetworkProvider.WalkSpeed;
 import de.schildbach.pte.RtProvider;
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
-import de.schildbach.pte.dto.QueryConnectionsResult;
 
 /**
  * @author Andreas Schildbach
@@ -57,19 +53,4 @@ public class LocationController
 		final Location location = new Location(LocationType.ANY, lat, lon);
 		return provider.queryNearbyStations(location, 5000, 100);
 	}
-
-	@RequestMapping(value = "/connection", method = RequestMethod.GET)
-	@ResponseBody
-	public QueryConnectionsResult connection(@RequestParam(value = "fromType", required = false, defaultValue = "ANY") final LocationType fromType,
-			@RequestParam(value = "from", required = false) final String from,
-			@RequestParam(value = "fromId", required = false, defaultValue = "0") final int fromId,
-			@RequestParam(value = "toType", required = false, defaultValue = "ANY") final LocationType toType,
-			@RequestParam(value = "to", required = false) final String to,
-			@RequestParam(value = "toId", required = false, defaultValue = "0") final int toId) throws IOException
-	{
-		final Location fromLocation = new Location(fromType, fromId, null, from);
-		final Location toLocation = new Location(toType, toId, null, to);
-		final String products = "IRSUTBFC";
-		return provider.queryConnections(fromLocation, null, toLocation, new Date(), true, products, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
-	}
 }