From 550c252813dffe525b692c1a5fae561c6a3400f2 Mon Sep 17 00:00:00 2001
From: Axel1092 <axellopez92@outlook.com>
Date: Tue, 28 Jul 2020 10:41:28 +0200
Subject: [PATCH] Renaming OSM2ODR

---
 PythonAPI/carla/setup.py                      |    4 +-
 PythonAPI/carla/source/libcarla/Converter.cpp |   32 -
 PythonAPI/carla/source/libcarla/OSM2ODR.cpp   |   39 +
 PythonAPI/carla/source/libcarla/libcarla.cpp  |    4 +-
 PythonAPI/util/config.py                      |   30 +-
 .../{BuildConverter.bat => BuildOSM2ODR.bat}  |   14 +-
 .../{BuildConverter.sh => BuildOSM2ODR.sh}    |   14 +-
 Util/BuildTools/Linux.mk                      |   20 +-
 Util/BuildTools/Windows.mk                    |    6 +-
 Util/Converter/CONTRIBUTING.md                |   57 -
 Util/Converter/ChangeLog                      |    1 -
 Util/Converter/NOTICE.md                      |  117 -
 Util/Converter/README.md                      |   92 -
 Util/Converter/sumo.doxyconf                  | 2493 -----------------
 Util/{Converter => OSM2ODR}/.gitignore        |    0
 Util/{Converter => OSM2ODR}/AUTHORS           |    0
 Util/{Converter => OSM2ODR}/CMakeLists.txt    |    0
 .../{Converter => OSM2ODR}/CMakeSettings.json |    0
 Util/{Converter => OSM2ODR}/LICENSE           |    0
 .../cmake-variants.yaml                       |    0
 .../cmake_modules/FindProj.cmake              |    0
 .../{Converter => OSM2ODR}/src/CMakeLists.txt |   52 +-
 .../Converter.cpp => OSM2ODR/src/OSM2ODR.cpp} |    2 +-
 .../src/Converter.h => OSM2ODR/src/OSM2ODR.h} |    0
 .../src/README_Contributing.md                |    0
 .../{Converter => OSM2ODR}/src/config.h.cmake |    0
 .../src/foreign/CMakeLists.txt                |    0
 .../src/foreign/eulerspiral/CMakeLists.txt    |    0
 .../src/foreign/eulerspiral/LICENSE.TXT       |    0
 .../src/foreign/eulerspiral/odrSpiral.cpp     |    0
 .../src/foreign/eulerspiral/odrSpiral.h       |    0
 .../src/foreign/rtree/LayeredRTree.h          |    0
 .../src/foreign/rtree/README.TXT              |    0
 .../src/foreign/rtree/RTree.h                 |    0
 .../src/foreign/rtree/SUMORTree.h             |    0
 .../src/foreign/tcpip/CMakeLists.txt          |    0
 .../src/foreign/tcpip/socket.cpp              |    0
 .../src/foreign/tcpip/socket.h                |    0
 .../src/foreign/tcpip/storage.cpp             |    0
 .../src/foreign/tcpip/storage.h               |    0
 .../src/foreign/zstr/LICENSE                  |    0
 .../src/foreign/zstr/strict_fstream.hpp       |    0
 .../src/foreign/zstr/zstr.hpp                 |    0
 .../src/libsumo/Helper.h                      |    0
 .../src/libsumo/Subscription.h                |    0
 .../src/libsumo/TraCIConstants.h              |    0
 .../src/libsumo/TraCIDefs.h                   |    0
 .../src/microsim/MSJunction.h                 |    0
 .../src/microsim/MSLane.h                     |    0
 .../src/microsim/MSLeaderInfo.h               |    0
 .../src/microsim/MSLink.h                     |    0
 .../src/microsim/MSLinkCont.h                 |    0
 .../src/microsim/MSMoveReminder.h             |    0
 .../src/microsim/MSNet.h                      |    0
 .../src/netbuild/CMakeLists.txt               |    0
 .../src/netbuild/NBAlgorithms.cpp             |    0
 .../src/netbuild/NBAlgorithms.h               |    0
 .../src/netbuild/NBAlgorithms_Railway.cpp     |    0
 .../src/netbuild/NBAlgorithms_Railway.h       |    0
 .../src/netbuild/NBAlgorithms_Ramps.cpp       |    0
 .../src/netbuild/NBAlgorithms_Ramps.h         |    0
 .../src/netbuild/NBCapacity2Lanes.h           |    0
 .../src/netbuild/NBConnection.cpp             |    0
 .../src/netbuild/NBConnection.h               |    0
 .../src/netbuild/NBConnectionDefs.h           |    0
 .../src/netbuild/NBCont.h                     |    0
 .../src/netbuild/NBContHelper.cpp             |    0
 .../src/netbuild/NBContHelper.h               |    0
 .../src/netbuild/NBDistrict.cpp               |    0
 .../src/netbuild/NBDistrict.h                 |    0
 .../src/netbuild/NBDistrictCont.cpp           |    0
 .../src/netbuild/NBDistrictCont.h             |    0
 .../src/netbuild/NBEdge.cpp                   |    0
 .../src/netbuild/NBEdge.h                     |    0
 .../src/netbuild/NBEdgeCont.cpp               |    0
 .../src/netbuild/NBEdgeCont.h                 |    0
 .../src/netbuild/NBFrame.cpp                  |    0
 .../src/netbuild/NBFrame.h                    |    0
 .../src/netbuild/NBHeightMapper.cpp           |    0
 .../src/netbuild/NBHeightMapper.h             |    0
 .../src/netbuild/NBHelpers.cpp                |    0
 .../src/netbuild/NBHelpers.h                  |    0
 .../src/netbuild/NBLinkPossibilityMatrix.h    |    0
 .../src/netbuild/NBLoadedSUMOTLDef.cpp        |    0
 .../src/netbuild/NBLoadedSUMOTLDef.h          |    0
 .../src/netbuild/NBLoadedTLDef.cpp            |    0
 .../src/netbuild/NBLoadedTLDef.h              |    0
 .../src/netbuild/NBNetBuilder.cpp             |    0
 .../src/netbuild/NBNetBuilder.h               |    0
 .../src/netbuild/NBNode.cpp                   |    0
 .../src/netbuild/NBNode.h                     |    0
 .../src/netbuild/NBNodeCont.cpp               |    0
 .../src/netbuild/NBNodeCont.h                 |    0
 .../src/netbuild/NBNodeShapeComputer.cpp      |    0
 .../src/netbuild/NBNodeShapeComputer.h        |    0
 .../src/netbuild/NBOwnTLDef.cpp               |    0
 .../src/netbuild/NBOwnTLDef.h                 |    0
 .../src/netbuild/NBPTLine.cpp                 |    0
 .../src/netbuild/NBPTLine.h                   |    0
 .../src/netbuild/NBPTLineCont.cpp             |    0
 .../src/netbuild/NBPTLineCont.h               |    0
 .../src/netbuild/NBPTPlatform.cpp             |    0
 .../src/netbuild/NBPTPlatform.h               |    0
 .../src/netbuild/NBPTStop.cpp                 |    0
 .../src/netbuild/NBPTStop.h                   |    0
 .../src/netbuild/NBPTStopCont.cpp             |    0
 .../src/netbuild/NBPTStopCont.h               |    0
 .../src/netbuild/NBParking.cpp                |    0
 .../src/netbuild/NBParking.h                  |    0
 .../src/netbuild/NBRequest.cpp                |    0
 .../src/netbuild/NBRequest.h                  |    0
 .../src/netbuild/NBSign.cpp                   |    0
 .../src/netbuild/NBSign.h                     |    0
 .../src/netbuild/NBTrafficLightDefinition.cpp |    0
 .../src/netbuild/NBTrafficLightDefinition.h   |    0
 .../src/netbuild/NBTrafficLightLogic.cpp      |    0
 .../src/netbuild/NBTrafficLightLogic.h        |    0
 .../src/netbuild/NBTrafficLightLogicCont.cpp  |    0
 .../src/netbuild/NBTrafficLightLogicCont.h    |    0
 .../src/netbuild/NBTypeCont.cpp               |    0
 .../src/netbuild/NBTypeCont.h                 |    0
 .../src/netbuild/NBVehicle.h                  |    0
 .../src/netbuild/_netbuild.dox                |    0
 .../src/netconvert_main.cpp                   |    0
 .../src/netgen/NGEdge.h                       |    0
 .../src/netgen/NGFrame.h                      |    0
 .../{Converter => OSM2ODR}/src/netgen/NGNet.h |    0
 .../src/netgen/NGNode.h                       |    0
 .../src/netgen/NGRandomNetBuilder.h           |    0
 .../src/netimport/CMakeLists.txt              |    0
 .../src/netimport/NIFrame.cpp                 |    0
 .../src/netimport/NIFrame.h                   |    0
 .../src/netimport/NIImporter_ArcView.cpp      |    0
 .../src/netimport/NIImporter_ArcView.h        |    0
 .../src/netimport/NIImporter_DlrNavteq.cpp    |    0
 .../src/netimport/NIImporter_DlrNavteq.h      |    0
 .../src/netimport/NIImporter_ITSUMO.cpp       |    0
 .../src/netimport/NIImporter_ITSUMO.h         |    0
 .../src/netimport/NIImporter_MATSim.cpp       |    0
 .../src/netimport/NIImporter_MATSim.h         |    0
 .../src/netimport/NIImporter_OpenDrive.cpp    |    0
 .../src/netimport/NIImporter_OpenDrive.h      |    0
 .../netimport/NIImporter_OpenStreetMap.cpp    |    0
 .../src/netimport/NIImporter_OpenStreetMap.h  |    0
 .../src/netimport/NIImporter_SUMO.cpp         |    0
 .../src/netimport/NIImporter_SUMO.h           |    0
 .../src/netimport/NIImporter_VISUM.cpp        |    0
 .../src/netimport/NIImporter_VISUM.h          |    0
 .../src/netimport/NILoader.cpp                |    0
 .../src/netimport/NILoader.h                  |    0
 .../src/netimport/NINavTeqHelper.cpp          |    0
 .../src/netimport/NINavTeqHelper.h            |    0
 .../src/netimport/NITypeLoader.cpp            |    0
 .../src/netimport/NITypeLoader.h              |    0
 .../src/netimport/NIVisumTL.cpp               |    0
 .../src/netimport/NIVisumTL.h                 |    0
 .../src/netimport/NIXMLConnectionsHandler.cpp |    0
 .../src/netimport/NIXMLConnectionsHandler.h   |    0
 .../src/netimport/NIXMLEdgesHandler.cpp       |    0
 .../src/netimport/NIXMLEdgesHandler.h         |    0
 .../src/netimport/NIXMLNodesHandler.cpp       |    0
 .../src/netimport/NIXMLNodesHandler.h         |    0
 .../src/netimport/NIXMLPTHandler.cpp          |    0
 .../src/netimport/NIXMLPTHandler.h            |    0
 .../src/netimport/NIXMLShapeHandler.cpp       |    0
 .../src/netimport/NIXMLShapeHandler.h         |    0
 .../netimport/NIXMLTrafficLightsHandler.cpp   |    0
 .../src/netimport/NIXMLTrafficLightsHandler.h |    0
 .../src/netimport/NIXMLTypesHandler.cpp       |    0
 .../src/netimport/NIXMLTypesHandler.h         |    0
 .../src/netimport/README_Contributing.md      |    0
 .../src/netimport/_netimport.dox              |    0
 .../src/netimport/typemap.h                   |    0
 .../src/netimport/vissim/CMakeLists.txt       |    0
 .../netimport/vissim/NIImporter_Vissim.cpp    |    0
 .../src/netimport/vissim/NIImporter_Vissim.h  |    0
 .../src/netimport/vissim/NIVissimElements.h   |    0
 .../vissim/tempstructs/CMakeLists.txt         |    0
 .../tempstructs/NIVissimAbstractEdge.cpp      |    0
 .../vissim/tempstructs/NIVissimAbstractEdge.h |    0
 .../NIVissimBoundedClusterObject.cpp          |    0
 .../NIVissimBoundedClusterObject.h            |    0
 .../tempstructs/NIVissimClosedLaneDef.cpp     |    0
 .../tempstructs/NIVissimClosedLaneDef.h       |    0
 .../tempstructs/NIVissimClosedLanesVector.h   |    0
 .../vissim/tempstructs/NIVissimClosures.cpp   |    0
 .../vissim/tempstructs/NIVissimClosures.h     |    0
 .../tempstructs/NIVissimConflictArea.cpp      |    0
 .../vissim/tempstructs/NIVissimConflictArea.h |    0
 .../vissim/tempstructs/NIVissimConnection.cpp |    0
 .../vissim/tempstructs/NIVissimConnection.h   |    0
 .../tempstructs/NIVissimConnectionCluster.cpp |    0
 .../tempstructs/NIVissimConnectionCluster.h   |    0
 .../NIVissimDistrictConnection.cpp            |    0
 .../tempstructs/NIVissimDistrictConnection.h  |    0
 .../tempstructs/NIVissimDisturbance.cpp       |    0
 .../vissim/tempstructs/NIVissimDisturbance.h  |    0
 .../vissim/tempstructs/NIVissimEdge.cpp       |    0
 .../vissim/tempstructs/NIVissimEdge.h         |    0
 .../vissim/tempstructs/NIVissimEdgePosMap.cpp |    0
 .../vissim/tempstructs/NIVissimEdgePosMap.h   |    0
 .../tempstructs/NIVissimExtendedEdgePoint.cpp |    0
 .../tempstructs/NIVissimExtendedEdgePoint.h   |    0
 .../NIVissimExtendedEdgePointVector.h         |    0
 .../tempstructs/NIVissimNodeCluster.cpp       |    0
 .../vissim/tempstructs/NIVissimNodeCluster.h  |    0
 .../vissim/tempstructs/NIVissimNodeDef.cpp    |    0
 .../vissim/tempstructs/NIVissimNodeDef.h      |    0
 .../tempstructs/NIVissimNodeDef_Edges.cpp     |    0
 .../tempstructs/NIVissimNodeDef_Edges.h       |    0
 .../tempstructs/NIVissimNodeDef_Poly.cpp      |    0
 .../vissim/tempstructs/NIVissimNodeDef_Poly.h |    0
 .../NIVissimNodeParticipatingEdge.cpp         |    0
 .../NIVissimNodeParticipatingEdge.h           |    0
 .../NIVissimNodeParticipatingEdgeVector.h     |    0
 .../vissim/tempstructs/NIVissimSource.cpp     |    0
 .../vissim/tempstructs/NIVissimSource.h       |    0
 .../vissim/tempstructs/NIVissimTL.cpp         |    0
 .../netimport/vissim/tempstructs/NIVissimTL.h |    0
 .../NIVissimTrafficDescription.cpp            |    0
 .../tempstructs/NIVissimTrafficDescription.h  |    0
 .../tempstructs/NIVissimVehTypeClass.cpp      |    0
 .../vissim/tempstructs/NIVissimVehTypeClass.h |    0
 .../tempstructs/NIVissimVehicleClass.cpp      |    0
 .../vissim/tempstructs/NIVissimVehicleClass.h |    0
 .../tempstructs/NIVissimVehicleClassVector.h  |    0
 .../tempstructs/NIVissimVehicleType.cpp       |    0
 .../vissim/tempstructs/NIVissimVehicleType.h  |    0
 .../vissim/typeloader/CMakeLists.txt          |    0
 ...SingleTypeParser_Auswertungsdefinition.cpp |    0
 ...imSingleTypeParser_Auswertungsdefinition.h |    0
 ...simSingleTypeParser_Detektordefinition.cpp |    0
 ...issimSingleTypeParser_Detektordefinition.h |    0
 .../NIVissimSingleTypeParser_DynUml.cpp       |    0
 .../NIVissimSingleTypeParser_DynUml.h         |    0
 ...imSingleTypeParser_Einheitendefinition.cpp |    0
 ...ssimSingleTypeParser_Einheitendefinition.h |    0
 .../NIVissimSingleTypeParser_Emission.cpp     |    0
 .../NIVissimSingleTypeParser_Emission.h       |    0
 ...imSingleTypeParser_Fahrtverlaufdateien.cpp |    0
 ...ssimSingleTypeParser_Fahrtverlaufdateien.h |    0
 ...ngleTypeParser_Fahrverhaltendefinition.cpp |    0
 ...SingleTypeParser_Fahrverhaltendefinition.h |    0
 ...leTypeParser_Fahrzeugklassendefinition.cpp |    0
 ...ngleTypeParser_Fahrzeugklassendefinition.h |    0
 ...SingleTypeParser_Fahrzeugtypdefinition.cpp |    0
 ...imSingleTypeParser_Fahrzeugtypdefinition.h |    0
 ...ssimSingleTypeParser_Fensterdefinition.cpp |    0
 ...VissimSingleTypeParser_Fensterdefinition.h |    0
 ...gleTypeParser_Gefahrwarnungsdefinition.cpp |    0
 ...ingleTypeParser_Gefahrwarnungsdefinition.h |    0
 ...ngleTypeParser_Gelbverhaltendefinition.cpp |    0
 ...SingleTypeParser_Gelbverhaltendefinition.h |    0
 ..._Geschwindigkeitsverteilungsdefinition.cpp |    0
 ...er_Geschwindigkeitsverteilungsdefinition.h |    0
 ...ingleTypeParser_Haltestellendefinition.cpp |    0
 ...mSingleTypeParser_Haltestellendefinition.h |    0
 ...IVissimSingleTypeParser_Kantensperrung.cpp |    0
 .../NIVissimSingleTypeParser_Kantensperrung.h |    0
 ...NIVissimSingleTypeParser_Kennungszeile.cpp |    0
 .../NIVissimSingleTypeParser_Kennungszeile.h  |    0
 ...issimSingleTypeParser_Knotendefinition.cpp |    0
 ...IVissimSingleTypeParser_Knotendefinition.h |    0
 ...ingleTypeParser_LSAKopplungsdefinition.cpp |    0
 ...mSingleTypeParser_LSAKopplungsdefinition.h |    0
 ...ypeParser_Laengenverteilungsdefinition.cpp |    0
 ...eTypeParser_Laengenverteilungsdefinition.h |    0
 ...ypeParser_Langsamfahrbereichdefinition.cpp |    0
 ...eTypeParser_Langsamfahrbereichdefinition.h |    0
 ...ypeParser_Lichtsignalanlagendefinition.cpp |    0
 ...eTypeParser_Lichtsignalanlagendefinition.h |    0
 ...issimSingleTypeParser_Liniendefinition.cpp |    0
 ...IVissimSingleTypeParser_Liniendefinition.h |    0
 .../NIVissimSingleTypeParser_Linksverkehr.cpp |    0
 .../NIVissimSingleTypeParser_Linksverkehr.h   |    0
 ...simSingleTypeParser_Messungsdefinition.cpp |    0
 ...issimSingleTypeParser_Messungsdefinition.h |    0
 ...mSingleTypeParser_Netzobjektdefinition.cpp |    0
 ...simSingleTypeParser_Netzobjektdefinition.h |    0
 ...imSingleTypeParser_Parkplatzdefinition.cpp |    0
 ...ssimSingleTypeParser_Parkplatzdefinition.h |    0
 ...eParser_Querschnittsmessungsdefinition.cpp |    0
 ...ypeParser_Querschnittsmessungsdefinition.h |    0
 ...Parser_Querverkehrsstoerungsdefinition.cpp |    0
 ...peParser_Querverkehrsstoerungsdefinition.h |    0
 ...VissimSingleTypeParser_Rautedefinition.cpp |    0
 ...NIVissimSingleTypeParser_Rautedefinition.h |    0
 ...TypeParser_Reisezeitmessungsdefinition.cpp |    0
 ...leTypeParser_Reisezeitmessungsdefinition.h |    0
 ...arser_Richtungsentscheidungsdefinition.cpp |    0
 ...eParser_Richtungsentscheidungsdefinition.h |    0
 ...gleTypeParser_Richtungspfeildefinition.cpp |    0
 ...ingleTypeParser_Richtungspfeildefinition.h |    0
 ...peParser_Routenentscheidungsdefinition.cpp |    0
 ...TypeParser_Routenentscheidungsdefinition.h |    0
 ...SingleTypeParser_Signalgeberdefinition.cpp |    0
 ...imSingleTypeParser_Signalgeberdefinition.h |    0
 ...ngleTypeParser_Signalgruppendefinition.cpp |    0
 ...SingleTypeParser_Signalgruppendefinition.h |    0
 .../NIVissimSingleTypeParser_SimRate.cpp      |    0
 .../NIVissimSingleTypeParser_SimRate.h        |    0
 .../NIVissimSingleTypeParser_Simdauer.cpp     |    0
 .../NIVissimSingleTypeParser_Simdauer.h       |    0
 .../NIVissimSingleTypeParser_Startuhrzeit.cpp |    0
 .../NIVissimSingleTypeParser_Startuhrzeit.h   |    0
 ...issimSingleTypeParser_Startzufallszahl.cpp |    0
 ...IVissimSingleTypeParser_Startzufallszahl.h |    0
 ...ngleTypeParser_Stauparameterdefinition.cpp |    0
 ...SingleTypeParser_Stauparameterdefinition.h |    0
 ...SingleTypeParser_Stauzaehlerdefinition.cpp |    0
 ...imSingleTypeParser_Stauzaehlerdefinition.h |    0
 ...mSingleTypeParser_Stopschilddefinition.cpp |    0
 ...simSingleTypeParser_Stopschilddefinition.h |    0
 ...simSingleTypeParser_Streckendefinition.cpp |    0
 ...issimSingleTypeParser_Streckendefinition.h |    0
 ...SingleTypeParser_Streckentypdefinition.cpp |    0
 ...imSingleTypeParser_Streckentypdefinition.h |    0
 ...issimSingleTypeParser_TEAPACDefinition.cpp |    0
 ...IVissimSingleTypeParser_TEAPACDefinition.h |    0
 ...eParser_VWunschentscheidungsdefinition.cpp |    0
 ...ypeParser_VWunschentscheidungsdefinition.h |    0
 ...SingleTypeParser_Verbindungsdefinition.cpp |    0
 ...imSingleTypeParser_Verbindungsdefinition.h |    0
 ...ser_Verkehrszusammensetzungsdefinition.cpp |    0
 ...arser_Verkehrszusammensetzungsdefinition.h |    0
 ...peParser_Verlustzeitmessungsdefinition.cpp |    0
 ...TypeParser_Verlustzeitmessungsdefinition.h |    0
 ...TypeParser_Zeitenverteilungsdefinition.cpp |    0
 ...leTypeParser_Zeitenverteilungsdefinition.h |    0
 ...ssimSingleTypeParser_Zeitschrittfaktor.cpp |    0
 ...VissimSingleTypeParser_Zeitschrittfaktor.h |    0
 ...ssimSingleTypeParser_Zuflussdefinition.cpp |    0
 ...VissimSingleTypeParser_Zuflussdefinition.h |    0
 ...eTypeParser_Zusammensetzungsdefinition.cpp |    0
 ...gleTypeParser_Zusammensetzungsdefinition.h |    0
 ...ssimSingleTypeParser__XKurvedefinition.cpp |    0
 ...VissimSingleTypeParser__XKurvedefinition.h |    0
 ...ngleTypeParser__XVerteilungsdefinition.cpp |    0
 ...SingleTypeParser__XVerteilungsdefinition.h |    0
 .../src/netload/NLBuilder.h                   |    0
 .../src/netload/NLDetectorBuilder.h           |    0
 .../src/netload/NLDiscreteEventBuilder.h      |    0
 .../src/netload/NLEdgeControlBuilder.h        |    0
 .../src/netload/NLHandler.h                   |    0
 .../src/netload/NLJunctionControlBuilder.h    |    0
 .../src/netload/NLTriggerBuilder.h            |    0
 .../src/netwrite/CMakeLists.txt               |    0
 .../src/netwrite/NWFrame.cpp                  |    0
 .../src/netwrite/NWFrame.h                    |    0
 .../src/netwrite/NWWriter_Amitran.cpp         |    0
 .../src/netwrite/NWWriter_Amitran.h           |    0
 .../src/netwrite/NWWriter_DlrNavteq.cpp       |    0
 .../src/netwrite/NWWriter_DlrNavteq.h         |    0
 .../src/netwrite/NWWriter_MATSim.cpp          |    0
 .../src/netwrite/NWWriter_MATSim.h            |    0
 .../src/netwrite/NWWriter_OpenDrive.cpp       |    0
 .../src/netwrite/NWWriter_OpenDrive.h         |    0
 .../src/netwrite/NWWriter_SUMO.cpp            |    0
 .../src/netwrite/NWWriter_SUMO.h              |    0
 .../src/netwrite/NWWriter_XML.cpp             |    0
 .../src/netwrite/NWWriter_XML.h               |    0
 .../src/netwrite/README_Contributing.md       |    0
 Util/{Converter => OSM2ODR}/src/notes         |    0
 .../src/polyconvert/PCLoaderArcView.h         |    0
 .../src/polyconvert/PCLoaderDlrNavteq.h       |    0
 .../src/polyconvert/PCLoaderOSM.h             |    0
 .../src/polyconvert/PCLoaderVisum.h           |    0
 .../src/polyconvert/PCLoaderXML.h             |    0
 .../src/polyconvert/PCNetProjectionLoader.h   |    0
 .../src/polyconvert/PCPolyContainer.h         |    0
 .../src/polyconvert/PCTypeDefHandler.h        |    0
 .../src/polyconvert/PCTypeMap.h               |    0
 .../src/utils/CMakeLists.txt                  |    0
 .../src/utils/common/CMakeLists.txt           |    0
 .../src/utils/common/Command.h                |    0
 .../src/utils/common/FileHelpers.cpp          |    0
 .../src/utils/common/FileHelpers.h            |    0
 .../src/utils/common/IDSupplier.cpp           |    0
 .../src/utils/common/IDSupplier.h             |    0
 .../src/utils/common/InstancePool.h           |    0
 .../src/utils/common/MsgHandler.cpp           |    0
 .../src/utils/common/MsgHandler.h             |    0
 .../src/utils/common/MsgRetrievingFunction.h  |    0
 .../src/utils/common/Named.h                  |    0
 .../src/utils/common/NamedObjectCont.h        |    0
 .../src/utils/common/NamedRTree.h             |    0
 .../src/utils/common/Parameterised.cpp        |    0
 .../src/utils/common/Parameterised.h          |    0
 .../common/ParametrisedWrappingCommand.h      |    0
 .../src/utils/common/PolySolver.cpp           |    0
 .../src/utils/common/PolySolver.h             |    0
 .../src/utils/common/RGBColor.cpp             |    0
 .../src/utils/common/RGBColor.h               |    0
 .../src/utils/common/RandHelper.cpp           |    0
 .../src/utils/common/RandHelper.h             |    0
 .../src/utils/common/SUMOTime.cpp             |    0
 .../src/utils/common/SUMOTime.h               |    0
 .../src/utils/common/SUMOVehicleClass.cpp     |    0
 .../src/utils/common/SUMOVehicleClass.h       |    0
 .../src/utils/common/StaticCommand.h          |    0
 .../src/utils/common/StdDefs.cpp              |    0
 .../src/utils/common/StdDefs.h                |    0
 .../src/utils/common/StringBijection.h        |    0
 .../src/utils/common/StringTokenizer.cpp      |    0
 .../src/utils/common/StringTokenizer.h        |    0
 .../src/utils/common/StringUtils.cpp          |    0
 .../src/utils/common/StringUtils.h            |    0
 .../src/utils/common/SwarmDebug.h             |    0
 .../src/utils/common/SysUtils.cpp             |    0
 .../src/utils/common/SysUtils.h               |    0
 .../src/utils/common/SystemFrame.cpp          |    0
 .../src/utils/common/SystemFrame.h            |    0
 .../src/utils/common/ToString.h               |    0
 .../src/utils/common/UtilExceptions.h         |    0
 .../src/utils/common/ValueRetriever.h         |    0
 .../src/utils/common/ValueSource.h            |    0
 .../src/utils/common/ValueTimeLine.h          |    0
 .../src/utils/common/VectorHelper.h           |    0
 .../src/utils/common/WrappingCommand.h        |    0
 .../src/utils/distribution/CMakeLists.txt     |    0
 .../src/utils/distribution/Distribution.h     |    0
 .../utils/distribution/DistributionCont.cpp   |    0
 .../src/utils/distribution/DistributionCont.h |    0
 .../Distribution_Parameterized.cpp            |    0
 .../distribution/Distribution_Parameterized.h |    0
 .../distribution/Distribution_Points.cpp      |    0
 .../utils/distribution/Distribution_Points.h  |    0
 .../utils/distribution/RandomDistributor.h    |    0
 .../src/utils/foxtools/FXConditionalLock.h    |    0
 .../src/utils/foxtools/FXSynchQue.h           |    0
 .../src/utils/foxtools/FXWorkerThread.h       |    0
 .../src/utils/geom/AbstractPoly.h             |    0
 .../src/utils/geom/Boundary.cpp               |    0
 .../src/utils/geom/Boundary.h                 |    0
 .../src/utils/geom/Bresenham.cpp              |    0
 .../src/utils/geom/Bresenham.h                |    0
 .../src/utils/geom/CMakeLists.txt             |    0
 .../src/utils/geom/GeoConvHelper.cpp          |    0
 .../src/utils/geom/GeoConvHelper.h            |    0
 .../src/utils/geom/GeomConvHelper.cpp         |    0
 .../src/utils/geom/GeomConvHelper.h           |    0
 .../src/utils/geom/GeomHelper.cpp             |    0
 .../src/utils/geom/GeomHelper.h               |    0
 .../src/utils/geom/Position.cpp               |    0
 .../src/utils/geom/Position.h                 |    0
 .../src/utils/geom/PositionVector.cpp         |    0
 .../src/utils/geom/PositionVector.h           |    0
 .../utils/gui/globjects/GUIGlObjectTypes.h    |    0
 .../src/utils/importio/CMakeLists.txt         |    0
 .../src/utils/importio/LineHandler.h          |    0
 .../src/utils/importio/LineReader.cpp         |    0
 .../src/utils/importio/LineReader.h           |    0
 .../src/utils/importio/NamedColumnsParser.cpp |    0
 .../src/utils/importio/NamedColumnsParser.h   |    0
 .../src/utils/iodevices/CMakeLists.txt        |    0
 .../src/utils/iodevices/OutputDevice.cpp      |    0
 .../src/utils/iodevices/OutputDevice.h        |    0
 .../src/utils/iodevices/OutputDevice_CERR.cpp |    0
 .../src/utils/iodevices/OutputDevice_CERR.h   |    0
 .../src/utils/iodevices/OutputDevice_COUT.cpp |    0
 .../src/utils/iodevices/OutputDevice_COUT.h   |    0
 .../src/utils/iodevices/OutputDevice_File.cpp |    0
 .../src/utils/iodevices/OutputDevice_File.h   |    0
 .../utils/iodevices/OutputDevice_Network.cpp  |    0
 .../utils/iodevices/OutputDevice_Network.h    |    0
 .../utils/iodevices/OutputDevice_String.cpp   |    0
 .../src/utils/iodevices/OutputDevice_String.h |    0
 .../src/utils/iodevices/OutputFormatter.h     |    0
 .../src/utils/iodevices/PlainXMLFormatter.cpp |    0
 .../src/utils/iodevices/PlainXMLFormatter.h   |    0
 .../src/utils/options/CMakeLists.txt          |    0
 .../src/utils/options/Option.cpp              |    0
 .../src/utils/options/Option.h                |    0
 .../src/utils/options/OptionsCont.cpp         |    0
 .../src/utils/options/OptionsCont.h           |    0
 .../src/utils/options/OptionsIO.cpp           |    0
 .../src/utils/options/OptionsIO.h             |    0
 .../src/utils/options/OptionsLoader.cpp       |    0
 .../src/utils/options/OptionsLoader.h         |    0
 .../src/utils/options/OptionsParser.cpp       |    0
 .../src/utils/options/OptionsParser.h         |    0
 .../src/utils/router/AStarLookupTable.h       |    0
 .../src/utils/router/AStarRouter.h            |    0
 .../src/utils/router/AccessEdge.h             |    0
 .../src/utils/router/CHBuilder.h              |    0
 .../src/utils/router/CHRouter.h               |    0
 .../src/utils/router/CHRouterWrapper.h        |    0
 .../src/utils/router/CMakeLists.txt           |    0
 .../src/utils/router/CarEdge.h                |    0
 .../src/utils/router/DijkstraRouter.h         |    0
 .../src/utils/router/EffortCalculator.h       |    0
 .../src/utils/router/FareModul.h              |    0
 .../src/utils/router/FareToken.h              |    0
 .../src/utils/router/FareZones.h              |    0
 .../src/utils/router/GawronCalculator.h       |    0
 .../src/utils/router/IntermodalEdge.h         |    0
 .../src/utils/router/IntermodalNetwork.h      |    0
 .../src/utils/router/IntermodalRouter.h       |    0
 .../src/utils/router/IntermodalTrip.h         |    0
 .../src/utils/router/LogitCalculator.h        |    0
 .../src/utils/router/PedestrianEdge.h         |    0
 .../src/utils/router/PedestrianRouter.h       |    0
 .../src/utils/router/PublicTransportEdge.h    |    0
 .../src/utils/router/RailEdge.h               |    0
 .../src/utils/router/RailwayRouter.h          |    0
 .../src/utils/router/ReversedEdge.h           |    0
 .../src/utils/router/RouteCostCalculator.h    |    0
 .../src/utils/router/RouterProvider.h         |    0
 .../src/utils/router/SPTree.h                 |    0
 .../src/utils/router/SUMOAbstractRouter.h     |    0
 .../src/utils/router/StopEdge.h               |    0
 .../src/utils/shapes/CMakeLists.txt           |    0
 .../src/utils/shapes/PointOfInterest.h        |    0
 .../src/utils/shapes/PolygonDynamics.cpp      |    0
 .../src/utils/shapes/PolygonDynamics.h        |    0
 .../src/utils/shapes/SUMOPolygon.cpp          |    0
 .../src/utils/shapes/SUMOPolygon.h            |    0
 .../src/utils/shapes/Shape.cpp                |    0
 .../src/utils/shapes/Shape.h                  |    0
 .../src/utils/shapes/ShapeContainer.cpp       |    0
 .../src/utils/shapes/ShapeContainer.h         |    0
 .../src/utils/shapes/ShapeHandler.cpp         |    0
 .../src/utils/shapes/ShapeHandler.h           |    0
 .../src/utils/traction_wire/CMakeLists.txt    |    0
 .../src/utils/traction_wire/Circuit.cpp       |    0
 .../src/utils/traction_wire/Circuit.h         |    0
 .../src/utils/traction_wire/Element.cpp       |    0
 .../src/utils/traction_wire/Element.h         |    0
 .../src/utils/traction_wire/Node.cpp          |    0
 .../src/utils/traction_wire/Node.h            |    0
 .../src/utils/vehicle/SUMOTrafficObject.h     |    0
 .../src/utils/vehicle/SUMOVTypeParameter.h    |    0
 .../src/utils/vehicle/SUMOVehicle.h           |    0
 .../src/utils/vehicle/SUMOVehicleParameter.h  |    0
 .../src/utils/xml/CMakeLists.txt              |    0
 .../src/utils/xml/GenericSAXHandler.cpp       |    0
 .../src/utils/xml/GenericSAXHandler.h         |    0
 .../src/utils/xml/IStreamInputSource.h        |    0
 .../src/utils/xml/SAXWeightsHandler.cpp       |    0
 .../src/utils/xml/SAXWeightsHandler.h         |    0
 .../src/utils/xml/SUMOSAXAttributes.cpp       |    0
 .../src/utils/xml/SUMOSAXAttributes.h         |    0
 .../xml/SUMOSAXAttributesImpl_Cached.cpp      |    0
 .../utils/xml/SUMOSAXAttributesImpl_Cached.h  |    0
 .../xml/SUMOSAXAttributesImpl_Xerces.cpp      |    0
 .../utils/xml/SUMOSAXAttributesImpl_Xerces.h  |    0
 .../src/utils/xml/SUMOSAXHandler.cpp          |    0
 .../src/utils/xml/SUMOSAXHandler.h            |    0
 .../src/utils/xml/SUMOSAXReader.cpp           |    0
 .../src/utils/xml/SUMOSAXReader.h             |    0
 .../src/utils/xml/SUMOXMLDefinitions.cpp      |    0
 .../src/utils/xml/SUMOXMLDefinitions.h        |    0
 .../src/utils/xml/XMLSubSys.cpp               |    0
 .../src/utils/xml/XMLSubSys.h                 |    0
 Util/{Converter => OSM2ODR}/src/version.h     |    0
 555 files changed, 126 insertions(+), 2851 deletions(-)
 delete mode 100644 PythonAPI/carla/source/libcarla/Converter.cpp
 create mode 100644 PythonAPI/carla/source/libcarla/OSM2ODR.cpp
 rename Util/BuildTools/{BuildConverter.bat => BuildOSM2ODR.bat} (72%)
 rename Util/BuildTools/{BuildConverter.sh => BuildOSM2ODR.sh} (50%)
 delete mode 100644 Util/Converter/CONTRIBUTING.md
 delete mode 100644 Util/Converter/ChangeLog
 delete mode 100644 Util/Converter/NOTICE.md
 delete mode 100644 Util/Converter/README.md
 delete mode 100644 Util/Converter/sumo.doxyconf
 rename Util/{Converter => OSM2ODR}/.gitignore (100%)
 rename Util/{Converter => OSM2ODR}/AUTHORS (100%)
 rename Util/{Converter => OSM2ODR}/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/CMakeSettings.json (100%)
 rename Util/{Converter => OSM2ODR}/LICENSE (100%)
 rename Util/{Converter => OSM2ODR}/cmake-variants.yaml (100%)
 rename Util/{Converter => OSM2ODR}/cmake_modules/FindProj.cmake (100%)
 rename Util/{Converter => OSM2ODR}/src/CMakeLists.txt (57%)
 rename Util/{Converter/src/Converter.cpp => OSM2ODR/src/OSM2ODR.cpp} (99%)
 rename Util/{Converter/src/Converter.h => OSM2ODR/src/OSM2ODR.h} (100%)
 rename Util/{Converter => OSM2ODR}/src/README_Contributing.md (100%)
 rename Util/{Converter => OSM2ODR}/src/config.h.cmake (100%)
 rename Util/{Converter => OSM2ODR}/src/foreign/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/foreign/eulerspiral/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/foreign/eulerspiral/LICENSE.TXT (100%)
 rename Util/{Converter => OSM2ODR}/src/foreign/eulerspiral/odrSpiral.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/foreign/eulerspiral/odrSpiral.h (100%)
 rename Util/{Converter => OSM2ODR}/src/foreign/rtree/LayeredRTree.h (100%)
 rename Util/{Converter => OSM2ODR}/src/foreign/rtree/README.TXT (100%)
 rename Util/{Converter => OSM2ODR}/src/foreign/rtree/RTree.h (100%)
 rename Util/{Converter => OSM2ODR}/src/foreign/rtree/SUMORTree.h (100%)
 rename Util/{Converter => OSM2ODR}/src/foreign/tcpip/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/foreign/tcpip/socket.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/foreign/tcpip/socket.h (100%)
 rename Util/{Converter => OSM2ODR}/src/foreign/tcpip/storage.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/foreign/tcpip/storage.h (100%)
 rename Util/{Converter => OSM2ODR}/src/foreign/zstr/LICENSE (100%)
 rename Util/{Converter => OSM2ODR}/src/foreign/zstr/strict_fstream.hpp (100%)
 rename Util/{Converter => OSM2ODR}/src/foreign/zstr/zstr.hpp (100%)
 rename Util/{Converter => OSM2ODR}/src/libsumo/Helper.h (100%)
 rename Util/{Converter => OSM2ODR}/src/libsumo/Subscription.h (100%)
 rename Util/{Converter => OSM2ODR}/src/libsumo/TraCIConstants.h (100%)
 rename Util/{Converter => OSM2ODR}/src/libsumo/TraCIDefs.h (100%)
 rename Util/{Converter => OSM2ODR}/src/microsim/MSJunction.h (100%)
 rename Util/{Converter => OSM2ODR}/src/microsim/MSLane.h (100%)
 rename Util/{Converter => OSM2ODR}/src/microsim/MSLeaderInfo.h (100%)
 rename Util/{Converter => OSM2ODR}/src/microsim/MSLink.h (100%)
 rename Util/{Converter => OSM2ODR}/src/microsim/MSLinkCont.h (100%)
 rename Util/{Converter => OSM2ODR}/src/microsim/MSMoveReminder.h (100%)
 rename Util/{Converter => OSM2ODR}/src/microsim/MSNet.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBAlgorithms.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBAlgorithms.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBAlgorithms_Railway.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBAlgorithms_Railway.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBAlgorithms_Ramps.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBAlgorithms_Ramps.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBCapacity2Lanes.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBConnection.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBConnection.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBConnectionDefs.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBCont.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBContHelper.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBContHelper.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBDistrict.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBDistrict.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBDistrictCont.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBDistrictCont.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBEdge.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBEdge.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBEdgeCont.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBEdgeCont.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBFrame.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBFrame.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBHeightMapper.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBHeightMapper.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBHelpers.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBHelpers.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBLinkPossibilityMatrix.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBLoadedSUMOTLDef.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBLoadedSUMOTLDef.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBLoadedTLDef.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBLoadedTLDef.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBNetBuilder.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBNetBuilder.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBNode.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBNode.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBNodeCont.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBNodeCont.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBNodeShapeComputer.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBNodeShapeComputer.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBOwnTLDef.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBOwnTLDef.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBPTLine.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBPTLine.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBPTLineCont.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBPTLineCont.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBPTPlatform.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBPTPlatform.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBPTStop.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBPTStop.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBPTStopCont.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBPTStopCont.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBParking.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBParking.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBRequest.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBRequest.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBSign.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBSign.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBTrafficLightDefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBTrafficLightDefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBTrafficLightLogic.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBTrafficLightLogic.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBTrafficLightLogicCont.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBTrafficLightLogicCont.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBTypeCont.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBTypeCont.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/NBVehicle.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netbuild/_netbuild.dox (100%)
 rename Util/{Converter => OSM2ODR}/src/netconvert_main.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netgen/NGEdge.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netgen/NGFrame.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netgen/NGNet.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netgen/NGNode.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netgen/NGRandomNetBuilder.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIFrame.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIFrame.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIImporter_ArcView.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIImporter_ArcView.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIImporter_DlrNavteq.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIImporter_DlrNavteq.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIImporter_ITSUMO.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIImporter_ITSUMO.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIImporter_MATSim.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIImporter_MATSim.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIImporter_OpenDrive.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIImporter_OpenDrive.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIImporter_OpenStreetMap.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIImporter_OpenStreetMap.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIImporter_SUMO.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIImporter_SUMO.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIImporter_VISUM.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIImporter_VISUM.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NILoader.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NILoader.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NINavTeqHelper.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NINavTeqHelper.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NITypeLoader.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NITypeLoader.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIVisumTL.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIVisumTL.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIXMLConnectionsHandler.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIXMLConnectionsHandler.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIXMLEdgesHandler.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIXMLEdgesHandler.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIXMLNodesHandler.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIXMLNodesHandler.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIXMLPTHandler.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIXMLPTHandler.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIXMLShapeHandler.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIXMLShapeHandler.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIXMLTrafficLightsHandler.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIXMLTrafficLightsHandler.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIXMLTypesHandler.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/NIXMLTypesHandler.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/README_Contributing.md (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/_netimport.dox (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/typemap.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/NIImporter_Vissim.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/NIImporter_Vissim.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/NIVissimElements.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimAbstractEdge.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimAbstractEdge.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimBoundedClusterObject.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimBoundedClusterObject.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimClosedLaneDef.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimClosedLaneDef.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimClosedLanesVector.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimClosures.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimClosures.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimConflictArea.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimConflictArea.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimConnection.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimConnection.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimConnectionCluster.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimConnectionCluster.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimDistrictConnection.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimDistrictConnection.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimDisturbance.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimDisturbance.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimEdge.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimEdge.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimEdgePosMap.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimEdgePosMap.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePoint.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePoint.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePointVector.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimNodeCluster.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimNodeCluster.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimNodeDef.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimNodeDef.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimNodeDef_Edges.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimNodeDef_Edges.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimNodeDef_Poly.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimNodeDef_Poly.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdge.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdge.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdgeVector.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimSource.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimSource.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimTL.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimTL.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimTrafficDescription.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimTrafficDescription.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimVehTypeClass.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimVehTypeClass.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimVehicleClass.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimVehicleClass.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimVehicleClassVector.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimVehicleType.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/tempstructs/NIVissimVehicleType.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Auswertungsdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Auswertungsdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Detektordefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Detektordefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_DynUml.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_DynUml.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Einheitendefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Einheitendefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Emission.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Emission.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrtverlaufdateien.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrtverlaufdateien.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrverhaltendefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrverhaltendefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugklassendefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugklassendefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugtypdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugtypdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fensterdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fensterdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gefahrwarnungsdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gefahrwarnungsdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gelbverhaltendefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gelbverhaltendefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Geschwindigkeitsverteilungsdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Geschwindigkeitsverteilungsdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Haltestellendefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Haltestellendefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kantensperrung.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kantensperrung.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kennungszeile.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kennungszeile.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Knotendefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Knotendefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_LSAKopplungsdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_LSAKopplungsdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Laengenverteilungsdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Laengenverteilungsdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Langsamfahrbereichdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Langsamfahrbereichdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Lichtsignalanlagendefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Lichtsignalanlagendefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Liniendefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Liniendefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Linksverkehr.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Linksverkehr.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Messungsdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Messungsdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Netzobjektdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Netzobjektdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Parkplatzdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Parkplatzdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querschnittsmessungsdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querschnittsmessungsdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querverkehrsstoerungsdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querverkehrsstoerungsdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Rautedefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Rautedefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Reisezeitmessungsdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Reisezeitmessungsdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungsentscheidungsdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungsentscheidungsdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungspfeildefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungspfeildefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Routenentscheidungsdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Routenentscheidungsdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgeberdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgeberdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgruppendefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgruppendefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_SimRate.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_SimRate.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Simdauer.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Simdauer.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startuhrzeit.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startuhrzeit.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startzufallszahl.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startzufallszahl.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauparameterdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauparameterdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauzaehlerdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauzaehlerdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stopschilddefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stopschilddefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckendefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckendefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckentypdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckentypdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_TEAPACDefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_TEAPACDefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_VWunschentscheidungsdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_VWunschentscheidungsdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verbindungsdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verbindungsdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verkehrszusammensetzungsdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verkehrszusammensetzungsdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verlustzeitmessungsdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verlustzeitmessungsdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitenverteilungsdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitenverteilungsdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitschrittfaktor.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitschrittfaktor.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zuflussdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zuflussdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zusammensetzungsdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zusammensetzungsdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XKurvedefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XKurvedefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XVerteilungsdefinition.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XVerteilungsdefinition.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netload/NLBuilder.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netload/NLDetectorBuilder.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netload/NLDiscreteEventBuilder.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netload/NLEdgeControlBuilder.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netload/NLHandler.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netload/NLJunctionControlBuilder.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netload/NLTriggerBuilder.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netwrite/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/netwrite/NWFrame.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netwrite/NWFrame.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netwrite/NWWriter_Amitran.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netwrite/NWWriter_Amitran.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netwrite/NWWriter_DlrNavteq.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netwrite/NWWriter_DlrNavteq.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netwrite/NWWriter_MATSim.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netwrite/NWWriter_MATSim.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netwrite/NWWriter_OpenDrive.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netwrite/NWWriter_OpenDrive.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netwrite/NWWriter_SUMO.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netwrite/NWWriter_SUMO.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netwrite/NWWriter_XML.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/netwrite/NWWriter_XML.h (100%)
 rename Util/{Converter => OSM2ODR}/src/netwrite/README_Contributing.md (100%)
 rename Util/{Converter => OSM2ODR}/src/notes (100%)
 rename Util/{Converter => OSM2ODR}/src/polyconvert/PCLoaderArcView.h (100%)
 rename Util/{Converter => OSM2ODR}/src/polyconvert/PCLoaderDlrNavteq.h (100%)
 rename Util/{Converter => OSM2ODR}/src/polyconvert/PCLoaderOSM.h (100%)
 rename Util/{Converter => OSM2ODR}/src/polyconvert/PCLoaderVisum.h (100%)
 rename Util/{Converter => OSM2ODR}/src/polyconvert/PCLoaderXML.h (100%)
 rename Util/{Converter => OSM2ODR}/src/polyconvert/PCNetProjectionLoader.h (100%)
 rename Util/{Converter => OSM2ODR}/src/polyconvert/PCPolyContainer.h (100%)
 rename Util/{Converter => OSM2ODR}/src/polyconvert/PCTypeDefHandler.h (100%)
 rename Util/{Converter => OSM2ODR}/src/polyconvert/PCTypeMap.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/Command.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/FileHelpers.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/FileHelpers.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/IDSupplier.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/IDSupplier.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/InstancePool.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/MsgHandler.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/MsgHandler.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/MsgRetrievingFunction.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/Named.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/NamedObjectCont.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/NamedRTree.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/Parameterised.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/Parameterised.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/ParametrisedWrappingCommand.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/PolySolver.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/PolySolver.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/RGBColor.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/RGBColor.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/RandHelper.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/RandHelper.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/SUMOTime.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/SUMOTime.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/SUMOVehicleClass.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/SUMOVehicleClass.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/StaticCommand.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/StdDefs.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/StdDefs.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/StringBijection.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/StringTokenizer.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/StringTokenizer.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/StringUtils.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/StringUtils.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/SwarmDebug.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/SysUtils.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/SysUtils.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/SystemFrame.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/SystemFrame.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/ToString.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/UtilExceptions.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/ValueRetriever.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/ValueSource.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/ValueTimeLine.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/VectorHelper.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/common/WrappingCommand.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/distribution/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/distribution/Distribution.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/distribution/DistributionCont.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/distribution/DistributionCont.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/distribution/Distribution_Parameterized.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/distribution/Distribution_Parameterized.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/distribution/Distribution_Points.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/distribution/Distribution_Points.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/distribution/RandomDistributor.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/foxtools/FXConditionalLock.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/foxtools/FXSynchQue.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/foxtools/FXWorkerThread.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/geom/AbstractPoly.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/geom/Boundary.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/geom/Boundary.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/geom/Bresenham.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/geom/Bresenham.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/geom/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/geom/GeoConvHelper.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/geom/GeoConvHelper.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/geom/GeomConvHelper.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/geom/GeomConvHelper.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/geom/GeomHelper.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/geom/GeomHelper.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/geom/Position.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/geom/Position.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/geom/PositionVector.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/geom/PositionVector.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/gui/globjects/GUIGlObjectTypes.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/importio/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/importio/LineHandler.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/importio/LineReader.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/importio/LineReader.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/importio/NamedColumnsParser.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/importio/NamedColumnsParser.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/iodevices/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/iodevices/OutputDevice.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/iodevices/OutputDevice.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/iodevices/OutputDevice_CERR.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/iodevices/OutputDevice_CERR.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/iodevices/OutputDevice_COUT.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/iodevices/OutputDevice_COUT.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/iodevices/OutputDevice_File.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/iodevices/OutputDevice_File.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/iodevices/OutputDevice_Network.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/iodevices/OutputDevice_Network.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/iodevices/OutputDevice_String.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/iodevices/OutputDevice_String.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/iodevices/OutputFormatter.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/iodevices/PlainXMLFormatter.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/iodevices/PlainXMLFormatter.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/options/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/options/Option.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/options/Option.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/options/OptionsCont.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/options/OptionsCont.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/options/OptionsIO.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/options/OptionsIO.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/options/OptionsLoader.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/options/OptionsLoader.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/options/OptionsParser.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/options/OptionsParser.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/AStarLookupTable.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/AStarRouter.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/AccessEdge.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/CHBuilder.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/CHRouter.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/CHRouterWrapper.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/CarEdge.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/DijkstraRouter.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/EffortCalculator.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/FareModul.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/FareToken.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/FareZones.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/GawronCalculator.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/IntermodalEdge.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/IntermodalNetwork.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/IntermodalRouter.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/IntermodalTrip.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/LogitCalculator.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/PedestrianEdge.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/PedestrianRouter.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/PublicTransportEdge.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/RailEdge.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/RailwayRouter.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/ReversedEdge.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/RouteCostCalculator.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/RouterProvider.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/SPTree.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/SUMOAbstractRouter.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/router/StopEdge.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/shapes/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/shapes/PointOfInterest.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/shapes/PolygonDynamics.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/shapes/PolygonDynamics.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/shapes/SUMOPolygon.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/shapes/SUMOPolygon.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/shapes/Shape.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/shapes/Shape.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/shapes/ShapeContainer.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/shapes/ShapeContainer.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/shapes/ShapeHandler.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/shapes/ShapeHandler.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/traction_wire/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/traction_wire/Circuit.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/traction_wire/Circuit.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/traction_wire/Element.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/traction_wire/Element.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/traction_wire/Node.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/traction_wire/Node.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/vehicle/SUMOTrafficObject.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/vehicle/SUMOVTypeParameter.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/vehicle/SUMOVehicle.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/vehicle/SUMOVehicleParameter.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/CMakeLists.txt (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/GenericSAXHandler.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/GenericSAXHandler.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/IStreamInputSource.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/SAXWeightsHandler.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/SAXWeightsHandler.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/SUMOSAXAttributes.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/SUMOSAXAttributes.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/SUMOSAXAttributesImpl_Cached.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/SUMOSAXAttributesImpl_Cached.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/SUMOSAXAttributesImpl_Xerces.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/SUMOSAXAttributesImpl_Xerces.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/SUMOSAXHandler.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/SUMOSAXHandler.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/SUMOSAXReader.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/SUMOSAXReader.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/SUMOXMLDefinitions.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/SUMOXMLDefinitions.h (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/XMLSubSys.cpp (100%)
 rename Util/{Converter => OSM2ODR}/src/utils/xml/XMLSubSys.h (100%)
 rename Util/{Converter => OSM2ODR}/src/version.h (100%)

diff --git a/PythonAPI/carla/setup.py b/PythonAPI/carla/setup.py
index c9915d3d3..f4313c655 100755
--- a/PythonAPI/carla/setup.py
+++ b/PythonAPI/carla/setup.py
@@ -51,7 +51,7 @@ def get_libcarla_extensions():
                 os.path.join(pwd, 'dependencies/lib/libRecast.a'),
                 os.path.join(pwd, 'dependencies/lib/libDetour.a'),
                 os.path.join(pwd, 'dependencies/lib/libDetourCrowd.a'),
-                os.path.join(pwd, 'dependencies/lib/libconverter.a')]
+                os.path.join(pwd, 'dependencies/lib/libosm2odr.a')]
             extra_link_args += ['-lxerces-c']
             extra_link_args += ['-lz']
             extra_compile_args = [
@@ -112,7 +112,7 @@ def get_libcarla_extensions():
             'rpc.lib', 'carla_client.lib',
             'libpng.lib', 'zlib.lib',
             'Recast.lib', 'Detour.lib', 'DetourCrowd.lib',
-            'converter.lib', 'xerces-c_3.lib']
+            'osm2odr.lib', 'xerces-c_3.lib']
 
         # Search for files in 'PythonAPI\carla\dependencies\lib' that contains
         # the names listed in required_libs in it's file name
diff --git a/PythonAPI/carla/source/libcarla/Converter.cpp b/PythonAPI/carla/source/libcarla/Converter.cpp
deleted file mode 100644
index 7d66b3c49..000000000
--- a/PythonAPI/carla/source/libcarla/Converter.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) 2020 Computer Vision Center (CVC) at the Universitat Autonoma
-// de Barcelona (UAB).
-//
-// This work is licensed under the terms of the MIT license.
-// For a copy, see <https://opensource.org/licenses/MIT>.
-
-#include <Converter.h>
-
-class OSM2ODR {
-public:
-  // static std::string ConvertOSMToOpenDRIVE(std::string osm_file, osm2odr::) {
-  //   return osm2odr::ConvertOSMToOpenDRIVE(osm_file);
-  // }
-};
-
-void export_converter() {
-  using namespace osm2odr;
-  using namespace boost::python;
-
-  class_<OSM2ODRSettings>("OSM2ODRSettings", init<>())
-    .add_property("use_offsets", &OSM2ODRSettings::use_offsets, &OSM2ODRSettings::use_offsets)
-    .add_property("offset_x", &OSM2ODRSettings::offset_x, &OSM2ODRSettings::offset_x)
-    .add_property("offset_y", &OSM2ODRSettings::offset_y, &OSM2ODRSettings::offset_y)
-    .add_property("default_lane_width", &OSM2ODRSettings::default_lane_width, &OSM2ODRSettings::default_lane_width)
-    .add_property("elevation_layer_height", &OSM2ODRSettings::elevation_layer_height, &OSM2ODRSettings::elevation_layer_height)
-  ;
-
-  class_<OSM2ODR>("OSM2ODR", no_init)
-    .def("convert_to_odr", &ConvertOSMToOpenDRIVE, (arg("osm_file"), arg("OSM2ODRSettings") = OSM2ODRSettings()))
-      .staticmethod("convert_to_odr")
-  ;
-}
diff --git a/PythonAPI/carla/source/libcarla/OSM2ODR.cpp b/PythonAPI/carla/source/libcarla/OSM2ODR.cpp
new file mode 100644
index 000000000..ef05b77b1
--- /dev/null
+++ b/PythonAPI/carla/source/libcarla/OSM2ODR.cpp
@@ -0,0 +1,39 @@
+// Copyright (c) 2020 Computer Vision Center (CVC) at the Universitat Autonoma
+// de Barcelona (UAB).
+//
+// This work is licensed under the terms of the MIT license.
+// For a copy, see <https://opensource.org/licenses/MIT>.
+
+#include <OSM2ODR.h>
+
+// Empty class to emulate the namespace in the PythonAPI
+class OSM2ODR {};
+
+namespace osm2odr {
+  std::ostream &operator<<(std::ostream &out, const OSM2ODRSettings &settings) {
+    out << "Osm2odrSettings(use_offsets=" << (settings.use_offsets ? "true" : "false")
+        << ", offset_x=" << settings.offset_x << ", offset_y=" << settings.offset_y
+        << ", default_lane_width=" << settings.default_lane_width
+        << ", elevation_layer_height=" << settings.elevation_layer_height << ")";
+    return out;
+  }
+}
+
+void export_osm2odr() {
+  using namespace osm2odr;
+  using namespace boost::python;
+
+  class_<OSM2ODRSettings>("Osm2odrSettings", init<>())
+    .add_property("use_offsets", &OSM2ODRSettings::use_offsets, &OSM2ODRSettings::use_offsets)
+    .add_property("offset_x", &OSM2ODRSettings::offset_x, &OSM2ODRSettings::offset_x)
+    .add_property("offset_y", &OSM2ODRSettings::offset_y, &OSM2ODRSettings::offset_y)
+    .add_property("default_lane_width", &OSM2ODRSettings::default_lane_width, &OSM2ODRSettings::default_lane_width)
+    .add_property("elevation_layer_height", &OSM2ODRSettings::elevation_layer_height, &OSM2ODRSettings::elevation_layer_height)
+    .def(self_ns::str(self_ns::self))
+  ;
+
+  class_<OSM2ODR>("osm2odr", no_init)
+    .def("convert", &ConvertOSMToOpenDRIVE, (arg("osm_file"), arg("osm2odr_settings") = OSM2ODRSettings()))
+      .staticmethod("convert")
+  ;
+}
diff --git a/PythonAPI/carla/source/libcarla/libcarla.cpp b/PythonAPI/carla/source/libcarla/libcarla.cpp
index 89e46ab10..0752f5015 100644
--- a/PythonAPI/carla/source/libcarla/libcarla.cpp
+++ b/PythonAPI/carla/source/libcarla/libcarla.cpp
@@ -198,7 +198,7 @@ static auto MakeCallback(boost::python::object callback) {
 #include "Commands.cpp"
 #include "TrafficManager.cpp"
 #include "LightManager.cpp"
-#include "Converter.cpp"
+#include "OSM2ODR.cpp"
 
 #ifdef LIBCARLA_RSS_ENABLED
 #include "AdRss.cpp"
@@ -226,5 +226,5 @@ BOOST_PYTHON_MODULE(libcarla) {
   #ifdef LIBCARLA_RSS_ENABLED
   export_ad_rss();
   #endif
-  export_converter();
+  export_osm2odr();
 }
diff --git a/PythonAPI/util/config.py b/PythonAPI/util/config.py
index 91693b5ee..781487d70 100755
--- a/PythonAPI/util/config.py
+++ b/PythonAPI/util/config.py
@@ -179,7 +179,10 @@ def main():
         '-x', '--xodr-path',
         metavar='XODR_FILE_PATH',
         help='load a new map with a minimum physical road representation of the provided OpenDRIVE')
