diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java
index fafb352e..1de119d0 100644
--- a/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -32,7 +32,13 @@ import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
 
-import de.schildbach.pte.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
+import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.util.Color;
+import de.schildbach.pte.util.ParserUtils;
 import de.schildbach.pte.util.XmlPullUtil;
 
 /**
diff --git a/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java
index 5028feda..e1c6acd4 100644
--- a/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/src/de/schildbach/pte/AbstractHafasProvider.java
@@ -25,6 +25,10 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import de.schildbach.pte.dto.Station;
+import de.schildbach.pte.util.Color;
+import de.schildbach.pte.util.ParserUtils;
+
 /**
  * @author Andreas Schildbach
  */
diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java
index 045a4ea8..65438d08 100644
--- a/src/de/schildbach/pte/BahnProvider.java
+++ b/src/de/schildbach/pte/BahnProvider.java
@@ -30,6 +30,17 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Connection;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.util.Color;
+import de.schildbach.pte.util.ParserUtils;
+
 /**
  * @author Andreas Schildbach
  */
diff --git a/src/de/schildbach/pte/GvhProvider.java b/src/de/schildbach/pte/GvhProvider.java
index de4ad832..54c894ea 100644
--- a/src/de/schildbach/pte/GvhProvider.java
+++ b/src/de/schildbach/pte/GvhProvider.java
@@ -20,6 +20,11 @@ package de.schildbach.pte;
 import java.io.IOException;
 import java.util.Date;
 
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.util.ParserUtils;
+
 /**
  * @author Andreas Schildbach
  */
diff --git a/src/de/schildbach/pte/LinzProvider.java b/src/de/schildbach/pte/LinzProvider.java
index 860391e6..05fc5b6d 100644
--- a/src/de/schildbach/pte/LinzProvider.java
+++ b/src/de/schildbach/pte/LinzProvider.java
@@ -20,6 +20,11 @@ package de.schildbach.pte;
 import java.io.IOException;
 import java.util.Date;
 
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.util.ParserUtils;
+
 /**
  * @author Andreas Schildbach
  */
diff --git a/src/de/schildbach/pte/MvvProvider.java b/src/de/schildbach/pte/MvvProvider.java
index 083c6777..bc8bf1d8 100644
--- a/src/de/schildbach/pte/MvvProvider.java
+++ b/src/de/schildbach/pte/MvvProvider.java
@@ -30,6 +30,16 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Connection;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.Station;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.exception.SessionExpiredException;
+import de.schildbach.pte.util.Color;
+import de.schildbach.pte.util.ParserUtils;
+
 /**
  * @author Andreas Schildbach
  */
diff --git a/src/de/schildbach/pte/NasaProvider.java b/src/de/schildbach/pte/NasaProvider.java
index 732ffc64..5893cb36 100644
--- a/src/de/schildbach/pte/NasaProvider.java
+++ b/src/de/schildbach/pte/NasaProvider.java
@@ -28,7 +28,14 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import de.schildbach.pte.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.util.ParserUtils;
 
 /**
  * @author Andreas Schildbach
diff --git a/src/de/schildbach/pte/NetworkProvider.java b/src/de/schildbach/pte/NetworkProvider.java
index 49c07c3b..26fca74e 100644
--- a/src/de/schildbach/pte/NetworkProvider.java
+++ b/src/de/schildbach/pte/NetworkProvider.java
@@ -21,6 +21,13 @@ import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
+import de.schildbach.pte.dto.StationLocationResult;
+
 /**
  * Interface to be implemented by providers of transportation networks
  * 
diff --git a/src/de/schildbach/pte/OebbProvider.java b/src/de/schildbach/pte/OebbProvider.java
index 805544ea..0e00c794 100644
--- a/src/de/schildbach/pte/OebbProvider.java
+++ b/src/de/schildbach/pte/OebbProvider.java
@@ -32,7 +32,16 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import de.schildbach.pte.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Connection;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.exception.SessionExpiredException;
+import de.schildbach.pte.util.ParserUtils;
 
 public class OebbProvider extends AbstractHafasProvider
 {
diff --git a/src/de/schildbach/pte/RmvProvider.java b/src/de/schildbach/pte/RmvProvider.java
index 74e08489..12d45d11 100644
--- a/src/de/schildbach/pte/RmvProvider.java
+++ b/src/de/schildbach/pte/RmvProvider.java
@@ -30,7 +30,16 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import de.schildbach.pte.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Connection;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.util.ParserUtils;
 
 /**
  * @author Andreas Schildbach
diff --git a/src/de/schildbach/pte/SbbProvider.java b/src/de/schildbach/pte/SbbProvider.java
index 7255f405..e1676a2e 100644
--- a/src/de/schildbach/pte/SbbProvider.java
+++ b/src/de/schildbach/pte/SbbProvider.java
@@ -28,7 +28,15 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import de.schildbach.pte.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Connection;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.util.ParserUtils;
 
 /**
  * @author Andreas Schildbach
diff --git a/src/de/schildbach/pte/SncbProvider.java b/src/de/schildbach/pte/SncbProvider.java
index 3ede1495..f395ace4 100644
--- a/src/de/schildbach/pte/SncbProvider.java
+++ b/src/de/schildbach/pte/SncbProvider.java
@@ -26,7 +26,14 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import de.schildbach.pte.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.util.ParserUtils;
 
 /**
  * @author Andreas Schildbach
diff --git a/src/de/schildbach/pte/StandardColors.java b/src/de/schildbach/pte/StandardColors.java
index 6c39d184..d6b9856b 100644
--- a/src/de/schildbach/pte/StandardColors.java
+++ b/src/de/schildbach/pte/StandardColors.java
@@ -20,6 +20,8 @@ package de.schildbach.pte;
 import java.util.HashMap;
 import java.util.Map;
 
+import de.schildbach.pte.util.Color;
+
 /**
  * @author Andreas Schildbach
  */
