diff --git a/src/eu/simstadt/regionchooser/RegionExtractor.java b/src/eu/simstadt/regionchooser/RegionExtractor.java
index 1bff19fcdd8a9de814ceb142f9f5c4fd40d0d7d1..aaf9a7c9785dae48b6c51df4b46e2db56dd993d2 100644
--- a/src/eu/simstadt/regionchooser/RegionExtractor.java
+++ b/src/eu/simstadt/regionchooser/RegionExtractor.java
@@ -12,8 +12,8 @@
 import com.ximpleware.NavException;
 import com.ximpleware.XPathEvalException;
 import com.ximpleware.XPathParseException;
-import eu.simstadt.lowlevelgmlparser.BuildingXmlNode;
-import eu.simstadt.lowlevelgmlparser.CityGmlIterator;
+import eu.simstadt.regionchooser.citygml_parser.BuildingXmlNode;
+import eu.simstadt.regionchooser.citygml_parser.CityGmlIterator;
 
 
 public class RegionExtractor
diff --git a/src/eu/simstadt/lowlevelgmlparser/BuildingXmlNode.java b/src/eu/simstadt/regionchooser/citygml_parser/BuildingXmlNode.java
similarity index 97%
rename from src/eu/simstadt/lowlevelgmlparser/BuildingXmlNode.java
rename to src/eu/simstadt/regionchooser/citygml_parser/BuildingXmlNode.java
index 791cc7197720dcfdb80cb2808581e87d64e14054..d19ad0c2f5ac7126fc21c42de9f3a79f6b69f553 100644
--- a/src/eu/simstadt/lowlevelgmlparser/BuildingXmlNode.java
+++ b/src/eu/simstadt/regionchooser/citygml_parser/BuildingXmlNode.java
@@ -1,4 +1,4 @@
-package eu.simstadt.lowlevelgmlparser;
+package eu.simstadt.regionchooser.citygml_parser;
 
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.GeometryFactory;
diff --git a/src/eu/simstadt/lowlevelgmlparser/CityGmlIterator.java b/src/eu/simstadt/regionchooser/citygml_parser/CityGmlIterator.java
similarity index 92%
rename from src/eu/simstadt/lowlevelgmlparser/CityGmlIterator.java
rename to src/eu/simstadt/regionchooser/citygml_parser/CityGmlIterator.java
index d38f75c7a94c00b79d4fa4c6f2d3b4537981e81d..70b398d23c5178290f411ca455eb05b4dd0f37d3 100644
--- a/src/eu/simstadt/lowlevelgmlparser/CityGmlIterator.java
+++ b/src/eu/simstadt/regionchooser/citygml_parser/CityGmlIterator.java
@@ -1,4 +1,4 @@
-package eu.simstadt.lowlevelgmlparser;
+package eu.simstadt.regionchooser.citygml_parser;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -20,7 +20,6 @@ public class CityGmlIterator implements Iterable<BuildingXmlNode>
 
 	private AutoPilot buildingsFinder;
 	private VTDNav navigator;
-	private long offsetAndLength;
 	private int buildingOffset = 0;
 	private int buildingLength = 0;
 	private Path citygmlPath;
@@ -28,7 +27,7 @@ public class CityGmlIterator implements Iterable<BuildingXmlNode>
 	/*
 	 * Simple class to parse a CityGML and extract cityObjectMember XML nodes and their coordinates. Since the
 	 * coordinates are extracted for RegionChooser, it's okay to not be perfectly robust, but it should be fast and not
-	 * use much memory.
+	 * use much memory. A SaxParser would use even less memory but might be harder to code and slower to run.
 	 * 
 	 * Based on VTD XML, it provides a Building iterator.
 	 * 
@@ -60,7 +59,7 @@ public boolean hasNext() {
 			@Override
 			public BuildingXmlNode next() {
 				try {
-					offsetAndLength = navigator.getElementFragment();
+					long offsetAndLength = navigator.getElementFragment();
 					buildingOffset = (int) offsetAndLength;
 					buildingLength = (int) (offsetAndLength >> 32);
 					return new BuildingXmlNode(navigator, buildingOffset, buildingLength);