diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4bb21a8..7d54350 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,5 +11,4 @@ include_directories(
 add_subdirectory(util)
 add_subdirectory(pfaedle)
 add_subdirectory(cppgtfs)
-add_subdirectory(xml)
 add_subdirectory(configparser)
diff --git a/src/cppgtfs b/src/cppgtfs
index f5391e1..c704a61 160000
--- a/src/cppgtfs
+++ b/src/cppgtfs
@@ -1 +1 @@
-Subproject commit f5391e1567f4f21379f7b1fb6d82fc904a61c434
+Subproject commit c704a610d91ec2be575c42a760cc6157c8fdf932
diff --git a/src/pfaedle/CMakeLists.txt b/src/pfaedle/CMakeLists.txt
index 5963842..271f2c6 100644
--- a/src/pfaedle/CMakeLists.txt
+++ b/src/pfaedle/CMakeLists.txt
@@ -17,4 +17,4 @@ add_executable(pfaedle ${pfaedle_main})
 add_library(pfaedle_dep ${pfaedle_SRC})
 
 include_directories(pfaedle_dep PUBLIC ${PROJECT_SOURCE_DIR}/src/cppgtfs/src)
-target_link_libraries(pfaedle pfaedle_dep util xml configparser ad_cppgtfs ${Boost_LIBRARIES} -lpthread)
+target_link_libraries(pfaedle pfaedle_dep util configparser ad_cppgtfs ${Boost_LIBRARIES} -lpthread)
diff --git a/src/pfaedle/PfaedleMain.cpp b/src/pfaedle/PfaedleMain.cpp
index e95bdd7..55bea77 100644
--- a/src/pfaedle/PfaedleMain.cpp
+++ b/src/pfaedle/PfaedleMain.cpp
@@ -178,7 +178,7 @@ int main(int argc, char** argv) {
     }
     try {
       osmBuilder.filterWrite(cfg.osmPath, cfg.writeOsm, opts, box);
-    } catch (const xml::XmlFileException& ex) {
+    } catch (const pfxml::parse_exc& ex) {
       LOG(ERROR) << "Could not parse OSM data, reason was:";
       std::cerr << ex.what() << std::endl;
       exit(static_cast<int>(RetCode::OSM_PARSE_ERR));
@@ -289,7 +289,7 @@ int main(int argc, char** argv) {
         out.printLatLng(ng, fstr);
         fstr.close();
       }
-    } catch (const xml::XmlFileException& ex) {
+    } catch (const pfxml::parse_exc& ex) {
       LOG(ERROR) << "Could not parse OSM data, reason was:";
       std::cerr << ex.what() << std::endl;
       exit(static_cast<int>(RetCode::OSM_PARSE_ERR));
diff --git a/src/pfaedle/osm/OsmBuilder.cpp b/src/pfaedle/osm/OsmBuilder.cpp
index 01df3d9..eaa4ab1 100644
--- a/src/pfaedle/osm/OsmBuilder.cpp
+++ b/src/pfaedle/osm/OsmBuilder.cpp
@@ -22,7 +22,7 @@
 #include "util/Misc.h"
 #include "util/Nullable.h"
 #include "util/log/Log.h"
-#include "xml/File.h"
+#include "xml/pfxml.h"
 
 using util::geo::webMercMeterDist;
 using util::geo::Box;
@@ -85,7 +85,7 @@ void OsmBuilder::read(const std::string& path, const OsmReadOpts& opts,
 
     OsmFilter filter(opts);
 
-    xml::File xml(path);
+    pfxml::file xml(path);
 
     // we do four passes of the file here to be as memory creedy as possible:
     // - the first pass collects all node IDs which are
@@ -103,8 +103,8 @@ void OsmBuilder::read(const std::string& path, const OsmReadOpts& opts,
 
     LOG(VDEBUG) << "Reading bounding box nodes...";
     skipUntil(&xml, "node");
-    xml::ParserState nodeBeg = xml.state();
-    xml::ParserState edgesBeg =
+    pfxml::parser_state nodeBeg = xml.state();
+    pfxml::parser_state edgesBeg =
         readBBoxNds(&xml, &bboxNodes, &noHupNodes, filter, bbox);
 
     LOG(VDEBUG) << "Reading relations...";
@@ -113,13 +113,13 @@ void OsmBuilder::read(const std::string& path, const OsmReadOpts& opts,
              &rawRests);
 
     LOG(VDEBUG) << "Reading edges...";
-    xml.setState(edgesBeg);
+    xml.set_state(edgesBeg);
     readEdges(&xml, g, intmRels, wayRels, filter, bboxNodes, &nodes, &multNodes,
               noHupNodes, attrKeys[1], rawRests, res, intmRels.flat, &eTracks,
               opts);
 
     LOG(VDEBUG) << "Reading kept nodes...";
-    xml.setState(nodeBeg);
+    xml.set_state(nodeBeg);
     readNodes(&xml, g, intmRels, nodeRels, filter, bboxNodes, &nodes,
               &multNodes, &orphanStations, attrKeys[0], intmRels.flat, opts);
   }
@@ -283,7 +283,7 @@ void OsmBuilder::filterWrite(const std::string& in, const std::string& out,
   // always empty
   NIdMultMap multNodes;
 
-  xml::File xml(in);
+  pfxml::file xml(in);
   std::ofstream outstr;
   outstr.open(out);
 
@@ -310,18 +310,18 @@ void OsmBuilder::filterWrite(const std::string& in, const std::string& out,
   }
 
   skipUntil(&xml, "node");
-  xml::ParserState nodeBeg = xml.state();
-  xml::ParserState edgesBeg =
+  pfxml::parser_state nodeBeg = xml.state();
+  pfxml::parser_state edgesBeg =
       readBBoxNds(&xml, &bboxNodes, &noHupNodes, filter, latLngBox);
 
   skipUntil(&xml, "relation");
   readRels(&xml, &rels, &nodeRels, &wayRels, filter, attrKeys[2], &rests);
 
-  xml.setState(edgesBeg);
+  xml.set_state(edgesBeg);
   readEdges(&xml, wayRels, filter, bboxNodes, attrKeys[1], &ways, &nodes,
             rels.flat);
 
-  xml.setState(nodeBeg);
+  xml.set_state(nodeBeg);
 
   readWriteNds(&xml, &wr, nodeRels, filter, bboxNodes, &nodes, attrKeys[0],
                rels.flat);
@@ -335,7 +335,7 @@ void OsmBuilder::filterWrite(const std::string& in, const std::string& out,
 }
 
 // _____________________________________________________________________________
-void OsmBuilder::readWriteRels(xml::File* i, util::xml::XmlWriter* o,
+void OsmBuilder::readWriteRels(pfxml::file* i, util::xml::XmlWriter* o,
                                OsmIdList* ways, NIdMap* nodes,
                                const OsmFilter& filter,
                                const AttrKeySet& keepAttrs) {
@@ -386,7 +386,7 @@ void OsmBuilder::readWriteRels(xml::File* i, util::xml::XmlWriter* o,
 
       for (const auto& kv : rel.attrs) {
         std::map<std::string, std::string> attrs = {
-            {"k", kv.first}, {"v", xml::File::decode(kv.second)}};
+            {"k", kv.first}, {"v", pfxml::file::decode(kv.second)}};
         o->openTag("tag", attrs);
         o->closeTag();
       }
@@ -397,7 +397,7 @@ void OsmBuilder::readWriteRels(xml::File* i, util::xml::XmlWriter* o,
 }
 
 // _____________________________________________________________________________
-void OsmBuilder::readWriteWays(xml::File* i, util::xml::XmlWriter* o,
+void OsmBuilder::readWriteWays(pfxml::file* i, util::xml::XmlWriter* o,
                                OsmIdList* ways,
                                const AttrKeySet& keepAttrs) const {
   OsmWay w;
@@ -413,7 +413,7 @@ void OsmBuilder::readWriteWays(xml::File* i, util::xml::XmlWriter* o,
     for (const auto& kv : w.attrs) {
       std::map<std::string, std::string> attrs;
       attrs["k"] = kv.first;
-      attrs["v"] = xml::File::decode(kv.second);
+      attrs["v"] = pfxml::file::decode(kv.second);
       o->openTag("tag", attrs);
       o->closeTag();
     }
@@ -441,7 +441,7 @@ NodePL OsmBuilder::plFromGtfs(const Stop* s, const OsmReadOpts& ops) {
 }
 
 // _____________________________________________________________________________
-xml::ParserState OsmBuilder::readBBoxNds(xml::File* xml, OsmIdSet* nodes,
+pfxml::parser_state OsmBuilder::readBBoxNds(pfxml::file* xml, OsmIdSet* nodes,
                                          OsmIdSet* nohupNodes,
                                          const OsmFilter& filter,
                                          const BBoxIdx& bbox) const {
@@ -449,7 +449,7 @@ xml::ParserState OsmBuilder::readBBoxNds(xml::File* xml, OsmIdSet* nodes,
   uint64_t curId = 0;
 
   do {
-    const xml::Tag& cur = xml->get();
+    const pfxml::tag& cur = xml->get();
 
     if (inNodeBlock && xml->level() == 3 && curId &&
         strcmp(cur.name, "tag") == 0) {
@@ -479,12 +479,12 @@ xml::ParserState OsmBuilder::readBBoxNds(xml::File* xml, OsmIdSet* nodes,
 }
 
 // _____________________________________________________________________________
-OsmWay OsmBuilder::nextWayWithId(xml::File* xml, osmid wid,
+OsmWay OsmBuilder::nextWayWithId(pfxml::file* xml, osmid wid,
                                  const AttrKeySet& keepAttrs) const {
   OsmWay w;
 
   do {
-    const xml::Tag& cur = xml->get();
+    const pfxml::tag& cur = xml->get();
     if (xml->level() == 2 || xml->level() == 0) {
       if (w.id || strcmp(cur.name, "way")) return w;
 
@@ -508,7 +508,7 @@ OsmWay OsmBuilder::nextWayWithId(xml::File* xml, osmid wid,
 }
 
 // _____________________________________________________________________________
-void OsmBuilder::skipUntil(xml::File* xml, const std::string& s) const {
+void OsmBuilder::skipUntil(pfxml::file* xml, const std::string& s) const {
   while (xml->next() && strcmp(xml->get().name, s.c_str())) {
   }
 }
@@ -529,14 +529,14 @@ bool OsmBuilder::relKeep(osmid id, const RelMap& rels,
 }
 
 // _____________________________________________________________________________
-OsmWay OsmBuilder::nextWay(xml::File* xml, const RelMap& wayRels,
+OsmWay OsmBuilder::nextWay(pfxml::file* xml, const RelMap& wayRels,
                            const OsmFilter& filter, const OsmIdSet& bBoxNodes,
                            const AttrKeySet& keepAttrs,
                            const FlatRels& fl) const {
   OsmWay w;
 
   do {
-    const xml::Tag& cur = xml->get();
+    const pfxml::tag& cur = xml->get();
     if (xml->level() == 2 || xml->level() == 0) {
       if (keepWay(w, wayRels, filter, bBoxNodes, fl)) return w;
       if (strcmp(cur.name, "way")) return OsmWay();
@@ -579,7 +579,7 @@ bool OsmBuilder::keepWay(const OsmWay& w, const RelMap& wayRels,
 }
 
 // _____________________________________________________________________________
-void OsmBuilder::readEdges(xml::File* xml, const RelMap& wayRels,
+void OsmBuilder::readEdges(pfxml::file* xml, const RelMap& wayRels,
                            const OsmFilter& filter, const OsmIdSet& bBoxNodes,
                            const AttrKeySet& keepAttrs, OsmIdList* ret,
                            NIdMap* nodes, const FlatRels& flat) {
@@ -593,7 +593,7 @@ void OsmBuilder::readEdges(xml::File* xml, const RelMap& wayRels,
 }
 
 // _____________________________________________________________________________
-void OsmBuilder::readEdges(xml::File* xml, Graph* g, const RelLst& rels,
+void OsmBuilder::readEdges(pfxml::file* xml, Graph* g, const RelLst& rels,
                            const RelMap& wayRels, const OsmFilter& filter,
                            const OsmIdSet& bBoxNodes, NIdMap* nodes,
                            NIdMultMap* multiNodes, const OsmIdSet& noHupNodes,
@@ -675,7 +675,7 @@ void OsmBuilder::processRestr(osmid nid, osmid wid,
 }
 
 // _____________________________________________________________________________
-OsmNode OsmBuilder::nextNode(xml::File* xml, NIdMap* nodes,
+OsmNode OsmBuilder::nextNode(pfxml::file* xml, NIdMap* nodes,
                              NIdMultMap* multNodes, const RelMap& nodeRels,
                              const OsmFilter& filter, const OsmIdSet& bBoxNodes,
                              const AttrKeySet& keepAttrs,
@@ -683,7 +683,7 @@ OsmNode OsmBuilder::nextNode(xml::File* xml, NIdMap* nodes,
   OsmNode n;
 
   do {
-    const xml::Tag& cur = xml->get();
+    const pfxml::tag& cur = xml->get();
     if (xml->level() == 2 || xml->level() == 0) {
       if (keepNode(n, *nodes, *multNodes, nodeRels, bBoxNodes, filter, fl))
         return n;
@@ -725,7 +725,7 @@ bool OsmBuilder::keepNode(const OsmNode& n, const NIdMap& nodes,
 }
 
 // _____________________________________________________________________________
-void OsmBuilder::readWriteNds(xml::File* i, util::xml::XmlWriter* o,
+void OsmBuilder::readWriteNds(pfxml::file* i, util::xml::XmlWriter* o,
                               const RelMap& nRels, const OsmFilter& filter,
                               const OsmIdSet& bBoxNds, NIdMap* nds,
                               const AttrKeySet& keepAttrs,
@@ -739,7 +739,7 @@ void OsmBuilder::readWriteNds(xml::File* i, util::xml::XmlWriter* o,
                         {"lat", std::to_string(nd.lat)},
                         {"lon", std::to_string(nd.lng)}});
     for (const auto& kv : nd.attrs) {
-      o->openTag("tag", {{"k", kv.first}, {"v", xml::File::decode(kv.second)}});
+      o->openTag("tag", {{"k", kv.first}, {"v", pfxml::file::decode(kv.second)}});
       o->closeTag();
     }
     o->closeTag();
@@ -747,7 +747,7 @@ void OsmBuilder::readWriteNds(xml::File* i, util::xml::XmlWriter* o,
 }
 
 // _____________________________________________________________________________
-void OsmBuilder::readNodes(xml::File* xml, Graph* g, const RelLst& rels,
+void OsmBuilder::readNodes(pfxml::file* xml, Graph* g, const RelLst& rels,
                            const RelMap& nodeRels, const OsmFilter& filter,
                            const OsmIdSet& bBoxNodes, NIdMap* nodes,
                            NIdMultMap* multNodes, NodeSet* orphanStations,
@@ -799,12 +799,12 @@ void OsmBuilder::readNodes(xml::File* xml, Graph* g, const RelLst& rels,
 }
 
 // _____________________________________________________________________________
-OsmRel OsmBuilder::nextRel(xml::File* xml, const OsmFilter& filter,
+OsmRel OsmBuilder::nextRel(pfxml::file* xml, const OsmFilter& filter,
                            const AttrKeySet& keepAttrs) const {
   OsmRel rel;
 
   do {
-    const xml::Tag& cur = xml->get();
+    const pfxml::tag& cur = xml->get();
     if (xml->level() == 2 || xml->level() == 0) {
       uint64_t keepFlags = 0;
       uint64_t dropFlags = 0;
@@ -873,7 +873,7 @@ OsmRel OsmBuilder::nextRel(xml::File* xml, const OsmFilter& filter,
 }
 
 // _____________________________________________________________________________
-void OsmBuilder::readRels(xml::File* xml, RelLst* rels, RelMap* nodeRels,
+void OsmBuilder::readRels(pfxml::file* xml, RelLst* rels, RelMap* nodeRels,
                           RelMap* wayRels, const OsmFilter& filter,
                           const AttrKeySet& keepAttrs,
                           Restrictions* rests) const {
@@ -940,7 +940,7 @@ std::string OsmBuilder::getAttrByFirstMatch(const DeepAttrLst& rule, osmid id,
                                             const Normalizer& norm) const {
   std::string ret;
   for (const auto& s : rule) {
-    ret = norm(xml::File::decode(getAttr(s, id, attrs, entRels, rels)));
+    ret = norm(pfxml::file::decode(getAttr(s, id, attrs, entRels, rels)));
     if (!ret.empty()) return ret;
   }
 
@@ -954,7 +954,7 @@ std::vector<std::string> OsmBuilder::getAttrMatchRanked(
   std::vector<std::string> ret;
   for (const auto& s : rule) {
     std::string tmp =
-        norm(xml::File::decode(getAttr(s, id, attrs, entRels, rels)));
+        norm(pfxml::file::decode(getAttr(s, id, attrs, entRels, rels)));
     if (!tmp.empty()) ret.push_back(tmp);
   }
 
@@ -1425,7 +1425,7 @@ std::vector<TransitEdgeLine*> OsmBuilder::getLines(
       for (const auto& r : ops.relLinerules.sNameRule) {
         for (const auto& relAttr : rels.rels[relId]) {
           if (relAttr.first == r) {
-            el.shortName = ops.lineNormzer(xml::File::decode(relAttr.second));
+            el.shortName = ops.lineNormzer(pfxml::file::decode(relAttr.second));
             if (!el.shortName.empty()) found = true;
           }
         }
@@ -1436,7 +1436,7 @@ std::vector<TransitEdgeLine*> OsmBuilder::getLines(
       for (const auto& r : ops.relLinerules.fromNameRule) {
         for (const auto& relAttr : rels.rels[relId]) {
           if (relAttr.first == r) {
-            el.fromStr = ops.statNormzer(xml::File::decode(relAttr.second));
+            el.fromStr = ops.statNormzer(pfxml::file::decode(relAttr.second));
             if (!el.fromStr.empty()) found = true;
           }
         }
@@ -1447,7 +1447,7 @@ std::vector<TransitEdgeLine*> OsmBuilder::getLines(
       for (const auto& r : ops.relLinerules.toNameRule) {
         for (const auto& relAttr : rels.rels[relId]) {
           if (relAttr.first == r) {
-            el.toStr = ops.statNormzer(xml::File::decode(relAttr.second));
+            el.toStr = ops.statNormzer(pfxml::file::decode(relAttr.second));
             if (!el.toStr.empty()) found = true;
           }
         }
diff --git a/src/pfaedle/osm/OsmBuilder.h b/src/pfaedle/osm/OsmBuilder.h
index fdcb764..8b4c54f 100644
--- a/src/pfaedle/osm/OsmBuilder.h
+++ b/src/pfaedle/osm/OsmBuilder.h
@@ -25,7 +25,7 @@
 #include "util/Nullable.h"
 #include "util/geo/Geo.h"
 #include "util/xml/XmlWriter.h"
-#include "xml/File.h"
+#include "xml/pfxml.h"
 
 namespace pfaedle {
 namespace osm {
@@ -102,37 +102,37 @@ class OsmBuilder {
                    const std::vector<OsmReadOpts>& opts, const BBoxIdx& box);
 
  private:
-  xml::ParserState readBBoxNds(xml::File* xml, OsmIdSet* nodes,
+  pfxml::parser_state readBBoxNds(pfxml::file* xml, OsmIdSet* nodes,
                                OsmIdSet* noHupNodes, const OsmFilter& filter,
                                const BBoxIdx& bbox) const;
 
-  void readRels(xml::File* f, RelLst* rels, RelMap* nodeRels, RelMap* wayRels,
+  void readRels(pfxml::file* f, RelLst* rels, RelMap* nodeRels, RelMap* wayRels,
                 const OsmFilter& filter, const AttrKeySet& keepAttrs,
                 Restrictions* rests) const;
 
   void readRestr(const OsmRel& rel, Restrictions* rests,
                  const OsmFilter& filter) const;
 
-  void readNodes(xml::File* f, Graph* g, const RelLst& rels,
+  void readNodes(pfxml::file* f, Graph* g, const RelLst& rels,
                  const RelMap& nodeRels, const OsmFilter& filter,
                  const OsmIdSet& bBoxNodes, NIdMap* nodes,
                  NIdMultMap* multNodes, NodeSet* orphanStations,
                  const AttrKeySet& keepAttrs, const FlatRels& flatRels,
                  const OsmReadOpts& opts) const;
 
-  void readWriteNds(xml::File* i, util::xml::XmlWriter* o,
+  void readWriteNds(pfxml::file* i, util::xml::XmlWriter* o,
                     const RelMap& nodeRels, const OsmFilter& filter,
                     const OsmIdSet& bBoxNodes, NIdMap* nodes,
                     const AttrKeySet& keepAttrs, const FlatRels& f) const;
 
-  void readWriteWays(xml::File* i, util::xml::XmlWriter* o, OsmIdList* ways,
+  void readWriteWays(pfxml::file* i, util::xml::XmlWriter* o, OsmIdList* ways,
                      const AttrKeySet& keepAttrs) const;
 
-  void readWriteRels(xml::File* i, util::xml::XmlWriter* o, OsmIdList* ways,
+  void readWriteRels(pfxml::file* i, util::xml::XmlWriter* o, OsmIdList* ways,
                      NIdMap* nodes, const OsmFilter& filter,
                      const AttrKeySet& keepAttrs);
 
-  void readEdges(xml::File* xml, Graph* g, const RelLst& rels,
+  void readEdges(pfxml::file* xml, Graph* g, const RelLst& rels,
                  const RelMap& wayRels, const OsmFilter& filter,
                  const OsmIdSet& bBoxNodes, NIdMap* nodes,
                  NIdMultMap* multNodes, const OsmIdSet& noHupNodes,
@@ -140,21 +140,21 @@ class OsmBuilder {
                  Restrictor* restor, const FlatRels& flatRels,
                  EdgTracks* etracks, const OsmReadOpts& opts);
 
-  void readEdges(xml::File* xml, const RelMap& wayRels, const OsmFilter& filter,
+  void readEdges(pfxml::file* xml, const RelMap& wayRels, const OsmFilter& filter,
                  const OsmIdSet& bBoxNodes, const AttrKeySet& keepAttrs,
                  OsmIdList* ret, NIdMap* nodes, const FlatRels& flatRels);
 
-  OsmWay nextWay(xml::File* xml, const RelMap& wayRels, const OsmFilter& filter,
+  OsmWay nextWay(pfxml::file* xml, const RelMap& wayRels, const OsmFilter& filter,
                  const OsmIdSet& bBoxNodes, const AttrKeySet& keepAttrs,
                  const FlatRels& flatRels) const;
 
   bool keepWay(const OsmWay& w, const RelMap& wayRels, const OsmFilter& filter,
                const OsmIdSet& bBoxNodes, const FlatRels& fl) const;
 
-  OsmWay nextWayWithId(xml::File* xml, osmid wid,
+  OsmWay nextWayWithId(pfxml::file* xml, osmid wid,
                        const AttrKeySet& keepAttrs) const;
 
-  OsmNode nextNode(xml::File* xml, NIdMap* nodes, NIdMultMap* multNodes,
+  OsmNode nextNode(pfxml::file* xml, NIdMap* nodes, NIdMultMap* multNodes,
                    const RelMap& nodeRels, const OsmFilter& filter,
                    const OsmIdSet& bBoxNodes, const AttrKeySet& keepAttrs,
                    const FlatRels& flatRels) const;
@@ -164,7 +164,7 @@ class OsmBuilder {
                 const OsmIdSet& bBoxNodes, const OsmFilter& filter,
                 const FlatRels& fl) const;
 
-  OsmRel nextRel(xml::File* xml, const OsmFilter& filter,
+  OsmRel nextRel(pfxml::file* xml, const OsmFilter& filter,
                  const AttrKeySet& keepAttrs) const;
 
  protected:
@@ -233,7 +233,7 @@ class OsmBuilder {
 
   void getKeptAttrKeys(const OsmReadOpts& opts, AttrKeySet sets[3]) const;
 
-  void skipUntil(xml::File* xml, const std::string& s) const;
+  void skipUntil(pfxml::file* xml, const std::string& s) const;
 
   void processRestr(osmid nid, osmid wid, const Restrictions& rawRests, Edge* e,
                     Node* n, Restrictor* restor) const;
diff --git a/src/xml b/src/xml
index 5081d32..23cc358 160000
--- a/src/xml
+++ b/src/xml
@@ -1 +1 @@
-Subproject commit 5081d32879c30456f6cb515342a3096c5a0d7de6
+Subproject commit 23cc358256df7f567cb249736e216c01b65aaf6f