diff --git a/src/de/schildbach/pte/TflProvider.java b/src/de/schildbach/pte/TflProvider.java
index c6268b32..3b7109b3 100644
--- a/src/de/schildbach/pte/TflProvider.java
+++ b/src/de/schildbach/pte/TflProvider.java
@@ -26,7 +26,16 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import de.schildbach.pte.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.util.Color;
+import de.schildbach.pte.util.ParserUtils;
 
 /**
  * @author Andreas Schildbach
diff --git a/src/de/schildbach/pte/VbbProvider.java b/src/de/schildbach/pte/VbbProvider.java
index ef381e6c..101deb4b 100644
--- a/src/de/schildbach/pte/VbbProvider.java
+++ b/src/de/schildbach/pte/VbbProvider.java
@@ -31,7 +31,17 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import de.schildbach.pte.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Connection;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.util.Color;
+import de.schildbach.pte.util.ParserUtils;
 
 /**
  * @author Andreas Schildbach
diff --git a/src/de/schildbach/pte/VgsProvider.java b/src/de/schildbach/pte/VgsProvider.java
index d81e325a..220fb3ca 100644
--- a/src/de/schildbach/pte/VgsProvider.java
+++ b/src/de/schildbach/pte/VgsProvider.java
@@ -28,7 +28,14 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import de.schildbach.pte.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.util.ParserUtils;
 
 /**
  * @author Andreas Schildbach
diff --git a/src/de/schildbach/pte/VrnProvider.java b/src/de/schildbach/pte/VrnProvider.java
index 908b9702..512e2ed0 100644
--- a/src/de/schildbach/pte/VrnProvider.java
+++ b/src/de/schildbach/pte/VrnProvider.java
@@ -19,6 +19,10 @@ package de.schildbach.pte;
 import java.io.IOException;
 import java.util.Date;
 
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.StationLocationResult;
+
 /**
  * @author Andreas Schildbach
  */
diff --git a/src/de/schildbach/pte/VrrProvider.java b/src/de/schildbach/pte/VrrProvider.java
index 4b0d75b4..e541aa2f 100644
--- a/src/de/schildbach/pte/VrrProvider.java
+++ b/src/de/schildbach/pte/VrrProvider.java
@@ -19,6 +19,10 @@ package de.schildbach.pte;
 import java.io.IOException;
 import java.util.Date;
 
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.StationLocationResult;
+
 /**
  * @author Andreas Schildbach
  */
diff --git a/src/de/schildbach/pte/Autocomplete.java b/src/de/schildbach/pte/dto/Autocomplete.java
similarity index 97%
rename from src/de/schildbach/pte/Autocomplete.java
rename to src/de/schildbach/pte/dto/Autocomplete.java
index ef7bda39..41d8c417 100644
--- a/src/de/schildbach/pte/Autocomplete.java
+++ b/src/de/schildbach/pte/dto/Autocomplete.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package de.schildbach.pte;
+package de.schildbach.pte.dto;
 
 import de.schildbach.pte.NetworkProvider.LocationType;
 