-
+    argparser.add_argument(
+        '--osm-path',
+        metavar='OSM_FILE_PATH',
+        help='load a new map with a minimum physical road representation of the provided OpenStreetMaps')
     if len(sys.argv) < 2:
         argparser.print_help()
         return
@@ -224,6 +227,31 @@ def main():
                     enable_mesh_visibility=True))
         else:
             print('file not found.')
+    elif args.osm_path is not None:
+        if os.path.exists(args.osm_path):
+            with open(args.osm_path) as od_file:
+                try:
+                    data = od_file.read()
+                except OSError:
+                    print('file could not be readed.')
+                    sys.exit()
+            print('Converting OSM data to opendrive')
+            xodr_data = carla.osm2odr.convert(data)
+            print('load opendrive map.')
+            vertex_distance = 2.0  # in meters
+            max_road_length = 500.0 # in meters
+            wall_height = 0.0      # in meters
+            extra_width = 0.6      # in meters
+            world = client.generate_opendrive_world(
+                data, carla.OpendriveGenerationParameters(
+                    vertex_distance=vertex_distance,
+                    max_road_length=max_road_length,
+                    wall_height=wall_height,
+                    additional_width=extra_width,
+                    smooth_junctions=True,
+                    enable_mesh_visibility=True))
+        else:
+            print('file not found.')
 
     else:
         world = client.get_world()