diff --git a/src/de/schildbach/pte/Connection.java b/src/de/schildbach/pte/dto/Connection.java
similarity index 99%
rename from src/de/schildbach/pte/Connection.java
rename to src/de/schildbach/pte/dto/Connection.java
index ed5cffbd..ee94cb4d 100644
--- a/src/de/schildbach/pte/Connection.java
+++ b/src/de/schildbach/pte/dto/Connection.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.dto;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/src/de/schildbach/pte/Departure.java b/src/de/schildbach/pte/dto/Departure.java
similarity index 99%
rename from src/de/schildbach/pte/Departure.java
rename to src/de/schildbach/pte/dto/Departure.java
index bbe575b8..12e70f50 100644
--- a/src/de/schildbach/pte/Departure.java
+++ b/src/de/schildbach/pte/dto/Departure.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.dto;
 
 import java.util.Date;
 
diff --git a/src/de/schildbach/pte/GetConnectionDetailsResult.java b/src/de/schildbach/pte/dto/GetConnectionDetailsResult.java
similarity index 97%
rename from src/de/schildbach/pte/GetConnectionDetailsResult.java
rename to src/de/schildbach/pte/dto/GetConnectionDetailsResult.java
index 7ff79f61..857648ea 100644
--- a/src/de/schildbach/pte/GetConnectionDetailsResult.java
+++ b/src/de/schildbach/pte/dto/GetConnectionDetailsResult.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.dto;
 
 import java.util.Date;
 
diff --git a/src/de/schildbach/pte/QueryConnectionsResult.java b/src/de/schildbach/pte/dto/QueryConnectionsResult.java
similarity index 99%
rename from src/de/schildbach/pte/QueryConnectionsResult.java
rename to src/de/schildbach/pte/dto/QueryConnectionsResult.java
index d3b06974..8e1a1b19 100644
--- a/src/de/schildbach/pte/QueryConnectionsResult.java
+++ b/src/de/schildbach/pte/dto/QueryConnectionsResult.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.dto;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/src/de/schildbach/pte/QueryDeparturesResult.java b/src/de/schildbach/pte/dto/QueryDeparturesResult.java
similarity index 97%
rename from src/de/schildbach/pte/QueryDeparturesResult.java
rename to src/de/schildbach/pte/dto/QueryDeparturesResult.java
index 632ba7c5..59b97082 100644
--- a/src/de/schildbach/pte/QueryDeparturesResult.java
+++ b/src/de/schildbach/pte/dto/QueryDeparturesResult.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.dto;
 
 import java.util.List;
 