diff --git a/Util/BuildTools/BuildConverter.bat b/Util/BuildTools/BuildOSM2ODR.bat
similarity index 72%
rename from Util/BuildTools/BuildConverter.bat
rename to Util/BuildTools/BuildOSM2ODR.bat
index 568a1295a..f5f22e0e1 100644
--- a/Util/BuildTools/BuildConverter.bat
+++ b/Util/BuildTools/BuildOSM2ODR.bat
@@ -21,21 +21,21 @@ rem ============================================================================
 
 rem Set the visual studio solution directory
 rem
-set CONVERTER_VSPROJECT_PATH=%INSTALLATION_DIR:/=\%converter-visualstudio\
-set CONVERTER_INSTALL_PATH=%ROOT_PATH:/=\%PythonAPI\carla\dependencies\
+set OSM2ODR_VSPROJECT_PATH=%INSTALLATION_DIR:/=\%osm2odr-visualstudio\
+set OSM2ODR_INSTALL_PATH=%ROOT_PATH:/=\%PythonAPI\carla\dependencies\
 
 if "%1"=="--rebuild" (
-    rmdir "%CONVERTER_VSPROJECT_PATH%" /s /q
+    rmdir "%OSM2ODR_VSPROJECT_PATH%" /s /q
 )
 
 
-if not exist "%CONVERTER_VSPROJECT_PATH%" mkdir "%CONVERTER_VSPROJECT_PATH%"
-cd "%CONVERTER_VSPROJECT_PATH%"
+if not exist "%OSM2ODR_VSPROJECT_PATH%" mkdir "%OSM2ODR_VSPROJECT_PATH%"
+cd "%OSM2ODR_VSPROJECT_PATH%"
 
 cmake -G "Visual Studio 15 2017 Win64"^
     -DCMAKE_CXX_FLAGS_RELEASE="/MD /MP"^
-    -DCMAKE_INSTALL_PREFIX="%CONVERTER_INSTALL_PATH:\=/%"^
-    "%ROOT_PATH%\Util\Converter"
+    -DCMAKE_INSTALL_PREFIX="%OSM2ODR_INSTALL_PATH:\=/%"^
+    "%ROOT_PATH%\Util\OSM2ODR"
 cmake --build . --config Release --target install | findstr /V "Up-to-date:"
 
 endlocal
diff --git a/Util/BuildTools/BuildConverter.sh b/Util/BuildTools/BuildOSM2ODR.sh
similarity index 50%
rename from Util/BuildTools/BuildConverter.sh
rename to Util/BuildTools/BuildOSM2ODR.sh
index 82941f7cb..cf599d18b 100755
--- a/Util/BuildTools/BuildConverter.sh
+++ b/Util/BuildTools/BuildOSM2ODR.sh
@@ -6,12 +6,12 @@ source $(dirname "$0")/Environment.sh
 export CC=/usr/bin/clang-8
 export CXX=/usr/bin/clang++-8
 
-CONVERTER_BASE_DIR=${CARLA_ROOT_FOLDER}/Util/Converter
-CONVERTER_BUILD_DIR=${CARLA_ROOT_FOLDER}/Build/converter-build
-CONVERTER_BIN_DIR=${CONVERTER_BASE_DIR}/bin
-[ ! -d ${CONVERTER_BUILD_DIR} ] && mkdir ${CONVERTER_BUILD_DIR}
+OSM2ODR_BASE_DIR=${CARLA_ROOT_FOLDER}/Util/OSM2ODR
+OSM2ODR_BUILD_DIR=${CARLA_ROOT_FOLDER}/Build/osm2odr-build
+OSM2ODR_BIN_DIR=${OSM2ODR_BASE_DIR}/bin
+[ ! -d ${OSM2ODR_BUILD_DIR} ] && mkdir ${OSM2ODR_BUILD_DIR}
 
-cd ${CONVERTER_BUILD_DIR}
+cd ${OSM2ODR_BUILD_DIR}
 
 case $1 in
   --rebuild)
@@ -19,9 +19,9 @@ case $1 in
     ;;
 esac
 
-cmake ${CONVERTER_BASE_DIR} \
+cmake ${OSM2ODR_BASE_DIR} \
     -G "Eclipse CDT4 - Ninja" \
     -DCMAKE_INSTALL_PREFIX=${LIBCARLA_INSTALL_CLIENT_FOLDER}
 
-ninja converter
+ninja osm2odr
 ninja install
diff --git a/Util/BuildTools/Linux.mk b/Util/BuildTools/Linux.mk
index d8c32cad5..a30c71dde 100644
--- a/Util/BuildTools/Linux.mk
+++ b/Util/BuildTools/Linux.mk
@@ -79,28 +79,28 @@ CarlaUE4Editor: LibCarla.server.release
 	@${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --build
 
 .PHONY: PythonAPI
-PythonAPI: LibCarla.client.release converter
+PythonAPI: LibCarla.client.release osm2odr
 	@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --py2 --py3
 
-PythonAPI.2: LibCarla.client.release converter
+PythonAPI.2: LibCarla.client.release osm2odr
 	@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --py2
 
-PythonAPI.3: LibCarla.client.release converter
+PythonAPI.3: LibCarla.client.release osm2odr
 	@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --py3
 
-PythonAPI.rebuild: LibCarla.client.release converter
+PythonAPI.rebuild: LibCarla.client.release osm2odr
 	@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --rebuild
 
-PythonAPI.rss: LibCarla.client.rss.release converter
+PythonAPI.rss: LibCarla.client.rss.release osm2odr
 	@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --py2 --py3 --rss
 
-PythonAPI.rss.2: LibCarla.client.rss.release converter
+PythonAPI.rss.2: LibCarla.client.rss.release osm2odr
 	@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --py2 --rss
 
-PythonAPI.rss.3: LibCarla.client.rss.release converter
+PythonAPI.rss.3: LibCarla.client.rss.release osm2odr
 	@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --py3 --rss
 
-PythonAPI.rss.rebuild: LibCarla.client.rss.release converter
+PythonAPI.rss.rebuild: LibCarla.client.rss.release osm2odr
 	@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --rebuild --rss
 
 PythonAPI.docs:
@@ -150,5 +150,5 @@ pretty:
 build.utils: PythonAPI
 	@${CARLA_BUILD_TOOLS_FOLDER}/BuildUtilsDocker.sh
 
-converter:
-	@${CARLA_BUILD_TOOLS_FOLDER}/BuildConverter.sh $(ARGS)
\ No newline at end of file
+osm2odr:
+	@${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.sh $(ARGS)
\ No newline at end of file
diff --git a/Util/BuildTools/Windows.mk b/Util/BuildTools/Windows.mk
index 901d00a34..93493307b 100644
--- a/Util/BuildTools/Windows.mk
+++ b/Util/BuildTools/Windows.mk
@@ -55,7 +55,7 @@ benchmark: LibCarla
 	@echo "Not implemented!"
 
 .PHONY: PythonAPI
-PythonAPI: LibCarla converter
+PythonAPI: LibCarla osm2odr
 	@"${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.bat" --py3
 
 server: setup
@@ -78,5 +78,5 @@ plugins:
 deploy:
 	@"${CARLA_BUILD_TOOLS_FOLDER}/Deploy.bat" $(ARGS)
 
-converter:
-	@${CARLA_BUILD_TOOLS_FOLDER}/BuildConverter.bat $(ARGS)
\ No newline at end of file
+osm2odr:
+	@${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.bat $(ARGS)
\ No newline at end of file
diff --git a/Util/Converter/CONTRIBUTING.md b/Util/Converter/CONTRIBUTING.md
deleted file mode 100644
index 1e7dc107b..000000000
--- a/Util/Converter/CONTRIBUTING.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contributing to Eclipse Sumo
-
-Thanks for your interest in this project.
-
-## Project description
-
-Eclipse Simulation of Urban Mobility (SUMO) is a free and open traffic
-simulation toolsuite. SUMO allows modelling and analyzing intermodal traffic
-systems, including road vehicles, public transport, cargo logistics and
-pedestrians. Included with SUMO is a wealth of supporting tools, which handle
-tasks like route finding, visualization, network import and emission
-calculation. SUMO can be enhanced with custom models and it provides various
-APIs to remotely control and influence the simulation.
-
-* https://eclipse.org/sumo
-
-## Developer resources
-
-Information regarding source code management, builds, coding standards, and
-more.
-
-* https://sumo.dlr.de/docs/Developer/Main.html
-
-The project maintains the following source code repositories
-
-* https://github.com/eclipse/sumo
-
-We are happily reviewing pull requests against the master of this repository.
-For details see below and https://sumo.dlr.de/docs/FAQ.html#how_do_code_contributions_work.
-
-In order to allow the development of separate external modules for SUMO (which are not
-part of the mainline repository) every source code directory lists the files and 
-subdirectories where modfications need to be made available under the EPL and in a 
-separate list which files / directories are considered interfaces to external modules,
-as an entry point see the [contribution README in the src dir](src/README_Contributing.md).
-
-## Eclipse Contributor Agreement
-
-Before your contribution can be accepted by the project team contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
-
-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
-
-## Contact
-
-Contact the project developers via the project's "dev" list.
-
-* https://dev.eclipse.org/mailman/listinfo/sumo-dev
diff --git a/Util/Converter/ChangeLog b/Util/Converter/ChangeLog
deleted file mode 100644
index 5c6f23710..000000000
--- a/Util/Converter/ChangeLog
+++ /dev/null
@@ -1 +0,0 @@
-Please refer to https://sumo.dlr.de/docs/ChangeLog.html
diff --git a/Util/Converter/NOTICE.md b/Util/Converter/NOTICE.md
deleted file mode 100644
index 604229efc..000000000
--- a/Util/Converter/NOTICE.md
+++ /dev/null
@@ -1,117 +0,0 @@
-# Notices for Eclipse Sumo
-
-This content is produced and maintained by the Eclipse Sumo project.
-
-* Project home: https://eclipse.org/sumo
-
-## Trademarks
-
-Eclipse Sumo is a trademark of the Eclipse Foundation.
-
-## Copyright
-
-All content is the property of the respective authors or their employers. For
-more information regarding authorship of content, please consult the listed
-source code repository logs.
-
-## Declared Project Licenses
-
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License v. 2.0 which is available at
-http://www.eclipse.org/legal/epl-v20.html.
-This Source Code may also be made available under the following Secondary
-Licenses when the conditions for such availability set forth in the Eclipse
-Public License 2.0 are satisfied: GNU General Public License, version 2
-or later which is available at
-https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
-SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-
-## Source Code
-
-The project maintains the following source code repositories:
-
-* https://github.com/eclipse/sumo
-
-## Third-party Content
-
-This project leverages the following third party content.
-
-Font Stash from 2017-09-23 (n/a)
-
-* License: Zlib AND (MIT OR LicenseRef-Public-Domain)
-* Project: https://github.com/memononen/fontstash
-* Source: https://github.com/memononen/fontstash
-
-FOX toolkit (1.6.55)
-
-* License: LicenseRef-Fox-Toolkit-Addendum-to-License AND
-   LicenseRef-Public-Domain AND  X11
-* Project: http://www.fox-toolkit.org/
-* Source: ftp://ftp.fox-toolkit.org/pub/fox-1.6.55.zip
-
-Google Design Icons (n/a)
-
-* License: CC-BY-4.0
-* Project: http://google.com/design/
-
-odrSpiral from 2017-05-03 (n/a)
-
-* License: Apache-2.0
-* Project: https://github.com/DLR-TS/odrSpiral
-* Source: https://github.com/DLR-TS/odrSpiral
-
-OpenStreetMap data files (n/a)
-
-* License: ODbL-1.0
-* Project: http://www.openstreetmap.org/
-
-Proj4 - (4.9.3)
-
-* License: MIT AND LicenseRef-Public-Domain AND Apache-2.0
-* Project: https://proj4.org/
-
-RTree (n/a)
-
-* License: LicenseRef-Permissive
-* Project: http://superliminal.com/sources/sources.htm
-* Source: http://superliminal.com/sources/RTreeTemplate.zip
-
-tcpip from 2012-09-28 (n/a)
-
-* License: BSD-3-Clause
-* Project: https://github.com/itm/shawn
-* Source: https://github.com/itm/shawn/tree/master/src/apps/tcpip
-
-Xerces-C++ (3.2.0)
-
-* License: Apache-2.0
-* Project: http://xerces.apache.org/xerces-c/
-* Source:
-   http://mirror.softaculous.com/apache//xerces/c/3/sources/xerces-c-3.2.0.tar.gz
-
-## Cryptography
-
-Content may contain encryption software. The country in which you are currently
-may have restrictions on the import, possession, and use, and/or re-export to
-another country, of encryption software. BEFORE using any encryption software,
-please check the country's laws, regulations and policies concerning the import,
-possession, or use, and re-export of encryption software, to see if this is
-permitted.
-
-## Derivative Works
-
-EPL requires that "derivative works" be licensed under the terms of the EPL
-whereas "separate modules of software" may be licensed arbitrarily. Please follow the links
-below for lists of files where modifications are considered derivative work.
-
-We currently consider all modifications to [src](src/README_Contributing.md) and [tools](tools/README_Contributing.md) (including the subdirectories) as derivative work except for the following cases:
-- TraCI client applications that use the public TraCI client libraries
-- separate modules residing in [src](src/README_Contributing.md)
-- car following models that inherit from MSCFModel (excluding [modifications of the existing models](src/microsim/cfmodels/README_Contributing.md))
-- lane changing models that inherit from MSAbstractLaneChangeModel (excluding [modifications of the existing models](src/microsim/lcmodels/README_Contributing.md))
-- simulation output modules (excluding [changes to the existing classes](src/microsim/output/README_Contributing.md))
-- vehicle device modules (excluding [changes to the existing classes](src/microsim/devices/README_Contributing.md))
-- network import modules (excluding [changes to the existing classes](src/netimport/README_Contributing.md))
-- network export modules (excluding [changes to the existing classes](src/netwrite/README_Contributing.md))
-- software that build upon the existing Python and Java tools libraries (excluding [changes to the existing](tools/README_Contributing.md))
-
diff --git a/Util/Converter/README.md b/Util/Converter/README.md
deleted file mode 100644
index 2f9a8d195..000000000
--- a/Util/Converter/README.md
+++ /dev/null
@@ -1,92 +0,0 @@
-<a href="https://sumo.dlr.de/docs"><p align="center"><img width=50% src="https://github.com/eclipse/sumo/blob/master/docs/web/docs/images/sumo-logo.svg"></p></a>
-
-Eclipse SUMO - Simulation of Urban MObility 
-===========================================
-
-![Windows, Linux and MacOS Build Status](https://github.com/eclipse/sumo/workflows/build/badge.svg)
-[![Windows Build status](https://ci.appveyor.com/api/projects/status/github/eclipse/sumo?svg=true)](https://ci.appveyor.com/project/eclipsewebmaster/sumo)
-![Repo Size](https://img.shields.io/github/repo-size/eclipse/sumo.svg)
-
-What is SUMO
-------------
-
-["Simulation of Urban MObility" (SUMO)](https://sumo.dlr.de/) is an open source,
-highly portable, microscopic traffic simulation package designed to handle
-large road networks and different modes of transport.
-
-It is mainly developed by employees of the [Institute of Transportation Systems
-at the German Aerospace Center](https://www.dlr.de/ts).
-
-
-Where to get it
----------------
-
-You can download SUMO via our [downloads site](https://sumo.dlr.de/docs/Downloads.html).
-
-As the program is still under development and is extended continuously, we advice you to
-use the latest sources from our GitHub repository. Using a command line client
-the following command should work:
-
-        git clone --recursive https://github.com/eclipse/sumo
-
-
-Contact
--------
-
-To stay informed, we have a mailing list for SUMO
-[you can subscribe](https://dev.eclipse.org/mailman/listinfo/sumo-user) to.
-Messages to the list can be sent to sumo-user@eclipse.org.
-SUMO announcements will be made through the sumo-announce@eclipse.org list;
-[you can subscribe](https://dev.eclipse.org/mailman/listinfo/sumo-announce) to as well.
-For further contact information have a look at the [this page](https://sumo.dlr.de/docs/Contact.html).
-
-
-Build and Installation
-----------------------
-
-For Windows we provide pre-compiled binaries and CMake files to generate Visual Studio projects.
-If you want to develop under Windows, please also clone the dependent libraries using
-
-        git clone --recursive https://github.com/DLR-TS/SUMOLibraries
-
-Using Linux you should have a look whether your distribution already contains sumo.
-There is also a [ppa for ubuntu users](https://launchpad.net/~sumo) and an
-[open build service instance](https://build.opensuse.org/project/show?project=home%3Abehrisch).
-If you want to build yourself, the steps for ubuntu are:
-
-        sudo apt-get install cmake python g++ libxerces-c-dev libfox-1.6-dev libgdal-dev libproj-dev libgl2ps-dev swig
-        cd <SUMO_DIR> # please insert the correct directory name here
-        export SUMO_HOME="$PWD"
-        mkdir build/cmake-build && cd build/cmake-build
-        cmake ../..
-        make -j$(nproc)
-
-For [detailed build instructions have a look at our Documentation](https://sumo.dlr.de/docs/Developer/Main.html#build_instructions).
-
-
-Getting started
----------------
-
-To get started with SUMO, take a look at the docs/tutorial and examples directories,
-which contain some example networks with routing data and configuration files.
-There is also user documentation provided in the docs/ directory and on the
-homepage.
-
-
-Bugs
-----
-
-Please use for bugs and requests the [GitHub bug tracking tool](https://github.com/eclipse/sumo/issues)
-or file them to the list sumo-user@eclipse.org. Before
-filing a bug, please consider to check with a current repository checkout
-whether the problem has already been fixed.
-
-We welcome patches, pull requests and other contributions! For details see [our contribution guidelines](CONTRIBUTING.md).
-
-
-License
--------
-
-SUMO is licensed under the [Eclipse Public License Version 2](https://eclipse.org/legal/epl-v20.html).
-For the licenses of the different libraries and supplementary code information is in the
-subdirectories and the [Documentation](https://sumo.dlr.de/docs/Libraries_Licenses.html).
diff --git a/Util/Converter/sumo.doxyconf b/Util/Converter/sumo.doxyconf
deleted file mode 100644
index 022797b49..000000000
--- a/Util/Converter/sumo.doxyconf
+++ /dev/null
@@ -1,2493 +0,0 @@
-# Doxyfile 1.8.13
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = "Eclipse SUMO - Simulation of Urban MObility"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         =
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          =
-
-# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
-# in the documentation. The maximum height of the logo should not exceed 55
-# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
-# the logo to the output directory.
-
-PROJECT_LOGO           = data/logo/sumo-145x50.png
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = .
-
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = YES
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES    = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = YES
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = YES
-
-# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = NO
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
-# page for each member. If set to NO, the documentation of a member will be part
-# of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
-
-ALIASES                =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. For
-# instance to make doxygen treat .inc files as Fortran files (default is PHP),
-# and .f files as C (default is Fortran), use: inc=Fortran f=C.
-#
-# Note: For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
-# to that level are automatically included in the table of contents, even if
-# they do not have an id attribute.
-# Note: This feature currently applies only to Markdown headings.
-# Minimum value: 0, maximum value: 99, default value: 0.
-# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
-
-TOC_INCLUDE_HEADINGS   = 0
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# If one adds a struct or class to a group and this option is enabled, then also
-# any nested class or struct is added to the same group. By default this option
-# is disabled and one has to add nested compounds explicitly via \ingroup.
-# The default value is: NO.
-
-GROUP_NESTED_COMPOUNDS = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = YES
-
-# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = YES
-
-# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO,
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. If set to YES, local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO, only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = YES
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO, these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = YES
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES, upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES, the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
-# append additional text to a page's title, such as Class Reference. If set to
-# YES the compound reference will be hidden.
-# The default value is: NO.
-
-HIDE_COMPOUND_REFERENCE= NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = YES
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = YES
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
-# list. This list is created by putting \todo commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
-# list. This list is created by putting \test commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES, the
-# list will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. See also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = YES
-
-# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
-# a warning is encountered.
-# The default value is: NO.
-
-WARN_AS_ERROR          = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           = ../sumo_doxygen_lastrun.log
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = ./src
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# read by doxygen.
-#
-# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
-# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
-
-FILE_PATTERNS          = *.c \
-                         *.cc \
-                         *.cxx \
-                         *.cpp \
-                         *.c++ \
-                         *.java \
-                         *.ii \
-                         *.ixx \
-                         *.ipp \
-                         *.i++ \
-                         *.inl \
-                         *.idl \
-                         *.ddl \
-                         *.odl \
-                         *.h \
-                         *.hh \
-                         *.hxx \
-                         *.hpp \
-                         *.h++ \
-                         *.cs \
-                         *.d \
-                         *.php \
-                         *.php4 \
-                         *.php5 \
-                         *.phtml \
-                         *.inc \
-                         *.m \
-                         *.markdown \
-                         *.md \
-                         *.mm \
-                         *.dox \
-                         *.py \
-                         *.f90 \
-                         *.f \
-                         *.for \
-                         *.tcl \
-                         *.vhd \
-                         *.vhdl \
-                         *.ucf \
-                         *.qsf \
-                         *.as \
-                         *.js
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       = */.svn/* \
-                         */.git/*
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       = *
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE =
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = YES
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = YES
-
-# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
-# Note: The availability of this option depends on whether or not doxygen was
-# generated with the -Duse-libclang=ON option for CMake.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = YES
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 3
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = docs/doxygen
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# cascading style sheets that are included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefore more robust against future updates.
-# Doxygen will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler (hhc.exe). If non-empty,
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated
-# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = YES
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = YES
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. The package can be specified just
-# by its name or with the correct syntax as to be used with the LaTeX
-# \usepackage command. To get the times font for instance you can specify :
-# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
-# To use the option intlimits with the amsmath package you can specify:
-# EXTRA_PACKAGES=[intlimits]{amsmath}
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
-# LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# LaTeX style sheets that are included after the standard style sheets created
-# by doxygen. Using this option one can overrule certain style aspects. Doxygen
-# will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_STYLESHEET =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = YES
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_TIMESTAMP        = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR             =
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sf.net) file that captures the
-# structure of the code including all documentation. Note that this feature is
-# still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO, the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
-# in the source code. If set to NO, only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES, the include files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# the class index. If set to NO, only the inherited external classes will be
-# listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
-# If set to YES the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: YES.
-
-HAVE_DOT               = YES
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command. Disabling a call graph can be
-# accomplished by means of the command \hidecallgraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command. Disabling a caller graph can be
-# accomplished by means of the command \hidecallergraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = YES
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. For an explanation of the image formats see the section
-# output formats in the documentation of the dot tool (Graphviz (see:
-# http://www.graphviz.org/)).
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
-# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
-# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
-# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
-# png:gdiplus:gdiplus.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = svg
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = YES
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           =
-
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
-
-PLANTUML_JAR_PATH      =
-
-# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
-# configuration file for plantuml.
-
-PLANTUML_CFG_FILE      =
-
-# When using plantuml, the specified paths are searched for files specified by
-# the !include statement in a plantuml block.
-
-PLANTUML_INCLUDE_PATH  =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 2
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = YES
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES
diff --git a/Util/Converter/.gitignore b/Util/OSM2ODR/.gitignore
similarity index 100%
rename from Util/Converter/.gitignore
rename to Util/OSM2ODR/.gitignore
diff --git a/Util/Converter/AUTHORS b/Util/OSM2ODR/AUTHORS
similarity index 100%
rename from Util/Converter/AUTHORS
rename to Util/OSM2ODR/AUTHORS
diff --git a/Util/Converter/CMakeLists.txt b/Util/OSM2ODR/CMakeLists.txt
similarity index 100%
rename from Util/Converter/CMakeLists.txt
rename to Util/OSM2ODR/CMakeLists.txt
diff --git a/Util/Converter/CMakeSettings.json b/Util/OSM2ODR/CMakeSettings.json
similarity index 100%
rename from Util/Converter/CMakeSettings.json
rename to Util/OSM2ODR/CMakeSettings.json
diff --git a/Util/Converter/LICENSE b/Util/OSM2ODR/LICENSE
similarity index 100%
rename from Util/Converter/LICENSE
rename to Util/OSM2ODR/LICENSE
diff --git a/Util/Converter/cmake-variants.yaml b/Util/OSM2ODR/cmake-variants.yaml
similarity index 100%
rename from Util/Converter/cmake-variants.yaml
rename to Util/OSM2ODR/cmake-variants.yaml
diff --git a/Util/Converter/cmake_modules/FindProj.cmake b/Util/OSM2ODR/cmake_modules/FindProj.cmake
similarity index 100%
rename from Util/Converter/cmake_modules/FindProj.cmake
rename to Util/OSM2ODR/cmake_modules/FindProj.cmake
diff --git a/Util/Converter/src/CMakeLists.txt b/Util/OSM2ODR/src/CMakeLists.txt
similarity index 57%
rename from Util/Converter/src/CMakeLists.txt
rename to Util/OSM2ODR/src/CMakeLists.txt
index 347cb7ec7..c972b5f1d 100644
--- a/Util/Converter/src/CMakeLists.txt
+++ b/Util/OSM2ODR/src/CMakeLists.txt
@@ -15,10 +15,10 @@ set(netconvertlibs
 
 #install(TARGETS netconvert RUNTIME DESTINATION bin)
 
-set(converter_sources "Converter.cpp")
-#add_library(converter STATIC ${converter_sources})
-#target_link_libraries(converter ${netconvertlibs})
-#install(TARGETS converter ARCHIVE DESTINATION lib)
+set(osm2odr_sources "OSM2ODR.cpp")
+#add_library(osm2odr STATIC ${osm2odr_sources})
+#target_link_libraries(osm2odr ${netconvertlibs})
+#install(TARGETS osm2odr ARCHIVE DESTINATION lib)
 
 configure_file(config.h.cmake config.h)
 
@@ -27,60 +27,60 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../.git")
 endif()
 
 file(GLOB netbuild_sources "netbuild/*.cpp" "netbuild/*.h")
-set(converter_sources "${converter_sources};${netbuild_sources}")
+set(osm2odr_sources "${osm2odr_sources};${netbuild_sources}")
 
 file(GLOB netimport_sources "netimport/*.cpp" "netimport/*.h")
-set(converter_sources "${converter_sources};${netimport_sources}")
+set(osm2odr_sources "${osm2odr_sources};${netimport_sources}")
 
 file(GLOB netimport_vissim_sources "netimport/vissim/*.cpp" "netimport/vissim/*.h")
-set(converter_sources "${converter_sources};${netimport_vissim_sources}")
+set(osm2odr_sources "${osm2odr_sources};${netimport_vissim_sources}")
 
 file(GLOB netimport_vissim_tempstructs_sources "netimport/vissim/tempstructs/*.cpp" "netimport/vissim/tempstructs/*.h")
-set(converter_sources "${converter_sources};${netimport_vissim_tempstructs_sources}")
+set(osm2odr_sources "${osm2odr_sources};${netimport_vissim_tempstructs_sources}")
 
 file(GLOB netimport_vissim_typeloader_sources "netimport/vissim/typeloader/*.cpp" "netimport/vissim/typeloader/*.h")
-set(converter_sources "${converter_sources};${netimport_vissim_typeloader_sources}")
+set(osm2odr_sources "${osm2odr_sources};${netimport_vissim_typeloader_sources}")
 
 file(GLOB netwrite_sources "netwrite/*.cpp" "netwrite/*.h")
-set(converter_sources "${converter_sources};${netwrite_sources}")
+set(osm2odr_sources "${osm2odr_sources};${netwrite_sources}")
 
 file(GLOB foreign_eulerspiral_sources "foreign/eulerspiral/*.cpp" "foreign/eulerspiral/*.h")
-set(converter_sources "${converter_sources};${foreign_eulerspiral_sources}")
+set(osm2odr_sources "${osm2odr_sources};${foreign_eulerspiral_sources}")
 
 file(GLOB foreign_tcpip_sources "foreign/tcpip/*.cpp" "foreign/tcpip/*.h")
-set(converter_sources "${converter_sources};${foreign_tcpip_sources}")
+set(osm2odr_sources "${osm2odr_sources};${foreign_tcpip_sources}")
 
 file(GLOB utils_common_sources "utils/common/*.cpp" "utils/common/*.h")
-set(converter_sources "${converter_sources};${utils_common_sources}")
+set(osm2odr_sources "${osm2odr_sources};${utils_common_sources}")
 
 file(GLOB utils_distribution_sources "utils/distribution/*.cpp" "utils/distribution/*.h")
-set(converter_sources "${converter_sources};${utils_distribution_sources}")
+set(osm2odr_sources "${osm2odr_sources};${utils_distribution_sources}")
 
 file(GLOB utils_shapes_sources "utils/shapes/*.cpp" "utils/shapes/*.h")
-set(converter_sources "${converter_sources};${utils_shapes_sources}")
+set(osm2odr_sources "${osm2odr_sources};${utils_shapes_sources}")
 
 file(GLOB utils_options_sources "utils/options/*.cpp" "utils/options/*.h")
-set(converter_sources "${converter_sources};${utils_options_sources}")
+set(osm2odr_sources "${osm2odr_sources};${utils_options_sources}")
 
 file(GLOB utils_xml_sources "utils/xml/*.cpp" "utils/xml/*.h")
-set(converter_sources "${converter_sources};${utils_xml_sources}")
+set(osm2odr_sources "${osm2odr_sources};${utils_xml_sources}")
 
 file(GLOB utils_geom_sources "utils/geom/*.cpp" "utils/geom/*.h")
-set(converter_sources "${converter_sources};${utils_geom_sources}")
+set(osm2odr_sources "${osm2odr_sources};${utils_geom_sources}")
 
 file(GLOB utils_importio_sources "utils/importio/*.cpp" "utils/importio/*.h")
-set(converter_sources "${converter_sources};${utils_importio_sources}")
+set(osm2odr_sources "${osm2odr_sources};${utils_importio_sources}")
 
 file(GLOB utils_iodevices_sources "utils/iodevices/*.cpp" "utils/iodevices/*.h")
-set(converter_sources "${converter_sources};${utils_iodevices_sources}")
+set(osm2odr_sources "${osm2odr_sources};${utils_iodevices_sources}")
 
 file(GLOB utils_traction_wire_sources "utils/traction_wire/*.cpp" "utils/traction_wire/*.h")
-set(converter_sources "${converter_sources};${utils_traction_wire_sources}")
+set(osm2odr_sources "${osm2odr_sources};${utils_traction_wire_sources}")
 
-add_library(converter STATIC ${converter_sources})
-target_link_libraries(converter ${XercesC_LIBRARIES} ${ZLIB_LIBRARIES} ${PROJ_LIBRARY})
+add_library(osm2odr STATIC ${osm2odr_sources})
+target_link_libraries(osm2odr ${XercesC_LIBRARIES} ${ZLIB_LIBRARIES} ${PROJ_LIBRARY})
 if (WIN32)
-    target_compile_definitions(converter PUBLIC "XERCES_STATIC_LIBRARY")
+    target_compile_definitions(osm2odr PUBLIC "XERCES_STATIC_LIBRARY")
 endif ()
-install(TARGETS converter ARCHIVE DESTINATION lib)
-install(FILES Converter.h DESTINATION include)
\ No newline at end of file
+install(TARGETS osm2odr ARCHIVE DESTINATION lib)
+install(FILES OSM2ODR.h DESTINATION include)
\ No newline at end of file
diff --git a/Util/Converter/src/Converter.cpp b/Util/OSM2ODR/src/OSM2ODR.cpp
similarity index 99%
rename from Util/Converter/src/Converter.cpp
rename to Util/OSM2ODR/src/OSM2ODR.cpp
index 4e8b80130..fff009d8b 100644
--- a/Util/Converter/src/Converter.cpp
+++ b/Util/OSM2ODR/src/OSM2ODR.cpp
@@ -4,7 +4,7 @@
 // This work is licensed under the terms of the MIT license.
 // For a copy, see <https://opensource.org/licenses/MIT>.
 
-#include "Converter.h"
+#include "OSM2ODR.h"
 
 #include <iostream>
 #include <string>
diff --git a/Util/Converter/src/Converter.h b/Util/OSM2ODR/src/OSM2ODR.h
similarity index 100%
rename from Util/Converter/src/Converter.h
rename to Util/OSM2ODR/src/OSM2ODR.h
diff --git a/Util/Converter/src/README_Contributing.md b/Util/OSM2ODR/src/README_Contributing.md
similarity index 100%
rename from Util/Converter/src/README_Contributing.md
rename to Util/OSM2ODR/src/README_Contributing.md
diff --git a/Util/Converter/src/config.h.cmake b/Util/OSM2ODR/src/config.h.cmake
similarity index 100%
rename from Util/Converter/src/config.h.cmake
rename to Util/OSM2ODR/src/config.h.cmake
diff --git a/Util/Converter/src/foreign/CMakeLists.txt b/Util/OSM2ODR/src/foreign/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/foreign/CMakeLists.txt
rename to Util/OSM2ODR/src/foreign/CMakeLists.txt
diff --git a/Util/Converter/src/foreign/eulerspiral/CMakeLists.txt b/Util/OSM2ODR/src/foreign/eulerspiral/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/foreign/eulerspiral/CMakeLists.txt
rename to Util/OSM2ODR/src/foreign/eulerspiral/CMakeLists.txt
diff --git a/Util/Converter/src/foreign/eulerspiral/LICENSE.TXT b/Util/OSM2ODR/src/foreign/eulerspiral/LICENSE.TXT
similarity index 100%
rename from Util/Converter/src/foreign/eulerspiral/LICENSE.TXT
rename to Util/OSM2ODR/src/foreign/eulerspiral/LICENSE.TXT
diff --git a/Util/Converter/src/foreign/eulerspiral/odrSpiral.cpp b/Util/OSM2ODR/src/foreign/eulerspiral/odrSpiral.cpp
similarity index 100%
rename from Util/Converter/src/foreign/eulerspiral/odrSpiral.cpp
rename to Util/OSM2ODR/src/foreign/eulerspiral/odrSpiral.cpp
diff --git a/Util/Converter/src/foreign/eulerspiral/odrSpiral.h b/Util/OSM2ODR/src/foreign/eulerspiral/odrSpiral.h
similarity index 100%
rename from Util/Converter/src/foreign/eulerspiral/odrSpiral.h
rename to Util/OSM2ODR/src/foreign/eulerspiral/odrSpiral.h
diff --git a/Util/Converter/src/foreign/rtree/LayeredRTree.h b/Util/OSM2ODR/src/foreign/rtree/LayeredRTree.h
similarity index 100%
rename from Util/Converter/src/foreign/rtree/LayeredRTree.h
rename to Util/OSM2ODR/src/foreign/rtree/LayeredRTree.h
diff --git a/Util/Converter/src/foreign/rtree/README.TXT b/Util/OSM2ODR/src/foreign/rtree/README.TXT
similarity index 100%
rename from Util/Converter/src/foreign/rtree/README.TXT
rename to Util/OSM2ODR/src/foreign/rtree/README.TXT
diff --git a/Util/Converter/src/foreign/rtree/RTree.h b/Util/OSM2ODR/src/foreign/rtree/RTree.h
similarity index 100%
rename from Util/Converter/src/foreign/rtree/RTree.h
rename to Util/OSM2ODR/src/foreign/rtree/RTree.h
diff --git a/Util/Converter/src/foreign/rtree/SUMORTree.h b/Util/OSM2ODR/src/foreign/rtree/SUMORTree.h
similarity index 100%
rename from Util/Converter/src/foreign/rtree/SUMORTree.h
rename to Util/OSM2ODR/src/foreign/rtree/SUMORTree.h
diff --git a/Util/Converter/src/foreign/tcpip/CMakeLists.txt b/Util/OSM2ODR/src/foreign/tcpip/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/foreign/tcpip/CMakeLists.txt
rename to Util/OSM2ODR/src/foreign/tcpip/CMakeLists.txt
diff --git a/Util/Converter/src/foreign/tcpip/socket.cpp b/Util/OSM2ODR/src/foreign/tcpip/socket.cpp
similarity index 100%
rename from Util/Converter/src/foreign/tcpip/socket.cpp
rename to Util/OSM2ODR/src/foreign/tcpip/socket.cpp
diff --git a/Util/Converter/src/foreign/tcpip/socket.h b/Util/OSM2ODR/src/foreign/tcpip/socket.h
similarity index 100%
rename from Util/Converter/src/foreign/tcpip/socket.h
rename to Util/OSM2ODR/src/foreign/tcpip/socket.h
diff --git a/Util/Converter/src/foreign/tcpip/storage.cpp b/Util/OSM2ODR/src/foreign/tcpip/storage.cpp
similarity index 100%
rename from Util/Converter/src/foreign/tcpip/storage.cpp
rename to Util/OSM2ODR/src/foreign/tcpip/storage.cpp
diff --git a/Util/Converter/src/foreign/tcpip/storage.h b/Util/OSM2ODR/src/foreign/tcpip/storage.h
similarity index 100%
rename from Util/Converter/src/foreign/tcpip/storage.h
rename to Util/OSM2ODR/src/foreign/tcpip/storage.h
diff --git a/Util/Converter/src/foreign/zstr/LICENSE b/Util/OSM2ODR/src/foreign/zstr/LICENSE
similarity index 100%
rename from Util/Converter/src/foreign/zstr/LICENSE
rename to Util/OSM2ODR/src/foreign/zstr/LICENSE
diff --git a/Util/Converter/src/foreign/zstr/strict_fstream.hpp b/Util/OSM2ODR/src/foreign/zstr/strict_fstream.hpp
similarity index 100%
rename from Util/Converter/src/foreign/zstr/strict_fstream.hpp
rename to Util/OSM2ODR/src/foreign/zstr/strict_fstream.hpp
diff --git a/Util/Converter/src/foreign/zstr/zstr.hpp b/Util/OSM2ODR/src/foreign/zstr/zstr.hpp
similarity index 100%
rename from Util/Converter/src/foreign/zstr/zstr.hpp
rename to Util/OSM2ODR/src/foreign/zstr/zstr.hpp
diff --git a/Util/Converter/src/libsumo/Helper.h b/Util/OSM2ODR/src/libsumo/Helper.h
similarity index 100%
rename from Util/Converter/src/libsumo/Helper.h
rename to Util/OSM2ODR/src/libsumo/Helper.h
diff --git a/Util/Converter/src/libsumo/Subscription.h b/Util/OSM2ODR/src/libsumo/Subscription.h
similarity index 100%
rename from Util/Converter/src/libsumo/Subscription.h
rename to Util/OSM2ODR/src/libsumo/Subscription.h
diff --git a/Util/Converter/src/libsumo/TraCIConstants.h b/Util/OSM2ODR/src/libsumo/TraCIConstants.h
similarity index 100%
rename from Util/Converter/src/libsumo/TraCIConstants.h
rename to Util/OSM2ODR/src/libsumo/TraCIConstants.h
diff --git a/Util/Converter/src/libsumo/TraCIDefs.h b/Util/OSM2ODR/src/libsumo/TraCIDefs.h
similarity index 100%
rename from Util/Converter/src/libsumo/TraCIDefs.h
rename to Util/OSM2ODR/src/libsumo/TraCIDefs.h
diff --git a/Util/Converter/src/microsim/MSJunction.h b/Util/OSM2ODR/src/microsim/MSJunction.h
similarity index 100%
rename from Util/Converter/src/microsim/MSJunction.h
rename to Util/OSM2ODR/src/microsim/MSJunction.h
diff --git a/Util/Converter/src/microsim/MSLane.h b/Util/OSM2ODR/src/microsim/MSLane.h
similarity index 100%
rename from Util/Converter/src/microsim/MSLane.h
rename to Util/OSM2ODR/src/microsim/MSLane.h
diff --git a/Util/Converter/src/microsim/MSLeaderInfo.h b/Util/OSM2ODR/src/microsim/MSLeaderInfo.h
similarity index 100%
rename from Util/Converter/src/microsim/MSLeaderInfo.h
rename to Util/OSM2ODR/src/microsim/MSLeaderInfo.h
diff --git a/Util/Converter/src/microsim/MSLink.h b/Util/OSM2ODR/src/microsim/MSLink.h
similarity index 100%
rename from Util/Converter/src/microsim/MSLink.h
rename to Util/OSM2ODR/src/microsim/MSLink.h
diff --git a/Util/Converter/src/microsim/MSLinkCont.h b/Util/OSM2ODR/src/microsim/MSLinkCont.h
similarity index 100%
rename from Util/Converter/src/microsim/MSLinkCont.h
rename to Util/OSM2ODR/src/microsim/MSLinkCont.h
diff --git a/Util/Converter/src/microsim/MSMoveReminder.h b/Util/OSM2ODR/src/microsim/MSMoveReminder.h
similarity index 100%
rename from Util/Converter/src/microsim/MSMoveReminder.h
rename to Util/OSM2ODR/src/microsim/MSMoveReminder.h
diff --git a/Util/Converter/src/microsim/MSNet.h b/Util/OSM2ODR/src/microsim/MSNet.h
similarity index 100%
rename from Util/Converter/src/microsim/MSNet.h
rename to Util/OSM2ODR/src/microsim/MSNet.h
diff --git a/Util/Converter/src/netbuild/CMakeLists.txt b/Util/OSM2ODR/src/netbuild/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/netbuild/CMakeLists.txt
rename to Util/OSM2ODR/src/netbuild/CMakeLists.txt
diff --git a/Util/Converter/src/netbuild/NBAlgorithms.cpp b/Util/OSM2ODR/src/netbuild/NBAlgorithms.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBAlgorithms.cpp
rename to Util/OSM2ODR/src/netbuild/NBAlgorithms.cpp
diff --git a/Util/Converter/src/netbuild/NBAlgorithms.h b/Util/OSM2ODR/src/netbuild/NBAlgorithms.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBAlgorithms.h
rename to Util/OSM2ODR/src/netbuild/NBAlgorithms.h
diff --git a/Util/Converter/src/netbuild/NBAlgorithms_Railway.cpp b/Util/OSM2ODR/src/netbuild/NBAlgorithms_Railway.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBAlgorithms_Railway.cpp
rename to Util/OSM2ODR/src/netbuild/NBAlgorithms_Railway.cpp
diff --git a/Util/Converter/src/netbuild/NBAlgorithms_Railway.h b/Util/OSM2ODR/src/netbuild/NBAlgorithms_Railway.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBAlgorithms_Railway.h
rename to Util/OSM2ODR/src/netbuild/NBAlgorithms_Railway.h
diff --git a/Util/Converter/src/netbuild/NBAlgorithms_Ramps.cpp b/Util/OSM2ODR/src/netbuild/NBAlgorithms_Ramps.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBAlgorithms_Ramps.cpp
rename to Util/OSM2ODR/src/netbuild/NBAlgorithms_Ramps.cpp
diff --git a/Util/Converter/src/netbuild/NBAlgorithms_Ramps.h b/Util/OSM2ODR/src/netbuild/NBAlgorithms_Ramps.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBAlgorithms_Ramps.h
rename to Util/OSM2ODR/src/netbuild/NBAlgorithms_Ramps.h
diff --git a/Util/Converter/src/netbuild/NBCapacity2Lanes.h b/Util/OSM2ODR/src/netbuild/NBCapacity2Lanes.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBCapacity2Lanes.h
rename to Util/OSM2ODR/src/netbuild/NBCapacity2Lanes.h
diff --git a/Util/Converter/src/netbuild/NBConnection.cpp b/Util/OSM2ODR/src/netbuild/NBConnection.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBConnection.cpp
rename to Util/OSM2ODR/src/netbuild/NBConnection.cpp
diff --git a/Util/Converter/src/netbuild/NBConnection.h b/Util/OSM2ODR/src/netbuild/NBConnection.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBConnection.h
rename to Util/OSM2ODR/src/netbuild/NBConnection.h
diff --git a/Util/Converter/src/netbuild/NBConnectionDefs.h b/Util/OSM2ODR/src/netbuild/NBConnectionDefs.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBConnectionDefs.h
rename to Util/OSM2ODR/src/netbuild/NBConnectionDefs.h
diff --git a/Util/Converter/src/netbuild/NBCont.h b/Util/OSM2ODR/src/netbuild/NBCont.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBCont.h
rename to Util/OSM2ODR/src/netbuild/NBCont.h
diff --git a/Util/Converter/src/netbuild/NBContHelper.cpp b/Util/OSM2ODR/src/netbuild/NBContHelper.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBContHelper.cpp
rename to Util/OSM2ODR/src/netbuild/NBContHelper.cpp
diff --git a/Util/Converter/src/netbuild/NBContHelper.h b/Util/OSM2ODR/src/netbuild/NBContHelper.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBContHelper.h
rename to Util/OSM2ODR/src/netbuild/NBContHelper.h
diff --git a/Util/Converter/src/netbuild/NBDistrict.cpp b/Util/OSM2ODR/src/netbuild/NBDistrict.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBDistrict.cpp
rename to Util/OSM2ODR/src/netbuild/NBDistrict.cpp
diff --git a/Util/Converter/src/netbuild/NBDistrict.h b/Util/OSM2ODR/src/netbuild/NBDistrict.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBDistrict.h
rename to Util/OSM2ODR/src/netbuild/NBDistrict.h
diff --git a/Util/Converter/src/netbuild/NBDistrictCont.cpp b/Util/OSM2ODR/src/netbuild/NBDistrictCont.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBDistrictCont.cpp
rename to Util/OSM2ODR/src/netbuild/NBDistrictCont.cpp
diff --git a/Util/Converter/src/netbuild/NBDistrictCont.h b/Util/OSM2ODR/src/netbuild/NBDistrictCont.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBDistrictCont.h
rename to Util/OSM2ODR/src/netbuild/NBDistrictCont.h
diff --git a/Util/Converter/src/netbuild/NBEdge.cpp b/Util/OSM2ODR/src/netbuild/NBEdge.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBEdge.cpp
rename to Util/OSM2ODR/src/netbuild/NBEdge.cpp
diff --git a/Util/Converter/src/netbuild/NBEdge.h b/Util/OSM2ODR/src/netbuild/NBEdge.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBEdge.h
rename to Util/OSM2ODR/src/netbuild/NBEdge.h
diff --git a/Util/Converter/src/netbuild/NBEdgeCont.cpp b/Util/OSM2ODR/src/netbuild/NBEdgeCont.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBEdgeCont.cpp
rename to Util/OSM2ODR/src/netbuild/NBEdgeCont.cpp
diff --git a/Util/Converter/src/netbuild/NBEdgeCont.h b/Util/OSM2ODR/src/netbuild/NBEdgeCont.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBEdgeCont.h
rename to Util/OSM2ODR/src/netbuild/NBEdgeCont.h
diff --git a/Util/Converter/src/netbuild/NBFrame.cpp b/Util/OSM2ODR/src/netbuild/NBFrame.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBFrame.cpp
rename to Util/OSM2ODR/src/netbuild/NBFrame.cpp
diff --git a/Util/Converter/src/netbuild/NBFrame.h b/Util/OSM2ODR/src/netbuild/NBFrame.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBFrame.h
rename to Util/OSM2ODR/src/netbuild/NBFrame.h
diff --git a/Util/Converter/src/netbuild/NBHeightMapper.cpp b/Util/OSM2ODR/src/netbuild/NBHeightMapper.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBHeightMapper.cpp
rename to Util/OSM2ODR/src/netbuild/NBHeightMapper.cpp
diff --git a/Util/Converter/src/netbuild/NBHeightMapper.h b/Util/OSM2ODR/src/netbuild/NBHeightMapper.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBHeightMapper.h
rename to Util/OSM2ODR/src/netbuild/NBHeightMapper.h
diff --git a/Util/Converter/src/netbuild/NBHelpers.cpp b/Util/OSM2ODR/src/netbuild/NBHelpers.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBHelpers.cpp
rename to Util/OSM2ODR/src/netbuild/NBHelpers.cpp
diff --git a/Util/Converter/src/netbuild/NBHelpers.h b/Util/OSM2ODR/src/netbuild/NBHelpers.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBHelpers.h
rename to Util/OSM2ODR/src/netbuild/NBHelpers.h
diff --git a/Util/Converter/src/netbuild/NBLinkPossibilityMatrix.h b/Util/OSM2ODR/src/netbuild/NBLinkPossibilityMatrix.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBLinkPossibilityMatrix.h
rename to Util/OSM2ODR/src/netbuild/NBLinkPossibilityMatrix.h
diff --git a/Util/Converter/src/netbuild/NBLoadedSUMOTLDef.cpp b/Util/OSM2ODR/src/netbuild/NBLoadedSUMOTLDef.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBLoadedSUMOTLDef.cpp
rename to Util/OSM2ODR/src/netbuild/NBLoadedSUMOTLDef.cpp
diff --git a/Util/Converter/src/netbuild/NBLoadedSUMOTLDef.h b/Util/OSM2ODR/src/netbuild/NBLoadedSUMOTLDef.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBLoadedSUMOTLDef.h
rename to Util/OSM2ODR/src/netbuild/NBLoadedSUMOTLDef.h
diff --git a/Util/Converter/src/netbuild/NBLoadedTLDef.cpp b/Util/OSM2ODR/src/netbuild/NBLoadedTLDef.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBLoadedTLDef.cpp
rename to Util/OSM2ODR/src/netbuild/NBLoadedTLDef.cpp
diff --git a/Util/Converter/src/netbuild/NBLoadedTLDef.h b/Util/OSM2ODR/src/netbuild/NBLoadedTLDef.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBLoadedTLDef.h
rename to Util/OSM2ODR/src/netbuild/NBLoadedTLDef.h
diff --git a/Util/Converter/src/netbuild/NBNetBuilder.cpp b/Util/OSM2ODR/src/netbuild/NBNetBuilder.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBNetBuilder.cpp
rename to Util/OSM2ODR/src/netbuild/NBNetBuilder.cpp
diff --git a/Util/Converter/src/netbuild/NBNetBuilder.h b/Util/OSM2ODR/src/netbuild/NBNetBuilder.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBNetBuilder.h
rename to Util/OSM2ODR/src/netbuild/NBNetBuilder.h
diff --git a/Util/Converter/src/netbuild/NBNode.cpp b/Util/OSM2ODR/src/netbuild/NBNode.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBNode.cpp
rename to Util/OSM2ODR/src/netbuild/NBNode.cpp
diff --git a/Util/Converter/src/netbuild/NBNode.h b/Util/OSM2ODR/src/netbuild/NBNode.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBNode.h
rename to Util/OSM2ODR/src/netbuild/NBNode.h
diff --git a/Util/Converter/src/netbuild/NBNodeCont.cpp b/Util/OSM2ODR/src/netbuild/NBNodeCont.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBNodeCont.cpp
rename to Util/OSM2ODR/src/netbuild/NBNodeCont.cpp
diff --git a/Util/Converter/src/netbuild/NBNodeCont.h b/Util/OSM2ODR/src/netbuild/NBNodeCont.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBNodeCont.h
rename to Util/OSM2ODR/src/netbuild/NBNodeCont.h
diff --git a/Util/Converter/src/netbuild/NBNodeShapeComputer.cpp b/Util/OSM2ODR/src/netbuild/NBNodeShapeComputer.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBNodeShapeComputer.cpp
rename to Util/OSM2ODR/src/netbuild/NBNodeShapeComputer.cpp
diff --git a/Util/Converter/src/netbuild/NBNodeShapeComputer.h b/Util/OSM2ODR/src/netbuild/NBNodeShapeComputer.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBNodeShapeComputer.h
rename to Util/OSM2ODR/src/netbuild/NBNodeShapeComputer.h
diff --git a/Util/Converter/src/netbuild/NBOwnTLDef.cpp b/Util/OSM2ODR/src/netbuild/NBOwnTLDef.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBOwnTLDef.cpp
rename to Util/OSM2ODR/src/netbuild/NBOwnTLDef.cpp
diff --git a/Util/Converter/src/netbuild/NBOwnTLDef.h b/Util/OSM2ODR/src/netbuild/NBOwnTLDef.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBOwnTLDef.h
rename to Util/OSM2ODR/src/netbuild/NBOwnTLDef.h
diff --git a/Util/Converter/src/netbuild/NBPTLine.cpp b/Util/OSM2ODR/src/netbuild/NBPTLine.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBPTLine.cpp
rename to Util/OSM2ODR/src/netbuild/NBPTLine.cpp
diff --git a/Util/Converter/src/netbuild/NBPTLine.h b/Util/OSM2ODR/src/netbuild/NBPTLine.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBPTLine.h
rename to Util/OSM2ODR/src/netbuild/NBPTLine.h
diff --git a/Util/Converter/src/netbuild/NBPTLineCont.cpp b/Util/OSM2ODR/src/netbuild/NBPTLineCont.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBPTLineCont.cpp
rename to Util/OSM2ODR/src/netbuild/NBPTLineCont.cpp
diff --git a/Util/Converter/src/netbuild/NBPTLineCont.h b/Util/OSM2ODR/src/netbuild/NBPTLineCont.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBPTLineCont.h
rename to Util/OSM2ODR/src/netbuild/NBPTLineCont.h
diff --git a/Util/Converter/src/netbuild/NBPTPlatform.cpp b/Util/OSM2ODR/src/netbuild/NBPTPlatform.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBPTPlatform.cpp
rename to Util/OSM2ODR/src/netbuild/NBPTPlatform.cpp
diff --git a/Util/Converter/src/netbuild/NBPTPlatform.h b/Util/OSM2ODR/src/netbuild/NBPTPlatform.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBPTPlatform.h
rename to Util/OSM2ODR/src/netbuild/NBPTPlatform.h
diff --git a/Util/Converter/src/netbuild/NBPTStop.cpp b/Util/OSM2ODR/src/netbuild/NBPTStop.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBPTStop.cpp
rename to Util/OSM2ODR/src/netbuild/NBPTStop.cpp
diff --git a/Util/Converter/src/netbuild/NBPTStop.h b/Util/OSM2ODR/src/netbuild/NBPTStop.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBPTStop.h
rename to Util/OSM2ODR/src/netbuild/NBPTStop.h
diff --git a/Util/Converter/src/netbuild/NBPTStopCont.cpp b/Util/OSM2ODR/src/netbuild/NBPTStopCont.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBPTStopCont.cpp
rename to Util/OSM2ODR/src/netbuild/NBPTStopCont.cpp
diff --git a/Util/Converter/src/netbuild/NBPTStopCont.h b/Util/OSM2ODR/src/netbuild/NBPTStopCont.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBPTStopCont.h
rename to Util/OSM2ODR/src/netbuild/NBPTStopCont.h
diff --git a/Util/Converter/src/netbuild/NBParking.cpp b/Util/OSM2ODR/src/netbuild/NBParking.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBParking.cpp
rename to Util/OSM2ODR/src/netbuild/NBParking.cpp
diff --git a/Util/Converter/src/netbuild/NBParking.h b/Util/OSM2ODR/src/netbuild/NBParking.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBParking.h
rename to Util/OSM2ODR/src/netbuild/NBParking.h
diff --git a/Util/Converter/src/netbuild/NBRequest.cpp b/Util/OSM2ODR/src/netbuild/NBRequest.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBRequest.cpp
rename to Util/OSM2ODR/src/netbuild/NBRequest.cpp
diff --git a/Util/Converter/src/netbuild/NBRequest.h b/Util/OSM2ODR/src/netbuild/NBRequest.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBRequest.h
rename to Util/OSM2ODR/src/netbuild/NBRequest.h
diff --git a/Util/Converter/src/netbuild/NBSign.cpp b/Util/OSM2ODR/src/netbuild/NBSign.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBSign.cpp
rename to Util/OSM2ODR/src/netbuild/NBSign.cpp
diff --git a/Util/Converter/src/netbuild/NBSign.h b/Util/OSM2ODR/src/netbuild/NBSign.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBSign.h
rename to Util/OSM2ODR/src/netbuild/NBSign.h
diff --git a/Util/Converter/src/netbuild/NBTrafficLightDefinition.cpp b/Util/OSM2ODR/src/netbuild/NBTrafficLightDefinition.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBTrafficLightDefinition.cpp
rename to Util/OSM2ODR/src/netbuild/NBTrafficLightDefinition.cpp
diff --git a/Util/Converter/src/netbuild/NBTrafficLightDefinition.h b/Util/OSM2ODR/src/netbuild/NBTrafficLightDefinition.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBTrafficLightDefinition.h
rename to Util/OSM2ODR/src/netbuild/NBTrafficLightDefinition.h
diff --git a/Util/Converter/src/netbuild/NBTrafficLightLogic.cpp b/Util/OSM2ODR/src/netbuild/NBTrafficLightLogic.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBTrafficLightLogic.cpp
rename to Util/OSM2ODR/src/netbuild/NBTrafficLightLogic.cpp
diff --git a/Util/Converter/src/netbuild/NBTrafficLightLogic.h b/Util/OSM2ODR/src/netbuild/NBTrafficLightLogic.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBTrafficLightLogic.h
rename to Util/OSM2ODR/src/netbuild/NBTrafficLightLogic.h
diff --git a/Util/Converter/src/netbuild/NBTrafficLightLogicCont.cpp b/Util/OSM2ODR/src/netbuild/NBTrafficLightLogicCont.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBTrafficLightLogicCont.cpp
rename to Util/OSM2ODR/src/netbuild/NBTrafficLightLogicCont.cpp
diff --git a/Util/Converter/src/netbuild/NBTrafficLightLogicCont.h b/Util/OSM2ODR/src/netbuild/NBTrafficLightLogicCont.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBTrafficLightLogicCont.h
rename to Util/OSM2ODR/src/netbuild/NBTrafficLightLogicCont.h
diff --git a/Util/Converter/src/netbuild/NBTypeCont.cpp b/Util/OSM2ODR/src/netbuild/NBTypeCont.cpp
similarity index 100%
rename from Util/Converter/src/netbuild/NBTypeCont.cpp
rename to Util/OSM2ODR/src/netbuild/NBTypeCont.cpp
diff --git a/Util/Converter/src/netbuild/NBTypeCont.h b/Util/OSM2ODR/src/netbuild/NBTypeCont.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBTypeCont.h
rename to Util/OSM2ODR/src/netbuild/NBTypeCont.h
diff --git a/Util/Converter/src/netbuild/NBVehicle.h b/Util/OSM2ODR/src/netbuild/NBVehicle.h
similarity index 100%
rename from Util/Converter/src/netbuild/NBVehicle.h
rename to Util/OSM2ODR/src/netbuild/NBVehicle.h
diff --git a/Util/Converter/src/netbuild/_netbuild.dox b/Util/OSM2ODR/src/netbuild/_netbuild.dox
similarity index 100%
rename from Util/Converter/src/netbuild/_netbuild.dox
rename to Util/OSM2ODR/src/netbuild/_netbuild.dox
diff --git a/Util/Converter/src/netconvert_main.cpp b/Util/OSM2ODR/src/netconvert_main.cpp
similarity index 100%
rename from Util/Converter/src/netconvert_main.cpp
rename to Util/OSM2ODR/src/netconvert_main.cpp
diff --git a/Util/Converter/src/netgen/NGEdge.h b/Util/OSM2ODR/src/netgen/NGEdge.h
similarity index 100%
rename from Util/Converter/src/netgen/NGEdge.h
rename to Util/OSM2ODR/src/netgen/NGEdge.h
diff --git a/Util/Converter/src/netgen/NGFrame.h b/Util/OSM2ODR/src/netgen/NGFrame.h
similarity index 100%
rename from Util/Converter/src/netgen/NGFrame.h
rename to Util/OSM2ODR/src/netgen/NGFrame.h
diff --git a/Util/Converter/src/netgen/NGNet.h b/Util/OSM2ODR/src/netgen/NGNet.h
similarity index 100%
rename from Util/Converter/src/netgen/NGNet.h
rename to Util/OSM2ODR/src/netgen/NGNet.h
diff --git a/Util/Converter/src/netgen/NGNode.h b/Util/OSM2ODR/src/netgen/NGNode.h
similarity index 100%
rename from Util/Converter/src/netgen/NGNode.h
rename to Util/OSM2ODR/src/netgen/NGNode.h
diff --git a/Util/Converter/src/netgen/NGRandomNetBuilder.h b/Util/OSM2ODR/src/netgen/NGRandomNetBuilder.h
similarity index 100%
rename from Util/Converter/src/netgen/NGRandomNetBuilder.h
rename to Util/OSM2ODR/src/netgen/NGRandomNetBuilder.h
diff --git a/Util/Converter/src/netimport/CMakeLists.txt b/Util/OSM2ODR/src/netimport/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/netimport/CMakeLists.txt
rename to Util/OSM2ODR/src/netimport/CMakeLists.txt
diff --git a/Util/Converter/src/netimport/NIFrame.cpp b/Util/OSM2ODR/src/netimport/NIFrame.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NIFrame.cpp
rename to Util/OSM2ODR/src/netimport/NIFrame.cpp
diff --git a/Util/Converter/src/netimport/NIFrame.h b/Util/OSM2ODR/src/netimport/NIFrame.h
similarity index 100%
rename from Util/Converter/src/netimport/NIFrame.h
rename to Util/OSM2ODR/src/netimport/NIFrame.h
diff --git a/Util/Converter/src/netimport/NIImporter_ArcView.cpp b/Util/OSM2ODR/src/netimport/NIImporter_ArcView.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NIImporter_ArcView.cpp
rename to Util/OSM2ODR/src/netimport/NIImporter_ArcView.cpp
diff --git a/Util/Converter/src/netimport/NIImporter_ArcView.h b/Util/OSM2ODR/src/netimport/NIImporter_ArcView.h
similarity index 100%
rename from Util/Converter/src/netimport/NIImporter_ArcView.h
rename to Util/OSM2ODR/src/netimport/NIImporter_ArcView.h
diff --git a/Util/Converter/src/netimport/NIImporter_DlrNavteq.cpp b/Util/OSM2ODR/src/netimport/NIImporter_DlrNavteq.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NIImporter_DlrNavteq.cpp
rename to Util/OSM2ODR/src/netimport/NIImporter_DlrNavteq.cpp
diff --git a/Util/Converter/src/netimport/NIImporter_DlrNavteq.h b/Util/OSM2ODR/src/netimport/NIImporter_DlrNavteq.h
similarity index 100%
rename from Util/Converter/src/netimport/NIImporter_DlrNavteq.h
rename to Util/OSM2ODR/src/netimport/NIImporter_DlrNavteq.h
diff --git a/Util/Converter/src/netimport/NIImporter_ITSUMO.cpp b/Util/OSM2ODR/src/netimport/NIImporter_ITSUMO.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NIImporter_ITSUMO.cpp
rename to Util/OSM2ODR/src/netimport/NIImporter_ITSUMO.cpp
diff --git a/Util/Converter/src/netimport/NIImporter_ITSUMO.h b/Util/OSM2ODR/src/netimport/NIImporter_ITSUMO.h
similarity index 100%
rename from Util/Converter/src/netimport/NIImporter_ITSUMO.h
rename to Util/OSM2ODR/src/netimport/NIImporter_ITSUMO.h
diff --git a/Util/Converter/src/netimport/NIImporter_MATSim.cpp b/Util/OSM2ODR/src/netimport/NIImporter_MATSim.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NIImporter_MATSim.cpp
rename to Util/OSM2ODR/src/netimport/NIImporter_MATSim.cpp
diff --git a/Util/Converter/src/netimport/NIImporter_MATSim.h b/Util/OSM2ODR/src/netimport/NIImporter_MATSim.h
similarity index 100%
rename from Util/Converter/src/netimport/NIImporter_MATSim.h
rename to Util/OSM2ODR/src/netimport/NIImporter_MATSim.h
diff --git a/Util/Converter/src/netimport/NIImporter_OpenDrive.cpp b/Util/OSM2ODR/src/netimport/NIImporter_OpenDrive.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NIImporter_OpenDrive.cpp
rename to Util/OSM2ODR/src/netimport/NIImporter_OpenDrive.cpp
diff --git a/Util/Converter/src/netimport/NIImporter_OpenDrive.h b/Util/OSM2ODR/src/netimport/NIImporter_OpenDrive.h
similarity index 100%
rename from Util/Converter/src/netimport/NIImporter_OpenDrive.h
rename to Util/OSM2ODR/src/netimport/NIImporter_OpenDrive.h
diff --git a/Util/Converter/src/netimport/NIImporter_OpenStreetMap.cpp b/Util/OSM2ODR/src/netimport/NIImporter_OpenStreetMap.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NIImporter_OpenStreetMap.cpp
rename to Util/OSM2ODR/src/netimport/NIImporter_OpenStreetMap.cpp
diff --git a/Util/Converter/src/netimport/NIImporter_OpenStreetMap.h b/Util/OSM2ODR/src/netimport/NIImporter_OpenStreetMap.h
similarity index 100%
rename from Util/Converter/src/netimport/NIImporter_OpenStreetMap.h
rename to Util/OSM2ODR/src/netimport/NIImporter_OpenStreetMap.h
diff --git a/Util/Converter/src/netimport/NIImporter_SUMO.cpp b/Util/OSM2ODR/src/netimport/NIImporter_SUMO.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NIImporter_SUMO.cpp
rename to Util/OSM2ODR/src/netimport/NIImporter_SUMO.cpp
diff --git a/Util/Converter/src/netimport/NIImporter_SUMO.h b/Util/OSM2ODR/src/netimport/NIImporter_SUMO.h
similarity index 100%
rename from Util/Converter/src/netimport/NIImporter_SUMO.h
rename to Util/OSM2ODR/src/netimport/NIImporter_SUMO.h
diff --git a/Util/Converter/src/netimport/NIImporter_VISUM.cpp b/Util/OSM2ODR/src/netimport/NIImporter_VISUM.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NIImporter_VISUM.cpp
rename to Util/OSM2ODR/src/netimport/NIImporter_VISUM.cpp
diff --git a/Util/Converter/src/netimport/NIImporter_VISUM.h b/Util/OSM2ODR/src/netimport/NIImporter_VISUM.h
similarity index 100%
rename from Util/Converter/src/netimport/NIImporter_VISUM.h
rename to Util/OSM2ODR/src/netimport/NIImporter_VISUM.h
diff --git a/Util/Converter/src/netimport/NILoader.cpp b/Util/OSM2ODR/src/netimport/NILoader.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NILoader.cpp
rename to Util/OSM2ODR/src/netimport/NILoader.cpp
diff --git a/Util/Converter/src/netimport/NILoader.h b/Util/OSM2ODR/src/netimport/NILoader.h
similarity index 100%
rename from Util/Converter/src/netimport/NILoader.h
rename to Util/OSM2ODR/src/netimport/NILoader.h
diff --git a/Util/Converter/src/netimport/NINavTeqHelper.cpp b/Util/OSM2ODR/src/netimport/NINavTeqHelper.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NINavTeqHelper.cpp
rename to Util/OSM2ODR/src/netimport/NINavTeqHelper.cpp
diff --git a/Util/Converter/src/netimport/NINavTeqHelper.h b/Util/OSM2ODR/src/netimport/NINavTeqHelper.h
similarity index 100%
rename from Util/Converter/src/netimport/NINavTeqHelper.h
rename to Util/OSM2ODR/src/netimport/NINavTeqHelper.h
diff --git a/Util/Converter/src/netimport/NITypeLoader.cpp b/Util/OSM2ODR/src/netimport/NITypeLoader.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NITypeLoader.cpp
rename to Util/OSM2ODR/src/netimport/NITypeLoader.cpp
diff --git a/Util/Converter/src/netimport/NITypeLoader.h b/Util/OSM2ODR/src/netimport/NITypeLoader.h
similarity index 100%
rename from Util/Converter/src/netimport/NITypeLoader.h
rename to Util/OSM2ODR/src/netimport/NITypeLoader.h
diff --git a/Util/Converter/src/netimport/NIVisumTL.cpp b/Util/OSM2ODR/src/netimport/NIVisumTL.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NIVisumTL.cpp
rename to Util/OSM2ODR/src/netimport/NIVisumTL.cpp
diff --git a/Util/Converter/src/netimport/NIVisumTL.h b/Util/OSM2ODR/src/netimport/NIVisumTL.h
similarity index 100%
rename from Util/Converter/src/netimport/NIVisumTL.h
rename to Util/OSM2ODR/src/netimport/NIVisumTL.h
diff --git a/Util/Converter/src/netimport/NIXMLConnectionsHandler.cpp b/Util/OSM2ODR/src/netimport/NIXMLConnectionsHandler.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NIXMLConnectionsHandler.cpp
rename to Util/OSM2ODR/src/netimport/NIXMLConnectionsHandler.cpp
diff --git a/Util/Converter/src/netimport/NIXMLConnectionsHandler.h b/Util/OSM2ODR/src/netimport/NIXMLConnectionsHandler.h
similarity index 100%
rename from Util/Converter/src/netimport/NIXMLConnectionsHandler.h
rename to Util/OSM2ODR/src/netimport/NIXMLConnectionsHandler.h
diff --git a/Util/Converter/src/netimport/NIXMLEdgesHandler.cpp b/Util/OSM2ODR/src/netimport/NIXMLEdgesHandler.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NIXMLEdgesHandler.cpp
rename to Util/OSM2ODR/src/netimport/NIXMLEdgesHandler.cpp
diff --git a/Util/Converter/src/netimport/NIXMLEdgesHandler.h b/Util/OSM2ODR/src/netimport/NIXMLEdgesHandler.h
similarity index 100%
rename from Util/Converter/src/netimport/NIXMLEdgesHandler.h
rename to Util/OSM2ODR/src/netimport/NIXMLEdgesHandler.h
diff --git a/Util/Converter/src/netimport/NIXMLNodesHandler.cpp b/Util/OSM2ODR/src/netimport/NIXMLNodesHandler.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NIXMLNodesHandler.cpp
rename to Util/OSM2ODR/src/netimport/NIXMLNodesHandler.cpp
diff --git a/Util/Converter/src/netimport/NIXMLNodesHandler.h b/Util/OSM2ODR/src/netimport/NIXMLNodesHandler.h
similarity index 100%
rename from Util/Converter/src/netimport/NIXMLNodesHandler.h
rename to Util/OSM2ODR/src/netimport/NIXMLNodesHandler.h
diff --git a/Util/Converter/src/netimport/NIXMLPTHandler.cpp b/Util/OSM2ODR/src/netimport/NIXMLPTHandler.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NIXMLPTHandler.cpp
rename to Util/OSM2ODR/src/netimport/NIXMLPTHandler.cpp
diff --git a/Util/Converter/src/netimport/NIXMLPTHandler.h b/Util/OSM2ODR/src/netimport/NIXMLPTHandler.h
similarity index 100%
rename from Util/Converter/src/netimport/NIXMLPTHandler.h
rename to Util/OSM2ODR/src/netimport/NIXMLPTHandler.h
diff --git a/Util/Converter/src/netimport/NIXMLShapeHandler.cpp b/Util/OSM2ODR/src/netimport/NIXMLShapeHandler.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NIXMLShapeHandler.cpp
rename to Util/OSM2ODR/src/netimport/NIXMLShapeHandler.cpp
diff --git a/Util/Converter/src/netimport/NIXMLShapeHandler.h b/Util/OSM2ODR/src/netimport/NIXMLShapeHandler.h
similarity index 100%
rename from Util/Converter/src/netimport/NIXMLShapeHandler.h
rename to Util/OSM2ODR/src/netimport/NIXMLShapeHandler.h
diff --git a/Util/Converter/src/netimport/NIXMLTrafficLightsHandler.cpp b/Util/OSM2ODR/src/netimport/NIXMLTrafficLightsHandler.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NIXMLTrafficLightsHandler.cpp
rename to Util/OSM2ODR/src/netimport/NIXMLTrafficLightsHandler.cpp
diff --git a/Util/Converter/src/netimport/NIXMLTrafficLightsHandler.h b/Util/OSM2ODR/src/netimport/NIXMLTrafficLightsHandler.h
similarity index 100%
rename from Util/Converter/src/netimport/NIXMLTrafficLightsHandler.h
rename to Util/OSM2ODR/src/netimport/NIXMLTrafficLightsHandler.h
diff --git a/Util/Converter/src/netimport/NIXMLTypesHandler.cpp b/Util/OSM2ODR/src/netimport/NIXMLTypesHandler.cpp
similarity index 100%
rename from Util/Converter/src/netimport/NIXMLTypesHandler.cpp
rename to Util/OSM2ODR/src/netimport/NIXMLTypesHandler.cpp
diff --git a/Util/Converter/src/netimport/NIXMLTypesHandler.h b/Util/OSM2ODR/src/netimport/NIXMLTypesHandler.h
similarity index 100%
rename from Util/Converter/src/netimport/NIXMLTypesHandler.h
rename to Util/OSM2ODR/src/netimport/NIXMLTypesHandler.h
diff --git a/Util/Converter/src/netimport/README_Contributing.md b/Util/OSM2ODR/src/netimport/README_Contributing.md
similarity index 100%
rename from Util/Converter/src/netimport/README_Contributing.md
rename to Util/OSM2ODR/src/netimport/README_Contributing.md
diff --git a/Util/Converter/src/netimport/_netimport.dox b/Util/OSM2ODR/src/netimport/_netimport.dox
similarity index 100%
rename from Util/Converter/src/netimport/_netimport.dox
rename to Util/OSM2ODR/src/netimport/_netimport.dox
diff --git a/Util/Converter/src/netimport/typemap.h b/Util/OSM2ODR/src/netimport/typemap.h
similarity index 100%
rename from Util/Converter/src/netimport/typemap.h
rename to Util/OSM2ODR/src/netimport/typemap.h
diff --git a/Util/Converter/src/netimport/vissim/CMakeLists.txt b/Util/OSM2ODR/src/netimport/vissim/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/netimport/vissim/CMakeLists.txt
rename to Util/OSM2ODR/src/netimport/vissim/CMakeLists.txt
diff --git a/Util/Converter/src/netimport/vissim/NIImporter_Vissim.cpp b/Util/OSM2ODR/src/netimport/vissim/NIImporter_Vissim.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/NIImporter_Vissim.cpp
rename to Util/OSM2ODR/src/netimport/vissim/NIImporter_Vissim.cpp
diff --git a/Util/Converter/src/netimport/vissim/NIImporter_Vissim.h b/Util/OSM2ODR/src/netimport/vissim/NIImporter_Vissim.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/NIImporter_Vissim.h
rename to Util/OSM2ODR/src/netimport/vissim/NIImporter_Vissim.h
diff --git a/Util/Converter/src/netimport/vissim/NIVissimElements.h b/Util/OSM2ODR/src/netimport/vissim/NIVissimElements.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/NIVissimElements.h
rename to Util/OSM2ODR/src/netimport/vissim/NIVissimElements.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/CMakeLists.txt b/Util/OSM2ODR/src/netimport/vissim/tempstructs/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/CMakeLists.txt
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/CMakeLists.txt
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimAbstractEdge.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimAbstractEdge.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimAbstractEdge.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimAbstractEdge.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimAbstractEdge.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimAbstractEdge.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimAbstractEdge.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimAbstractEdge.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimBoundedClusterObject.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimBoundedClusterObject.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimBoundedClusterObject.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimBoundedClusterObject.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimBoundedClusterObject.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimBoundedClusterObject.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimBoundedClusterObject.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimBoundedClusterObject.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimClosedLaneDef.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimClosedLaneDef.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimClosedLaneDef.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimClosedLaneDef.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimClosedLaneDef.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimClosedLaneDef.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimClosedLaneDef.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimClosedLaneDef.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimClosedLanesVector.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimClosedLanesVector.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimClosedLanesVector.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimClosedLanesVector.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimClosures.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimClosures.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimClosures.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimClosures.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimClosures.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimClosures.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimClosures.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimClosures.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimConflictArea.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimConflictArea.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimConflictArea.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimConflictArea.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimConflictArea.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimConflictArea.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimConflictArea.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimConflictArea.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimConnection.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimConnection.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimConnection.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimConnection.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimConnection.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimConnection.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimConnection.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimConnection.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimConnectionCluster.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimConnectionCluster.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimConnectionCluster.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimConnectionCluster.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimConnectionCluster.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimConnectionCluster.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimConnectionCluster.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimConnectionCluster.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimDistrictConnection.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimDistrictConnection.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimDistrictConnection.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimDistrictConnection.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimDistrictConnection.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimDistrictConnection.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimDistrictConnection.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimDistrictConnection.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimDisturbance.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimDisturbance.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimDisturbance.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimDisturbance.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimDisturbance.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimDisturbance.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimDisturbance.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimDisturbance.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimEdge.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimEdge.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimEdge.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimEdge.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimEdge.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimEdge.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimEdge.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimEdge.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimEdgePosMap.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimEdgePosMap.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimEdgePosMap.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimEdgePosMap.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimEdgePosMap.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimEdgePosMap.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimEdgePosMap.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimEdgePosMap.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePoint.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePoint.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePoint.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePoint.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePoint.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePoint.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePoint.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePoint.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePointVector.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePointVector.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePointVector.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimExtendedEdgePointVector.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeCluster.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeCluster.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeCluster.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeCluster.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeCluster.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeCluster.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeCluster.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeCluster.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeDef.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeDef.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeDef.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeDef.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeDef.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeDef.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeDef.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeDef.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeDef_Edges.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeDef_Edges.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeDef_Edges.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeDef_Edges.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeDef_Edges.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeDef_Edges.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeDef_Edges.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeDef_Edges.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeDef_Poly.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeDef_Poly.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeDef_Poly.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeDef_Poly.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeDef_Poly.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeDef_Poly.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeDef_Poly.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeDef_Poly.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdge.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdge.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdge.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdge.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdge.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdge.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdge.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdge.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdgeVector.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdgeVector.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdgeVector.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimNodeParticipatingEdgeVector.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimSource.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimSource.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimSource.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimSource.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimSource.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimSource.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimSource.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimSource.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimTL.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimTL.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimTL.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimTL.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimTL.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimTL.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimTL.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimTL.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimTrafficDescription.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimTrafficDescription.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimTrafficDescription.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimTrafficDescription.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimTrafficDescription.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimTrafficDescription.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimTrafficDescription.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimTrafficDescription.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimVehTypeClass.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimVehTypeClass.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimVehTypeClass.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimVehTypeClass.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimVehTypeClass.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimVehTypeClass.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimVehTypeClass.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimVehTypeClass.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimVehicleClass.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimVehicleClass.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimVehicleClass.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimVehicleClass.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimVehicleClass.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimVehicleClass.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimVehicleClass.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimVehicleClass.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimVehicleClassVector.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimVehicleClassVector.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimVehicleClassVector.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimVehicleClassVector.h
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimVehicleType.cpp b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimVehicleType.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimVehicleType.cpp
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimVehicleType.cpp
diff --git a/Util/Converter/src/netimport/vissim/tempstructs/NIVissimVehicleType.h b/Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimVehicleType.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/tempstructs/NIVissimVehicleType.h
rename to Util/OSM2ODR/src/netimport/vissim/tempstructs/NIVissimVehicleType.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/CMakeLists.txt b/Util/OSM2ODR/src/netimport/vissim/typeloader/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/CMakeLists.txt
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/CMakeLists.txt
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Auswertungsdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Auswertungsdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Auswertungsdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Auswertungsdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Auswertungsdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Auswertungsdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Auswertungsdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Auswertungsdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Detektordefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Detektordefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Detektordefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Detektordefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Detektordefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Detektordefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Detektordefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Detektordefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_DynUml.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_DynUml.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_DynUml.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_DynUml.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_DynUml.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_DynUml.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_DynUml.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_DynUml.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Einheitendefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Einheitendefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Einheitendefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Einheitendefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Einheitendefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Einheitendefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Einheitendefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Einheitendefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Emission.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Emission.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Emission.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Emission.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Emission.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Emission.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Emission.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Emission.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrtverlaufdateien.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrtverlaufdateien.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrtverlaufdateien.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrtverlaufdateien.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrtverlaufdateien.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrtverlaufdateien.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrtverlaufdateien.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrtverlaufdateien.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrverhaltendefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrverhaltendefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrverhaltendefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrverhaltendefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrverhaltendefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrverhaltendefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrverhaltendefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrverhaltendefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugklassendefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugklassendefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugklassendefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugklassendefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugklassendefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugklassendefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugklassendefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugklassendefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugtypdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugtypdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugtypdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugtypdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugtypdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugtypdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugtypdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fahrzeugtypdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fensterdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fensterdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fensterdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fensterdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fensterdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fensterdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fensterdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Fensterdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gefahrwarnungsdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gefahrwarnungsdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gefahrwarnungsdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gefahrwarnungsdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gefahrwarnungsdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gefahrwarnungsdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gefahrwarnungsdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gefahrwarnungsdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gelbverhaltendefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gelbverhaltendefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gelbverhaltendefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gelbverhaltendefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gelbverhaltendefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gelbverhaltendefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gelbverhaltendefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Gelbverhaltendefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Geschwindigkeitsverteilungsdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Geschwindigkeitsverteilungsdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Geschwindigkeitsverteilungsdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Geschwindigkeitsverteilungsdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Geschwindigkeitsverteilungsdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Geschwindigkeitsverteilungsdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Geschwindigkeitsverteilungsdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Geschwindigkeitsverteilungsdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Haltestellendefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Haltestellendefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Haltestellendefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Haltestellendefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Haltestellendefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Haltestellendefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Haltestellendefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Haltestellendefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kantensperrung.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kantensperrung.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kantensperrung.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kantensperrung.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kantensperrung.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kantensperrung.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kantensperrung.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kantensperrung.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kennungszeile.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kennungszeile.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kennungszeile.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kennungszeile.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kennungszeile.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kennungszeile.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kennungszeile.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Kennungszeile.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Knotendefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Knotendefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Knotendefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Knotendefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Knotendefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Knotendefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Knotendefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Knotendefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_LSAKopplungsdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_LSAKopplungsdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_LSAKopplungsdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_LSAKopplungsdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_LSAKopplungsdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_LSAKopplungsdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_LSAKopplungsdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_LSAKopplungsdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Laengenverteilungsdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Laengenverteilungsdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Laengenverteilungsdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Laengenverteilungsdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Laengenverteilungsdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Laengenverteilungsdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Laengenverteilungsdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Laengenverteilungsdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Langsamfahrbereichdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Langsamfahrbereichdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Langsamfahrbereichdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Langsamfahrbereichdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Langsamfahrbereichdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Langsamfahrbereichdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Langsamfahrbereichdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Langsamfahrbereichdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Lichtsignalanlagendefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Lichtsignalanlagendefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Lichtsignalanlagendefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Lichtsignalanlagendefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Lichtsignalanlagendefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Lichtsignalanlagendefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Lichtsignalanlagendefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Lichtsignalanlagendefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Liniendefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Liniendefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Liniendefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Liniendefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Liniendefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Liniendefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Liniendefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Liniendefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Linksverkehr.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Linksverkehr.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Linksverkehr.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Linksverkehr.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Linksverkehr.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Linksverkehr.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Linksverkehr.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Linksverkehr.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Messungsdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Messungsdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Messungsdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Messungsdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Messungsdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Messungsdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Messungsdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Messungsdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Netzobjektdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Netzobjektdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Netzobjektdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Netzobjektdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Netzobjektdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Netzobjektdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Netzobjektdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Netzobjektdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Parkplatzdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Parkplatzdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Parkplatzdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Parkplatzdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Parkplatzdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Parkplatzdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Parkplatzdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Parkplatzdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querschnittsmessungsdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querschnittsmessungsdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querschnittsmessungsdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querschnittsmessungsdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querschnittsmessungsdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querschnittsmessungsdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querschnittsmessungsdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querschnittsmessungsdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querverkehrsstoerungsdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querverkehrsstoerungsdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querverkehrsstoerungsdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querverkehrsstoerungsdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querverkehrsstoerungsdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querverkehrsstoerungsdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querverkehrsstoerungsdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Querverkehrsstoerungsdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Rautedefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Rautedefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Rautedefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Rautedefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Rautedefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Rautedefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Rautedefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Rautedefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Reisezeitmessungsdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Reisezeitmessungsdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Reisezeitmessungsdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Reisezeitmessungsdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Reisezeitmessungsdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Reisezeitmessungsdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Reisezeitmessungsdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Reisezeitmessungsdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungsentscheidungsdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungsentscheidungsdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungsentscheidungsdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungsentscheidungsdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungsentscheidungsdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungsentscheidungsdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungsentscheidungsdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungsentscheidungsdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungspfeildefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungspfeildefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungspfeildefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungspfeildefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungspfeildefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungspfeildefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungspfeildefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Richtungspfeildefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Routenentscheidungsdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Routenentscheidungsdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Routenentscheidungsdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Routenentscheidungsdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Routenentscheidungsdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Routenentscheidungsdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Routenentscheidungsdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Routenentscheidungsdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgeberdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgeberdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgeberdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgeberdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgeberdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgeberdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgeberdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgeberdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgruppendefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgruppendefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgruppendefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgruppendefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgruppendefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgruppendefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgruppendefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Signalgruppendefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_SimRate.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_SimRate.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_SimRate.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_SimRate.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_SimRate.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_SimRate.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_SimRate.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_SimRate.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Simdauer.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Simdauer.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Simdauer.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Simdauer.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Simdauer.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Simdauer.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Simdauer.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Simdauer.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startuhrzeit.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startuhrzeit.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startuhrzeit.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startuhrzeit.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startuhrzeit.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startuhrzeit.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startuhrzeit.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startuhrzeit.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startzufallszahl.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startzufallszahl.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startzufallszahl.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startzufallszahl.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startzufallszahl.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startzufallszahl.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startzufallszahl.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Startzufallszahl.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauparameterdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauparameterdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauparameterdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauparameterdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauparameterdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauparameterdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauparameterdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauparameterdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauzaehlerdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauzaehlerdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauzaehlerdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauzaehlerdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauzaehlerdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauzaehlerdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauzaehlerdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stauzaehlerdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stopschilddefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stopschilddefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stopschilddefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stopschilddefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stopschilddefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stopschilddefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stopschilddefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Stopschilddefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckendefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckendefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckendefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckendefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckendefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckendefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckendefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckendefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckentypdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckentypdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckentypdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckentypdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckentypdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckentypdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckentypdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Streckentypdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_TEAPACDefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_TEAPACDefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_TEAPACDefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_TEAPACDefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_TEAPACDefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_TEAPACDefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_TEAPACDefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_TEAPACDefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_VWunschentscheidungsdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_VWunschentscheidungsdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_VWunschentscheidungsdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_VWunschentscheidungsdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_VWunschentscheidungsdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_VWunschentscheidungsdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_VWunschentscheidungsdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_VWunschentscheidungsdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verbindungsdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verbindungsdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verbindungsdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verbindungsdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verbindungsdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verbindungsdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verbindungsdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verbindungsdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verkehrszusammensetzungsdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verkehrszusammensetzungsdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verkehrszusammensetzungsdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verkehrszusammensetzungsdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verkehrszusammensetzungsdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verkehrszusammensetzungsdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verkehrszusammensetzungsdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verkehrszusammensetzungsdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verlustzeitmessungsdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verlustzeitmessungsdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verlustzeitmessungsdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verlustzeitmessungsdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verlustzeitmessungsdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verlustzeitmessungsdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verlustzeitmessungsdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Verlustzeitmessungsdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitenverteilungsdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitenverteilungsdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitenverteilungsdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitenverteilungsdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitenverteilungsdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitenverteilungsdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitenverteilungsdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitenverteilungsdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitschrittfaktor.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitschrittfaktor.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitschrittfaktor.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitschrittfaktor.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitschrittfaktor.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitschrittfaktor.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitschrittfaktor.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zeitschrittfaktor.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zuflussdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zuflussdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zuflussdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zuflussdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zuflussdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zuflussdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zuflussdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zuflussdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zusammensetzungsdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zusammensetzungsdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zusammensetzungsdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zusammensetzungsdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zusammensetzungsdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zusammensetzungsdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zusammensetzungsdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser_Zusammensetzungsdefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XKurvedefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XKurvedefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XKurvedefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XKurvedefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XKurvedefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XKurvedefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XKurvedefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XKurvedefinition.h
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XVerteilungsdefinition.cpp b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XVerteilungsdefinition.cpp
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XVerteilungsdefinition.cpp
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XVerteilungsdefinition.cpp
diff --git a/Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XVerteilungsdefinition.h b/Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XVerteilungsdefinition.h
similarity index 100%
rename from Util/Converter/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XVerteilungsdefinition.h
rename to Util/OSM2ODR/src/netimport/vissim/typeloader/NIVissimSingleTypeParser__XVerteilungsdefinition.h
diff --git a/Util/Converter/src/netload/NLBuilder.h b/Util/OSM2ODR/src/netload/NLBuilder.h
similarity index 100%
rename from Util/Converter/src/netload/NLBuilder.h
rename to Util/OSM2ODR/src/netload/NLBuilder.h
diff --git a/Util/Converter/src/netload/NLDetectorBuilder.h b/Util/OSM2ODR/src/netload/NLDetectorBuilder.h
similarity index 100%
rename from Util/Converter/src/netload/NLDetectorBuilder.h
rename to Util/OSM2ODR/src/netload/NLDetectorBuilder.h
diff --git a/Util/Converter/src/netload/NLDiscreteEventBuilder.h b/Util/OSM2ODR/src/netload/NLDiscreteEventBuilder.h
similarity index 100%
rename from Util/Converter/src/netload/NLDiscreteEventBuilder.h
rename to Util/OSM2ODR/src/netload/NLDiscreteEventBuilder.h
diff --git a/Util/Converter/src/netload/NLEdgeControlBuilder.h b/Util/OSM2ODR/src/netload/NLEdgeControlBuilder.h
similarity index 100%
rename from Util/Converter/src/netload/NLEdgeControlBuilder.h
rename to Util/OSM2ODR/src/netload/NLEdgeControlBuilder.h
diff --git a/Util/Converter/src/netload/NLHandler.h b/Util/OSM2ODR/src/netload/NLHandler.h
similarity index 100%
rename from Util/Converter/src/netload/NLHandler.h
rename to Util/OSM2ODR/src/netload/NLHandler.h
diff --git a/Util/Converter/src/netload/NLJunctionControlBuilder.h b/Util/OSM2ODR/src/netload/NLJunctionControlBuilder.h
similarity index 100%
rename from Util/Converter/src/netload/NLJunctionControlBuilder.h
rename to Util/OSM2ODR/src/netload/NLJunctionControlBuilder.h
diff --git a/Util/Converter/src/netload/NLTriggerBuilder.h b/Util/OSM2ODR/src/netload/NLTriggerBuilder.h
similarity index 100%
rename from Util/Converter/src/netload/NLTriggerBuilder.h
rename to Util/OSM2ODR/src/netload/NLTriggerBuilder.h
diff --git a/Util/Converter/src/netwrite/CMakeLists.txt b/Util/OSM2ODR/src/netwrite/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/netwrite/CMakeLists.txt
rename to Util/OSM2ODR/src/netwrite/CMakeLists.txt
diff --git a/Util/Converter/src/netwrite/NWFrame.cpp b/Util/OSM2ODR/src/netwrite/NWFrame.cpp
similarity index 100%
rename from Util/Converter/src/netwrite/NWFrame.cpp
rename to Util/OSM2ODR/src/netwrite/NWFrame.cpp
diff --git a/Util/Converter/src/netwrite/NWFrame.h b/Util/OSM2ODR/src/netwrite/NWFrame.h
similarity index 100%
rename from Util/Converter/src/netwrite/NWFrame.h
rename to Util/OSM2ODR/src/netwrite/NWFrame.h
diff --git a/Util/Converter/src/netwrite/NWWriter_Amitran.cpp b/Util/OSM2ODR/src/netwrite/NWWriter_Amitran.cpp
similarity index 100%
rename from Util/Converter/src/netwrite/NWWriter_Amitran.cpp
rename to Util/OSM2ODR/src/netwrite/NWWriter_Amitran.cpp
diff --git a/Util/Converter/src/netwrite/NWWriter_Amitran.h b/Util/OSM2ODR/src/netwrite/NWWriter_Amitran.h
similarity index 100%
rename from Util/Converter/src/netwrite/NWWriter_Amitran.h
rename to Util/OSM2ODR/src/netwrite/NWWriter_Amitran.h
diff --git a/Util/Converter/src/netwrite/NWWriter_DlrNavteq.cpp b/Util/OSM2ODR/src/netwrite/NWWriter_DlrNavteq.cpp
similarity index 100%
rename from Util/Converter/src/netwrite/NWWriter_DlrNavteq.cpp
rename to Util/OSM2ODR/src/netwrite/NWWriter_DlrNavteq.cpp
diff --git a/Util/Converter/src/netwrite/NWWriter_DlrNavteq.h b/Util/OSM2ODR/src/netwrite/NWWriter_DlrNavteq.h
similarity index 100%
rename from Util/Converter/src/netwrite/NWWriter_DlrNavteq.h
rename to Util/OSM2ODR/src/netwrite/NWWriter_DlrNavteq.h
diff --git a/Util/Converter/src/netwrite/NWWriter_MATSim.cpp b/Util/OSM2ODR/src/netwrite/NWWriter_MATSim.cpp
similarity index 100%
rename from Util/Converter/src/netwrite/NWWriter_MATSim.cpp
rename to Util/OSM2ODR/src/netwrite/NWWriter_MATSim.cpp
diff --git a/Util/Converter/src/netwrite/NWWriter_MATSim.h b/Util/OSM2ODR/src/netwrite/NWWriter_MATSim.h
similarity index 100%
rename from Util/Converter/src/netwrite/NWWriter_MATSim.h
rename to Util/OSM2ODR/src/netwrite/NWWriter_MATSim.h
diff --git a/Util/Converter/src/netwrite/NWWriter_OpenDrive.cpp b/Util/OSM2ODR/src/netwrite/NWWriter_OpenDrive.cpp
similarity index 100%
rename from Util/Converter/src/netwrite/NWWriter_OpenDrive.cpp
rename to Util/OSM2ODR/src/netwrite/NWWriter_OpenDrive.cpp
diff --git a/Util/Converter/src/netwrite/NWWriter_OpenDrive.h b/Util/OSM2ODR/src/netwrite/NWWriter_OpenDrive.h
similarity index 100%
rename from Util/Converter/src/netwrite/NWWriter_OpenDrive.h
rename to Util/OSM2ODR/src/netwrite/NWWriter_OpenDrive.h
diff --git a/Util/Converter/src/netwrite/NWWriter_SUMO.cpp b/Util/OSM2ODR/src/netwrite/NWWriter_SUMO.cpp
similarity index 100%
rename from Util/Converter/src/netwrite/NWWriter_SUMO.cpp
rename to Util/OSM2ODR/src/netwrite/NWWriter_SUMO.cpp
diff --git a/Util/Converter/src/netwrite/NWWriter_SUMO.h b/Util/OSM2ODR/src/netwrite/NWWriter_SUMO.h
similarity index 100%
rename from Util/Converter/src/netwrite/NWWriter_SUMO.h
rename to Util/OSM2ODR/src/netwrite/NWWriter_SUMO.h
diff --git a/Util/Converter/src/netwrite/NWWriter_XML.cpp b/Util/OSM2ODR/src/netwrite/NWWriter_XML.cpp
similarity index 100%
rename from Util/Converter/src/netwrite/NWWriter_XML.cpp
rename to Util/OSM2ODR/src/netwrite/NWWriter_XML.cpp
diff --git a/Util/Converter/src/netwrite/NWWriter_XML.h b/Util/OSM2ODR/src/netwrite/NWWriter_XML.h
similarity index 100%
rename from Util/Converter/src/netwrite/NWWriter_XML.h
rename to Util/OSM2ODR/src/netwrite/NWWriter_XML.h
diff --git a/Util/Converter/src/netwrite/README_Contributing.md b/Util/OSM2ODR/src/netwrite/README_Contributing.md
similarity index 100%
rename from Util/Converter/src/netwrite/README_Contributing.md
rename to Util/OSM2ODR/src/netwrite/README_Contributing.md
diff --git a/Util/Converter/src/notes b/Util/OSM2ODR/src/notes
similarity index 100%
rename from Util/Converter/src/notes
rename to Util/OSM2ODR/src/notes
diff --git a/Util/Converter/src/polyconvert/PCLoaderArcView.h b/Util/OSM2ODR/src/polyconvert/PCLoaderArcView.h
similarity index 100%
rename from Util/Converter/src/polyconvert/PCLoaderArcView.h
rename to Util/OSM2ODR/src/polyconvert/PCLoaderArcView.h
diff --git a/Util/Converter/src/polyconvert/PCLoaderDlrNavteq.h b/Util/OSM2ODR/src/polyconvert/PCLoaderDlrNavteq.h
similarity index 100%
rename from Util/Converter/src/polyconvert/PCLoaderDlrNavteq.h
rename to Util/OSM2ODR/src/polyconvert/PCLoaderDlrNavteq.h
diff --git a/Util/Converter/src/polyconvert/PCLoaderOSM.h b/Util/OSM2ODR/src/polyconvert/PCLoaderOSM.h
similarity index 100%
rename from Util/Converter/src/polyconvert/PCLoaderOSM.h
rename to Util/OSM2ODR/src/polyconvert/PCLoaderOSM.h
diff --git a/Util/Converter/src/polyconvert/PCLoaderVisum.h b/Util/OSM2ODR/src/polyconvert/PCLoaderVisum.h
similarity index 100%
rename from Util/Converter/src/polyconvert/PCLoaderVisum.h
rename to Util/OSM2ODR/src/polyconvert/PCLoaderVisum.h
diff --git a/Util/Converter/src/polyconvert/PCLoaderXML.h b/Util/OSM2ODR/src/polyconvert/PCLoaderXML.h
similarity index 100%
rename from Util/Converter/src/polyconvert/PCLoaderXML.h
rename to Util/OSM2ODR/src/polyconvert/PCLoaderXML.h
diff --git a/Util/Converter/src/polyconvert/PCNetProjectionLoader.h b/Util/OSM2ODR/src/polyconvert/PCNetProjectionLoader.h
similarity index 100%
rename from Util/Converter/src/polyconvert/PCNetProjectionLoader.h
rename to Util/OSM2ODR/src/polyconvert/PCNetProjectionLoader.h
diff --git a/Util/Converter/src/polyconvert/PCPolyContainer.h b/Util/OSM2ODR/src/polyconvert/PCPolyContainer.h
similarity index 100%
rename from Util/Converter/src/polyconvert/PCPolyContainer.h
rename to Util/OSM2ODR/src/polyconvert/PCPolyContainer.h
diff --git a/Util/Converter/src/polyconvert/PCTypeDefHandler.h b/Util/OSM2ODR/src/polyconvert/PCTypeDefHandler.h
similarity index 100%
rename from Util/Converter/src/polyconvert/PCTypeDefHandler.h
rename to Util/OSM2ODR/src/polyconvert/PCTypeDefHandler.h
diff --git a/Util/Converter/src/polyconvert/PCTypeMap.h b/Util/OSM2ODR/src/polyconvert/PCTypeMap.h
similarity index 100%
rename from Util/Converter/src/polyconvert/PCTypeMap.h
rename to Util/OSM2ODR/src/polyconvert/PCTypeMap.h
diff --git a/Util/Converter/src/utils/CMakeLists.txt b/Util/OSM2ODR/src/utils/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/utils/CMakeLists.txt
rename to Util/OSM2ODR/src/utils/CMakeLists.txt
diff --git a/Util/Converter/src/utils/common/CMakeLists.txt b/Util/OSM2ODR/src/utils/common/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/utils/common/CMakeLists.txt
rename to Util/OSM2ODR/src/utils/common/CMakeLists.txt
diff --git a/Util/Converter/src/utils/common/Command.h b/Util/OSM2ODR/src/utils/common/Command.h
similarity index 100%
rename from Util/Converter/src/utils/common/Command.h
rename to Util/OSM2ODR/src/utils/common/Command.h
diff --git a/Util/Converter/src/utils/common/FileHelpers.cpp b/Util/OSM2ODR/src/utils/common/FileHelpers.cpp
similarity index 100%
rename from Util/Converter/src/utils/common/FileHelpers.cpp
rename to Util/OSM2ODR/src/utils/common/FileHelpers.cpp
diff --git a/Util/Converter/src/utils/common/FileHelpers.h b/Util/OSM2ODR/src/utils/common/FileHelpers.h
similarity index 100%
rename from Util/Converter/src/utils/common/FileHelpers.h
rename to Util/OSM2ODR/src/utils/common/FileHelpers.h
diff --git a/Util/Converter/src/utils/common/IDSupplier.cpp b/Util/OSM2ODR/src/utils/common/IDSupplier.cpp
similarity index 100%
rename from Util/Converter/src/utils/common/IDSupplier.cpp
rename to Util/OSM2ODR/src/utils/common/IDSupplier.cpp
diff --git a/Util/Converter/src/utils/common/IDSupplier.h b/Util/OSM2ODR/src/utils/common/IDSupplier.h
similarity index 100%
rename from Util/Converter/src/utils/common/IDSupplier.h
rename to Util/OSM2ODR/src/utils/common/IDSupplier.h
diff --git a/Util/Converter/src/utils/common/InstancePool.h b/Util/OSM2ODR/src/utils/common/InstancePool.h
similarity index 100%
rename from Util/Converter/src/utils/common/InstancePool.h
rename to Util/OSM2ODR/src/utils/common/InstancePool.h
diff --git a/Util/Converter/src/utils/common/MsgHandler.cpp b/Util/OSM2ODR/src/utils/common/MsgHandler.cpp
similarity index 100%
rename from Util/Converter/src/utils/common/MsgHandler.cpp
rename to Util/OSM2ODR/src/utils/common/MsgHandler.cpp
diff --git a/Util/Converter/src/utils/common/MsgHandler.h b/Util/OSM2ODR/src/utils/common/MsgHandler.h
similarity index 100%
rename from Util/Converter/src/utils/common/MsgHandler.h
rename to Util/OSM2ODR/src/utils/common/MsgHandler.h
diff --git a/Util/Converter/src/utils/common/MsgRetrievingFunction.h b/Util/OSM2ODR/src/utils/common/MsgRetrievingFunction.h
similarity index 100%
rename from Util/Converter/src/utils/common/MsgRetrievingFunction.h
rename to Util/OSM2ODR/src/utils/common/MsgRetrievingFunction.h
diff --git a/Util/Converter/src/utils/common/Named.h b/Util/OSM2ODR/src/utils/common/Named.h
similarity index 100%
rename from Util/Converter/src/utils/common/Named.h
rename to Util/OSM2ODR/src/utils/common/Named.h
diff --git a/Util/Converter/src/utils/common/NamedObjectCont.h b/Util/OSM2ODR/src/utils/common/NamedObjectCont.h
similarity index 100%
rename from Util/Converter/src/utils/common/NamedObjectCont.h
rename to Util/OSM2ODR/src/utils/common/NamedObjectCont.h
diff --git a/Util/Converter/src/utils/common/NamedRTree.h b/Util/OSM2ODR/src/utils/common/NamedRTree.h
similarity index 100%
rename from Util/Converter/src/utils/common/NamedRTree.h
rename to Util/OSM2ODR/src/utils/common/NamedRTree.h
diff --git a/Util/Converter/src/utils/common/Parameterised.cpp b/Util/OSM2ODR/src/utils/common/Parameterised.cpp
similarity index 100%
rename from Util/Converter/src/utils/common/Parameterised.cpp
rename to Util/OSM2ODR/src/utils/common/Parameterised.cpp
diff --git a/Util/Converter/src/utils/common/Parameterised.h b/Util/OSM2ODR/src/utils/common/Parameterised.h
similarity index 100%
rename from Util/Converter/src/utils/common/Parameterised.h
rename to Util/OSM2ODR/src/utils/common/Parameterised.h
diff --git a/Util/Converter/src/utils/common/ParametrisedWrappingCommand.h b/Util/OSM2ODR/src/utils/common/ParametrisedWrappingCommand.h
similarity index 100%
rename from Util/Converter/src/utils/common/ParametrisedWrappingCommand.h
rename to Util/OSM2ODR/src/utils/common/ParametrisedWrappingCommand.h
diff --git a/Util/Converter/src/utils/common/PolySolver.cpp b/Util/OSM2ODR/src/utils/common/PolySolver.cpp
similarity index 100%
rename from Util/Converter/src/utils/common/PolySolver.cpp
rename to Util/OSM2ODR/src/utils/common/PolySolver.cpp
diff --git a/Util/Converter/src/utils/common/PolySolver.h b/Util/OSM2ODR/src/utils/common/PolySolver.h
similarity index 100%
rename from Util/Converter/src/utils/common/PolySolver.h
rename to Util/OSM2ODR/src/utils/common/PolySolver.h
diff --git a/Util/Converter/src/utils/common/RGBColor.cpp b/Util/OSM2ODR/src/utils/common/RGBColor.cpp
similarity index 100%
rename from Util/Converter/src/utils/common/RGBColor.cpp
rename to Util/OSM2ODR/src/utils/common/RGBColor.cpp
diff --git a/Util/Converter/src/utils/common/RGBColor.h b/Util/OSM2ODR/src/utils/common/RGBColor.h
similarity index 100%
rename from Util/Converter/src/utils/common/RGBColor.h
rename to Util/OSM2ODR/src/utils/common/RGBColor.h
diff --git a/Util/Converter/src/utils/common/RandHelper.cpp b/Util/OSM2ODR/src/utils/common/RandHelper.cpp
similarity index 100%
rename from Util/Converter/src/utils/common/RandHelper.cpp
rename to Util/OSM2ODR/src/utils/common/RandHelper.cpp
diff --git a/Util/Converter/src/utils/common/RandHelper.h b/Util/OSM2ODR/src/utils/common/RandHelper.h
similarity index 100%
rename from Util/Converter/src/utils/common/RandHelper.h
rename to Util/OSM2ODR/src/utils/common/RandHelper.h
diff --git a/Util/Converter/src/utils/common/SUMOTime.cpp b/Util/OSM2ODR/src/utils/common/SUMOTime.cpp
similarity index 100%
rename from Util/Converter/src/utils/common/SUMOTime.cpp
rename to Util/OSM2ODR/src/utils/common/SUMOTime.cpp
diff --git a/Util/Converter/src/utils/common/SUMOTime.h b/Util/OSM2ODR/src/utils/common/SUMOTime.h
similarity index 100%
rename from Util/Converter/src/utils/common/SUMOTime.h
rename to Util/OSM2ODR/src/utils/common/SUMOTime.h
diff --git a/Util/Converter/src/utils/common/SUMOVehicleClass.cpp b/Util/OSM2ODR/src/utils/common/SUMOVehicleClass.cpp
similarity index 100%
rename from Util/Converter/src/utils/common/SUMOVehicleClass.cpp
rename to Util/OSM2ODR/src/utils/common/SUMOVehicleClass.cpp
diff --git a/Util/Converter/src/utils/common/SUMOVehicleClass.h b/Util/OSM2ODR/src/utils/common/SUMOVehicleClass.h
similarity index 100%
rename from Util/Converter/src/utils/common/SUMOVehicleClass.h
rename to Util/OSM2ODR/src/utils/common/SUMOVehicleClass.h
diff --git a/Util/Converter/src/utils/common/StaticCommand.h b/Util/OSM2ODR/src/utils/common/StaticCommand.h
similarity index 100%
rename from Util/Converter/src/utils/common/StaticCommand.h
rename to Util/OSM2ODR/src/utils/common/StaticCommand.h
diff --git a/Util/Converter/src/utils/common/StdDefs.cpp b/Util/OSM2ODR/src/utils/common/StdDefs.cpp
similarity index 100%
rename from Util/Converter/src/utils/common/StdDefs.cpp
rename to Util/OSM2ODR/src/utils/common/StdDefs.cpp
diff --git a/Util/Converter/src/utils/common/StdDefs.h b/Util/OSM2ODR/src/utils/common/StdDefs.h
similarity index 100%
rename from Util/Converter/src/utils/common/StdDefs.h
rename to Util/OSM2ODR/src/utils/common/StdDefs.h
diff --git a/Util/Converter/src/utils/common/StringBijection.h b/Util/OSM2ODR/src/utils/common/StringBijection.h
similarity index 100%
rename from Util/Converter/src/utils/common/StringBijection.h
rename to Util/OSM2ODR/src/utils/common/StringBijection.h
diff --git a/Util/Converter/src/utils/common/StringTokenizer.cpp b/Util/OSM2ODR/src/utils/common/StringTokenizer.cpp
similarity index 100%
rename from Util/Converter/src/utils/common/StringTokenizer.cpp
rename to Util/OSM2ODR/src/utils/common/StringTokenizer.cpp
diff --git a/Util/Converter/src/utils/common/StringTokenizer.h b/Util/OSM2ODR/src/utils/common/StringTokenizer.h
similarity index 100%
rename from Util/Converter/src/utils/common/StringTokenizer.h
rename to Util/OSM2ODR/src/utils/common/StringTokenizer.h
diff --git a/Util/Converter/src/utils/common/StringUtils.cpp b/Util/OSM2ODR/src/utils/common/StringUtils.cpp
similarity index 100%
rename from Util/Converter/src/utils/common/StringUtils.cpp
rename to Util/OSM2ODR/src/utils/common/StringUtils.cpp
diff --git a/Util/Converter/src/utils/common/StringUtils.h b/Util/OSM2ODR/src/utils/common/StringUtils.h
similarity index 100%
rename from Util/Converter/src/utils/common/StringUtils.h
rename to Util/OSM2ODR/src/utils/common/StringUtils.h
diff --git a/Util/Converter/src/utils/common/SwarmDebug.h b/Util/OSM2ODR/src/utils/common/SwarmDebug.h
similarity index 100%
rename from Util/Converter/src/utils/common/SwarmDebug.h
rename to Util/OSM2ODR/src/utils/common/SwarmDebug.h
diff --git a/Util/Converter/src/utils/common/SysUtils.cpp b/Util/OSM2ODR/src/utils/common/SysUtils.cpp
similarity index 100%
rename from Util/Converter/src/utils/common/SysUtils.cpp
rename to Util/OSM2ODR/src/utils/common/SysUtils.cpp
diff --git a/Util/Converter/src/utils/common/SysUtils.h b/Util/OSM2ODR/src/utils/common/SysUtils.h
similarity index 100%
rename from Util/Converter/src/utils/common/SysUtils.h
rename to Util/OSM2ODR/src/utils/common/SysUtils.h
diff --git a/Util/Converter/src/utils/common/SystemFrame.cpp b/Util/OSM2ODR/src/utils/common/SystemFrame.cpp
similarity index 100%
rename from Util/Converter/src/utils/common/SystemFrame.cpp
rename to Util/OSM2ODR/src/utils/common/SystemFrame.cpp
diff --git a/Util/Converter/src/utils/common/SystemFrame.h b/Util/OSM2ODR/src/utils/common/SystemFrame.h
similarity index 100%
rename from Util/Converter/src/utils/common/SystemFrame.h
rename to Util/OSM2ODR/src/utils/common/SystemFrame.h
diff --git a/Util/Converter/src/utils/common/ToString.h b/Util/OSM2ODR/src/utils/common/ToString.h
similarity index 100%
rename from Util/Converter/src/utils/common/ToString.h
rename to Util/OSM2ODR/src/utils/common/ToString.h
diff --git a/Util/Converter/src/utils/common/UtilExceptions.h b/Util/OSM2ODR/src/utils/common/UtilExceptions.h
similarity index 100%
rename from Util/Converter/src/utils/common/UtilExceptions.h
rename to Util/OSM2ODR/src/utils/common/UtilExceptions.h
diff --git a/Util/Converter/src/utils/common/ValueRetriever.h b/Util/OSM2ODR/src/utils/common/ValueRetriever.h
similarity index 100%
rename from Util/Converter/src/utils/common/ValueRetriever.h
rename to Util/OSM2ODR/src/utils/common/ValueRetriever.h
diff --git a/Util/Converter/src/utils/common/ValueSource.h b/Util/OSM2ODR/src/utils/common/ValueSource.h
similarity index 100%
rename from Util/Converter/src/utils/common/ValueSource.h
rename to Util/OSM2ODR/src/utils/common/ValueSource.h
diff --git a/Util/Converter/src/utils/common/ValueTimeLine.h b/Util/OSM2ODR/src/utils/common/ValueTimeLine.h
similarity index 100%
rename from Util/Converter/src/utils/common/ValueTimeLine.h
rename to Util/OSM2ODR/src/utils/common/ValueTimeLine.h
diff --git a/Util/Converter/src/utils/common/VectorHelper.h b/Util/OSM2ODR/src/utils/common/VectorHelper.h
similarity index 100%
rename from Util/Converter/src/utils/common/VectorHelper.h
rename to Util/OSM2ODR/src/utils/common/VectorHelper.h
diff --git a/Util/Converter/src/utils/common/WrappingCommand.h b/Util/OSM2ODR/src/utils/common/WrappingCommand.h
similarity index 100%
rename from Util/Converter/src/utils/common/WrappingCommand.h
rename to Util/OSM2ODR/src/utils/common/WrappingCommand.h
diff --git a/Util/Converter/src/utils/distribution/CMakeLists.txt b/Util/OSM2ODR/src/utils/distribution/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/utils/distribution/CMakeLists.txt
rename to Util/OSM2ODR/src/utils/distribution/CMakeLists.txt
diff --git a/Util/Converter/src/utils/distribution/Distribution.h b/Util/OSM2ODR/src/utils/distribution/Distribution.h
similarity index 100%
rename from Util/Converter/src/utils/distribution/Distribution.h
rename to Util/OSM2ODR/src/utils/distribution/Distribution.h
diff --git a/Util/Converter/src/utils/distribution/DistributionCont.cpp b/Util/OSM2ODR/src/utils/distribution/DistributionCont.cpp
similarity index 100%
rename from Util/Converter/src/utils/distribution/DistributionCont.cpp
rename to Util/OSM2ODR/src/utils/distribution/DistributionCont.cpp
diff --git a/Util/Converter/src/utils/distribution/DistributionCont.h b/Util/OSM2ODR/src/utils/distribution/DistributionCont.h
similarity index 100%
rename from Util/Converter/src/utils/distribution/DistributionCont.h
rename to Util/OSM2ODR/src/utils/distribution/DistributionCont.h
diff --git a/Util/Converter/src/utils/distribution/Distribution_Parameterized.cpp b/Util/OSM2ODR/src/utils/distribution/Distribution_Parameterized.cpp
similarity index 100%
rename from Util/Converter/src/utils/distribution/Distribution_Parameterized.cpp
rename to Util/OSM2ODR/src/utils/distribution/Distribution_Parameterized.cpp
diff --git a/Util/Converter/src/utils/distribution/Distribution_Parameterized.h b/Util/OSM2ODR/src/utils/distribution/Distribution_Parameterized.h
similarity index 100%
rename from Util/Converter/src/utils/distribution/Distribution_Parameterized.h
rename to Util/OSM2ODR/src/utils/distribution/Distribution_Parameterized.h
diff --git a/Util/Converter/src/utils/distribution/Distribution_Points.cpp b/Util/OSM2ODR/src/utils/distribution/Distribution_Points.cpp
similarity index 100%
rename from Util/Converter/src/utils/distribution/Distribution_Points.cpp
rename to Util/OSM2ODR/src/utils/distribution/Distribution_Points.cpp
diff --git a/Util/Converter/src/utils/distribution/Distribution_Points.h b/Util/OSM2ODR/src/utils/distribution/Distribution_Points.h
similarity index 100%
rename from Util/Converter/src/utils/distribution/Distribution_Points.h
rename to Util/OSM2ODR/src/utils/distribution/Distribution_Points.h
diff --git a/Util/Converter/src/utils/distribution/RandomDistributor.h b/Util/OSM2ODR/src/utils/distribution/RandomDistributor.h
similarity index 100%
rename from Util/Converter/src/utils/distribution/RandomDistributor.h
rename to Util/OSM2ODR/src/utils/distribution/RandomDistributor.h
diff --git a/Util/Converter/src/utils/foxtools/FXConditionalLock.h b/Util/OSM2ODR/src/utils/foxtools/FXConditionalLock.h
similarity index 100%
rename from Util/Converter/src/utils/foxtools/FXConditionalLock.h
rename to Util/OSM2ODR/src/utils/foxtools/FXConditionalLock.h
diff --git a/Util/Converter/src/utils/foxtools/FXSynchQue.h b/Util/OSM2ODR/src/utils/foxtools/FXSynchQue.h
similarity index 100%
rename from Util/Converter/src/utils/foxtools/FXSynchQue.h
rename to Util/OSM2ODR/src/utils/foxtools/FXSynchQue.h
diff --git a/Util/Converter/src/utils/foxtools/FXWorkerThread.h b/Util/OSM2ODR/src/utils/foxtools/FXWorkerThread.h
similarity index 100%
rename from Util/Converter/src/utils/foxtools/FXWorkerThread.h
rename to Util/OSM2ODR/src/utils/foxtools/FXWorkerThread.h
diff --git a/Util/Converter/src/utils/geom/AbstractPoly.h b/Util/OSM2ODR/src/utils/geom/AbstractPoly.h
similarity index 100%
rename from Util/Converter/src/utils/geom/AbstractPoly.h
rename to Util/OSM2ODR/src/utils/geom/AbstractPoly.h
diff --git a/Util/Converter/src/utils/geom/Boundary.cpp b/Util/OSM2ODR/src/utils/geom/Boundary.cpp
similarity index 100%
rename from Util/Converter/src/utils/geom/Boundary.cpp
rename to Util/OSM2ODR/src/utils/geom/Boundary.cpp
diff --git a/Util/Converter/src/utils/geom/Boundary.h b/Util/OSM2ODR/src/utils/geom/Boundary.h
similarity index 100%
rename from Util/Converter/src/utils/geom/Boundary.h
rename to Util/OSM2ODR/src/utils/geom/Boundary.h
diff --git a/Util/Converter/src/utils/geom/Bresenham.cpp b/Util/OSM2ODR/src/utils/geom/Bresenham.cpp
similarity index 100%
rename from Util/Converter/src/utils/geom/Bresenham.cpp
rename to Util/OSM2ODR/src/utils/geom/Bresenham.cpp
diff --git a/Util/Converter/src/utils/geom/Bresenham.h b/Util/OSM2ODR/src/utils/geom/Bresenham.h
similarity index 100%
rename from Util/Converter/src/utils/geom/Bresenham.h
rename to Util/OSM2ODR/src/utils/geom/Bresenham.h
diff --git a/Util/Converter/src/utils/geom/CMakeLists.txt b/Util/OSM2ODR/src/utils/geom/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/utils/geom/CMakeLists.txt
rename to Util/OSM2ODR/src/utils/geom/CMakeLists.txt
diff --git a/Util/Converter/src/utils/geom/GeoConvHelper.cpp b/Util/OSM2ODR/src/utils/geom/GeoConvHelper.cpp
similarity index 100%
rename from Util/Converter/src/utils/geom/GeoConvHelper.cpp
rename to Util/OSM2ODR/src/utils/geom/GeoConvHelper.cpp
diff --git a/Util/Converter/src/utils/geom/GeoConvHelper.h b/Util/OSM2ODR/src/utils/geom/GeoConvHelper.h
similarity index 100%
rename from Util/Converter/src/utils/geom/GeoConvHelper.h
rename to Util/OSM2ODR/src/utils/geom/GeoConvHelper.h
diff --git a/Util/Converter/src/utils/geom/GeomConvHelper.cpp b/Util/OSM2ODR/src/utils/geom/GeomConvHelper.cpp
similarity index 100%
rename from Util/Converter/src/utils/geom/GeomConvHelper.cpp
rename to Util/OSM2ODR/src/utils/geom/GeomConvHelper.cpp
diff --git a/Util/Converter/src/utils/geom/GeomConvHelper.h b/Util/OSM2ODR/src/utils/geom/GeomConvHelper.h
similarity index 100%
rename from Util/Converter/src/utils/geom/GeomConvHelper.h
rename to Util/OSM2ODR/src/utils/geom/GeomConvHelper.h
diff --git a/Util/Converter/src/utils/geom/GeomHelper.cpp b/Util/OSM2ODR/src/utils/geom/GeomHelper.cpp
similarity index 100%
rename from Util/Converter/src/utils/geom/GeomHelper.cpp
rename to Util/OSM2ODR/src/utils/geom/GeomHelper.cpp
diff --git a/Util/Converter/src/utils/geom/GeomHelper.h b/Util/OSM2ODR/src/utils/geom/GeomHelper.h
similarity index 100%
rename from Util/Converter/src/utils/geom/GeomHelper.h
rename to Util/OSM2ODR/src/utils/geom/GeomHelper.h
diff --git a/Util/Converter/src/utils/geom/Position.cpp b/Util/OSM2ODR/src/utils/geom/Position.cpp
similarity index 100%
rename from Util/Converter/src/utils/geom/Position.cpp
rename to Util/OSM2ODR/src/utils/geom/Position.cpp
diff --git a/Util/Converter/src/utils/geom/Position.h b/Util/OSM2ODR/src/utils/geom/Position.h
similarity index 100%
rename from Util/Converter/src/utils/geom/Position.h
rename to Util/OSM2ODR/src/utils/geom/Position.h
diff --git a/Util/Converter/src/utils/geom/PositionVector.cpp b/Util/OSM2ODR/src/utils/geom/PositionVector.cpp
similarity index 100%
rename from Util/Converter/src/utils/geom/PositionVector.cpp
rename to Util/OSM2ODR/src/utils/geom/PositionVector.cpp
diff --git a/Util/Converter/src/utils/geom/PositionVector.h b/Util/OSM2ODR/src/utils/geom/PositionVector.h
similarity index 100%
rename from Util/Converter/src/utils/geom/PositionVector.h
rename to Util/OSM2ODR/src/utils/geom/PositionVector.h
diff --git a/Util/Converter/src/utils/gui/globjects/GUIGlObjectTypes.h b/Util/OSM2ODR/src/utils/gui/globjects/GUIGlObjectTypes.h
similarity index 100%
rename from Util/Converter/src/utils/gui/globjects/GUIGlObjectTypes.h
rename to Util/OSM2ODR/src/utils/gui/globjects/GUIGlObjectTypes.h
diff --git a/Util/Converter/src/utils/importio/CMakeLists.txt b/Util/OSM2ODR/src/utils/importio/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/utils/importio/CMakeLists.txt
rename to Util/OSM2ODR/src/utils/importio/CMakeLists.txt
diff --git a/Util/Converter/src/utils/importio/LineHandler.h b/Util/OSM2ODR/src/utils/importio/LineHandler.h
similarity index 100%
rename from Util/Converter/src/utils/importio/LineHandler.h
rename to Util/OSM2ODR/src/utils/importio/LineHandler.h
diff --git a/Util/Converter/src/utils/importio/LineReader.cpp b/Util/OSM2ODR/src/utils/importio/LineReader.cpp
similarity index 100%
rename from Util/Converter/src/utils/importio/LineReader.cpp
rename to Util/OSM2ODR/src/utils/importio/LineReader.cpp
diff --git a/Util/Converter/src/utils/importio/LineReader.h b/Util/OSM2ODR/src/utils/importio/LineReader.h
similarity index 100%
rename from Util/Converter/src/utils/importio/LineReader.h
rename to Util/OSM2ODR/src/utils/importio/LineReader.h
diff --git a/Util/Converter/src/utils/importio/NamedColumnsParser.cpp b/Util/OSM2ODR/src/utils/importio/NamedColumnsParser.cpp
similarity index 100%
rename from Util/Converter/src/utils/importio/NamedColumnsParser.cpp
rename to Util/OSM2ODR/src/utils/importio/NamedColumnsParser.cpp
diff --git a/Util/Converter/src/utils/importio/NamedColumnsParser.h b/Util/OSM2ODR/src/utils/importio/NamedColumnsParser.h
similarity index 100%
rename from Util/Converter/src/utils/importio/NamedColumnsParser.h
rename to Util/OSM2ODR/src/utils/importio/NamedColumnsParser.h
diff --git a/Util/Converter/src/utils/iodevices/CMakeLists.txt b/Util/OSM2ODR/src/utils/iodevices/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/utils/iodevices/CMakeLists.txt
rename to Util/OSM2ODR/src/utils/iodevices/CMakeLists.txt
diff --git a/Util/Converter/src/utils/iodevices/OutputDevice.cpp b/Util/OSM2ODR/src/utils/iodevices/OutputDevice.cpp
similarity index 100%
rename from Util/Converter/src/utils/iodevices/OutputDevice.cpp
rename to Util/OSM2ODR/src/utils/iodevices/OutputDevice.cpp
diff --git a/Util/Converter/src/utils/iodevices/OutputDevice.h b/Util/OSM2ODR/src/utils/iodevices/OutputDevice.h
similarity index 100%
rename from Util/Converter/src/utils/iodevices/OutputDevice.h
rename to Util/OSM2ODR/src/utils/iodevices/OutputDevice.h
diff --git a/Util/Converter/src/utils/iodevices/OutputDevice_CERR.cpp b/Util/OSM2ODR/src/utils/iodevices/OutputDevice_CERR.cpp
similarity index 100%
rename from Util/Converter/src/utils/iodevices/OutputDevice_CERR.cpp
rename to Util/OSM2ODR/src/utils/iodevices/OutputDevice_CERR.cpp
diff --git a/Util/Converter/src/utils/iodevices/OutputDevice_CERR.h b/Util/OSM2ODR/src/utils/iodevices/OutputDevice_CERR.h
similarity index 100%
rename from Util/Converter/src/utils/iodevices/OutputDevice_CERR.h
rename to Util/OSM2ODR/src/utils/iodevices/OutputDevice_CERR.h
diff --git a/Util/Converter/src/utils/iodevices/OutputDevice_COUT.cpp b/Util/OSM2ODR/src/utils/iodevices/OutputDevice_COUT.cpp
similarity index 100%
rename from Util/Converter/src/utils/iodevices/OutputDevice_COUT.cpp
rename to Util/OSM2ODR/src/utils/iodevices/OutputDevice_COUT.cpp
diff --git a/Util/Converter/src/utils/iodevices/OutputDevice_COUT.h b/Util/OSM2ODR/src/utils/iodevices/OutputDevice_COUT.h
similarity index 100%
rename from Util/Converter/src/utils/iodevices/OutputDevice_COUT.h
rename to Util/OSM2ODR/src/utils/iodevices/OutputDevice_COUT.h
diff --git a/Util/Converter/src/utils/iodevices/OutputDevice_File.cpp b/Util/OSM2ODR/src/utils/iodevices/OutputDevice_File.cpp
similarity index 100%
rename from Util/Converter/src/utils/iodevices/OutputDevice_File.cpp
rename to Util/OSM2ODR/src/utils/iodevices/OutputDevice_File.cpp
diff --git a/Util/Converter/src/utils/iodevices/OutputDevice_File.h b/Util/OSM2ODR/src/utils/iodevices/OutputDevice_File.h
similarity index 100%
rename from Util/Converter/src/utils/iodevices/OutputDevice_File.h
rename to Util/OSM2ODR/src/utils/iodevices/OutputDevice_File.h
diff --git a/Util/Converter/src/utils/iodevices/OutputDevice_Network.cpp b/Util/OSM2ODR/src/utils/iodevices/OutputDevice_Network.cpp
similarity index 100%
rename from Util/Converter/src/utils/iodevices/OutputDevice_Network.cpp
rename to Util/OSM2ODR/src/utils/iodevices/OutputDevice_Network.cpp
diff --git a/Util/Converter/src/utils/iodevices/OutputDevice_Network.h b/Util/OSM2ODR/src/utils/iodevices/OutputDevice_Network.h
similarity index 100%
rename from Util/Converter/src/utils/iodevices/OutputDevice_Network.h
rename to Util/OSM2ODR/src/utils/iodevices/OutputDevice_Network.h
diff --git a/Util/Converter/src/utils/iodevices/OutputDevice_String.cpp b/Util/OSM2ODR/src/utils/iodevices/OutputDevice_String.cpp
similarity index 100%
rename from Util/Converter/src/utils/iodevices/OutputDevice_String.cpp
rename to Util/OSM2ODR/src/utils/iodevices/OutputDevice_String.cpp
diff --git a/Util/Converter/src/utils/iodevices/OutputDevice_String.h b/Util/OSM2ODR/src/utils/iodevices/OutputDevice_String.h
similarity index 100%
rename from Util/Converter/src/utils/iodevices/OutputDevice_String.h
rename to Util/OSM2ODR/src/utils/iodevices/OutputDevice_String.h
diff --git a/Util/Converter/src/utils/iodevices/OutputFormatter.h b/Util/OSM2ODR/src/utils/iodevices/OutputFormatter.h
similarity index 100%
rename from Util/Converter/src/utils/iodevices/OutputFormatter.h
rename to Util/OSM2ODR/src/utils/iodevices/OutputFormatter.h
diff --git a/Util/Converter/src/utils/iodevices/PlainXMLFormatter.cpp b/Util/OSM2ODR/src/utils/iodevices/PlainXMLFormatter.cpp
similarity index 100%
rename from Util/Converter/src/utils/iodevices/PlainXMLFormatter.cpp
rename to Util/OSM2ODR/src/utils/iodevices/PlainXMLFormatter.cpp
diff --git a/Util/Converter/src/utils/iodevices/PlainXMLFormatter.h b/Util/OSM2ODR/src/utils/iodevices/PlainXMLFormatter.h
similarity index 100%
rename from Util/Converter/src/utils/iodevices/PlainXMLFormatter.h
rename to Util/OSM2ODR/src/utils/iodevices/PlainXMLFormatter.h
diff --git a/Util/Converter/src/utils/options/CMakeLists.txt b/Util/OSM2ODR/src/utils/options/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/utils/options/CMakeLists.txt
rename to Util/OSM2ODR/src/utils/options/CMakeLists.txt
diff --git a/Util/Converter/src/utils/options/Option.cpp b/Util/OSM2ODR/src/utils/options/Option.cpp
similarity index 100%
rename from Util/Converter/src/utils/options/Option.cpp
rename to Util/OSM2ODR/src/utils/options/Option.cpp
diff --git a/Util/Converter/src/utils/options/Option.h b/Util/OSM2ODR/src/utils/options/Option.h
similarity index 100%
rename from Util/Converter/src/utils/options/Option.h
rename to Util/OSM2ODR/src/utils/options/Option.h
diff --git a/Util/Converter/src/utils/options/OptionsCont.cpp b/Util/OSM2ODR/src/utils/options/OptionsCont.cpp
similarity index 100%
rename from Util/Converter/src/utils/options/OptionsCont.cpp
rename to Util/OSM2ODR/src/utils/options/OptionsCont.cpp
diff --git a/Util/Converter/src/utils/options/OptionsCont.h b/Util/OSM2ODR/src/utils/options/OptionsCont.h
similarity index 100%
rename from Util/Converter/src/utils/options/OptionsCont.h
rename to Util/OSM2ODR/src/utils/options/OptionsCont.h
diff --git a/Util/Converter/src/utils/options/OptionsIO.cpp b/Util/OSM2ODR/src/utils/options/OptionsIO.cpp
similarity index 100%
rename from Util/Converter/src/utils/options/OptionsIO.cpp
rename to Util/OSM2ODR/src/utils/options/OptionsIO.cpp
diff --git a/Util/Converter/src/utils/options/OptionsIO.h b/Util/OSM2ODR/src/utils/options/OptionsIO.h
similarity index 100%
rename from Util/Converter/src/utils/options/OptionsIO.h
rename to Util/OSM2ODR/src/utils/options/OptionsIO.h
diff --git a/Util/Converter/src/utils/options/OptionsLoader.cpp b/Util/OSM2ODR/src/utils/options/OptionsLoader.cpp
similarity index 100%
rename from Util/Converter/src/utils/options/OptionsLoader.cpp
rename to Util/OSM2ODR/src/utils/options/OptionsLoader.cpp
diff --git a/Util/Converter/src/utils/options/OptionsLoader.h b/Util/OSM2ODR/src/utils/options/OptionsLoader.h
similarity index 100%
rename from Util/Converter/src/utils/options/OptionsLoader.h
rename to Util/OSM2ODR/src/utils/options/OptionsLoader.h
diff --git a/Util/Converter/src/utils/options/OptionsParser.cpp b/Util/OSM2ODR/src/utils/options/OptionsParser.cpp
similarity index 100%
rename from Util/Converter/src/utils/options/OptionsParser.cpp
rename to Util/OSM2ODR/src/utils/options/OptionsParser.cpp
diff --git a/Util/Converter/src/utils/options/OptionsParser.h b/Util/OSM2ODR/src/utils/options/OptionsParser.h
similarity index 100%
rename from Util/Converter/src/utils/options/OptionsParser.h
rename to Util/OSM2ODR/src/utils/options/OptionsParser.h
diff --git a/Util/Converter/src/utils/router/AStarLookupTable.h b/Util/OSM2ODR/src/utils/router/AStarLookupTable.h
similarity index 100%
rename from Util/Converter/src/utils/router/AStarLookupTable.h
rename to Util/OSM2ODR/src/utils/router/AStarLookupTable.h
diff --git a/Util/Converter/src/utils/router/AStarRouter.h b/Util/OSM2ODR/src/utils/router/AStarRouter.h
similarity index 100%
rename from Util/Converter/src/utils/router/AStarRouter.h
rename to Util/OSM2ODR/src/utils/router/AStarRouter.h
diff --git a/Util/Converter/src/utils/router/AccessEdge.h b/Util/OSM2ODR/src/utils/router/AccessEdge.h
similarity index 100%
rename from Util/Converter/src/utils/router/AccessEdge.h
rename to Util/OSM2ODR/src/utils/router/AccessEdge.h
diff --git a/Util/Converter/src/utils/router/CHBuilder.h b/Util/OSM2ODR/src/utils/router/CHBuilder.h
similarity index 100%
rename from Util/Converter/src/utils/router/CHBuilder.h
rename to Util/OSM2ODR/src/utils/router/CHBuilder.h
diff --git a/Util/Converter/src/utils/router/CHRouter.h b/Util/OSM2ODR/src/utils/router/CHRouter.h
similarity index 100%
rename from Util/Converter/src/utils/router/CHRouter.h
rename to Util/OSM2ODR/src/utils/router/CHRouter.h
diff --git a/Util/Converter/src/utils/router/CHRouterWrapper.h b/Util/OSM2ODR/src/utils/router/CHRouterWrapper.h
similarity index 100%
rename from Util/Converter/src/utils/router/CHRouterWrapper.h
rename to Util/OSM2ODR/src/utils/router/CHRouterWrapper.h
diff --git a/Util/Converter/src/utils/router/CMakeLists.txt b/Util/OSM2ODR/src/utils/router/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/utils/router/CMakeLists.txt
rename to Util/OSM2ODR/src/utils/router/CMakeLists.txt
diff --git a/Util/Converter/src/utils/router/CarEdge.h b/Util/OSM2ODR/src/utils/router/CarEdge.h
similarity index 100%
rename from Util/Converter/src/utils/router/CarEdge.h
rename to Util/OSM2ODR/src/utils/router/CarEdge.h
diff --git a/Util/Converter/src/utils/router/DijkstraRouter.h b/Util/OSM2ODR/src/utils/router/DijkstraRouter.h
similarity index 100%
rename from Util/Converter/src/utils/router/DijkstraRouter.h
rename to Util/OSM2ODR/src/utils/router/DijkstraRouter.h
diff --git a/Util/Converter/src/utils/router/EffortCalculator.h b/Util/OSM2ODR/src/utils/router/EffortCalculator.h
similarity index 100%
rename from Util/Converter/src/utils/router/EffortCalculator.h
rename to Util/OSM2ODR/src/utils/router/EffortCalculator.h
diff --git a/Util/Converter/src/utils/router/FareModul.h b/Util/OSM2ODR/src/utils/router/FareModul.h
similarity index 100%
rename from Util/Converter/src/utils/router/FareModul.h
rename to Util/OSM2ODR/src/utils/router/FareModul.h
diff --git a/Util/Converter/src/utils/router/FareToken.h b/Util/OSM2ODR/src/utils/router/FareToken.h
similarity index 100%
rename from Util/Converter/src/utils/router/FareToken.h
rename to Util/OSM2ODR/src/utils/router/FareToken.h
diff --git a/Util/Converter/src/utils/router/FareZones.h b/Util/OSM2ODR/src/utils/router/FareZones.h
similarity index 100%
rename from Util/Converter/src/utils/router/FareZones.h
rename to Util/OSM2ODR/src/utils/router/FareZones.h
diff --git a/Util/Converter/src/utils/router/GawronCalculator.h b/Util/OSM2ODR/src/utils/router/GawronCalculator.h
similarity index 100%
rename from Util/Converter/src/utils/router/GawronCalculator.h
rename to Util/OSM2ODR/src/utils/router/GawronCalculator.h
diff --git a/Util/Converter/src/utils/router/IntermodalEdge.h b/Util/OSM2ODR/src/utils/router/IntermodalEdge.h
similarity index 100%
rename from Util/Converter/src/utils/router/IntermodalEdge.h
rename to Util/OSM2ODR/src/utils/router/IntermodalEdge.h
diff --git a/Util/Converter/src/utils/router/IntermodalNetwork.h b/Util/OSM2ODR/src/utils/router/IntermodalNetwork.h
similarity index 100%
rename from Util/Converter/src/utils/router/IntermodalNetwork.h
rename to Util/OSM2ODR/src/utils/router/IntermodalNetwork.h
diff --git a/Util/Converter/src/utils/router/IntermodalRouter.h b/Util/OSM2ODR/src/utils/router/IntermodalRouter.h
similarity index 100%
rename from Util/Converter/src/utils/router/IntermodalRouter.h
rename to Util/OSM2ODR/src/utils/router/IntermodalRouter.h
diff --git a/Util/Converter/src/utils/router/IntermodalTrip.h b/Util/OSM2ODR/src/utils/router/IntermodalTrip.h
similarity index 100%
rename from Util/Converter/src/utils/router/IntermodalTrip.h
rename to Util/OSM2ODR/src/utils/router/IntermodalTrip.h
diff --git a/Util/Converter/src/utils/router/LogitCalculator.h b/Util/OSM2ODR/src/utils/router/LogitCalculator.h
similarity index 100%
rename from Util/Converter/src/utils/router/LogitCalculator.h
rename to Util/OSM2ODR/src/utils/router/LogitCalculator.h
diff --git a/Util/Converter/src/utils/router/PedestrianEdge.h b/Util/OSM2ODR/src/utils/router/PedestrianEdge.h
similarity index 100%
rename from Util/Converter/src/utils/router/PedestrianEdge.h
rename to Util/OSM2ODR/src/utils/router/PedestrianEdge.h
diff --git a/Util/Converter/src/utils/router/PedestrianRouter.h b/Util/OSM2ODR/src/utils/router/PedestrianRouter.h
similarity index 100%
rename from Util/Converter/src/utils/router/PedestrianRouter.h
rename to Util/OSM2ODR/src/utils/router/PedestrianRouter.h
diff --git a/Util/Converter/src/utils/router/PublicTransportEdge.h b/Util/OSM2ODR/src/utils/router/PublicTransportEdge.h
similarity index 100%
rename from Util/Converter/src/utils/router/PublicTransportEdge.h
rename to Util/OSM2ODR/src/utils/router/PublicTransportEdge.h
diff --git a/Util/Converter/src/utils/router/RailEdge.h b/Util/OSM2ODR/src/utils/router/RailEdge.h
similarity index 100%
rename from Util/Converter/src/utils/router/RailEdge.h
rename to Util/OSM2ODR/src/utils/router/RailEdge.h
diff --git a/Util/Converter/src/utils/router/RailwayRouter.h b/Util/OSM2ODR/src/utils/router/RailwayRouter.h
similarity index 100%
rename from Util/Converter/src/utils/router/RailwayRouter.h
rename to Util/OSM2ODR/src/utils/router/RailwayRouter.h
diff --git a/Util/Converter/src/utils/router/ReversedEdge.h b/Util/OSM2ODR/src/utils/router/ReversedEdge.h
similarity index 100%
rename from Util/Converter/src/utils/router/ReversedEdge.h
rename to Util/OSM2ODR/src/utils/router/ReversedEdge.h
diff --git a/Util/Converter/src/utils/router/RouteCostCalculator.h b/Util/OSM2ODR/src/utils/router/RouteCostCalculator.h
similarity index 100%
rename from Util/Converter/src/utils/router/RouteCostCalculator.h
rename to Util/OSM2ODR/src/utils/router/RouteCostCalculator.h
diff --git a/Util/Converter/src/utils/router/RouterProvider.h b/Util/OSM2ODR/src/utils/router/RouterProvider.h
similarity index 100%
rename from Util/Converter/src/utils/router/RouterProvider.h
rename to Util/OSM2ODR/src/utils/router/RouterProvider.h
diff --git a/Util/Converter/src/utils/router/SPTree.h b/Util/OSM2ODR/src/utils/router/SPTree.h
similarity index 100%
rename from Util/Converter/src/utils/router/SPTree.h
rename to Util/OSM2ODR/src/utils/router/SPTree.h
diff --git a/Util/Converter/src/utils/router/SUMOAbstractRouter.h b/Util/OSM2ODR/src/utils/router/SUMOAbstractRouter.h
similarity index 100%
rename from Util/Converter/src/utils/router/SUMOAbstractRouter.h
rename to Util/OSM2ODR/src/utils/router/SUMOAbstractRouter.h
diff --git a/Util/Converter/src/utils/router/StopEdge.h b/Util/OSM2ODR/src/utils/router/StopEdge.h
similarity index 100%
rename from Util/Converter/src/utils/router/StopEdge.h
rename to Util/OSM2ODR/src/utils/router/StopEdge.h
diff --git a/Util/Converter/src/utils/shapes/CMakeLists.txt b/Util/OSM2ODR/src/utils/shapes/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/utils/shapes/CMakeLists.txt
rename to Util/OSM2ODR/src/utils/shapes/CMakeLists.txt
diff --git a/Util/Converter/src/utils/shapes/PointOfInterest.h b/Util/OSM2ODR/src/utils/shapes/PointOfInterest.h
similarity index 100%
rename from Util/Converter/src/utils/shapes/PointOfInterest.h
rename to Util/OSM2ODR/src/utils/shapes/PointOfInterest.h
diff --git a/Util/Converter/src/utils/shapes/PolygonDynamics.cpp b/Util/OSM2ODR/src/utils/shapes/PolygonDynamics.cpp
similarity index 100%
rename from Util/Converter/src/utils/shapes/PolygonDynamics.cpp
rename to Util/OSM2ODR/src/utils/shapes/PolygonDynamics.cpp
diff --git a/Util/Converter/src/utils/shapes/PolygonDynamics.h b/Util/OSM2ODR/src/utils/shapes/PolygonDynamics.h
similarity index 100%
rename from Util/Converter/src/utils/shapes/PolygonDynamics.h
rename to Util/OSM2ODR/src/utils/shapes/PolygonDynamics.h
diff --git a/Util/Converter/src/utils/shapes/SUMOPolygon.cpp b/Util/OSM2ODR/src/utils/shapes/SUMOPolygon.cpp
similarity index 100%
rename from Util/Converter/src/utils/shapes/SUMOPolygon.cpp
rename to Util/OSM2ODR/src/utils/shapes/SUMOPolygon.cpp
diff --git a/Util/Converter/src/utils/shapes/SUMOPolygon.h b/Util/OSM2ODR/src/utils/shapes/SUMOPolygon.h
similarity index 100%
rename from Util/Converter/src/utils/shapes/SUMOPolygon.h
rename to Util/OSM2ODR/src/utils/shapes/SUMOPolygon.h
diff --git a/Util/Converter/src/utils/shapes/Shape.cpp b/Util/OSM2ODR/src/utils/shapes/Shape.cpp
similarity index 100%
rename from Util/Converter/src/utils/shapes/Shape.cpp
rename to Util/OSM2ODR/src/utils/shapes/Shape.cpp
diff --git a/Util/Converter/src/utils/shapes/Shape.h b/Util/OSM2ODR/src/utils/shapes/Shape.h
similarity index 100%
rename from Util/Converter/src/utils/shapes/Shape.h
rename to Util/OSM2ODR/src/utils/shapes/Shape.h
diff --git a/Util/Converter/src/utils/shapes/ShapeContainer.cpp b/Util/OSM2ODR/src/utils/shapes/ShapeContainer.cpp
similarity index 100%
rename from Util/Converter/src/utils/shapes/ShapeContainer.cpp
rename to Util/OSM2ODR/src/utils/shapes/ShapeContainer.cpp
diff --git a/Util/Converter/src/utils/shapes/ShapeContainer.h b/Util/OSM2ODR/src/utils/shapes/ShapeContainer.h
similarity index 100%
rename from Util/Converter/src/utils/shapes/ShapeContainer.h
rename to Util/OSM2ODR/src/utils/shapes/ShapeContainer.h
diff --git a/Util/Converter/src/utils/shapes/ShapeHandler.cpp b/Util/OSM2ODR/src/utils/shapes/ShapeHandler.cpp
similarity index 100%
rename from Util/Converter/src/utils/shapes/ShapeHandler.cpp
rename to Util/OSM2ODR/src/utils/shapes/ShapeHandler.cpp
diff --git a/Util/Converter/src/utils/shapes/ShapeHandler.h b/Util/OSM2ODR/src/utils/shapes/ShapeHandler.h
similarity index 100%
rename from Util/Converter/src/utils/shapes/ShapeHandler.h
rename to Util/OSM2ODR/src/utils/shapes/ShapeHandler.h
diff --git a/Util/Converter/src/utils/traction_wire/CMakeLists.txt b/Util/OSM2ODR/src/utils/traction_wire/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/utils/traction_wire/CMakeLists.txt
rename to Util/OSM2ODR/src/utils/traction_wire/CMakeLists.txt
diff --git a/Util/Converter/src/utils/traction_wire/Circuit.cpp b/Util/OSM2ODR/src/utils/traction_wire/Circuit.cpp
similarity index 100%
rename from Util/Converter/src/utils/traction_wire/Circuit.cpp
rename to Util/OSM2ODR/src/utils/traction_wire/Circuit.cpp
diff --git a/Util/Converter/src/utils/traction_wire/Circuit.h b/Util/OSM2ODR/src/utils/traction_wire/Circuit.h
similarity index 100%
rename from Util/Converter/src/utils/traction_wire/Circuit.h
rename to Util/OSM2ODR/src/utils/traction_wire/Circuit.h
diff --git a/Util/Converter/src/utils/traction_wire/Element.cpp b/Util/OSM2ODR/src/utils/traction_wire/Element.cpp
similarity index 100%
rename from Util/Converter/src/utils/traction_wire/Element.cpp
rename to Util/OSM2ODR/src/utils/traction_wire/Element.cpp
diff --git a/Util/Converter/src/utils/traction_wire/Element.h b/Util/OSM2ODR/src/utils/traction_wire/Element.h
similarity index 100%
rename from Util/Converter/src/utils/traction_wire/Element.h
rename to Util/OSM2ODR/src/utils/traction_wire/Element.h
diff --git a/Util/Converter/src/utils/traction_wire/Node.cpp b/Util/OSM2ODR/src/utils/traction_wire/Node.cpp
similarity index 100%
rename from Util/Converter/src/utils/traction_wire/Node.cpp
rename to Util/OSM2ODR/src/utils/traction_wire/Node.cpp
diff --git a/Util/Converter/src/utils/traction_wire/Node.h b/Util/OSM2ODR/src/utils/traction_wire/Node.h
similarity index 100%
rename from Util/Converter/src/utils/traction_wire/Node.h
rename to Util/OSM2ODR/src/utils/traction_wire/Node.h
diff --git a/Util/Converter/src/utils/vehicle/SUMOTrafficObject.h b/Util/OSM2ODR/src/utils/vehicle/SUMOTrafficObject.h
similarity index 100%
rename from Util/Converter/src/utils/vehicle/SUMOTrafficObject.h
rename to Util/OSM2ODR/src/utils/vehicle/SUMOTrafficObject.h
diff --git a/Util/Converter/src/utils/vehicle/SUMOVTypeParameter.h b/Util/OSM2ODR/src/utils/vehicle/SUMOVTypeParameter.h
similarity index 100%
rename from Util/Converter/src/utils/vehicle/SUMOVTypeParameter.h
rename to Util/OSM2ODR/src/utils/vehicle/SUMOVTypeParameter.h
diff --git a/Util/Converter/src/utils/vehicle/SUMOVehicle.h b/Util/OSM2ODR/src/utils/vehicle/SUMOVehicle.h
similarity index 100%
rename from Util/Converter/src/utils/vehicle/SUMOVehicle.h
rename to Util/OSM2ODR/src/utils/vehicle/SUMOVehicle.h
diff --git a/Util/Converter/src/utils/vehicle/SUMOVehicleParameter.h b/Util/OSM2ODR/src/utils/vehicle/SUMOVehicleParameter.h
similarity index 100%
rename from Util/Converter/src/utils/vehicle/SUMOVehicleParameter.h
rename to Util/OSM2ODR/src/utils/vehicle/SUMOVehicleParameter.h
diff --git a/Util/Converter/src/utils/xml/CMakeLists.txt b/Util/OSM2ODR/src/utils/xml/CMakeLists.txt
similarity index 100%
rename from Util/Converter/src/utils/xml/CMakeLists.txt
rename to Util/OSM2ODR/src/utils/xml/CMakeLists.txt
diff --git a/Util/Converter/src/utils/xml/GenericSAXHandler.cpp b/Util/OSM2ODR/src/utils/xml/GenericSAXHandler.cpp
similarity index 100%
rename from Util/Converter/src/utils/xml/GenericSAXHandler.cpp
rename to Util/OSM2ODR/src/utils/xml/GenericSAXHandler.cpp
diff --git a/Util/Converter/src/utils/xml/GenericSAXHandler.h b/Util/OSM2ODR/src/utils/xml/GenericSAXHandler.h
similarity index 100%
rename from Util/Converter/src/utils/xml/GenericSAXHandler.h
rename to Util/OSM2ODR/src/utils/xml/GenericSAXHandler.h
diff --git a/Util/Converter/src/utils/xml/IStreamInputSource.h b/Util/OSM2ODR/src/utils/xml/IStreamInputSource.h
similarity index 100%
rename from Util/Converter/src/utils/xml/IStreamInputSource.h
rename to Util/OSM2ODR/src/utils/xml/IStreamInputSource.h
diff --git a/Util/Converter/src/utils/xml/SAXWeightsHandler.cpp b/Util/OSM2ODR/src/utils/xml/SAXWeightsHandler.cpp
similarity index 100%
rename from Util/Converter/src/utils/xml/SAXWeightsHandler.cpp
rename to Util/OSM2ODR/src/utils/xml/SAXWeightsHandler.cpp
diff --git a/Util/Converter/src/utils/xml/SAXWeightsHandler.h b/Util/OSM2ODR/src/utils/xml/SAXWeightsHandler.h
similarity index 100%
rename from Util/Converter/src/utils/xml/SAXWeightsHandler.h
rename to Util/OSM2ODR/src/utils/xml/SAXWeightsHandler.h
diff --git a/Util/Converter/src/utils/xml/SUMOSAXAttributes.cpp b/Util/OSM2ODR/src/utils/xml/SUMOSAXAttributes.cpp
similarity index 100%
rename from Util/Converter/src/utils/xml/SUMOSAXAttributes.cpp
rename to Util/OSM2ODR/src/utils/xml/SUMOSAXAttributes.cpp
diff --git a/Util/Converter/src/utils/xml/SUMOSAXAttributes.h b/Util/OSM2ODR/src/utils/xml/SUMOSAXAttributes.h
similarity index 100%
rename from Util/Converter/src/utils/xml/SUMOSAXAttributes.h
rename to Util/OSM2ODR/src/utils/xml/SUMOSAXAttributes.h
diff --git a/Util/Converter/src/utils/xml/SUMOSAXAttributesImpl_Cached.cpp b/Util/OSM2ODR/src/utils/xml/SUMOSAXAttributesImpl_Cached.cpp
similarity index 100%
rename from Util/Converter/src/utils/xml/SUMOSAXAttributesImpl_Cached.cpp
rename to Util/OSM2ODR/src/utils/xml/SUMOSAXAttributesImpl_Cached.cpp
diff --git a/Util/Converter/src/utils/xml/SUMOSAXAttributesImpl_Cached.h b/Util/OSM2ODR/src/utils/xml/SUMOSAXAttributesImpl_Cached.h
similarity index 100%
rename from Util/Converter/src/utils/xml/SUMOSAXAttributesImpl_Cached.h
rename to Util/OSM2ODR/src/utils/xml/SUMOSAXAttributesImpl_Cached.h
diff --git a/Util/Converter/src/utils/xml/SUMOSAXAttributesImpl_Xerces.cpp b/Util/OSM2ODR/src/utils/xml/SUMOSAXAttributesImpl_Xerces.cpp
similarity index 100%
rename from Util/Converter/src/utils/xml/SUMOSAXAttributesImpl_Xerces.cpp
rename to Util/OSM2ODR/src/utils/xml/SUMOSAXAttributesImpl_Xerces.cpp
diff --git a/Util/Converter/src/utils/xml/SUMOSAXAttributesImpl_Xerces.h b/Util/OSM2ODR/src/utils/xml/SUMOSAXAttributesImpl_Xerces.h
similarity index 100%
rename from Util/Converter/src/utils/xml/SUMOSAXAttributesImpl_Xerces.h
rename to Util/OSM2ODR/src/utils/xml/SUMOSAXAttributesImpl_Xerces.h
diff --git a/Util/Converter/src/utils/xml/SUMOSAXHandler.cpp b/Util/OSM2ODR/src/utils/xml/SUMOSAXHandler.cpp
similarity index 100%
rename from Util/Converter/src/utils/xml/SUMOSAXHandler.cpp
rename to Util/OSM2ODR/src/utils/xml/SUMOSAXHandler.cpp
diff --git a/Util/Converter/src/utils/xml/SUMOSAXHandler.h b/Util/OSM2ODR/src/utils/xml/SUMOSAXHandler.h
similarity index 100%
rename from Util/Converter/src/utils/xml/SUMOSAXHandler.h
rename to Util/OSM2ODR/src/utils/xml/SUMOSAXHandler.h
diff --git a/Util/Converter/src/utils/xml/SUMOSAXReader.cpp b/Util/OSM2ODR/src/utils/xml/SUMOSAXReader.cpp
similarity index 100%
rename from Util/Converter/src/utils/xml/SUMOSAXReader.cpp
rename to Util/OSM2ODR/src/utils/xml/SUMOSAXReader.cpp
diff --git a/Util/Converter/src/utils/xml/SUMOSAXReader.h b/Util/OSM2ODR/src/utils/xml/SUMOSAXReader.h
similarity index 100%
rename from Util/Converter/src/utils/xml/SUMOSAXReader.h
rename to Util/OSM2ODR/src/utils/xml/SUMOSAXReader.h
diff --git a/Util/Converter/src/utils/xml/SUMOXMLDefinitions.cpp b/Util/OSM2ODR/src/utils/xml/SUMOXMLDefinitions.cpp
similarity index 100%
rename from Util/Converter/src/utils/xml/SUMOXMLDefinitions.cpp
rename to Util/OSM2ODR/src/utils/xml/SUMOXMLDefinitions.cpp
diff --git a/Util/Converter/src/utils/xml/SUMOXMLDefinitions.h b/Util/OSM2ODR/src/utils/xml/SUMOXMLDefinitions.h
similarity index 100%
rename from Util/Converter/src/utils/xml/SUMOXMLDefinitions.h
rename to Util/OSM2ODR/src/utils/xml/SUMOXMLDefinitions.h
diff --git a/Util/Converter/src/utils/xml/XMLSubSys.cpp b/Util/OSM2ODR/src/utils/xml/XMLSubSys.cpp
similarity index 100%
rename from Util/Converter/src/utils/xml/XMLSubSys.cpp
rename to Util/OSM2ODR/src/utils/xml/XMLSubSys.cpp
diff --git a/Util/Converter/src/utils/xml/XMLSubSys.h b/Util/OSM2ODR/src/utils/xml/XMLSubSys.h
similarity index 100%
rename from Util/Converter/src/utils/xml/XMLSubSys.h
rename to Util/OSM2ODR/src/utils/xml/XMLSubSys.h
diff --git a/Util/Converter/src/version.h b/Util/OSM2ODR/src/version.h
similarity index 100%
rename from Util/Converter/src/version.h
rename to Util/OSM2ODR/src/version.h