diff --git a/src/de/schildbach/pte/Station.java b/src/de/schildbach/pte/dto/Station.java
similarity index 98%
rename from src/de/schildbach/pte/Station.java
rename to src/de/schildbach/pte/dto/Station.java
index 8ced2de5..d13f1c20 100644
--- a/src/de/schildbach/pte/Station.java
+++ b/src/de/schildbach/pte/dto/Station.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.dto;
 
 /**
  * @author Andreas Schildbach
diff --git a/src/de/schildbach/pte/StationLocationResult.java b/src/de/schildbach/pte/dto/StationLocationResult.java
similarity index 96%
rename from src/de/schildbach/pte/StationLocationResult.java
rename to src/de/schildbach/pte/dto/StationLocationResult.java
index 8861e614..69fd94e0 100644
--- a/src/de/schildbach/pte/StationLocationResult.java
+++ b/src/de/schildbach/pte/dto/StationLocationResult.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.dto;
 
 /**
  * @author Andreas Schildbach
diff --git a/src/de/schildbach/pte/SessionExpiredException.java b/src/de/schildbach/pte/exception/SessionExpiredException.java
similarity index 95%
rename from src/de/schildbach/pte/SessionExpiredException.java
rename to src/de/schildbach/pte/exception/SessionExpiredException.java
index f2dd6321..f7e0f6b2 100644
--- a/src/de/schildbach/pte/SessionExpiredException.java
+++ b/src/de/schildbach/pte/exception/SessionExpiredException.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.exception;
 
 import java.io.IOException;
 
diff --git a/src/de/schildbach/pte/Color.java b/src/de/schildbach/pte/util/Color.java
similarity index 98%
rename from src/de/schildbach/pte/Color.java
rename to src/de/schildbach/pte/util/Color.java
index 0220d9bf..2db24b0d 100644
--- a/src/de/schildbach/pte/Color.java
+++ b/src/de/schildbach/pte/util/Color.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.util;
 
 /**
  * @author Andreas Schildbach
diff --git a/src/de/schildbach/pte/ParserUtils.java b/src/de/schildbach/pte/util/ParserUtils.java
similarity index 99%
rename from src/de/schildbach/pte/ParserUtils.java
rename to src/de/schildbach/pte/util/ParserUtils.java
index f80392e2..5c454d11 100644
--- a/src/de/schildbach/pte/ParserUtils.java
+++ b/src/de/schildbach/pte/util/ParserUtils.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.util;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
diff --git a/test/de/schildbach/pte/live/BahnProviderLiveTest.java b/test/de/schildbach/pte/live/BahnProviderLiveTest.java
index 66d816dd..de84d793 100644
--- a/test/de/schildbach/pte/live/BahnProviderLiveTest.java
+++ b/test/de/schildbach/pte/live/BahnProviderLiveTest.java
@@ -22,11 +22,11 @@ import java.util.Date;
 import org.junit.Test;
 
 import de.schildbach.pte.BahnProvider;
-import de.schildbach.pte.Connection;
-import de.schildbach.pte.QueryConnectionsResult;
-import de.schildbach.pte.QueryDeparturesResult;
 import de.schildbach.pte.NetworkProvider.LocationType;
 import de.schildbach.pte.NetworkProvider.WalkSpeed;
+import de.schildbach.pte.dto.Connection;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
 
 /**
  * @author Andreas Schildbach
diff --git a/test/de/schildbach/pte/live/GvhProviderLiveTest.java b/test/de/schildbach/pte/live/GvhProviderLiveTest.java
index 8d224dcb..0a44cb2d 100644
--- a/test/de/schildbach/pte/live/GvhProviderLiveTest.java
+++ b/test/de/schildbach/pte/live/GvhProviderLiveTest.java
@@ -20,9 +20,9 @@ import java.util.List;
 
 import org.junit.Test;
 
-import de.schildbach.pte.Autocomplete;
 import de.schildbach.pte.GvhProvider;
-import de.schildbach.pte.Station;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Station;
 
 /**
  * @author Andreas Schildbach
diff --git a/test/de/schildbach/pte/live/LinzProviderLiveTest.java b/test/de/schildbach/pte/live/LinzProviderLiveTest.java
index b2f20edc..170bfa99 100644
--- a/test/de/schildbach/pte/live/LinzProviderLiveTest.java
+++ b/test/de/schildbach/pte/live/LinzProviderLiveTest.java
@@ -22,10 +22,10 @@ import java.util.Date;
 import org.junit.Test;
 
 import de.schildbach.pte.LinzProvider;
-import de.schildbach.pte.QueryConnectionsResult;
-import de.schildbach.pte.QueryDeparturesResult;
 import de.schildbach.pte.NetworkProvider.LocationType;
 import de.schildbach.pte.NetworkProvider.WalkSpeed;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
 
 /**
  * @author Andreas Schildbach
diff --git a/test/de/schildbach/pte/live/MvvProviderLiveTest.java b/test/de/schildbach/pte/live/MvvProviderLiveTest.java
index 77e251dd..169218fe 100644
--- a/test/de/schildbach/pte/live/MvvProviderLiveTest.java
+++ b/test/de/schildbach/pte/live/MvvProviderLiveTest.java
@@ -22,9 +22,9 @@ import java.util.Date;
 import org.junit.Test;
 
 import de.schildbach.pte.MvvProvider;
-import de.schildbach.pte.QueryConnectionsResult;
 import de.schildbach.pte.NetworkProvider.LocationType;
 import de.schildbach.pte.NetworkProvider.WalkSpeed;
+import de.schildbach.pte.dto.QueryConnectionsResult;
 
 /**
  * @author Andreas Schildbach
diff --git a/test/de/schildbach/pte/live/NasaProviderLiveTest.java b/test/de/schildbach/pte/live/NasaProviderLiveTest.java
index 41c9e140..0e976eba 100644
--- a/test/de/schildbach/pte/live/NasaProviderLiveTest.java
+++ b/test/de/schildbach/pte/live/NasaProviderLiveTest.java
@@ -21,8 +21,8 @@ import java.util.List;
 import org.junit.Test;
 
 import de.schildbach.pte.NasaProvider;
-import de.schildbach.pte.QueryDeparturesResult;
-import de.schildbach.pte.Station;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
 
 /**
  * @author Andreas Schildbach
diff --git a/test/de/schildbach/pte/live/OebbProviderLiveTest.java b/test/de/schildbach/pte/live/OebbProviderLiveTest.java
index 6e0d6b83..8861af9a 100644
--- a/test/de/schildbach/pte/live/OebbProviderLiveTest.java
+++ b/test/de/schildbach/pte/live/OebbProviderLiveTest.java
@@ -23,10 +23,10 @@ import java.util.List;
 import org.junit.Test;
 
 import de.schildbach.pte.OebbProvider;
-import de.schildbach.pte.QueryConnectionsResult;
-import de.schildbach.pte.Station;
 import de.schildbach.pte.NetworkProvider.LocationType;
 import de.schildbach.pte.NetworkProvider.WalkSpeed;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.Station;
 
 /**
  * @author Andreas Schildbach
diff --git a/test/de/schildbach/pte/live/RmvProviderLiveTest.java b/test/de/schildbach/pte/live/RmvProviderLiveTest.java
index 86380a94..173e8dad 100644
--- a/test/de/schildbach/pte/live/RmvProviderLiveTest.java
+++ b/test/de/schildbach/pte/live/RmvProviderLiveTest.java
@@ -21,7 +21,7 @@ import java.util.List;
 import org.junit.Test;
 
 import de.schildbach.pte.RmvProvider;
-import de.schildbach.pte.Station;
+import de.schildbach.pte.dto.Station;
 
 /**
  * @author Andreas Schildbach
diff --git a/test/de/schildbach/pte/live/SbbProviderLiveTest.java b/test/de/schildbach/pte/live/SbbProviderLiveTest.java
index 891b4ceb..1b79c411 100644
--- a/test/de/schildbach/pte/live/SbbProviderLiveTest.java
+++ b/test/de/schildbach/pte/live/SbbProviderLiveTest.java
@@ -22,12 +22,12 @@ import java.util.List;
 
 import org.junit.Test;
 
-import de.schildbach.pte.Autocomplete;
-import de.schildbach.pte.QueryConnectionsResult;
 import de.schildbach.pte.SbbProvider;
-import de.schildbach.pte.Station;
 import de.schildbach.pte.NetworkProvider.LocationType;
 import de.schildbach.pte.NetworkProvider.WalkSpeed;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.Station;
 
 /**
  * @author Andreas Schildbach
diff --git a/test/de/schildbach/pte/live/SncbProviderLiveTest.java b/test/de/schildbach/pte/live/SncbProviderLiveTest.java
index 66b37adb..8d38dd01 100644
--- a/test/de/schildbach/pte/live/SncbProviderLiveTest.java
+++ b/test/de/schildbach/pte/live/SncbProviderLiveTest.java
@@ -21,7 +21,7 @@ import java.util.List;
 import org.junit.Test;
 
 import de.schildbach.pte.SncbProvider;
-import de.schildbach.pte.Station;
+import de.schildbach.pte.dto.Station;
 
 /**
  * @author Andreas Schildbach
diff --git a/test/de/schildbach/pte/live/VgsProviderLiveTest.java b/test/de/schildbach/pte/live/VgsProviderLiveTest.java
index e1500646..c2f67528 100644
--- a/test/de/schildbach/pte/live/VgsProviderLiveTest.java
+++ b/test/de/schildbach/pte/live/VgsProviderLiveTest.java
@@ -20,9 +20,9 @@ import java.util.List;
 
 import org.junit.Test;
 
-import de.schildbach.pte.QueryDeparturesResult;
-import de.schildbach.pte.Station;
 import de.schildbach.pte.VgsProvider;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
 
 /**
  * @author Andreas Schildbach
diff --git a/test/de/schildbach/pte/live/VrnProviderLiveTest.java b/test/de/schildbach/pte/live/VrnProviderLiveTest.java
index bc8721fa..f2b42b8b 100644
--- a/test/de/schildbach/pte/live/VrnProviderLiveTest.java
+++ b/test/de/schildbach/pte/live/VrnProviderLiveTest.java
@@ -20,9 +20,9 @@ import java.util.List;
 
 import org.junit.Test;
 
-import de.schildbach.pte.QueryDeparturesResult;
-import de.schildbach.pte.Station;
 import de.schildbach.pte.VrnProvider;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
 
 /**
  * @author Andreas Schildbach
diff --git a/test/de/schildbach/pte/live/VrrProviderLiveTest.java b/test/de/schildbach/pte/live/VrrProviderLiveTest.java
index c96833e1..cda2741c 100644
--- a/test/de/schildbach/pte/live/VrrProviderLiveTest.java
+++ b/test/de/schildbach/pte/live/VrrProviderLiveTest.java
@@ -20,9 +20,9 @@ import java.util.List;
 
 import org.junit.Test;
 
-import de.schildbach.pte.QueryDeparturesResult;
-import de.schildbach.pte.Station;
 import de.schildbach.pte.VrrProvider;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
 
 /**
  * @author Andreas Schildbach