diff --git a/gpsbabel/AUTHORS b/AUTHORS similarity index 100% rename from gpsbabel/AUTHORS rename to AUTHORS diff --git a/gpsbabel/COPYING b/COPYING similarity index 100% rename from gpsbabel/COPYING rename to COPYING diff --git a/gpsbabel/GPSBabel.pro b/GPSBabel.pro similarity index 100% rename from gpsbabel/GPSBabel.pro rename to GPSBabel.pro diff --git a/gpsbabel/GPSBabel.xcodeproj/project.pbxproj b/GPSBabel.xcodeproj/project.pbxproj similarity index 100% rename from gpsbabel/GPSBabel.xcodeproj/project.pbxproj rename to GPSBabel.xcodeproj/project.pbxproj diff --git a/gpsbabel/GPSBabel.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/GPSBabel.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from gpsbabel/GPSBabel.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to GPSBabel.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/gpsbabel/GPSBabel.xcodeproj/project.xcworkspace/xcuserdata/robertlipe.xcuserdatad/UserInterfaceState.xcuserstate b/GPSBabel.xcodeproj/project.xcworkspace/xcuserdata/robertlipe.xcuserdatad/UserInterfaceState.xcuserstate similarity index 100% rename from gpsbabel/GPSBabel.xcodeproj/project.xcworkspace/xcuserdata/robertlipe.xcuserdatad/UserInterfaceState.xcuserstate rename to GPSBabel.xcodeproj/project.xcworkspace/xcuserdata/robertlipe.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/gpsbabel/GPSBabel.xcodeproj/project.xcworkspace/xcuserdata/robertlipe.xcuserdatad/WorkspaceSettings.xcsettings b/GPSBabel.xcodeproj/project.xcworkspace/xcuserdata/robertlipe.xcuserdatad/WorkspaceSettings.xcsettings similarity index 100% rename from gpsbabel/GPSBabel.xcodeproj/project.xcworkspace/xcuserdata/robertlipe.xcuserdatad/WorkspaceSettings.xcsettings rename to GPSBabel.xcodeproj/project.xcworkspace/xcuserdata/robertlipe.xcuserdatad/WorkspaceSettings.xcsettings diff --git a/gpsbabel/GPSBabel.xcodeproj/qt_makeqmake.mak b/GPSBabel.xcodeproj/qt_makeqmake.mak similarity index 100% rename from gpsbabel/GPSBabel.xcodeproj/qt_makeqmake.mak rename to GPSBabel.xcodeproj/qt_makeqmake.mak diff --git a/gpsbabel/GPSBabel.xcodeproj/qt_preprocess.mak b/GPSBabel.xcodeproj/qt_preprocess.mak similarity index 100% rename from gpsbabel/GPSBabel.xcodeproj/qt_preprocess.mak rename to GPSBabel.xcodeproj/qt_preprocess.mak diff --git a/gpsbabel/GPSBabel.xcodeproj/xcuserdata/robertlipe.xcuserdatad/xcschemes/GPSBabel.xcscheme b/GPSBabel.xcodeproj/xcuserdata/robertlipe.xcuserdatad/xcschemes/GPSBabel.xcscheme similarity index 100% rename from gpsbabel/GPSBabel.xcodeproj/xcuserdata/robertlipe.xcuserdatad/xcschemes/GPSBabel.xcscheme rename to GPSBabel.xcodeproj/xcuserdata/robertlipe.xcuserdatad/xcschemes/GPSBabel.xcscheme diff --git a/gpsbabel/GPSBabel.xcodeproj/xcuserdata/robertlipe.xcuserdatad/xcschemes/xcschememanagement.plist b/GPSBabel.xcodeproj/xcuserdata/robertlipe.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from gpsbabel/GPSBabel.xcodeproj/xcuserdata/robertlipe.xcuserdatad/xcschemes/xcschememanagement.plist rename to GPSBabel.xcodeproj/xcuserdata/robertlipe.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/gpsbabel/Makefile.in b/Makefile.in similarity index 100% rename from gpsbabel/Makefile.in rename to Makefile.in diff --git a/gpsbabel/README.contrib b/README.contrib similarity index 100% rename from gpsbabel/README.contrib rename to README.contrib diff --git a/gpsbabel/README.igc b/README.igc similarity index 100% rename from gpsbabel/README.igc rename to README.igc diff --git a/gpsbabel/README.mapconverter b/README.mapconverter similarity index 100% rename from gpsbabel/README.mapconverter rename to README.mapconverter diff --git a/gpsbabel/README.xmapwpt b/README.xmapwpt similarity index 100% rename from gpsbabel/README.xmapwpt rename to README.xmapwpt diff --git a/gpsbabel/alan.cc b/alan.cc similarity index 100% rename from gpsbabel/alan.cc rename to alan.cc diff --git a/gpsbabel/an1.cc b/an1.cc similarity index 100% rename from gpsbabel/an1.cc rename to an1.cc diff --git a/gpsbabel/an1sym.h b/an1sym.h similarity index 100% rename from gpsbabel/an1sym.h rename to an1sym.h diff --git a/gpsbabel/arcdist.cc b/arcdist.cc similarity index 100% rename from gpsbabel/arcdist.cc rename to arcdist.cc diff --git a/gpsbabel/astylerc b/astylerc similarity index 100% rename from gpsbabel/astylerc rename to astylerc diff --git a/gpsbabel/bcr.cc b/bcr.cc similarity index 100% rename from gpsbabel/bcr.cc rename to bcr.cc diff --git a/gpsbabel/bend.cc b/bend.cc similarity index 100% rename from gpsbabel/bend.cc rename to bend.cc diff --git a/gpsbabel/brauniger_iq.cc b/brauniger_iq.cc similarity index 100% rename from gpsbabel/brauniger_iq.cc rename to brauniger_iq.cc diff --git a/gpsbabel/build_and_test b/build_and_test similarity index 100% rename from gpsbabel/build_and_test rename to build_and_test diff --git a/gpsbabel/bushnell.cc b/bushnell.cc similarity index 100% rename from gpsbabel/bushnell.cc rename to bushnell.cc diff --git a/gpsbabel/bushnell_trl.cc b/bushnell_trl.cc similarity index 100% rename from gpsbabel/bushnell_trl.cc rename to bushnell_trl.cc diff --git a/gpsbabel/cet.cc b/cet.cc similarity index 100% rename from gpsbabel/cet.cc rename to cet.cc diff --git a/gpsbabel/cet.h b/cet.h similarity index 100% rename from gpsbabel/cet.h rename to cet.h diff --git a/gpsbabel/cet/ansi_x3_4_1968.h b/cet/ansi_x3_4_1968.h similarity index 100% rename from gpsbabel/cet/ansi_x3_4_1968.h rename to cet/ansi_x3_4_1968.h diff --git a/gpsbabel/cet/cp1252.h b/cet/cp1252.h similarity index 100% rename from gpsbabel/cet/cp1252.h rename to cet/cp1252.h diff --git a/gpsbabel/cet/iso_8859_8.h b/cet/iso_8859_8.h similarity index 100% rename from gpsbabel/cet/iso_8859_8.h rename to cet/iso_8859_8.h diff --git a/gpsbabel/cet_util.cc b/cet_util.cc similarity index 100% rename from gpsbabel/cet_util.cc rename to cet_util.cc diff --git a/gpsbabel/cet_util.h b/cet_util.h similarity index 100% rename from gpsbabel/cet_util.h rename to cet_util.h diff --git a/gpsbabel/chkdoc b/chkdoc similarity index 100% rename from gpsbabel/chkdoc rename to chkdoc diff --git a/gpsbabel/compegps.cc b/compegps.cc similarity index 100% rename from gpsbabel/compegps.cc rename to compegps.cc diff --git a/gpsbabel/config.guess b/config.guess similarity index 100% rename from gpsbabel/config.guess rename to config.guess diff --git a/gpsbabel/config.h.in b/config.h.in similarity index 100% rename from gpsbabel/config.h.in rename to config.h.in diff --git a/gpsbabel/config.sub b/config.sub similarity index 100% rename from gpsbabel/config.sub rename to config.sub diff --git a/gpsbabel/configure b/configure similarity index 100% rename from gpsbabel/configure rename to configure diff --git a/gpsbabel/configure.in b/configure.in similarity index 100% rename from gpsbabel/configure.in rename to configure.in diff --git a/gpsbabel/coverity_model.cc b/coverity_model.cc similarity index 100% rename from gpsbabel/coverity_model.cc rename to coverity_model.cc diff --git a/gpsbabel/cst.cc b/cst.cc similarity index 100% rename from gpsbabel/cst.cc rename to cst.cc diff --git a/gpsbabel/csv_util.cc b/csv_util.cc similarity index 100% rename from gpsbabel/csv_util.cc rename to csv_util.cc diff --git a/gpsbabel/csv_util.h b/csv_util.h similarity index 100% rename from gpsbabel/csv_util.h rename to csv_util.h diff --git a/gpsbabel/defs.h b/defs.h similarity index 100% rename from gpsbabel/defs.h rename to defs.h diff --git a/gpsbabel/delbin.cc b/delbin.cc similarity index 100% rename from gpsbabel/delbin.cc rename to delbin.cc diff --git a/gpsbabel/delgpl.cc b/delgpl.cc similarity index 100% rename from gpsbabel/delgpl.cc rename to delgpl.cc diff --git a/gpsbabel/deprecated/README b/deprecated/README similarity index 100% rename from gpsbabel/deprecated/README rename to deprecated/README diff --git a/gpsbabel/deprecated/README.magnav b/deprecated/README.magnav similarity index 100% rename from gpsbabel/deprecated/README.magnav rename to deprecated/README.magnav diff --git a/gpsbabel/deprecated/README.psp b/deprecated/README.psp similarity index 100% rename from gpsbabel/deprecated/README.psp rename to deprecated/README.psp diff --git a/gpsbabel/deprecated/axim_gpb.cc b/deprecated/axim_gpb.cc similarity index 100% rename from gpsbabel/deprecated/axim_gpb.cc rename to deprecated/axim_gpb.cc diff --git a/gpsbabel/deprecated/cetus.cc b/deprecated/cetus.cc similarity index 100% rename from gpsbabel/deprecated/cetus.cc rename to deprecated/cetus.cc diff --git a/gpsbabel/deprecated/copilot.cc b/deprecated/copilot.cc similarity index 100% rename from gpsbabel/deprecated/copilot.cc rename to deprecated/copilot.cc diff --git a/gpsbabel/deprecated/coto.cc b/deprecated/coto.cc similarity index 100% rename from gpsbabel/deprecated/coto.cc rename to deprecated/coto.cc diff --git a/gpsbabel/deprecated/gcdb.cc b/deprecated/gcdb.cc similarity index 100% rename from gpsbabel/deprecated/gcdb.cc rename to deprecated/gcdb.cc diff --git a/gpsbabel/deprecated/geoniche.cc b/deprecated/geoniche.cc similarity index 100% rename from gpsbabel/deprecated/geoniche.cc rename to deprecated/geoniche.cc diff --git a/gpsbabel/deprecated/gpilots.cc b/deprecated/gpilots.cc similarity index 100% rename from gpsbabel/deprecated/gpilots.cc rename to deprecated/gpilots.cc diff --git a/gpsbabel/deprecated/gpspilot.cc b/deprecated/gpspilot.cc similarity index 100% rename from gpsbabel/deprecated/gpspilot.cc rename to deprecated/gpspilot.cc diff --git a/gpsbabel/deprecated/mag_pdb.cc b/deprecated/mag_pdb.cc similarity index 100% rename from gpsbabel/deprecated/mag_pdb.cc rename to deprecated/mag_pdb.cc diff --git a/gpsbabel/deprecated/magnav.cc b/deprecated/magnav.cc similarity index 100% rename from gpsbabel/deprecated/magnav.cc rename to deprecated/magnav.cc diff --git a/gpsbabel/deprecated/mapopolis.cc b/deprecated/mapopolis.cc similarity index 100% rename from gpsbabel/deprecated/mapopolis.cc rename to deprecated/mapopolis.cc diff --git a/gpsbabel/deprecated/msroute.cc b/deprecated/msroute.cc similarity index 100% rename from gpsbabel/deprecated/msroute.cc rename to deprecated/msroute.cc diff --git a/gpsbabel/deprecated/overlay.cc b/deprecated/overlay.cc similarity index 100% rename from gpsbabel/deprecated/overlay.cc rename to deprecated/overlay.cc diff --git a/gpsbabel/deprecated/palmdoc.cc b/deprecated/palmdoc.cc similarity index 100% rename from gpsbabel/deprecated/palmdoc.cc rename to deprecated/palmdoc.cc diff --git a/gpsbabel/deprecated/pathaway.cc b/deprecated/pathaway.cc similarity index 100% rename from gpsbabel/deprecated/pathaway.cc rename to deprecated/pathaway.cc diff --git a/gpsbabel/deprecated/pdbfile.cc b/deprecated/pdbfile.cc similarity index 100% rename from gpsbabel/deprecated/pdbfile.cc rename to deprecated/pdbfile.cc diff --git a/gpsbabel/deprecated/pdbfile.h b/deprecated/pdbfile.h similarity index 100% rename from gpsbabel/deprecated/pdbfile.h rename to deprecated/pdbfile.h diff --git a/gpsbabel/deprecated/psp.cc b/deprecated/psp.cc similarity index 100% rename from gpsbabel/deprecated/psp.cc rename to deprecated/psp.cc diff --git a/gpsbabel/deprecated/quovadis.cc b/deprecated/quovadis.cc similarity index 100% rename from gpsbabel/deprecated/quovadis.cc rename to deprecated/quovadis.cc diff --git a/gpsbabel/deprecated/quovadis.h b/deprecated/quovadis.h similarity index 100% rename from gpsbabel/deprecated/quovadis.h rename to deprecated/quovadis.h diff --git a/gpsbabel/destinator.cc b/destinator.cc similarity index 100% rename from gpsbabel/destinator.cc rename to destinator.cc diff --git a/gpsbabel/dg-100.cc b/dg-100.cc similarity index 100% rename from gpsbabel/dg-100.cc rename to dg-100.cc diff --git a/gpsbabel/discard.cc b/discard.cc similarity index 100% rename from gpsbabel/discard.cc rename to discard.cc diff --git a/gpsbabel/dmtlog.cc b/dmtlog.cc similarity index 100% rename from gpsbabel/dmtlog.cc rename to dmtlog.cc diff --git a/gpsbabel/duplicate.cc b/duplicate.cc similarity index 100% rename from gpsbabel/duplicate.cc rename to duplicate.cc diff --git a/gpsbabel/easygps.cc b/easygps.cc similarity index 100% rename from gpsbabel/easygps.cc rename to easygps.cc diff --git a/gpsbabel/energympro.cc b/energympro.cc similarity index 100% rename from gpsbabel/energympro.cc rename to energympro.cc diff --git a/gpsbabel/enigma.cc b/enigma.cc similarity index 100% rename from gpsbabel/enigma.cc rename to enigma.cc diff --git a/gpsbabel/exif.cc b/exif.cc similarity index 100% rename from gpsbabel/exif.cc rename to exif.cc diff --git a/gpsbabel/explorist_ini.cc b/explorist_ini.cc similarity index 100% rename from gpsbabel/explorist_ini.cc rename to explorist_ini.cc diff --git a/gpsbabel/explorist_ini.h b/explorist_ini.h similarity index 100% rename from gpsbabel/explorist_ini.h rename to explorist_ini.h diff --git a/gpsbabel/f90g_track.cc b/f90g_track.cc similarity index 100% rename from gpsbabel/f90g_track.cc rename to f90g_track.cc diff --git a/gpsbabel/fatal.cc b/fatal.cc similarity index 100% rename from gpsbabel/fatal.cc rename to fatal.cc diff --git a/gpsbabel/filter_skeleton.cc b/filter_skeleton.cc similarity index 100% rename from gpsbabel/filter_skeleton.cc rename to filter_skeleton.cc diff --git a/gpsbabel/filter_vecs.cc b/filter_vecs.cc similarity index 100% rename from gpsbabel/filter_vecs.cc rename to filter_vecs.cc diff --git a/gpsbabel/filterdefs.h b/filterdefs.h similarity index 100% rename from gpsbabel/filterdefs.h rename to filterdefs.h diff --git a/gpsbabel/format_skeleton.cc b/format_skeleton.cc similarity index 100% rename from gpsbabel/format_skeleton.cc rename to format_skeleton.cc diff --git a/gpsbabel/formspec.cc b/formspec.cc similarity index 100% rename from gpsbabel/formspec.cc rename to formspec.cc diff --git a/gpsbabel/g7towin.cc b/g7towin.cc similarity index 100% rename from gpsbabel/g7towin.cc rename to g7towin.cc diff --git a/gpsbabel/garmin.cc b/garmin.cc similarity index 100% rename from gpsbabel/garmin.cc rename to garmin.cc diff --git a/gpsbabel/garmin_device_xml.cc b/garmin_device_xml.cc similarity index 100% rename from gpsbabel/garmin_device_xml.cc rename to garmin_device_xml.cc diff --git a/gpsbabel/garmin_device_xml.h b/garmin_device_xml.h similarity index 100% rename from gpsbabel/garmin_device_xml.h rename to garmin_device_xml.h diff --git a/gpsbabel/garmin_fit.cc b/garmin_fit.cc similarity index 100% rename from gpsbabel/garmin_fit.cc rename to garmin_fit.cc diff --git a/gpsbabel/garmin_fs.cc b/garmin_fs.cc similarity index 100% rename from gpsbabel/garmin_fs.cc rename to garmin_fs.cc diff --git a/gpsbabel/garmin_fs.h b/garmin_fs.h similarity index 100% rename from gpsbabel/garmin_fs.h rename to garmin_fs.h diff --git a/gpsbabel/garmin_gpi.cc b/garmin_gpi.cc similarity index 100% rename from gpsbabel/garmin_gpi.cc rename to garmin_gpi.cc diff --git a/gpsbabel/garmin_gpi.h b/garmin_gpi.h similarity index 100% rename from gpsbabel/garmin_gpi.h rename to garmin_gpi.h diff --git a/gpsbabel/garmin_tables.cc b/garmin_tables.cc similarity index 100% rename from gpsbabel/garmin_tables.cc rename to garmin_tables.cc diff --git a/gpsbabel/garmin_tables.h b/garmin_tables.h similarity index 100% rename from gpsbabel/garmin_tables.h rename to garmin_tables.h diff --git a/gpsbabel/garmin_txt.cc b/garmin_txt.cc similarity index 100% rename from gpsbabel/garmin_txt.cc rename to garmin_txt.cc diff --git a/gpsbabel/garmin_xt.cc b/garmin_xt.cc similarity index 100% rename from gpsbabel/garmin_xt.cc rename to garmin_xt.cc diff --git a/gpsbabel/gbfile.cc b/gbfile.cc similarity index 100% rename from gpsbabel/gbfile.cc rename to gbfile.cc diff --git a/gpsbabel/gbfile.h b/gbfile.h similarity index 100% rename from gpsbabel/gbfile.h rename to gbfile.h diff --git a/gpsbabel/gbser.cc b/gbser.cc similarity index 100% rename from gpsbabel/gbser.cc rename to gbser.cc diff --git a/gpsbabel/gbser.h b/gbser.h similarity index 100% rename from gpsbabel/gbser.h rename to gbser.h diff --git a/gpsbabel/gbser_posix.cc b/gbser_posix.cc similarity index 100% rename from gpsbabel/gbser_posix.cc rename to gbser_posix.cc diff --git a/gpsbabel/gbser_posix.h b/gbser_posix.h similarity index 100% rename from gpsbabel/gbser_posix.h rename to gbser_posix.h diff --git a/gpsbabel/gbser_private.h b/gbser_private.h similarity index 100% rename from gpsbabel/gbser_private.h rename to gbser_private.h diff --git a/gpsbabel/gbser_win.cc b/gbser_win.cc similarity index 100% rename from gpsbabel/gbser_win.cc rename to gbser_win.cc diff --git a/gpsbabel/gbser_win.h b/gbser_win.h similarity index 100% rename from gpsbabel/gbser_win.h rename to gbser_win.h diff --git a/gpsbabel/gbsleep.cc b/gbsleep.cc similarity index 100% rename from gpsbabel/gbsleep.cc rename to gbsleep.cc diff --git a/gpsbabel/gbversion.h b/gbversion.h similarity index 100% rename from gpsbabel/gbversion.h rename to gbversion.h diff --git a/gpsbabel/gbversion.h.in b/gbversion.h.in similarity index 100% rename from gpsbabel/gbversion.h.in rename to gbversion.h.in diff --git a/gpsbabel/gdb.cc b/gdb.cc similarity index 100% rename from gpsbabel/gdb.cc rename to gdb.cc diff --git a/gpsbabel/geo.cc b/geo.cc similarity index 100% rename from gpsbabel/geo.cc rename to geo.cc diff --git a/gpsbabel/geocaching.loc b/geocaching.loc similarity index 100% rename from gpsbabel/geocaching.loc rename to geocaching.loc diff --git a/gpsbabel/ggv_log.cc b/ggv_log.cc similarity index 100% rename from gpsbabel/ggv_log.cc rename to ggv_log.cc diff --git a/gpsbabel/ggv_ovl.cc b/ggv_ovl.cc similarity index 100% rename from gpsbabel/ggv_ovl.cc rename to ggv_ovl.cc diff --git a/gpsbabel/globals.cc b/globals.cc similarity index 100% rename from gpsbabel/globals.cc rename to globals.cc diff --git a/gpsbabel/glogbook.cc b/glogbook.cc similarity index 100% rename from gpsbabel/glogbook.cc rename to glogbook.cc diff --git a/gpsbabel/gnav_trl.cc b/gnav_trl.cc similarity index 100% rename from gpsbabel/gnav_trl.cc rename to gnav_trl.cc diff --git a/gpsbabel/google.cc b/google.cc similarity index 100% rename from gpsbabel/google.cc rename to google.cc diff --git a/gpsbabel/googledir.cc b/googledir.cc similarity index 100% rename from gpsbabel/googledir.cc rename to googledir.cc diff --git a/gpsbabel/gopal.cc b/gopal.cc similarity index 100% rename from gpsbabel/gopal.cc rename to gopal.cc diff --git a/gpsbabel/gpsbabel-sample.ini b/gpsbabel-sample.ini similarity index 100% rename from gpsbabel/gpsbabel-sample.ini rename to gpsbabel-sample.ini diff --git a/gpsbabel/gpsbabel.supp b/gpsbabel.supp similarity index 100% rename from gpsbabel/gpsbabel.supp rename to gpsbabel.supp diff --git a/gpsbabel/gpsman b/gpsman similarity index 100% rename from gpsbabel/gpsman rename to gpsman diff --git a/gpsbabel/gpsman2 b/gpsman2 similarity index 100% rename from gpsbabel/gpsman2 rename to gpsman2 diff --git a/gpsbabel/gpssim.cc b/gpssim.cc similarity index 100% rename from gpsbabel/gpssim.cc rename to gpssim.cc diff --git a/gpsbabel/gpsutil.cc b/gpsutil.cc similarity index 100% rename from gpsbabel/gpsutil.cc rename to gpsutil.cc diff --git a/gpsbabel/gpx.cc b/gpx.cc similarity index 100% rename from gpsbabel/gpx.cc rename to gpx.cc diff --git a/gpsbabel/gpxval b/gpxval similarity index 100% rename from gpsbabel/gpxval rename to gpxval diff --git a/gpsbabel/grtcirc.cc b/grtcirc.cc similarity index 100% rename from gpsbabel/grtcirc.cc rename to grtcirc.cc diff --git a/gpsbabel/grtcirc.h b/grtcirc.h similarity index 100% rename from gpsbabel/grtcirc.h rename to grtcirc.h diff --git a/gpsbabel/gtm.cc b/gtm.cc similarity index 100% rename from gpsbabel/gtm.cc rename to gtm.cc diff --git a/gpsbabel/gtrnctr.cc b/gtrnctr.cc similarity index 100% rename from gpsbabel/gtrnctr.cc rename to gtrnctr.cc diff --git a/gpsbabel/gui/.gitignore b/gui/.gitignore similarity index 100% rename from gpsbabel/gui/.gitignore rename to gui/.gitignore diff --git a/gpsbabel/gui/AUTHORS b/gui/AUTHORS similarity index 100% rename from gpsbabel/gui/AUTHORS rename to gui/AUTHORS diff --git a/gpsbabel/gui/COPYING.txt b/gui/COPYING.txt similarity index 100% rename from gpsbabel/gui/COPYING.txt rename to gui/COPYING.txt diff --git a/gpsbabel/gui/README.contrib b/gui/README.contrib similarity index 100% rename from gpsbabel/gui/README.contrib rename to gui/README.contrib diff --git a/gpsbabel/gui/README.gui b/gui/README.gui similarity index 100% rename from gpsbabel/gui/README.gui rename to gui/README.gui diff --git a/gpsbabel/gui/TODO b/gui/TODO similarity index 100% rename from gpsbabel/gui/TODO rename to gui/TODO diff --git a/gpsbabel/gui/aboutdlg.cc b/gui/aboutdlg.cc similarity index 100% rename from gpsbabel/gui/aboutdlg.cc rename to gui/aboutdlg.cc diff --git a/gpsbabel/gui/aboutdlg.h b/gui/aboutdlg.h similarity index 100% rename from gpsbabel/gui/aboutdlg.h rename to gui/aboutdlg.h diff --git a/gpsbabel/gui/aboutui.ui b/gui/aboutui.ui similarity index 100% rename from gpsbabel/gui/aboutui.ui rename to gui/aboutui.ui diff --git a/gpsbabel/gui/advdlg.cc b/gui/advdlg.cc similarity index 100% rename from gpsbabel/gui/advdlg.cc rename to gui/advdlg.cc diff --git a/gpsbabel/gui/advdlg.h b/gui/advdlg.h similarity index 100% rename from gpsbabel/gui/advdlg.h rename to gui/advdlg.h diff --git a/gpsbabel/gui/advui.ui b/gui/advui.ui similarity index 100% rename from gpsbabel/gui/advui.ui rename to gui/advui.ui diff --git a/gpsbabel/gui/app.pro b/gui/app.pro similarity index 100% rename from gpsbabel/gui/app.pro rename to gui/app.pro diff --git a/gpsbabel/gui/app.qrc b/gui/app.qrc similarity index 100% rename from gpsbabel/gui/app.qrc rename to gui/app.qrc diff --git a/gpsbabel/gui/app.rc b/gui/app.rc similarity index 100% rename from gpsbabel/gui/app.rc rename to gui/app.rc diff --git a/gpsbabel/gui/appname.h b/gui/appname.h similarity index 100% rename from gpsbabel/gui/appname.h rename to gui/appname.h diff --git a/gpsbabel/gui/babeldata.h b/gui/babeldata.h similarity index 100% rename from gpsbabel/gui/babeldata.h rename to gui/babeldata.h diff --git a/gpsbabel/gui/babelstrings.pl b/gui/babelstrings.pl similarity index 100% rename from gpsbabel/gui/babelstrings.pl rename to gui/babelstrings.pl diff --git a/gpsbabel/gui/basepage.html b/gui/basepage.html similarity index 100% rename from gpsbabel/gui/basepage.html rename to gui/basepage.html diff --git a/gpsbabel/gui/donate.cc b/gui/donate.cc similarity index 100% rename from gpsbabel/gui/donate.cc rename to gui/donate.cc diff --git a/gpsbabel/gui/donate.h b/gui/donate.h similarity index 100% rename from gpsbabel/gui/donate.h rename to gui/donate.h diff --git a/gpsbabel/gui/donate.ui b/gui/donate.ui similarity index 100% rename from gpsbabel/gui/donate.ui rename to gui/donate.ui diff --git a/gpsbabel/gui/dpencode.cc b/gui/dpencode.cc similarity index 100% rename from gpsbabel/gui/dpencode.cc rename to gui/dpencode.cc diff --git a/gpsbabel/gui/dpencode.h b/gui/dpencode.h similarity index 100% rename from gpsbabel/gui/dpencode.h rename to gui/dpencode.h diff --git a/gpsbabel/gui/env.sh b/gui/env.sh similarity index 100% rename from gpsbabel/gui/env.sh rename to gui/env.sh diff --git a/gpsbabel/gui/filterdata.cc b/gui/filterdata.cc similarity index 100% rename from gpsbabel/gui/filterdata.cc rename to gui/filterdata.cc diff --git a/gpsbabel/gui/filterdata.h b/gui/filterdata.h similarity index 100% rename from gpsbabel/gui/filterdata.h rename to gui/filterdata.h diff --git a/gpsbabel/gui/filterdlg.cc b/gui/filterdlg.cc similarity index 100% rename from gpsbabel/gui/filterdlg.cc rename to gui/filterdlg.cc diff --git a/gpsbabel/gui/filterdlg.h b/gui/filterdlg.h similarity index 100% rename from gpsbabel/gui/filterdlg.h rename to gui/filterdlg.h diff --git a/gpsbabel/gui/filterui.ui b/gui/filterui.ui similarity index 100% rename from gpsbabel/gui/filterui.ui rename to gui/filterui.ui diff --git a/gpsbabel/gui/filterwidgets.cc b/gui/filterwidgets.cc similarity index 100% rename from gpsbabel/gui/filterwidgets.cc rename to gui/filterwidgets.cc diff --git a/gpsbabel/gui/filterwidgets.h b/gui/filterwidgets.h similarity index 100% rename from gpsbabel/gui/filterwidgets.h rename to gui/filterwidgets.h diff --git a/gpsbabel/gui/format.cc b/gui/format.cc similarity index 100% rename from gpsbabel/gui/format.cc rename to gui/format.cc diff --git a/gpsbabel/gui/format.h b/gui/format.h similarity index 100% rename from gpsbabel/gui/format.h rename to gui/format.h diff --git a/gpsbabel/gui/formatload.cc b/gui/formatload.cc similarity index 100% rename from gpsbabel/gui/formatload.cc rename to gui/formatload.cc diff --git a/gpsbabel/gui/formatload.h b/gui/formatload.h similarity index 100% rename from gpsbabel/gui/formatload.h rename to gui/formatload.h diff --git a/gpsbabel/gui/gmapbase.html b/gui/gmapbase.html similarity index 100% rename from gpsbabel/gui/gmapbase.html rename to gui/gmapbase.html diff --git a/gpsbabel/gui/gmapdlg.cc b/gui/gmapdlg.cc similarity index 100% rename from gpsbabel/gui/gmapdlg.cc rename to gui/gmapdlg.cc diff --git a/gpsbabel/gui/gmapdlg.h b/gui/gmapdlg.h similarity index 100% rename from gpsbabel/gui/gmapdlg.h rename to gui/gmapdlg.h diff --git a/gpsbabel/gui/gmapui.ui b/gui/gmapui.ui similarity index 100% rename from gpsbabel/gui/gmapui.ui rename to gui/gmapui.ui diff --git a/gpsbabel/gui/gpsbabel.desktop b/gui/gpsbabel.desktop similarity index 100% rename from gpsbabel/gui/gpsbabel.desktop rename to gui/gpsbabel.desktop diff --git a/gpsbabel/gui/gpsbabel.qm b/gui/gpsbabel.qm similarity index 100% rename from gpsbabel/gui/gpsbabel.qm rename to gui/gpsbabel.qm diff --git a/gpsbabel/gui/gpsbabel.ts b/gui/gpsbabel.ts similarity index 100% rename from gpsbabel/gui/gpsbabel.ts rename to gui/gpsbabel.ts diff --git a/gpsbabel/gui/gpsbabel_de.ts b/gui/gpsbabel_de.ts similarity index 100% rename from gpsbabel/gui/gpsbabel_de.ts rename to gui/gpsbabel_de.ts diff --git a/gpsbabel/gui/gpsbabel_es.ts b/gui/gpsbabel_es.ts similarity index 100% rename from gpsbabel/gui/gpsbabel_es.ts rename to gui/gpsbabel_es.ts diff --git a/gpsbabel/gui/gpsbabel_fr.ts b/gui/gpsbabel_fr.ts similarity index 100% rename from gpsbabel/gui/gpsbabel_fr.ts rename to gui/gpsbabel_fr.ts diff --git a/gpsbabel/gui/gpsbabel_hu.ts b/gui/gpsbabel_hu.ts similarity index 100% rename from gpsbabel/gui/gpsbabel_hu.ts rename to gui/gpsbabel_hu.ts diff --git a/gpsbabel/gui/gpsbabel_it.ts b/gui/gpsbabel_it.ts similarity index 100% rename from gpsbabel/gui/gpsbabel_it.ts rename to gui/gpsbabel_it.ts diff --git a/gpsbabel/gui/gpsbabelfe b/gui/gpsbabelfe similarity index 100% rename from gpsbabel/gui/gpsbabelfe rename to gui/gpsbabelfe diff --git a/gpsbabel/gui/gpsbabelfe.qm b/gui/gpsbabelfe.qm similarity index 100% rename from gpsbabel/gui/gpsbabelfe.qm rename to gui/gpsbabelfe.qm diff --git a/gpsbabel/gui/gpsbabelfe.ts b/gui/gpsbabelfe.ts similarity index 100% rename from gpsbabel/gui/gpsbabelfe.ts rename to gui/gpsbabelfe.ts diff --git a/gpsbabel/gui/gpsbabelfe_de.qm b/gui/gpsbabelfe_de.qm similarity index 100% rename from gpsbabel/gui/gpsbabelfe_de.qm rename to gui/gpsbabelfe_de.qm diff --git a/gpsbabel/gui/gpsbabelfe_de.ts b/gui/gpsbabelfe_de.ts similarity index 100% rename from gpsbabel/gui/gpsbabelfe_de.ts rename to gui/gpsbabelfe_de.ts diff --git a/gpsbabel/gui/gpsbabelfe_es.qm b/gui/gpsbabelfe_es.qm similarity index 100% rename from gpsbabel/gui/gpsbabelfe_es.qm rename to gui/gpsbabelfe_es.qm diff --git a/gpsbabel/gui/gpsbabelfe_es.ts b/gui/gpsbabelfe_es.ts similarity index 100% rename from gpsbabel/gui/gpsbabelfe_es.ts rename to gui/gpsbabelfe_es.ts diff --git a/gpsbabel/gui/gpsbabelfe_fr.qm b/gui/gpsbabelfe_fr.qm similarity index 100% rename from gpsbabel/gui/gpsbabelfe_fr.qm rename to gui/gpsbabelfe_fr.qm diff --git a/gpsbabel/gui/gpsbabelfe_fr.ts b/gui/gpsbabelfe_fr.ts similarity index 100% rename from gpsbabel/gui/gpsbabelfe_fr.ts rename to gui/gpsbabelfe_fr.ts diff --git a/gpsbabel/gui/gpsbabelfe_hu.qm b/gui/gpsbabelfe_hu.qm similarity index 100% rename from gpsbabel/gui/gpsbabelfe_hu.qm rename to gui/gpsbabelfe_hu.qm diff --git a/gpsbabel/gui/gpsbabelfe_hu.ts b/gui/gpsbabelfe_hu.ts similarity index 100% rename from gpsbabel/gui/gpsbabelfe_hu.ts rename to gui/gpsbabelfe_hu.ts diff --git a/gpsbabel/gui/gpsbabelfe_it.qm b/gui/gpsbabelfe_it.qm similarity index 100% rename from gpsbabel/gui/gpsbabelfe_it.qm rename to gui/gpsbabelfe_it.qm diff --git a/gpsbabel/gui/gpsbabelfe_it.ts b/gui/gpsbabelfe_it.ts similarity index 100% rename from gpsbabel/gui/gpsbabelfe_it.ts rename to gui/gpsbabelfe_it.ts diff --git a/gpsbabel/gui/gpsbabelfe_ru.qm b/gui/gpsbabelfe_ru.qm similarity index 100% rename from gpsbabel/gui/gpsbabelfe_ru.qm rename to gui/gpsbabelfe_ru.qm diff --git a/gpsbabel/gui/gpsbabelfe_ru.ts b/gui/gpsbabelfe_ru.ts similarity index 100% rename from gpsbabel/gui/gpsbabelfe_ru.ts rename to gui/gpsbabelfe_ru.ts diff --git a/gpsbabel/gui/gpx.cc b/gui/gpx.cc similarity index 100% rename from gpsbabel/gui/gpx.cc rename to gui/gpx.cc diff --git a/gpsbabel/gui/gpx.h b/gui/gpx.h similarity index 100% rename from gpsbabel/gui/gpx.h rename to gui/gpx.h diff --git a/gpsbabel/gui/help.cc b/gui/help.cc similarity index 100% rename from gpsbabel/gui/help.cc rename to gui/help.cc diff --git a/gpsbabel/gui/help.h b/gui/help.h similarity index 100% rename from gpsbabel/gui/help.h rename to gui/help.h diff --git a/gpsbabel/gui/help/gpsbabel.html b/gui/help/gpsbabel.html similarity index 100% rename from gpsbabel/gui/help/gpsbabel.html rename to gui/help/gpsbabel.html diff --git a/gpsbabel/gui/images/00.png b/gui/images/00.png similarity index 100% rename from gpsbabel/gui/images/00.png rename to gui/images/00.png diff --git a/gpsbabel/gui/images/01.png b/gui/images/01.png similarity index 100% rename from gpsbabel/gui/images/01.png rename to gui/images/01.png diff --git a/gpsbabel/gui/images/10.png b/gui/images/10.png similarity index 100% rename from gpsbabel/gui/images/10.png rename to gui/images/10.png diff --git a/gpsbabel/gui/images/11.png b/gui/images/11.png similarity index 100% rename from gpsbabel/gui/images/11.png rename to gui/images/11.png diff --git a/gpsbabel/gui/images/appicon.icns b/gui/images/appicon.icns similarity index 100% rename from gpsbabel/gui/images/appicon.icns rename to gui/images/appicon.icns diff --git a/gpsbabel/gui/images/appicon.ico b/gui/images/appicon.ico similarity index 100% rename from gpsbabel/gui/images/appicon.ico rename to gui/images/appicon.ico diff --git a/gpsbabel/gui/images/appicon.png b/gui/images/appicon.png similarity index 100% rename from gpsbabel/gui/images/appicon.png rename to gui/images/appicon.png diff --git a/gpsbabel/gui/images/appicon.xcf b/gui/images/appicon.xcf similarity index 100% rename from gpsbabel/gui/images/appicon.xcf rename to gui/images/appicon.xcf diff --git a/gpsbabel/gui/images/babel2.ico b/gui/images/babel2.ico similarity index 100% rename from gpsbabel/gui/images/babel2.ico rename to gui/images/babel2.ico diff --git a/gpsbabel/gui/images/babel3.ico b/gui/images/babel3.ico similarity index 100% rename from gpsbabel/gui/images/babel3.ico rename to gui/images/babel3.ico diff --git a/gpsbabel/gui/images/cancel.png b/gui/images/cancel.png similarity index 100% rename from gpsbabel/gui/images/cancel.png rename to gui/images/cancel.png diff --git a/gpsbabel/gui/images/exit.png b/gui/images/exit.png similarity index 100% rename from gpsbabel/gui/images/exit.png rename to gui/images/exit.png diff --git a/gpsbabel/gui/images/help.png b/gui/images/help.png similarity index 100% rename from gpsbabel/gui/images/help.png rename to gui/images/help.png diff --git a/gpsbabel/gui/images/ok.png b/gui/images/ok.png similarity index 100% rename from gpsbabel/gui/images/ok.png rename to gui/images/ok.png diff --git a/gpsbabel/gui/images/ok20.png b/gui/images/ok20.png similarity index 100% rename from gpsbabel/gui/images/ok20.png rename to gui/images/ok20.png diff --git a/gpsbabel/gui/images/open.png b/gui/images/open.png similarity index 100% rename from gpsbabel/gui/images/open.png rename to gui/images/open.png diff --git a/gpsbabel/gui/images/reload.png b/gui/images/reload.png similarity index 100% rename from gpsbabel/gui/images/reload.png rename to gui/images/reload.png diff --git a/gpsbabel/gui/images/runit.png b/gui/images/runit.png similarity index 100% rename from gpsbabel/gui/images/runit.png rename to gui/images/runit.png diff --git a/gpsbabel/gui/images/save.png b/gui/images/save.png similarity index 100% rename from gpsbabel/gui/images/save.png rename to gui/images/save.png diff --git a/gpsbabel/gui/latlng.cc b/gui/latlng.cc similarity index 100% rename from gpsbabel/gui/latlng.cc rename to gui/latlng.cc diff --git a/gpsbabel/gui/latlng.h b/gui/latlng.h similarity index 100% rename from gpsbabel/gui/latlng.h rename to gui/latlng.h diff --git a/gpsbabel/gui/main.cc b/gui/main.cc similarity index 100% rename from gpsbabel/gui/main.cc rename to gui/main.cc diff --git a/gpsbabel/gui/mainwindow.cc b/gui/mainwindow.cc similarity index 100% rename from gpsbabel/gui/mainwindow.cc rename to gui/mainwindow.cc diff --git a/gpsbabel/gui/mainwindow.h b/gui/mainwindow.h similarity index 100% rename from gpsbabel/gui/mainwindow.h rename to gui/mainwindow.h diff --git a/gpsbabel/gui/mainwinui.ui b/gui/mainwinui.ui similarity index 100% rename from gpsbabel/gui/mainwinui.ui rename to gui/mainwinui.ui diff --git a/gpsbabel/gui/makelinuxdist.sh.in b/gui/makelinuxdist.sh.in similarity index 100% rename from gpsbabel/gui/makelinuxdist.sh.in rename to gui/makelinuxdist.sh.in diff --git a/gpsbabel/gui/makesetup.bat b/gui/makesetup.bat similarity index 100% rename from gpsbabel/gui/makesetup.bat rename to gui/makesetup.bat diff --git a/gpsbabel/gui/map.cc b/gui/map.cc similarity index 100% rename from gpsbabel/gui/map.cc rename to gui/map.cc diff --git a/gpsbabel/gui/map.h b/gui/map.h similarity index 100% rename from gpsbabel/gui/map.h rename to gui/map.h diff --git a/gpsbabel/gui/miscfltui.ui b/gui/miscfltui.ui similarity index 100% rename from gpsbabel/gui/miscfltui.ui rename to gui/miscfltui.ui diff --git a/gpsbabel/gui/optionsdlg.cc b/gui/optionsdlg.cc similarity index 100% rename from gpsbabel/gui/optionsdlg.cc rename to gui/optionsdlg.cc diff --git a/gpsbabel/gui/optionsdlg.h b/gui/optionsdlg.h similarity index 100% rename from gpsbabel/gui/optionsdlg.h rename to gui/optionsdlg.h diff --git a/gpsbabel/gui/preferences.cc b/gui/preferences.cc similarity index 100% rename from gpsbabel/gui/preferences.cc rename to gui/preferences.cc diff --git a/gpsbabel/gui/preferences.h b/gui/preferences.h similarity index 100% rename from gpsbabel/gui/preferences.h rename to gui/preferences.h diff --git a/gpsbabel/gui/preferences.ui b/gui/preferences.ui similarity index 100% rename from gpsbabel/gui/preferences.ui rename to gui/preferences.ui diff --git a/gpsbabel/gui/processwait.cc b/gui/processwait.cc similarity index 100% rename from gpsbabel/gui/processwait.cc rename to gui/processwait.cc diff --git a/gpsbabel/gui/processwait.h b/gui/processwait.h similarity index 100% rename from gpsbabel/gui/processwait.h rename to gui/processwait.h diff --git a/gpsbabel/gui/qt.conf b/gui/qt.conf similarity index 100% rename from gpsbabel/gui/qt.conf rename to gui/qt.conf diff --git a/gpsbabel/gui/rttrkui.ui b/gui/rttrkui.ui similarity index 100% rename from gpsbabel/gui/rttrkui.ui rename to gui/rttrkui.ui diff --git a/gpsbabel/gui/serial_mac.cc b/gui/serial_mac.cc similarity index 100% rename from gpsbabel/gui/serial_mac.cc rename to gui/serial_mac.cc diff --git a/gpsbabel/gui/serial_unix.cc b/gui/serial_unix.cc similarity index 100% rename from gpsbabel/gui/serial_unix.cc rename to gui/serial_unix.cc diff --git a/gpsbabel/gui/serial_win.cc b/gui/serial_win.cc similarity index 100% rename from gpsbabel/gui/serial_win.cc rename to gui/serial_win.cc diff --git a/gpsbabel/gui/setting.h b/gui/setting.h similarity index 100% rename from gpsbabel/gui/setting.h rename to gui/setting.h diff --git a/gpsbabel/gui/setup.iss b/gui/setup.iss similarity index 100% rename from gpsbabel/gui/setup.iss rename to gui/setup.iss diff --git a/gpsbabel/gui/setup.iss.in b/gui/setup.iss.in similarity index 100% rename from gpsbabel/gui/setup.iss.in rename to gui/setup.iss.in diff --git a/gpsbabel/gui/showUrl.sh b/gui/showUrl.sh similarity index 100% rename from gpsbabel/gui/showUrl.sh rename to gui/showUrl.sh diff --git a/gpsbabel/gui/testx.html b/gui/testx.html similarity index 100% rename from gpsbabel/gui/testx.html rename to gui/testx.html diff --git a/gpsbabel/gui/testy.html b/gui/testy.html similarity index 100% rename from gpsbabel/gui/testy.html rename to gui/testy.html diff --git a/gpsbabel/gui/trackui.ui b/gui/trackui.ui similarity index 100% rename from gpsbabel/gui/trackui.ui rename to gui/trackui.ui diff --git a/gpsbabel/gui/upgrade.cc b/gui/upgrade.cc similarity index 100% rename from gpsbabel/gui/upgrade.cc rename to gui/upgrade.cc diff --git a/gpsbabel/gui/upgrade.h b/gui/upgrade.h similarity index 100% rename from gpsbabel/gui/upgrade.h rename to gui/upgrade.h diff --git a/gpsbabel/gui/upgrade.ui b/gui/upgrade.ui similarity index 100% rename from gpsbabel/gui/upgrade.ui rename to gui/upgrade.ui diff --git a/gpsbabel/gui/version_mismatch.cc b/gui/version_mismatch.cc similarity index 100% rename from gpsbabel/gui/version_mismatch.cc rename to gui/version_mismatch.cc diff --git a/gpsbabel/gui/version_mismatch.h b/gui/version_mismatch.h similarity index 100% rename from gpsbabel/gui/version_mismatch.h rename to gui/version_mismatch.h diff --git a/gpsbabel/gui/version_mismatch.ui b/gui/version_mismatch.ui similarity index 100% rename from gpsbabel/gui/version_mismatch.ui rename to gui/version_mismatch.ui diff --git a/gpsbabel/gui/wayptsui.ui b/gui/wayptsui.ui similarity index 100% rename from gpsbabel/gui/wayptsui.ui rename to gui/wayptsui.ui diff --git a/gpsbabel/guibabel b/guibabel similarity index 100% rename from gpsbabel/guibabel rename to guibabel diff --git a/gpsbabel/height.cc b/height.cc similarity index 100% rename from gpsbabel/height.cc rename to height.cc diff --git a/gpsbabel/height.h b/height.h similarity index 100% rename from gpsbabel/height.h rename to height.h diff --git a/gpsbabel/hiketech.cc b/hiketech.cc similarity index 100% rename from gpsbabel/hiketech.cc rename to hiketech.cc diff --git a/gpsbabel/holux.cc b/holux.cc similarity index 100% rename from gpsbabel/holux.cc rename to holux.cc diff --git a/gpsbabel/holux.h b/holux.h similarity index 100% rename from gpsbabel/holux.h rename to holux.h diff --git a/gpsbabel/html.cc b/html.cc similarity index 100% rename from gpsbabel/html.cc rename to html.cc diff --git a/gpsbabel/humminbird.cc b/humminbird.cc similarity index 100% rename from gpsbabel/humminbird.cc rename to humminbird.cc diff --git a/gpsbabel/igc.cc b/igc.cc similarity index 100% rename from gpsbabel/igc.cc rename to igc.cc diff --git a/gpsbabel/ignrando.cc b/ignrando.cc similarity index 100% rename from gpsbabel/ignrando.cc rename to ignrando.cc diff --git a/gpsbabel/igo8.cc b/igo8.cc similarity index 100% rename from gpsbabel/igo8.cc rename to igo8.cc diff --git a/gpsbabel/ik3d.cc b/ik3d.cc similarity index 100% rename from gpsbabel/ik3d.cc rename to ik3d.cc diff --git a/gpsbabel/inifile.cc b/inifile.cc similarity index 100% rename from gpsbabel/inifile.cc rename to inifile.cc diff --git a/gpsbabel/inifile.h b/inifile.h similarity index 100% rename from gpsbabel/inifile.h rename to inifile.h diff --git a/gpsbabel/install-sh b/install-sh similarity index 100% rename from gpsbabel/install-sh rename to install-sh diff --git a/gpsbabel/intdoc/BraunigerIQformat b/intdoc/BraunigerIQformat similarity index 100% rename from gpsbabel/intdoc/BraunigerIQformat rename to intdoc/BraunigerIQformat diff --git a/gpsbabel/intdoc/MPSformat b/intdoc/MPSformat similarity index 100% rename from gpsbabel/intdoc/MPSformat rename to intdoc/MPSformat diff --git a/gpsbabel/intdoc/SA2003_an1_dump.pl b/intdoc/SA2003_an1_dump.pl similarity index 100% rename from gpsbabel/intdoc/SA2003_an1_dump.pl rename to intdoc/SA2003_an1_dump.pl diff --git a/gpsbabel/intdoc/SA2003_annotations.txt b/intdoc/SA2003_annotations.txt similarity index 100% rename from gpsbabel/intdoc/SA2003_annotations.txt rename to intdoc/SA2003_annotations.txt diff --git a/gpsbabel/intdoc/SA2005_dump.pl b/intdoc/SA2005_dump.pl similarity index 100% rename from gpsbabel/intdoc/SA2005_dump.pl rename to intdoc/SA2005_dump.pl diff --git a/gpsbabel/intdoc/an1_road_types.txt b/intdoc/an1_road_types.txt similarity index 100% rename from gpsbabel/intdoc/an1_road_types.txt rename to intdoc/an1_road_types.txt diff --git a/gpsbabel/intdoc/jeeps-device.odg b/intdoc/jeeps-device.odg similarity index 100% rename from gpsbabel/intdoc/jeeps-device.odg rename to intdoc/jeeps-device.odg diff --git a/gpsbabel/internal_styles.cc b/internal_styles.cc similarity index 100% rename from gpsbabel/internal_styles.cc rename to internal_styles.cc diff --git a/gpsbabel/interpolate.cc b/interpolate.cc similarity index 100% rename from gpsbabel/interpolate.cc rename to interpolate.cc diff --git a/gpsbabel/itracku.cc b/itracku.cc similarity index 100% rename from gpsbabel/itracku.cc rename to itracku.cc diff --git a/gpsbabel/jeeps/.gitignore b/jeeps/.gitignore similarity index 100% rename from gpsbabel/jeeps/.gitignore rename to jeeps/.gitignore diff --git a/gpsbabel/jeeps/Makefile.in b/jeeps/Makefile.in similarity index 100% rename from gpsbabel/jeeps/Makefile.in rename to jeeps/Makefile.in diff --git a/gpsbabel/jeeps/README b/jeeps/README similarity index 100% rename from gpsbabel/jeeps/README rename to jeeps/README diff --git a/gpsbabel/jeeps/garminusb.h b/jeeps/garminusb.h similarity index 100% rename from gpsbabel/jeeps/garminusb.h rename to jeeps/garminusb.h diff --git a/gpsbabel/jeeps/gps.h b/jeeps/gps.h similarity index 100% rename from gpsbabel/jeeps/gps.h rename to jeeps/gps.h diff --git a/gpsbabel/jeeps/gpsapp.cc b/jeeps/gpsapp.cc similarity index 100% rename from gpsbabel/jeeps/gpsapp.cc rename to jeeps/gpsapp.cc diff --git a/gpsbabel/jeeps/gpsapp.h b/jeeps/gpsapp.h similarity index 100% rename from gpsbabel/jeeps/gpsapp.h rename to jeeps/gpsapp.h diff --git a/gpsbabel/jeeps/gpscom.cc b/jeeps/gpscom.cc similarity index 100% rename from gpsbabel/jeeps/gpscom.cc rename to jeeps/gpscom.cc diff --git a/gpsbabel/jeeps/gpscom.h b/jeeps/gpscom.h similarity index 100% rename from gpsbabel/jeeps/gpscom.h rename to jeeps/gpscom.h diff --git a/gpsbabel/jeeps/gpsdatum.h b/jeeps/gpsdatum.h similarity index 100% rename from gpsbabel/jeeps/gpsdatum.h rename to jeeps/gpsdatum.h diff --git a/gpsbabel/jeeps/gpsdevice.cc b/jeeps/gpsdevice.cc similarity index 100% rename from gpsbabel/jeeps/gpsdevice.cc rename to jeeps/gpsdevice.cc diff --git a/gpsbabel/jeeps/gpsdevice.h b/jeeps/gpsdevice.h similarity index 100% rename from gpsbabel/jeeps/gpsdevice.h rename to jeeps/gpsdevice.h diff --git a/gpsbabel/jeeps/gpsdevice_ser.cc b/jeeps/gpsdevice_ser.cc similarity index 100% rename from gpsbabel/jeeps/gpsdevice_ser.cc rename to jeeps/gpsdevice_ser.cc diff --git a/gpsbabel/jeeps/gpsdevice_usb.cc b/jeeps/gpsdevice_usb.cc similarity index 100% rename from gpsbabel/jeeps/gpsdevice_usb.cc rename to jeeps/gpsdevice_usb.cc diff --git a/gpsbabel/jeeps/gpsfmt.cc b/jeeps/gpsfmt.cc similarity index 100% rename from gpsbabel/jeeps/gpsfmt.cc rename to jeeps/gpsfmt.cc diff --git a/gpsbabel/jeeps/gpsfmt.h b/jeeps/gpsfmt.h similarity index 100% rename from gpsbabel/jeeps/gpsfmt.h rename to jeeps/gpsfmt.h diff --git a/gpsbabel/jeeps/gpsinput.cc b/jeeps/gpsinput.cc similarity index 100% rename from gpsbabel/jeeps/gpsinput.cc rename to jeeps/gpsinput.cc diff --git a/gpsbabel/jeeps/gpsinput.h b/jeeps/gpsinput.h similarity index 100% rename from gpsbabel/jeeps/gpsinput.h rename to jeeps/gpsinput.h diff --git a/gpsbabel/jeeps/gpslibusb.cc b/jeeps/gpslibusb.cc similarity index 100% rename from gpsbabel/jeeps/gpslibusb.cc rename to jeeps/gpslibusb.cc diff --git a/gpsbabel/jeeps/gpsmath.cc b/jeeps/gpsmath.cc similarity index 100% rename from gpsbabel/jeeps/gpsmath.cc rename to jeeps/gpsmath.cc diff --git a/gpsbabel/jeeps/gpsmath.h b/jeeps/gpsmath.h similarity index 100% rename from gpsbabel/jeeps/gpsmath.h rename to jeeps/gpsmath.h diff --git a/gpsbabel/jeeps/gpsmem.cc b/jeeps/gpsmem.cc similarity index 100% rename from gpsbabel/jeeps/gpsmem.cc rename to jeeps/gpsmem.cc diff --git a/gpsbabel/jeeps/gpsmem.h b/jeeps/gpsmem.h similarity index 100% rename from gpsbabel/jeeps/gpsmem.h rename to jeeps/gpsmem.h diff --git a/gpsbabel/jeeps/gpsport.h b/jeeps/gpsport.h similarity index 100% rename from gpsbabel/jeeps/gpsport.h rename to jeeps/gpsport.h diff --git a/gpsbabel/jeeps/gpsproj.cc b/jeeps/gpsproj.cc similarity index 100% rename from gpsbabel/jeeps/gpsproj.cc rename to jeeps/gpsproj.cc diff --git a/gpsbabel/jeeps/gpsproj.h b/jeeps/gpsproj.h similarity index 100% rename from gpsbabel/jeeps/gpsproj.h rename to jeeps/gpsproj.h diff --git a/gpsbabel/jeeps/gpsprot.cc b/jeeps/gpsprot.cc similarity index 100% rename from gpsbabel/jeeps/gpsprot.cc rename to jeeps/gpsprot.cc diff --git a/gpsbabel/jeeps/gpsprot.h b/jeeps/gpsprot.h similarity index 100% rename from gpsbabel/jeeps/gpsprot.h rename to jeeps/gpsprot.h diff --git a/gpsbabel/jeeps/gpsread.cc b/jeeps/gpsread.cc similarity index 100% rename from gpsbabel/jeeps/gpsread.cc rename to jeeps/gpsread.cc diff --git a/gpsbabel/jeeps/gpsread.h b/jeeps/gpsread.h similarity index 100% rename from gpsbabel/jeeps/gpsread.h rename to jeeps/gpsread.h diff --git a/gpsbabel/jeeps/gpsrqst.cc b/jeeps/gpsrqst.cc similarity index 100% rename from gpsbabel/jeeps/gpsrqst.cc rename to jeeps/gpsrqst.cc diff --git a/gpsbabel/jeeps/gpsrqst.h b/jeeps/gpsrqst.h similarity index 100% rename from gpsbabel/jeeps/gpsrqst.h rename to jeeps/gpsrqst.h diff --git a/gpsbabel/jeeps/gpssend.cc b/jeeps/gpssend.cc similarity index 100% rename from gpsbabel/jeeps/gpssend.cc rename to jeeps/gpssend.cc diff --git a/gpsbabel/jeeps/gpssend.h b/jeeps/gpssend.h similarity index 100% rename from gpsbabel/jeeps/gpssend.h rename to jeeps/gpssend.h diff --git a/gpsbabel/jeeps/gpsserial.cc b/jeeps/gpsserial.cc similarity index 100% rename from gpsbabel/jeeps/gpsserial.cc rename to jeeps/gpsserial.cc diff --git a/gpsbabel/jeeps/gpsserial.h b/jeeps/gpsserial.h similarity index 100% rename from gpsbabel/jeeps/gpsserial.h rename to jeeps/gpsserial.h diff --git a/gpsbabel/jeeps/gpsusbcommon.cc b/jeeps/gpsusbcommon.cc similarity index 100% rename from gpsbabel/jeeps/gpsusbcommon.cc rename to jeeps/gpsusbcommon.cc diff --git a/gpsbabel/jeeps/gpsusbcommon.h b/jeeps/gpsusbcommon.h similarity index 100% rename from gpsbabel/jeeps/gpsusbcommon.h rename to jeeps/gpsusbcommon.h diff --git a/gpsbabel/jeeps/gpsusbint.h b/jeeps/gpsusbint.h similarity index 100% rename from gpsbabel/jeeps/gpsusbint.h rename to jeeps/gpsusbint.h diff --git a/gpsbabel/jeeps/gpsusbread.cc b/jeeps/gpsusbread.cc similarity index 100% rename from gpsbabel/jeeps/gpsusbread.cc rename to jeeps/gpsusbread.cc diff --git a/gpsbabel/jeeps/gpsusbsend.cc b/jeeps/gpsusbsend.cc similarity index 100% rename from gpsbabel/jeeps/gpsusbsend.cc rename to jeeps/gpsusbsend.cc diff --git a/gpsbabel/jeeps/gpsusbstub.cc b/jeeps/gpsusbstub.cc similarity index 100% rename from gpsbabel/jeeps/gpsusbstub.cc rename to jeeps/gpsusbstub.cc diff --git a/gpsbabel/jeeps/gpsusbwin.cc b/jeeps/gpsusbwin.cc similarity index 100% rename from gpsbabel/jeeps/gpsusbwin.cc rename to jeeps/gpsusbwin.cc diff --git a/gpsbabel/jeeps/gpsutil.h b/jeeps/gpsutil.h similarity index 100% rename from gpsbabel/jeeps/gpsutil.h rename to jeeps/gpsutil.h diff --git a/gpsbabel/jeeps/jgpsutil.cc b/jeeps/jgpsutil.cc similarity index 100% rename from gpsbabel/jeeps/jgpsutil.cc rename to jeeps/jgpsutil.cc diff --git a/gpsbabel/jogmap.cc b/jogmap.cc similarity index 100% rename from gpsbabel/jogmap.cc rename to jogmap.cc diff --git a/gpsbabel/jtr.cc b/jtr.cc similarity index 100% rename from gpsbabel/jtr.cc rename to jtr.cc diff --git a/gpsbabel/kml.cc b/kml.cc similarity index 100% rename from gpsbabel/kml.cc rename to kml.cc diff --git a/gpsbabel/lmx.cc b/lmx.cc similarity index 100% rename from gpsbabel/lmx.cc rename to lmx.cc diff --git a/gpsbabel/lowranceusr.cc b/lowranceusr.cc similarity index 100% rename from gpsbabel/lowranceusr.cc rename to lowranceusr.cc diff --git a/gpsbabel/lowranceusr4.cc b/lowranceusr4.cc similarity index 100% rename from gpsbabel/lowranceusr4.cc rename to lowranceusr4.cc diff --git a/gpsbabel/mac/libusb/README b/mac/libusb/README similarity index 100% rename from gpsbabel/mac/libusb/README rename to mac/libusb/README diff --git a/gpsbabel/mac/libusb/darwin.c b/mac/libusb/darwin.c similarity index 100% rename from gpsbabel/mac/libusb/darwin.c rename to mac/libusb/darwin.c diff --git a/gpsbabel/mac/libusb/descriptors.c b/mac/libusb/descriptors.c similarity index 100% rename from gpsbabel/mac/libusb/descriptors.c rename to mac/libusb/descriptors.c diff --git a/gpsbabel/mac/libusb/error.c b/mac/libusb/error.c similarity index 100% rename from gpsbabel/mac/libusb/error.c rename to mac/libusb/error.c diff --git a/gpsbabel/mac/libusb/error.h b/mac/libusb/error.h similarity index 100% rename from gpsbabel/mac/libusb/error.h rename to mac/libusb/error.h diff --git a/gpsbabel/mac/libusb/usb.c b/mac/libusb/usb.c similarity index 100% rename from gpsbabel/mac/libusb/usb.c rename to mac/libusb/usb.c diff --git a/gpsbabel/mac/libusb/usb.h b/mac/libusb/usb.h similarity index 100% rename from gpsbabel/mac/libusb/usb.h rename to mac/libusb/usb.h diff --git a/gpsbabel/mac/libusb/usbi.h b/mac/libusb/usbi.h similarity index 100% rename from gpsbabel/mac/libusb/usbi.h rename to mac/libusb/usbi.h diff --git a/gpsbabel/magellan.h b/magellan.h similarity index 100% rename from gpsbabel/magellan.h rename to magellan.h diff --git a/gpsbabel/maggeo.cc b/maggeo.cc similarity index 100% rename from gpsbabel/maggeo.cc rename to maggeo.cc diff --git a/gpsbabel/magproto.cc b/magproto.cc similarity index 100% rename from gpsbabel/magproto.cc rename to magproto.cc diff --git a/gpsbabel/main.cc b/main.cc similarity index 100% rename from gpsbabel/main.cc rename to main.cc diff --git a/gpsbabel/make-an1sym.pl b/make-an1sym.pl similarity index 100% rename from gpsbabel/make-an1sym.pl rename to make-an1sym.pl diff --git a/gpsbabel/mapasia.cc b/mapasia.cc similarity index 100% rename from gpsbabel/mapasia.cc rename to mapasia.cc diff --git a/gpsbabel/mapbar_track.cc b/mapbar_track.cc similarity index 100% rename from gpsbabel/mapbar_track.cc rename to mapbar_track.cc diff --git a/gpsbabel/mapfactor.cc b/mapfactor.cc similarity index 100% rename from gpsbabel/mapfactor.cc rename to mapfactor.cc diff --git a/gpsbabel/mapsend.cc b/mapsend.cc similarity index 100% rename from gpsbabel/mapsend.cc rename to mapsend.cc diff --git a/gpsbabel/mapsend.h b/mapsend.h similarity index 100% rename from gpsbabel/mapsend.h rename to mapsend.h diff --git a/gpsbabel/mapsource.cc b/mapsource.cc similarity index 100% rename from gpsbabel/mapsource.cc rename to mapsource.cc diff --git a/gpsbabel/mingw/Makefile b/mingw/Makefile similarity index 100% rename from gpsbabel/mingw/Makefile rename to mingw/Makefile diff --git a/gpsbabel/mingw/include/ddk/hidsdi.h b/mingw/include/ddk/hidsdi.h similarity index 100% rename from gpsbabel/mingw/include/ddk/hidsdi.h rename to mingw/include/ddk/hidsdi.h diff --git a/gpsbabel/mingw/include/specstrings.h b/mingw/include/specstrings.h similarity index 100% rename from gpsbabel/mingw/include/specstrings.h rename to mingw/include/specstrings.h diff --git a/gpsbabel/mingw/shapelib/.ignore b/mingw/shapelib/.ignore similarity index 100% rename from gpsbabel/mingw/shapelib/.ignore rename to mingw/shapelib/.ignore diff --git a/gpsbabel/mingw/testo b/mingw/testo similarity index 100% rename from gpsbabel/mingw/testo rename to mingw/testo diff --git a/gpsbabel/mingw/wintesto.cmd b/mingw/wintesto.cmd similarity index 100% rename from gpsbabel/mingw/wintesto.cmd rename to mingw/wintesto.cmd diff --git a/gpsbabel/mkicondoc.cc b/mkicondoc.cc similarity index 100% rename from gpsbabel/mkicondoc.cc rename to mkicondoc.cc diff --git a/gpsbabel/mkshort.cc b/mkshort.cc similarity index 100% rename from gpsbabel/mkshort.cc rename to mkshort.cc diff --git a/gpsbabel/mkstyle.sh b/mkstyle.sh similarity index 100% rename from gpsbabel/mkstyle.sh rename to mkstyle.sh diff --git a/gpsbabel/mmo.cc b/mmo.cc similarity index 100% rename from gpsbabel/mmo.cc rename to mmo.cc diff --git a/gpsbabel/msvc/GPSBabel.sln b/msvc/GPSBabel.sln similarity index 100% rename from gpsbabel/msvc/GPSBabel.sln rename to msvc/GPSBabel.sln diff --git a/gpsbabel/msvc/GPSBabel.vcxproj b/msvc/GPSBabel.vcxproj similarity index 100% rename from gpsbabel/msvc/GPSBabel.vcxproj rename to msvc/GPSBabel.vcxproj diff --git a/gpsbabel/msvc/README.msvc b/msvc/README.msvc similarity index 100% rename from gpsbabel/msvc/README.msvc rename to msvc/README.msvc diff --git a/gpsbabel/msvc/config.h b/msvc/config.h similarity index 100% rename from gpsbabel/msvc/config.h rename to msvc/config.h diff --git a/gpsbabel/mtk_locus.cc b/mtk_locus.cc similarity index 100% rename from gpsbabel/mtk_locus.cc rename to mtk_locus.cc diff --git a/gpsbabel/mtk_logger.cc b/mtk_logger.cc similarity index 100% rename from gpsbabel/mtk_logger.cc rename to mtk_logger.cc diff --git a/gpsbabel/mynav.cc b/mynav.cc similarity index 100% rename from gpsbabel/mynav.cc rename to mynav.cc diff --git a/gpsbabel/navicache.cc b/navicache.cc similarity index 100% rename from gpsbabel/navicache.cc rename to navicache.cc diff --git a/gpsbabel/naviguide.cc b/naviguide.cc similarity index 100% rename from gpsbabel/naviguide.cc rename to naviguide.cc diff --git a/gpsbabel/navilink.cc b/navilink.cc similarity index 100% rename from gpsbabel/navilink.cc rename to navilink.cc diff --git a/gpsbabel/navilink.h b/navilink.h similarity index 100% rename from gpsbabel/navilink.h rename to navilink.h diff --git a/gpsbabel/navitel.cc b/navitel.cc similarity index 100% rename from gpsbabel/navitel.cc rename to navitel.cc diff --git a/gpsbabel/netstumbler.cc b/netstumbler.cc similarity index 100% rename from gpsbabel/netstumbler.cc rename to netstumbler.cc diff --git a/gpsbabel/nmea.cc b/nmea.cc similarity index 100% rename from gpsbabel/nmea.cc rename to nmea.cc diff --git a/gpsbabel/nmn4.cc b/nmn4.cc similarity index 100% rename from gpsbabel/nmn4.cc rename to nmn4.cc diff --git a/gpsbabel/nukedata.cc b/nukedata.cc similarity index 100% rename from gpsbabel/nukedata.cc rename to nukedata.cc diff --git a/gpsbabel/osm.cc b/osm.cc similarity index 100% rename from gpsbabel/osm.cc rename to osm.cc diff --git a/gpsbabel/ozi.cc b/ozi.cc similarity index 100% rename from gpsbabel/ozi.cc rename to ozi.cc diff --git a/gpsbabel/parse.cc b/parse.cc similarity index 100% rename from gpsbabel/parse.cc rename to parse.cc diff --git a/gpsbabel/pcx.cc b/pcx.cc similarity index 100% rename from gpsbabel/pcx.cc rename to pcx.cc diff --git a/gpsbabel/pocketfms_bc.cc b/pocketfms_bc.cc similarity index 100% rename from gpsbabel/pocketfms_bc.cc rename to pocketfms_bc.cc diff --git a/gpsbabel/pocketfms_fp.cc b/pocketfms_fp.cc similarity index 100% rename from gpsbabel/pocketfms_fp.cc rename to pocketfms_fp.cc diff --git a/gpsbabel/pocketfms_wp.cc b/pocketfms_wp.cc similarity index 100% rename from gpsbabel/pocketfms_wp.cc rename to pocketfms_wp.cc diff --git a/gpsbabel/polygon.cc b/polygon.cc similarity index 100% rename from gpsbabel/polygon.cc rename to polygon.cc diff --git a/gpsbabel/position.cc b/position.cc similarity index 100% rename from gpsbabel/position.cc rename to position.cc diff --git a/gpsbabel/psitrex.cc b/psitrex.cc similarity index 100% rename from gpsbabel/psitrex.cc rename to psitrex.cc diff --git a/gpsbabel/ptesto b/ptesto similarity index 100% rename from gpsbabel/ptesto rename to ptesto diff --git a/gpsbabel/queue.cc b/queue.cc similarity index 100% rename from gpsbabel/queue.cc rename to queue.cc diff --git a/gpsbabel/queue.h b/queue.h similarity index 100% rename from gpsbabel/queue.h rename to queue.h diff --git a/gpsbabel/radius.cc b/radius.cc similarity index 100% rename from gpsbabel/radius.cc rename to radius.cc diff --git a/gpsbabel/random.cc b/random.cc similarity index 100% rename from gpsbabel/random.cc rename to random.cc diff --git a/gpsbabel/raymarine.cc b/raymarine.cc similarity index 100% rename from gpsbabel/raymarine.cc rename to raymarine.cc diff --git a/gpsbabel/reference/A_20080712_100501.trk b/reference/A_20080712_100501.trk similarity index 100% rename from gpsbabel/reference/A_20080712_100501.trk rename to reference/A_20080712_100501.trk diff --git a/gpsbabel/reference/GeocachingDB.PDB b/reference/GeocachingDB.PDB similarity index 100% rename from gpsbabel/reference/GeocachingDB.PDB rename to reference/GeocachingDB.PDB diff --git a/gpsbabel/reference/Glad_4.exp b/reference/Glad_4.exp similarity index 100% rename from gpsbabel/reference/Glad_4.exp rename to reference/Glad_4.exp diff --git a/gpsbabel/reference/Glad_5.exp b/reference/Glad_5.exp similarity index 100% rename from gpsbabel/reference/Glad_5.exp rename to reference/Glad_5.exp diff --git a/gpsbabel/reference/IMG_2065.JPG b/reference/IMG_2065.JPG similarity index 100% rename from gpsbabel/reference/IMG_2065.JPG rename to reference/IMG_2065.JPG diff --git a/gpsbabel/reference/LineStyles.gpx b/reference/LineStyles.gpx similarity index 100% rename from gpsbabel/reference/LineStyles.gpx rename to reference/LineStyles.gpx diff --git a/gpsbabel/reference/LineStyles.kml b/reference/LineStyles.kml similarity index 100% rename from gpsbabel/reference/LineStyles.kml rename to reference/LineStyles.kml diff --git a/gpsbabel/reference/LineStyles.tpo b/reference/LineStyles.tpo similarity index 100% rename from gpsbabel/reference/LineStyles.tpo rename to reference/LineStyles.tpo diff --git a/gpsbabel/reference/UKultralight.pdb b/reference/UKultralight.pdb similarity index 100% rename from gpsbabel/reference/UKultralight.pdb rename to reference/UKultralight.pdb diff --git a/gpsbabel/reference/alantrl.gpx b/reference/alantrl.gpx similarity index 100% rename from gpsbabel/reference/alantrl.gpx rename to reference/alantrl.gpx diff --git a/gpsbabel/reference/alantrl.trl b/reference/alantrl.trl similarity index 100% rename from gpsbabel/reference/alantrl.trl rename to reference/alantrl.trl diff --git a/gpsbabel/reference/alanwpr.gpx b/reference/alanwpr.gpx similarity index 100% rename from gpsbabel/reference/alanwpr.gpx rename to reference/alanwpr.gpx diff --git a/gpsbabel/reference/alanwpr.wpr b/reference/alanwpr.wpr similarity index 100% rename from gpsbabel/reference/alanwpr.wpr rename to reference/alanwpr.wpr diff --git a/gpsbabel/reference/all.usr b/reference/all.usr similarity index 100% rename from gpsbabel/reference/all.usr rename to reference/all.usr diff --git a/gpsbabel/reference/an1-an1.ref b/reference/an1-an1.ref similarity index 100% rename from gpsbabel/reference/an1-an1.ref rename to reference/an1-an1.ref diff --git a/gpsbabel/reference/an1-in.ref b/reference/an1-in.ref similarity index 100% rename from gpsbabel/reference/an1-in.ref rename to reference/an1-in.ref diff --git a/gpsbabel/reference/an1-line-out.ref b/reference/an1-line-out.ref similarity index 100% rename from gpsbabel/reference/an1-line-out.ref rename to reference/an1-line-out.ref diff --git a/gpsbabel/reference/an1-out.ref b/reference/an1-out.ref similarity index 100% rename from gpsbabel/reference/an1-out.ref rename to reference/an1-out.ref diff --git a/gpsbabel/reference/arc-project.gpx b/reference/arc-project.gpx similarity index 100% rename from gpsbabel/reference/arc-project.gpx rename to reference/arc-project.gpx diff --git a/gpsbabel/reference/arc-project1.gpx b/reference/arc-project1.gpx similarity index 100% rename from gpsbabel/reference/arc-project1.gpx rename to reference/arc-project1.gpx diff --git a/gpsbabel/reference/arc-project2.gpx b/reference/arc-project2.gpx similarity index 100% rename from gpsbabel/reference/arc-project2.gpx rename to reference/arc-project2.gpx diff --git a/gpsbabel/reference/arc-project3.gpx b/reference/arc-project3.gpx similarity index 100% rename from gpsbabel/reference/arc-project3.gpx rename to reference/arc-project3.gpx diff --git a/gpsbabel/reference/arcdist_arc.txt b/reference/arcdist_arc.txt similarity index 100% rename from gpsbabel/reference/arcdist_arc.txt rename to reference/arcdist_arc.txt diff --git a/gpsbabel/reference/arcdist_input.txt b/reference/arcdist_input.txt similarity index 100% rename from gpsbabel/reference/arcdist_input.txt rename to reference/arcdist_input.txt diff --git a/gpsbabel/reference/arcdist_output.txt b/reference/arcdist_output.txt similarity index 100% rename from gpsbabel/reference/arcdist_output.txt rename to reference/arcdist_output.txt diff --git a/gpsbabel/reference/basecamp.gpx b/reference/basecamp.gpx similarity index 100% rename from gpsbabel/reference/basecamp.gpx rename to reference/basecamp.gpx diff --git a/gpsbabel/reference/basecamp~gpx.gpx b/reference/basecamp~gpx.gpx similarity index 100% rename from gpsbabel/reference/basecamp~gpx.gpx rename to reference/basecamp~gpx.gpx diff --git a/gpsbabel/reference/bigtime.gpx b/reference/bigtime.gpx similarity index 100% rename from gpsbabel/reference/bigtime.gpx rename to reference/bigtime.gpx diff --git a/gpsbabel/reference/binary.lmx b/reference/binary.lmx similarity index 100% rename from gpsbabel/reference/binary.lmx rename to reference/binary.lmx diff --git a/gpsbabel/reference/bounds-test.gpx b/reference/bounds-test.gpx similarity index 100% rename from gpsbabel/reference/bounds-test.gpx rename to reference/bounds-test.gpx diff --git a/gpsbabel/reference/bounds-test.kml b/reference/bounds-test.kml similarity index 100% rename from gpsbabel/reference/bounds-test.kml rename to reference/bounds-test.kml diff --git a/gpsbabel/reference/bushnell.gpx b/reference/bushnell.gpx similarity index 100% rename from gpsbabel/reference/bushnell.gpx rename to reference/bushnell.gpx diff --git a/gpsbabel/reference/bushnell.wpt b/reference/bushnell.wpt similarity index 100% rename from gpsbabel/reference/bushnell.wpt rename to reference/bushnell.wpt diff --git a/gpsbabel/reference/bushnell_trl.gpx b/reference/bushnell_trl.gpx similarity index 100% rename from gpsbabel/reference/bushnell_trl.gpx rename to reference/bushnell_trl.gpx diff --git a/gpsbabel/reference/bushnell_trl.trl b/reference/bushnell_trl.trl similarity index 100% rename from gpsbabel/reference/bushnell_trl.trl rename to reference/bushnell_trl.trl diff --git a/gpsbabel/reference/cet/cet-sample.cp1250.txt b/reference/cet/cet-sample.cp1250.txt similarity index 100% rename from gpsbabel/reference/cet/cet-sample.cp1250.txt rename to reference/cet/cet-sample.cp1250.txt diff --git a/gpsbabel/reference/cet/cet-sample.gdb b/reference/cet/cet-sample.gdb similarity index 100% rename from gpsbabel/reference/cet/cet-sample.gdb rename to reference/cet/cet-sample.gdb diff --git a/gpsbabel/reference/cet/cet-sample.gpx b/reference/cet/cet-sample.gpx similarity index 100% rename from gpsbabel/reference/cet/cet-sample.gpx rename to reference/cet/cet-sample.gpx diff --git a/gpsbabel/reference/cet/cet-sample.latin1.txt b/reference/cet/cet-sample.latin1.txt similarity index 100% rename from gpsbabel/reference/cet/cet-sample.latin1.txt rename to reference/cet/cet-sample.latin1.txt diff --git a/gpsbabel/reference/cet/cet-sample.latin2.txt b/reference/cet/cet-sample.latin2.txt similarity index 100% rename from gpsbabel/reference/cet/cet-sample.latin2.txt rename to reference/cet/cet-sample.latin2.txt diff --git a/gpsbabel/reference/cet/cet-sample.macroman.txt b/reference/cet/cet-sample.macroman.txt similarity index 100% rename from gpsbabel/reference/cet/cet-sample.macroman.txt rename to reference/cet/cet-sample.macroman.txt diff --git a/gpsbabel/reference/cetus.gpu b/reference/cetus.gpu similarity index 100% rename from gpsbabel/reference/cetus.gpu rename to reference/cetus.gpu diff --git a/gpsbabel/reference/cetus.pdb b/reference/cetus.pdb similarity index 100% rename from gpsbabel/reference/cetus.pdb rename to reference/cetus.pdb diff --git a/gpsbabel/reference/chicago.trk b/reference/chicago.trk similarity index 100% rename from gpsbabel/reference/chicago.trk rename to reference/chicago.trk diff --git a/gpsbabel/reference/coastexp.nob b/reference/coastexp.nob similarity index 100% rename from gpsbabel/reference/coastexp.nob rename to reference/coastexp.nob diff --git a/gpsbabel/reference/coastexp.ref b/reference/coastexp.ref similarity index 100% rename from gpsbabel/reference/coastexp.ref rename to reference/coastexp.ref diff --git a/gpsbabel/reference/coastexp.ref2 b/reference/coastexp.ref2 similarity index 100% rename from gpsbabel/reference/coastexp.ref2 rename to reference/coastexp.ref2 diff --git a/gpsbabel/reference/coastexp.ref3 b/reference/coastexp.ref3 similarity index 100% rename from gpsbabel/reference/coastexp.ref3 rename to reference/coastexp.ref3 diff --git a/gpsbabel/reference/coastexp.ref4 b/reference/coastexp.ref4 similarity index 100% rename from gpsbabel/reference/coastexp.ref4 rename to reference/coastexp.ref4 diff --git a/gpsbabel/reference/compegps-wpt.gpx b/reference/compegps-wpt.gpx similarity index 100% rename from gpsbabel/reference/compegps-wpt.gpx rename to reference/compegps-wpt.gpx diff --git a/gpsbabel/reference/compegps.wpt b/reference/compegps.wpt similarity index 100% rename from gpsbabel/reference/compegps.wpt rename to reference/compegps.wpt diff --git a/gpsbabel/reference/compegps.wpt.gz b/reference/compegps.wpt.gz similarity index 100% rename from gpsbabel/reference/compegps.wpt.gz rename to reference/compegps.wpt.gz diff --git a/gpsbabel/reference/compegps_time.wpt b/reference/compegps_time.wpt similarity index 100% rename from gpsbabel/reference/compegps_time.wpt rename to reference/compegps_time.wpt diff --git a/gpsbabel/reference/compegps_time_wpt.gpx b/reference/compegps_time_wpt.gpx similarity index 100% rename from gpsbabel/reference/compegps_time_wpt.gpx rename to reference/compegps_time_wpt.gpx diff --git a/gpsbabel/reference/cototest.style b/reference/cototest.style similarity index 100% rename from gpsbabel/reference/cototest.style rename to reference/cototest.style diff --git a/gpsbabel/reference/cototestmarker.gpx b/reference/cototestmarker.gpx similarity index 100% rename from gpsbabel/reference/cototestmarker.gpx rename to reference/cototestmarker.gpx diff --git a/gpsbabel/reference/cototestmarker.pdb b/reference/cototestmarker.pdb similarity index 100% rename from gpsbabel/reference/cototestmarker.pdb rename to reference/cototestmarker.pdb diff --git a/gpsbabel/reference/cototesttrack.csv b/reference/cototesttrack.csv similarity index 100% rename from gpsbabel/reference/cototesttrack.csv rename to reference/cototesttrack.csv diff --git a/gpsbabel/reference/cototesttrack.pdb b/reference/cototesttrack.pdb similarity index 100% rename from gpsbabel/reference/cototesttrack.pdb rename to reference/cototesttrack.pdb diff --git a/gpsbabel/reference/destinator_poi.dat b/reference/destinator_poi.dat similarity index 100% rename from gpsbabel/reference/destinator_poi.dat rename to reference/destinator_poi.dat diff --git a/gpsbabel/reference/destinator_poi.txt b/reference/destinator_poi.txt similarity index 100% rename from gpsbabel/reference/destinator_poi.txt rename to reference/destinator_poi.txt diff --git a/gpsbabel/reference/discardfields.gpx b/reference/discardfields.gpx similarity index 100% rename from gpsbabel/reference/discardfields.gpx rename to reference/discardfields.gpx diff --git a/gpsbabel/reference/dnatest.txt b/reference/dnatest.txt similarity index 100% rename from gpsbabel/reference/dnatest.txt rename to reference/dnatest.txt diff --git a/gpsbabel/reference/dop-test.gpx b/reference/dop-test.gpx similarity index 100% rename from gpsbabel/reference/dop-test.gpx rename to reference/dop-test.gpx diff --git a/gpsbabel/reference/dusky.gnuplot b/reference/dusky.gnuplot similarity index 100% rename from gpsbabel/reference/dusky.gnuplot rename to reference/dusky.gnuplot diff --git a/gpsbabel/reference/dusky.trk b/reference/dusky.trk similarity index 100% rename from gpsbabel/reference/dusky.trk rename to reference/dusky.trk diff --git a/gpsbabel/reference/earth-expertgps-track.kml b/reference/earth-expertgps-track.kml similarity index 100% rename from gpsbabel/reference/earth-expertgps-track.kml rename to reference/earth-expertgps-track.kml diff --git a/gpsbabel/reference/earth-expertgps.kml b/reference/earth-expertgps.kml similarity index 100% rename from gpsbabel/reference/earth-expertgps.kml rename to reference/earth-expertgps.kml diff --git a/gpsbabel/reference/earth-gc.kml b/reference/earth-gc.kml similarity index 100% rename from gpsbabel/reference/earth-gc.kml rename to reference/earth-gc.kml diff --git a/gpsbabel/reference/easygps.loc b/reference/easygps.loc similarity index 100% rename from gpsbabel/reference/easygps.loc rename to reference/easygps.loc diff --git a/gpsbabel/reference/enchilada.usr b/reference/enchilada.usr similarity index 100% rename from gpsbabel/reference/enchilada.usr rename to reference/enchilada.usr diff --git a/gpsbabel/reference/enigma-gpsb.ert b/reference/enigma-gpsb.ert similarity index 100% rename from gpsbabel/reference/enigma-gpsb.ert rename to reference/enigma-gpsb.ert diff --git a/gpsbabel/reference/enigma-pfms.ert b/reference/enigma-pfms.ert similarity index 100% rename from gpsbabel/reference/enigma-pfms.ert rename to reference/enigma-pfms.ert diff --git a/gpsbabel/reference/enigma.gpx b/reference/enigma.gpx similarity index 100% rename from gpsbabel/reference/enigma.gpx rename to reference/enigma.gpx diff --git a/gpsbabel/reference/exif-dat.csv b/reference/exif-dat.csv similarity index 100% rename from gpsbabel/reference/exif-dat.csv rename to reference/exif-dat.csv diff --git a/gpsbabel/reference/expertgps-g7t.txt b/reference/expertgps-g7t.txt similarity index 100% rename from gpsbabel/reference/expertgps-g7t.txt rename to reference/expertgps-g7t.txt diff --git a/gpsbabel/reference/expertgps.g7t b/reference/expertgps.g7t similarity index 100% rename from gpsbabel/reference/expertgps.g7t rename to reference/expertgps.g7t diff --git a/gpsbabel/reference/expertgps.gpx b/reference/expertgps.gpx similarity index 100% rename from gpsbabel/reference/expertgps.gpx rename to reference/expertgps.gpx diff --git a/gpsbabel/reference/expertgps.rwf b/reference/expertgps.rwf similarity index 100% rename from gpsbabel/reference/expertgps.rwf rename to reference/expertgps.rwf diff --git a/gpsbabel/reference/extensiondata.unicsv b/reference/extensiondata.unicsv similarity index 100% rename from gpsbabel/reference/extensiondata.unicsv rename to reference/extensiondata.unicsv diff --git a/gpsbabel/reference/extensiondata~unicsv.gpx b/reference/extensiondata~unicsv.gpx similarity index 100% rename from gpsbabel/reference/extensiondata~unicsv.gpx rename to reference/extensiondata~unicsv.gpx diff --git a/gpsbabel/reference/foo.an1 b/reference/foo.an1 similarity index 100% rename from gpsbabel/reference/foo.an1 rename to reference/foo.an1 diff --git a/gpsbabel/reference/fugawi.notime.txt b/reference/fugawi.notime.txt similarity index 100% rename from gpsbabel/reference/fugawi.notime.txt rename to reference/fugawi.notime.txt diff --git a/gpsbabel/reference/fugawi.ref b/reference/fugawi.ref similarity index 100% rename from gpsbabel/reference/fugawi.ref rename to reference/fugawi.ref diff --git a/gpsbabel/reference/fugawi.ref.txt b/reference/fugawi.ref.txt similarity index 100% rename from gpsbabel/reference/fugawi.ref.txt rename to reference/fugawi.ref.txt diff --git a/gpsbabel/reference/fugawi.time.ref.txt b/reference/fugawi.time.ref.txt similarity index 100% rename from gpsbabel/reference/fugawi.time.ref.txt rename to reference/fugawi.time.ref.txt diff --git a/gpsbabel/reference/fugawi.time.txt b/reference/fugawi.time.txt similarity index 100% rename from gpsbabel/reference/fugawi.time.txt rename to reference/fugawi.time.txt diff --git a/gpsbabel/reference/garmin_gpi.gpi b/reference/garmin_gpi.gpi similarity index 100% rename from gpsbabel/reference/garmin_gpi.gpi rename to reference/garmin_gpi.gpi diff --git a/gpsbabel/reference/garmin_gpi.gpx b/reference/garmin_gpi.gpx similarity index 100% rename from gpsbabel/reference/garmin_gpi.gpx rename to reference/garmin_gpi.gpx diff --git a/gpsbabel/reference/garmin_gpi2.gpx b/reference/garmin_gpi2.gpx similarity index 100% rename from gpsbabel/reference/garmin_gpi2.gpx rename to reference/garmin_gpi2.gpx diff --git a/gpsbabel/reference/garmin_gpi_encoding.gpi b/reference/garmin_gpi_encoding.gpi similarity index 100% rename from gpsbabel/reference/garmin_gpi_encoding.gpi rename to reference/garmin_gpi_encoding.gpi diff --git a/gpsbabel/reference/garmin_gpi_encoding.gpx b/reference/garmin_gpi_encoding.gpx similarity index 100% rename from gpsbabel/reference/garmin_gpi_encoding.gpx rename to reference/garmin_gpi_encoding.gpx diff --git a/gpsbabel/reference/garmin_gpi_encoding2.gpi.gpx b/reference/garmin_gpi_encoding2.gpi.gpx similarity index 100% rename from gpsbabel/reference/garmin_gpi_encoding2.gpi.gpx rename to reference/garmin_gpi_encoding2.gpi.gpx diff --git a/gpsbabel/reference/garmin_symbols.gpx b/reference/garmin_symbols.gpx similarity index 100% rename from gpsbabel/reference/garmin_symbols.gpx rename to reference/garmin_symbols.gpx diff --git a/gpsbabel/reference/garmin_txt-uni.csv b/reference/garmin_txt-uni.csv similarity index 100% rename from gpsbabel/reference/garmin_txt-uni.csv rename to reference/garmin_txt-uni.csv diff --git a/gpsbabel/reference/garmin_txt.txt b/reference/garmin_txt.txt similarity index 100% rename from gpsbabel/reference/garmin_txt.txt rename to reference/garmin_txt.txt diff --git a/gpsbabel/reference/gc/GC7FA4.gpx b/reference/gc/GC7FA4.gpx similarity index 100% rename from gpsbabel/reference/gc/GC7FA4.gpx rename to reference/gc/GC7FA4.gpx diff --git a/gpsbabel/reference/gc/GC7FA4~unicsv.csv b/reference/gc/GC7FA4~unicsv.csv similarity index 100% rename from gpsbabel/reference/gc/GC7FA4~unicsv.csv rename to reference/gc/GC7FA4~unicsv.csv diff --git a/gpsbabel/reference/gc/GCGCA8.gpx b/reference/gc/GCGCA8.gpx similarity index 100% rename from gpsbabel/reference/gc/GCGCA8.gpx rename to reference/gc/GCGCA8.gpx diff --git a/gpsbabel/reference/gc/GCGCA8~html.txt b/reference/gc/GCGCA8~html.txt similarity index 100% rename from gpsbabel/reference/gc/GCGCA8~html.txt rename to reference/gc/GCGCA8~html.txt diff --git a/gpsbabel/reference/gc/GCGCA8~text-encoded.txt b/reference/gc/GCGCA8~text-encoded.txt similarity index 100% rename from gpsbabel/reference/gc/GCGCA8~text-encoded.txt rename to reference/gc/GCGCA8~text-encoded.txt diff --git a/gpsbabel/reference/gc/GCGCA8~text.txt b/reference/gc/GCGCA8~text.txt similarity index 100% rename from gpsbabel/reference/gc/GCGCA8~text.txt rename to reference/gc/GCGCA8~text.txt diff --git a/gpsbabel/reference/gc/maggeo.gs b/reference/gc/maggeo.gs similarity index 100% rename from gpsbabel/reference/gc/maggeo.gs rename to reference/gc/maggeo.gs diff --git a/gpsbabel/reference/gdb-sample-v3.gdb b/reference/gdb-sample-v3.gdb similarity index 100% rename from gpsbabel/reference/gdb-sample-v3.gdb rename to reference/gdb-sample-v3.gdb diff --git a/gpsbabel/reference/gdb-sample.gdb b/reference/gdb-sample.gdb similarity index 100% rename from gpsbabel/reference/gdb-sample.gdb rename to reference/gdb-sample.gdb diff --git a/gpsbabel/reference/gdb-sample.gpx b/reference/gdb-sample.gpx similarity index 100% rename from gpsbabel/reference/gdb-sample.gpx rename to reference/gdb-sample.gpx diff --git a/gpsbabel/reference/gdb-sample2.gdb b/reference/gdb-sample2.gdb similarity index 100% rename from gpsbabel/reference/gdb-sample2.gdb rename to reference/gdb-sample2.gdb diff --git a/gpsbabel/reference/geocaching.gpx b/reference/geocaching.gpx similarity index 100% rename from gpsbabel/reference/geocaching.gpx rename to reference/geocaching.gpx diff --git a/gpsbabel/reference/geonet-sample.gpx b/reference/geonet-sample.gpx similarity index 100% rename from gpsbabel/reference/geonet-sample.gpx rename to reference/geonet-sample.gpx diff --git a/gpsbabel/reference/geonet-sample.txt b/reference/geonet-sample.txt similarity index 100% rename from gpsbabel/reference/geonet-sample.txt rename to reference/geonet-sample.txt diff --git a/gpsbabel/reference/geoniche.pdb b/reference/geoniche.pdb similarity index 100% rename from gpsbabel/reference/geoniche.pdb rename to reference/geoniche.pdb diff --git a/gpsbabel/reference/ggv_ovl.ovl b/reference/ggv_ovl.ovl similarity index 100% rename from gpsbabel/reference/ggv_ovl.ovl rename to reference/ggv_ovl.ovl diff --git a/gpsbabel/reference/ggv_ovl~ovl.gpx b/reference/ggv_ovl~ovl.gpx similarity index 100% rename from gpsbabel/reference/ggv_ovl~ovl.gpx rename to reference/ggv_ovl~ovl.gpx diff --git a/gpsbabel/reference/gl.loc b/reference/gl.loc similarity index 100% rename from gpsbabel/reference/gl.loc rename to reference/gl.loc diff --git a/gpsbabel/reference/gn-targets.gpx b/reference/gn-targets.gpx similarity index 100% rename from gpsbabel/reference/gn-targets.gpx rename to reference/gn-targets.gpx diff --git a/gpsbabel/reference/gn-targets.pdb b/reference/gn-targets.pdb similarity index 100% rename from gpsbabel/reference/gn-targets.pdb rename to reference/gn-targets.pdb diff --git a/gpsbabel/reference/gnuplot.style b/reference/gnuplot.style similarity index 100% rename from gpsbabel/reference/gnuplot.style rename to reference/gnuplot.style diff --git a/gpsbabel/reference/googdir.sh b/reference/googdir.sh similarity index 100% rename from gpsbabel/reference/googdir.sh rename to reference/googdir.sh diff --git a/gpsbabel/reference/google-direction.gpx b/reference/google-direction.gpx similarity index 100% rename from gpsbabel/reference/google-direction.gpx rename to reference/google-direction.gpx diff --git a/gpsbabel/reference/google-direction.xml b/reference/google-direction.xml similarity index 100% rename from gpsbabel/reference/google-direction.xml rename to reference/google-direction.xml diff --git a/gpsbabel/reference/google.arc b/reference/google.arc similarity index 100% rename from gpsbabel/reference/google.arc rename to reference/google.arc diff --git a/gpsbabel/reference/google.csv b/reference/google.csv similarity index 100% rename from gpsbabel/reference/google.csv rename to reference/google.csv diff --git a/gpsbabel/reference/google.js b/reference/google.js similarity index 100% rename from gpsbabel/reference/google.js rename to reference/google.js diff --git a/gpsbabel/reference/google.xml b/reference/google.xml similarity index 100% rename from gpsbabel/reference/google.xml rename to reference/google.xml diff --git a/gpsbabel/reference/google_jan_06.csv b/reference/google_jan_06.csv similarity index 100% rename from gpsbabel/reference/google_jan_06.csv rename to reference/google_jan_06.csv diff --git a/gpsbabel/reference/google_jan_06.html b/reference/google_jan_06.html similarity index 100% rename from gpsbabel/reference/google_jan_06.html rename to reference/google_jan_06.html diff --git a/gpsbabel/reference/google_multisegment.gpx b/reference/google_multisegment.gpx similarity index 100% rename from gpsbabel/reference/google_multisegment.gpx rename to reference/google_multisegment.gpx diff --git a/gpsbabel/reference/google_multisegment.js b/reference/google_multisegment.js similarity index 100% rename from gpsbabel/reference/google_multisegment.js rename to reference/google_multisegment.js diff --git a/gpsbabel/reference/google_multisegment.txt b/reference/google_multisegment.txt similarity index 100% rename from gpsbabel/reference/google_multisegment.txt rename to reference/google_multisegment.txt diff --git a/gpsbabel/reference/google_multisegment_utf16.js b/reference/google_multisegment_utf16.js similarity index 100% rename from gpsbabel/reference/google_multisegment_utf16.js rename to reference/google_multisegment_utf16.js diff --git a/gpsbabel/reference/google_multisegment_utf8.js b/reference/google_multisegment_utf8.js similarity index 100% rename from gpsbabel/reference/google_multisegment_utf8.js rename to reference/google_multisegment_utf8.js diff --git a/gpsbabel/reference/googmap.sh b/reference/googmap.sh similarity index 100% rename from gpsbabel/reference/googmap.sh rename to reference/googmap.sh diff --git a/gpsbabel/reference/googmapjs.sh b/reference/googmapjs.sh similarity index 100% rename from gpsbabel/reference/googmapjs.sh rename to reference/googmapjs.sh diff --git a/gpsbabel/reference/gopal-11-gpx.gpx b/reference/gopal-11-gpx.gpx similarity index 100% rename from gpsbabel/reference/gopal-11-gpx.gpx rename to reference/gopal-11-gpx.gpx diff --git a/gpsbabel/reference/gopal-11.trk b/reference/gopal-11.trk similarity index 100% rename from gpsbabel/reference/gopal-11.trk rename to reference/gopal-11.trk diff --git a/gpsbabel/reference/gpi_ext-sample.csv b/reference/gpi_ext-sample.csv similarity index 100% rename from gpsbabel/reference/gpi_ext-sample.csv rename to reference/gpi_ext-sample.csv diff --git a/gpsbabel/reference/gpi_ext-sample.gpi b/reference/gpi_ext-sample.gpi similarity index 100% rename from gpsbabel/reference/gpi_ext-sample.gpi rename to reference/gpi_ext-sample.gpi diff --git a/gpsbabel/reference/gpilots.pdb b/reference/gpilots.pdb similarity index 100% rename from gpsbabel/reference/gpilots.pdb rename to reference/gpilots.pdb diff --git a/gpsbabel/reference/gpsdrive.txt b/reference/gpsdrive.txt similarity index 100% rename from gpsbabel/reference/gpsdrive.txt rename to reference/gpsdrive.txt diff --git a/gpsbabel/reference/gpspilot.pdb b/reference/gpspilot.pdb similarity index 100% rename from gpsbabel/reference/gpspilot.pdb rename to reference/gpspilot.pdb diff --git a/gpsbabel/reference/gpsutil-1.pcx b/reference/gpsutil-1.pcx similarity index 100% rename from gpsbabel/reference/gpsutil-1.pcx rename to reference/gpsutil-1.pcx diff --git a/gpsbabel/reference/grid-bng.csv b/reference/grid-bng.csv similarity index 100% rename from gpsbabel/reference/grid-bng.csv rename to reference/grid-bng.csv diff --git a/gpsbabel/reference/grid-bng~csv.gpx b/reference/grid-bng~csv.gpx similarity index 100% rename from gpsbabel/reference/grid-bng~csv.gpx rename to reference/grid-bng~csv.gpx diff --git a/gpsbabel/reference/grid-swiss.csv b/reference/grid-swiss.csv similarity index 100% rename from gpsbabel/reference/grid-swiss.csv rename to reference/grid-swiss.csv diff --git a/gpsbabel/reference/grid-swiss~csv.gpx b/reference/grid-swiss~csv.gpx similarity index 100% rename from gpsbabel/reference/grid-swiss~csv.gpx rename to reference/grid-swiss~csv.gpx diff --git a/gpsbabel/reference/grid-utm.csv b/reference/grid-utm.csv similarity index 100% rename from gpsbabel/reference/grid-utm.csv rename to reference/grid-utm.csv diff --git a/gpsbabel/reference/grid-utm~csv.gpx b/reference/grid-utm~csv.gpx similarity index 100% rename from gpsbabel/reference/grid-utm~csv.gpx rename to reference/grid-utm~csv.gpx diff --git a/gpsbabel/reference/grid-utm~xscv.gpx b/reference/grid-utm~xscv.gpx similarity index 100% rename from gpsbabel/reference/grid-utm~xscv.gpx rename to reference/grid-utm~xscv.gpx diff --git a/gpsbabel/reference/gu.wpt b/reference/gu.wpt similarity index 100% rename from gpsbabel/reference/gu.wpt rename to reference/gu.wpt diff --git a/gpsbabel/reference/headerdetection.unicsv b/reference/headerdetection.unicsv similarity index 100% rename from gpsbabel/reference/headerdetection.unicsv rename to reference/headerdetection.unicsv diff --git a/gpsbabel/reference/heightcheck.csv b/reference/heightcheck.csv similarity index 100% rename from gpsbabel/reference/heightcheck.csv rename to reference/heightcheck.csv diff --git a/gpsbabel/reference/heightcheck.style b/reference/heightcheck.style similarity index 100% rename from gpsbabel/reference/heightcheck.style rename to reference/heightcheck.style diff --git a/gpsbabel/reference/heightcheck_out.csv b/reference/heightcheck_out.csv similarity index 100% rename from gpsbabel/reference/heightcheck_out.csv rename to reference/heightcheck_out.csv diff --git a/gpsbabel/reference/hiketech.gpx b/reference/hiketech.gpx similarity index 100% rename from gpsbabel/reference/hiketech.gpx rename to reference/hiketech.gpx diff --git a/gpsbabel/reference/hiketech.ref b/reference/hiketech.ref similarity index 100% rename from gpsbabel/reference/hiketech.ref rename to reference/hiketech.ref diff --git a/gpsbabel/reference/holux.gpx b/reference/holux.gpx similarity index 100% rename from gpsbabel/reference/holux.gpx rename to reference/holux.gpx diff --git a/gpsbabel/reference/holux.wpo b/reference/holux.wpo similarity index 100% rename from gpsbabel/reference/holux.wpo rename to reference/holux.wpo diff --git a/gpsbabel/reference/hsandv.exp b/reference/hsandv.exp similarity index 100% rename from gpsbabel/reference/hsandv.exp rename to reference/hsandv.exp diff --git a/gpsbabel/reference/human.in b/reference/human.in similarity index 100% rename from gpsbabel/reference/human.in rename to reference/human.in diff --git a/gpsbabel/reference/humanread.out b/reference/humanread.out similarity index 100% rename from gpsbabel/reference/humanread.out rename to reference/humanread.out diff --git a/gpsbabel/reference/humanread.style b/reference/humanread.style similarity index 100% rename from gpsbabel/reference/humanread.style rename to reference/humanread.style diff --git a/gpsbabel/reference/humanwrite.out b/reference/humanwrite.out similarity index 100% rename from gpsbabel/reference/humanwrite.out rename to reference/humanwrite.out diff --git a/gpsbabel/reference/humanwrite.style b/reference/humanwrite.style similarity index 100% rename from gpsbabel/reference/humanwrite.style rename to reference/humanwrite.style diff --git a/gpsbabel/reference/humminbird-rte-v2.hwr b/reference/humminbird-rte-v2.hwr similarity index 100% rename from gpsbabel/reference/humminbird-rte-v2.hwr rename to reference/humminbird-rte-v2.hwr diff --git a/gpsbabel/reference/humminbird-rte-v2~gpx.gpx b/reference/humminbird-rte-v2~gpx.gpx similarity index 100% rename from gpsbabel/reference/humminbird-rte-v2~gpx.gpx rename to reference/humminbird-rte-v2~gpx.gpx diff --git a/gpsbabel/reference/humminbird-rte-v3.hwr b/reference/humminbird-rte-v3.hwr similarity index 100% rename from gpsbabel/reference/humminbird-rte-v3.hwr rename to reference/humminbird-rte-v3.hwr diff --git a/gpsbabel/reference/humminbird-rte-v3~gpx.gpx b/reference/humminbird-rte-v3~gpx.gpx similarity index 100% rename from gpsbabel/reference/humminbird-rte-v3~gpx.gpx rename to reference/humminbird-rte-v3~gpx.gpx diff --git a/gpsbabel/reference/humminbird.hwr b/reference/humminbird.hwr similarity index 100% rename from gpsbabel/reference/humminbird.hwr rename to reference/humminbird.hwr diff --git a/gpsbabel/reference/humminbird~hwr.csv b/reference/humminbird~hwr.csv similarity index 100% rename from gpsbabel/reference/humminbird~hwr.csv rename to reference/humminbird~hwr.csv diff --git a/gpsbabel/reference/ics.gpx b/reference/ics.gpx similarity index 100% rename from gpsbabel/reference/ics.gpx rename to reference/ics.gpx diff --git a/gpsbabel/reference/ics.gpx.naviguide.gpx b/reference/ics.gpx.naviguide.gpx similarity index 100% rename from gpsbabel/reference/ics.gpx.naviguide.gpx rename to reference/ics.gpx.naviguide.gpx diff --git a/gpsbabel/reference/igc1.gpx b/reference/igc1.gpx similarity index 100% rename from gpsbabel/reference/igc1.gpx rename to reference/igc1.gpx diff --git a/gpsbabel/reference/igc1_3d.out b/reference/igc1_3d.out similarity index 100% rename from gpsbabel/reference/igc1_3d.out rename to reference/igc1_3d.out diff --git a/gpsbabel/reference/igc1_baro.gpx b/reference/igc1_baro.gpx similarity index 100% rename from gpsbabel/reference/igc1_baro.gpx rename to reference/igc1_baro.gpx diff --git a/gpsbabel/reference/igc1_gpx.out b/reference/igc1_gpx.out similarity index 100% rename from gpsbabel/reference/igc1_gpx.out rename to reference/igc1_gpx.out diff --git a/gpsbabel/reference/igc1_igc.out b/reference/igc1_igc.out similarity index 100% rename from gpsbabel/reference/igc1_igc.out rename to reference/igc1_igc.out diff --git a/gpsbabel/reference/igc2.igc b/reference/igc2.igc similarity index 100% rename from gpsbabel/reference/igc2.igc rename to reference/igc2.igc diff --git a/gpsbabel/reference/igc2_gpx.out b/reference/igc2_gpx.out similarity index 100% rename from gpsbabel/reference/igc2_gpx.out rename to reference/igc2_gpx.out diff --git a/gpsbabel/reference/igc2_igc.out b/reference/igc2_igc.out similarity index 100% rename from gpsbabel/reference/igc2_igc.out rename to reference/igc2_igc.out diff --git a/gpsbabel/reference/ignoreicons.usr b/reference/ignoreicons.usr similarity index 100% rename from gpsbabel/reference/ignoreicons.usr rename to reference/ignoreicons.usr diff --git a/gpsbabel/reference/igo2008_poi.upoi b/reference/igo2008_poi.upoi similarity index 100% rename from gpsbabel/reference/igo2008_poi.upoi rename to reference/igo2008_poi.upoi diff --git a/gpsbabel/reference/igo2008_poi~upoi.csv b/reference/igo2008_poi~upoi.csv similarity index 100% rename from gpsbabel/reference/igo2008_poi~upoi.csv rename to reference/igo2008_poi~upoi.csv diff --git a/gpsbabel/reference/igo2008_poi~upoi.gpx b/reference/igo2008_poi~upoi.gpx similarity index 100% rename from gpsbabel/reference/igo2008_poi~upoi.gpx rename to reference/igo2008_poi~upoi.gpx diff --git a/gpsbabel/reference/ik3d-sample.gpx b/reference/ik3d-sample.gpx similarity index 100% rename from gpsbabel/reference/ik3d-sample.gpx rename to reference/ik3d-sample.gpx diff --git a/gpsbabel/reference/ik3d-sample.ikt b/reference/ik3d-sample.ikt similarity index 100% rename from gpsbabel/reference/ik3d-sample.ikt rename to reference/ik3d-sample.ikt diff --git a/gpsbabel/reference/itracku.dat b/reference/itracku.dat similarity index 100% rename from gpsbabel/reference/itracku.dat rename to reference/itracku.dat diff --git a/gpsbabel/reference/itracku.unicsv b/reference/itracku.unicsv similarity index 100% rename from gpsbabel/reference/itracku.unicsv rename to reference/itracku.unicsv diff --git a/gpsbabel/reference/kartex-out.kwf b/reference/kartex-out.kwf similarity index 100% rename from gpsbabel/reference/kartex-out.kwf rename to reference/kartex-out.kwf diff --git a/gpsbabel/reference/kartex.txt b/reference/kartex.txt similarity index 100% rename from gpsbabel/reference/kartex.txt rename to reference/kartex.txt diff --git a/gpsbabel/reference/kml-points.kml b/reference/kml-points.kml similarity index 100% rename from gpsbabel/reference/kml-points.kml rename to reference/kml-points.kml diff --git a/gpsbabel/reference/kml-points.txt b/reference/kml-points.txt similarity index 100% rename from gpsbabel/reference/kml-points.txt rename to reference/kml-points.txt diff --git a/gpsbabel/reference/lowrance-v2-unicsv.txt b/reference/lowrance-v2-unicsv.txt similarity index 100% rename from gpsbabel/reference/lowrance-v2-unicsv.txt rename to reference/lowrance-v2-unicsv.txt diff --git a/gpsbabel/reference/lowrance-v2.usr b/reference/lowrance-v2.usr similarity index 100% rename from gpsbabel/reference/lowrance-v2.usr rename to reference/lowrance-v2.usr diff --git a/gpsbabel/reference/lowrance-v3-unicsv.txt b/reference/lowrance-v3-unicsv.txt similarity index 100% rename from gpsbabel/reference/lowrance-v3-unicsv.txt rename to reference/lowrance-v3-unicsv.txt diff --git a/gpsbabel/reference/lowrance-v3.usr b/reference/lowrance-v3.usr similarity index 100% rename from gpsbabel/reference/lowrance-v3.usr rename to reference/lowrance-v3.usr diff --git a/gpsbabel/reference/lowrance.usr b/reference/lowrance.usr similarity index 100% rename from gpsbabel/reference/lowrance.usr rename to reference/lowrance.usr diff --git a/gpsbabel/reference/lowranceusr4.gpx b/reference/lowranceusr4.gpx similarity index 100% rename from gpsbabel/reference/lowranceusr4.gpx rename to reference/lowranceusr4.gpx diff --git a/gpsbabel/reference/lowranceusr4.usr b/reference/lowranceusr4.usr similarity index 100% rename from gpsbabel/reference/lowranceusr4.usr rename to reference/lowranceusr4.usr diff --git a/gpsbabel/reference/magfile b/reference/magfile similarity index 100% rename from gpsbabel/reference/magfile rename to reference/magfile diff --git a/gpsbabel/reference/magnav.pdb b/reference/magnav.pdb similarity index 100% rename from gpsbabel/reference/magnav.pdb rename to reference/magnav.pdb diff --git a/gpsbabel/reference/magnavr.gpu b/reference/magnavr.gpu similarity index 100% rename from gpsbabel/reference/magnavr.gpu rename to reference/magnavr.gpu diff --git a/gpsbabel/reference/magxfile b/reference/magxfile similarity index 100% rename from gpsbabel/reference/magxfile rename to reference/magxfile diff --git a/gpsbabel/reference/mapfactor.xml b/reference/mapfactor.xml similarity index 100% rename from gpsbabel/reference/mapfactor.xml rename to reference/mapfactor.xml diff --git a/gpsbabel/reference/mapfactor~gpx.gpx b/reference/mapfactor~gpx.gpx similarity index 100% rename from gpsbabel/reference/mapfactor~gpx.gpx rename to reference/mapfactor~gpx.gpx diff --git a/gpsbabel/reference/mapsource.mps b/reference/mapsource.mps similarity index 100% rename from gpsbabel/reference/mapsource.mps rename to reference/mapsource.mps diff --git a/gpsbabel/reference/memory-map.mmo b/reference/memory-map.mmo similarity index 100% rename from gpsbabel/reference/memory-map.mmo rename to reference/memory-map.mmo diff --git a/gpsbabel/reference/memory-map_v24.mmo b/reference/memory-map_v24.mmo similarity index 100% rename from gpsbabel/reference/memory-map_v24.mmo rename to reference/memory-map_v24.mmo diff --git a/gpsbabel/reference/memory-map_v24~mmo.gpx b/reference/memory-map_v24~mmo.gpx similarity index 100% rename from gpsbabel/reference/memory-map_v24~mmo.gpx rename to reference/memory-map_v24~mmo.gpx diff --git a/gpsbabel/reference/memory-map~mmo.gpx b/reference/memory-map~mmo.gpx similarity index 100% rename from gpsbabel/reference/memory-map~mmo.gpx rename to reference/memory-map~mmo.gpx diff --git a/gpsbabel/reference/mps-empty.mps b/reference/mps-empty.mps similarity index 100% rename from gpsbabel/reference/mps-empty.mps rename to reference/mps-empty.mps diff --git a/gpsbabel/reference/mtk_locus.gpx b/reference/mtk_locus.gpx similarity index 100% rename from gpsbabel/reference/mtk_locus.gpx rename to reference/mtk_locus.gpx diff --git a/gpsbabel/reference/mtk_locus.nmea b/reference/mtk_locus.nmea similarity index 100% rename from gpsbabel/reference/mtk_locus.nmea rename to reference/mtk_locus.nmea diff --git a/gpsbabel/reference/multiple-links-2.gpx b/reference/multiple-links-2.gpx similarity index 100% rename from gpsbabel/reference/multiple-links-2.gpx rename to reference/multiple-links-2.gpx diff --git a/gpsbabel/reference/multiple-links-2~gpx.gpx b/reference/multiple-links-2~gpx.gpx similarity index 100% rename from gpsbabel/reference/multiple-links-2~gpx.gpx rename to reference/multiple-links-2~gpx.gpx diff --git a/gpsbabel/reference/multiple-links.gpx b/reference/multiple-links.gpx similarity index 100% rename from gpsbabel/reference/multiple-links.gpx rename to reference/multiple-links.gpx diff --git a/gpsbabel/reference/mxf.mxf b/reference/mxf.mxf similarity index 100% rename from gpsbabel/reference/mxf.mxf rename to reference/mxf.mxf diff --git a/gpsbabel/reference/navicache.xml b/reference/navicache.xml similarity index 100% rename from gpsbabel/reference/navicache.xml rename to reference/navicache.xml diff --git a/gpsbabel/reference/navicache~unicsv.txt b/reference/navicache~unicsv.txt similarity index 100% rename from gpsbabel/reference/navicache~unicsv.txt rename to reference/navicache~unicsv.txt diff --git a/gpsbabel/reference/navilink_tracks.gpx b/reference/navilink_tracks.gpx similarity index 100% rename from gpsbabel/reference/navilink_tracks.gpx rename to reference/navilink_tracks.gpx diff --git a/gpsbabel/reference/navilink_tracks.trk b/reference/navilink_tracks.trk similarity index 100% rename from gpsbabel/reference/navilink_tracks.trk rename to reference/navilink_tracks.trk diff --git a/gpsbabel/reference/navilink_tracks_gpx.trk b/reference/navilink_tracks_gpx.trk similarity index 100% rename from gpsbabel/reference/navilink_tracks_gpx.trk rename to reference/navilink_tracks_gpx.trk diff --git a/gpsbabel/reference/navilink_waypoints.gpx b/reference/navilink_waypoints.gpx similarity index 100% rename from gpsbabel/reference/navilink_waypoints.gpx rename to reference/navilink_waypoints.gpx diff --git a/gpsbabel/reference/navilink_waypoints.wpt b/reference/navilink_waypoints.wpt similarity index 100% rename from gpsbabel/reference/navilink_waypoints.wpt rename to reference/navilink_waypoints.wpt diff --git a/gpsbabel/reference/navilink_waypoints_gpx.wpt b/reference/navilink_waypoints_gpx.wpt similarity index 100% rename from gpsbabel/reference/navilink_waypoints_gpx.wpt rename to reference/navilink_waypoints_gpx.wpt diff --git a/gpsbabel/reference/netstumbler.mps b/reference/netstumbler.mps similarity index 100% rename from gpsbabel/reference/netstumbler.mps rename to reference/netstumbler.mps diff --git a/gpsbabel/reference/netstumbler.txt b/reference/netstumbler.txt similarity index 100% rename from gpsbabel/reference/netstumbler.txt rename to reference/netstumbler.txt diff --git a/gpsbabel/reference/nokia.lmx b/reference/nokia.lmx similarity index 100% rename from gpsbabel/reference/nokia.lmx rename to reference/nokia.lmx diff --git a/gpsbabel/reference/nonexistent.err b/reference/nonexistent.err similarity index 100% rename from gpsbabel/reference/nonexistent.err rename to reference/nonexistent.err diff --git a/gpsbabel/reference/osm-center-data.gpx b/reference/osm-center-data.gpx similarity index 100% rename from gpsbabel/reference/osm-center-data.gpx rename to reference/osm-center-data.gpx diff --git a/gpsbabel/reference/osm-center-data.xml b/reference/osm-center-data.xml similarity index 100% rename from gpsbabel/reference/osm-center-data.xml rename to reference/osm-center-data.xml diff --git a/gpsbabel/reference/osm-data.gpx b/reference/osm-data.gpx similarity index 100% rename from gpsbabel/reference/osm-data.gpx rename to reference/osm-data.gpx diff --git a/gpsbabel/reference/osm-data.xml b/reference/osm-data.xml similarity index 100% rename from gpsbabel/reference/osm-data.xml rename to reference/osm-data.xml diff --git a/gpsbabel/reference/ov2-arc-out.ref b/reference/ov2-arc-out.ref similarity index 100% rename from gpsbabel/reference/ov2-arc-out.ref rename to reference/ov2-arc-out.ref diff --git a/gpsbabel/reference/ov2-geo-out.ref b/reference/ov2-geo-out.ref similarity index 100% rename from gpsbabel/reference/ov2-geo-out.ref rename to reference/ov2-geo-out.ref diff --git a/gpsbabel/reference/ov2-in.ref b/reference/ov2-in.ref similarity index 100% rename from gpsbabel/reference/ov2-in.ref rename to reference/ov2-in.ref diff --git a/gpsbabel/reference/ozi.wpt b/reference/ozi.wpt similarity index 100% rename from gpsbabel/reference/ozi.wpt rename to reference/ozi.wpt diff --git a/gpsbabel/reference/paris.wpo b/reference/paris.wpo similarity index 100% rename from gpsbabel/reference/paris.wpo rename to reference/paris.wpo diff --git a/gpsbabel/reference/pathaway-geo.loc b/reference/pathaway-geo.loc similarity index 100% rename from gpsbabel/reference/pathaway-geo.loc rename to reference/pathaway-geo.loc diff --git a/gpsbabel/reference/pocketfms_bc b/reference/pocketfms_bc similarity index 100% rename from gpsbabel/reference/pocketfms_bc rename to reference/pocketfms_bc diff --git a/gpsbabel/reference/pocketfms_bc.babel b/reference/pocketfms_bc.babel similarity index 100% rename from gpsbabel/reference/pocketfms_bc.babel rename to reference/pocketfms_bc.babel diff --git a/gpsbabel/reference/pocketfms_bc.gpx b/reference/pocketfms_bc.gpx similarity index 100% rename from gpsbabel/reference/pocketfms_bc.gpx rename to reference/pocketfms_bc.gpx diff --git a/gpsbabel/reference/pocketfms_fp.gpx b/reference/pocketfms_fp.gpx similarity index 100% rename from gpsbabel/reference/pocketfms_fp.gpx rename to reference/pocketfms_fp.gpx diff --git a/gpsbabel/reference/pocketfms_fp.xml b/reference/pocketfms_fp.xml similarity index 100% rename from gpsbabel/reference/pocketfms_fp.xml rename to reference/pocketfms_fp.xml diff --git a/gpsbabel/reference/pocketfms_wp.gpx b/reference/pocketfms_wp.gpx similarity index 100% rename from gpsbabel/reference/pocketfms_wp.gpx rename to reference/pocketfms_wp.gpx diff --git a/gpsbabel/reference/pocketfms_wp.txt b/reference/pocketfms_wp.txt similarity index 100% rename from gpsbabel/reference/pocketfms_wp.txt rename to reference/pocketfms_wp.txt diff --git a/gpsbabel/reference/polygon_allencty.txt b/reference/polygon_allencty.txt similarity index 100% rename from gpsbabel/reference/polygon_allencty.txt rename to reference/polygon_allencty.txt diff --git a/gpsbabel/reference/polygon_output.txt b/reference/polygon_output.txt similarity index 100% rename from gpsbabel/reference/polygon_output.txt rename to reference/polygon_output.txt diff --git a/gpsbabel/reference/ps.psp b/reference/ps.psp similarity index 100% rename from gpsbabel/reference/ps.psp rename to reference/ps.psp diff --git a/gpsbabel/reference/psitwpts.txt b/reference/psitwpts.txt similarity index 100% rename from gpsbabel/reference/psitwpts.txt rename to reference/psitwpts.txt diff --git a/gpsbabel/reference/quovadis.gpu b/reference/quovadis.gpu similarity index 100% rename from gpsbabel/reference/quovadis.gpu rename to reference/quovadis.gpu diff --git a/gpsbabel/reference/quovadis.pdb b/reference/quovadis.pdb similarity index 100% rename from gpsbabel/reference/quovadis.pdb rename to reference/quovadis.pdb diff --git a/gpsbabel/reference/radius.csv b/reference/radius.csv similarity index 100% rename from gpsbabel/reference/radius.csv rename to reference/radius.csv diff --git a/gpsbabel/reference/raymarine-sample.gpx b/reference/raymarine-sample.gpx similarity index 100% rename from gpsbabel/reference/raymarine-sample.gpx rename to reference/raymarine-sample.gpx diff --git a/gpsbabel/reference/raymarine-sample.rwf b/reference/raymarine-sample.rwf similarity index 100% rename from gpsbabel/reference/raymarine-sample.rwf rename to reference/raymarine-sample.rwf diff --git a/gpsbabel/reference/route/bcr-sample.bcr b/reference/route/bcr-sample.bcr similarity index 100% rename from gpsbabel/reference/route/bcr-sample.bcr rename to reference/route/bcr-sample.bcr diff --git a/gpsbabel/reference/route/bcr-sample.gpx b/reference/route/bcr-sample.gpx similarity index 100% rename from gpsbabel/reference/route/bcr-sample.gpx rename to reference/route/bcr-sample.gpx diff --git a/gpsbabel/reference/route/bcr-sample2.bcr b/reference/route/bcr-sample2.bcr similarity index 100% rename from gpsbabel/reference/route/bcr-sample2.bcr rename to reference/route/bcr-sample2.bcr diff --git a/gpsbabel/reference/route/bend-expected.gpx b/reference/route/bend-expected.gpx similarity index 100% rename from gpsbabel/reference/route/bend-expected.gpx rename to reference/route/bend-expected.gpx diff --git a/gpsbabel/reference/route/bend-input.gpx b/reference/route/bend-input.gpx similarity index 100% rename from gpsbabel/reference/route/bend-input.gpx rename to reference/route/bend-input.gpx diff --git a/gpsbabel/reference/route/compegps-rte.gpx b/reference/route/compegps-rte.gpx similarity index 100% rename from gpsbabel/reference/route/compegps-rte.gpx rename to reference/route/compegps-rte.gpx diff --git a/gpsbabel/reference/route/compegps.rte b/reference/route/compegps.rte similarity index 100% rename from gpsbabel/reference/route/compegps.rte rename to reference/route/compegps.rte diff --git a/gpsbabel/reference/route/cst-sample.cst b/reference/route/cst-sample.cst similarity index 100% rename from gpsbabel/reference/route/cst-sample.cst rename to reference/route/cst-sample.cst diff --git a/gpsbabel/reference/route/cst-sample.cst.gz b/reference/route/cst-sample.cst.gz similarity index 100% rename from gpsbabel/reference/route/cst-sample.cst.gz rename to reference/route/cst-sample.cst.gz diff --git a/gpsbabel/reference/route/cst-sample.gpx b/reference/route/cst-sample.gpx similarity index 100% rename from gpsbabel/reference/route/cst-sample.gpx rename to reference/route/cst-sample.gpx diff --git a/gpsbabel/reference/route/destinator_itn.dat b/reference/route/destinator_itn.dat similarity index 100% rename from gpsbabel/reference/route/destinator_itn.dat rename to reference/route/destinator_itn.dat diff --git a/gpsbabel/reference/route/destinator_itn.txt b/reference/route/destinator_itn.txt similarity index 100% rename from gpsbabel/reference/route/destinator_itn.txt rename to reference/route/destinator_itn.txt diff --git a/gpsbabel/reference/route/humminbird.hwr b/reference/route/humminbird.hwr similarity index 100% rename from gpsbabel/reference/route/humminbird.hwr rename to reference/route/humminbird.hwr diff --git a/gpsbabel/reference/route/humminbird~hwr.gpx b/reference/route/humminbird~hwr.gpx similarity index 100% rename from gpsbabel/reference/route/humminbird~hwr.gpx rename to reference/route/humminbird~hwr.gpx diff --git a/gpsbabel/reference/route/mag_pdb-sample.gpx b/reference/route/mag_pdb-sample.gpx similarity index 100% rename from gpsbabel/reference/route/mag_pdb-sample.gpx rename to reference/route/mag_pdb-sample.gpx diff --git a/gpsbabel/reference/route/mag_pdb-sample.pdb b/reference/route/mag_pdb-sample.pdb similarity index 100% rename from gpsbabel/reference/route/mag_pdb-sample.pdb rename to reference/route/mag_pdb-sample.pdb diff --git a/gpsbabel/reference/route/magellan.rte b/reference/route/magellan.rte similarity index 100% rename from gpsbabel/reference/route/magellan.rte rename to reference/route/magellan.rte diff --git a/gpsbabel/reference/route/magexplorist.rte b/reference/route/magexplorist.rte similarity index 100% rename from gpsbabel/reference/route/magexplorist.rte rename to reference/route/magexplorist.rte diff --git a/gpsbabel/reference/route/msroute-sample.axe b/reference/route/msroute-sample.axe similarity index 100% rename from gpsbabel/reference/route/msroute-sample.axe rename to reference/route/msroute-sample.axe diff --git a/gpsbabel/reference/route/msroute-sample.gpx b/reference/route/msroute-sample.gpx similarity index 100% rename from gpsbabel/reference/route/msroute-sample.gpx rename to reference/route/msroute-sample.gpx diff --git a/gpsbabel/reference/route/naviguide-route.twl b/reference/route/naviguide-route.twl similarity index 100% rename from gpsbabel/reference/route/naviguide-route.twl rename to reference/route/naviguide-route.twl diff --git a/gpsbabel/reference/route/naviguide.gpx b/reference/route/naviguide.gpx similarity index 100% rename from gpsbabel/reference/route/naviguide.gpx rename to reference/route/naviguide.gpx diff --git a/gpsbabel/reference/route/nmn4-sample-out.rte b/reference/route/nmn4-sample-out.rte similarity index 100% rename from gpsbabel/reference/route/nmn4-sample-out.rte rename to reference/route/nmn4-sample-out.rte diff --git a/gpsbabel/reference/route/nmn4-sample.gpx b/reference/route/nmn4-sample.gpx similarity index 100% rename from gpsbabel/reference/route/nmn4-sample.gpx rename to reference/route/nmn4-sample.gpx diff --git a/gpsbabel/reference/route/nmn4-sample.rte b/reference/route/nmn4-sample.rte similarity index 100% rename from gpsbabel/reference/route/nmn4-sample.rte rename to reference/route/nmn4-sample.rte diff --git a/gpsbabel/reference/route/ozi.rte b/reference/route/ozi.rte similarity index 100% rename from gpsbabel/reference/route/ozi.rte rename to reference/route/ozi.rte diff --git a/gpsbabel/reference/route/ozi~gpx.gpx b/reference/route/ozi~gpx.gpx similarity index 100% rename from gpsbabel/reference/route/ozi~gpx.gpx rename to reference/route/ozi~gpx.gpx diff --git a/gpsbabel/reference/route/psitrtes.txt b/reference/route/psitrtes.txt similarity index 100% rename from gpsbabel/reference/route/psitrtes.txt rename to reference/route/psitrtes.txt diff --git a/gpsbabel/reference/route/route.gpx b/reference/route/route.gpx similarity index 100% rename from gpsbabel/reference/route/route.gpx rename to reference/route/route.gpx diff --git a/gpsbabel/reference/route/route.mapsend b/reference/route/route.mapsend similarity index 100% rename from gpsbabel/reference/route/route.mapsend rename to reference/route/route.mapsend diff --git a/gpsbabel/reference/route/route.mps b/reference/route/route.mps similarity index 100% rename from gpsbabel/reference/route/route.mps rename to reference/route/route.mps diff --git a/gpsbabel/reference/route/skyforce_rte.gpx b/reference/route/skyforce_rte.gpx similarity index 100% rename from gpsbabel/reference/route/skyforce_rte.gpx rename to reference/route/skyforce_rte.gpx diff --git a/gpsbabel/reference/route/skyforce_rte.txt b/reference/route/skyforce_rte.txt similarity index 100% rename from gpsbabel/reference/route/skyforce_rte.txt rename to reference/route/skyforce_rte.txt diff --git a/gpsbabel/reference/route/stmsdf-route.sdf b/reference/route/stmsdf-route.sdf similarity index 100% rename from gpsbabel/reference/route/stmsdf-route.sdf rename to reference/route/stmsdf-route.sdf diff --git a/gpsbabel/reference/route/stmwpp-route.gpx b/reference/route/stmwpp-route.gpx similarity index 100% rename from gpsbabel/reference/route/stmwpp-route.gpx rename to reference/route/stmwpp-route.gpx diff --git a/gpsbabel/reference/route/stmwpp-route.txt b/reference/route/stmwpp-route.txt similarity index 100% rename from gpsbabel/reference/route/stmwpp-route.txt rename to reference/route/stmwpp-route.txt diff --git a/gpsbabel/reference/route/tef_xml.sample.gpx b/reference/route/tef_xml.sample.gpx similarity index 100% rename from gpsbabel/reference/route/tef_xml.sample.gpx rename to reference/route/tef_xml.sample.gpx diff --git a/gpsbabel/reference/route/tef_xml.sample.xml b/reference/route/tef_xml.sample.xml similarity index 100% rename from gpsbabel/reference/route/tef_xml.sample.xml rename to reference/route/tef_xml.sample.xml diff --git a/gpsbabel/reference/route/tomtom_itn.itn b/reference/route/tomtom_itn.itn similarity index 100% rename from gpsbabel/reference/route/tomtom_itn.itn rename to reference/route/tomtom_itn.itn diff --git a/gpsbabel/reference/route/vieac.README b/reference/route/vieac.README similarity index 100% rename from gpsbabel/reference/route/vieac.README rename to reference/route/vieac.README diff --git a/gpsbabel/reference/route/vieac.rte b/reference/route/vieac.rte similarity index 100% rename from gpsbabel/reference/route/vieac.rte rename to reference/route/vieac.rte diff --git a/gpsbabel/reference/sample.gtm b/reference/sample.gtm similarity index 100% rename from gpsbabel/reference/sample.gtm rename to reference/sample.gtm diff --git a/gpsbabel/reference/sample.gtm.gz b/reference/sample.gtm.gz similarity index 100% rename from gpsbabel/reference/sample.gtm.gz rename to reference/sample.gtm.gz diff --git a/gpsbabel/reference/simplify_output.txt b/reference/simplify_output.txt similarity index 100% rename from gpsbabel/reference/simplify_output.txt rename to reference/simplify_output.txt diff --git a/gpsbabel/reference/skyforce.gpx b/reference/skyforce.gpx similarity index 100% rename from gpsbabel/reference/skyforce.gpx rename to reference/skyforce.gpx diff --git a/gpsbabel/reference/skyforce_wpt.gpx b/reference/skyforce_wpt.gpx similarity index 100% rename from gpsbabel/reference/skyforce_wpt.gpx rename to reference/skyforce_wpt.gpx diff --git a/gpsbabel/reference/skyforce_wpt.txt b/reference/skyforce_wpt.txt similarity index 100% rename from gpsbabel/reference/skyforce_wpt.txt rename to reference/skyforce_wpt.txt diff --git a/gpsbabel/reference/skytraq-2.bin b/reference/skytraq-2.bin similarity index 100% rename from gpsbabel/reference/skytraq-2.bin rename to reference/skytraq-2.bin diff --git a/gpsbabel/reference/skytraq-2.gpx b/reference/skytraq-2.gpx similarity index 100% rename from gpsbabel/reference/skytraq-2.gpx rename to reference/skytraq-2.gpx diff --git a/gpsbabel/reference/skytraq-artificial.bin b/reference/skytraq-artificial.bin similarity index 100% rename from gpsbabel/reference/skytraq-artificial.bin rename to reference/skytraq-artificial.bin diff --git a/gpsbabel/reference/skytraq-artificial.gpx b/reference/skytraq-artificial.gpx similarity index 100% rename from gpsbabel/reference/skytraq-artificial.gpx rename to reference/skytraq-artificial.gpx diff --git a/gpsbabel/reference/skytraq-miniHomer2_8.bin b/reference/skytraq-miniHomer2_8.bin similarity index 100% rename from gpsbabel/reference/skytraq-miniHomer2_8.bin rename to reference/skytraq-miniHomer2_8.bin diff --git a/gpsbabel/reference/skytraq-miniHomer2_8.gpx b/reference/skytraq-miniHomer2_8.gpx similarity index 100% rename from gpsbabel/reference/skytraq-miniHomer2_8.gpx rename to reference/skytraq-miniHomer2_8.gpx diff --git a/gpsbabel/reference/skytraq-realdata.bin b/reference/skytraq-realdata.bin similarity index 100% rename from gpsbabel/reference/skytraq-realdata.bin rename to reference/skytraq-realdata.bin diff --git a/gpsbabel/reference/skytraq-realdata.gpx b/reference/skytraq-realdata.gpx similarity index 100% rename from gpsbabel/reference/skytraq-realdata.gpx rename to reference/skytraq-realdata.gpx diff --git a/gpsbabel/reference/skytraq.bin b/reference/skytraq.bin similarity index 100% rename from gpsbabel/reference/skytraq.bin rename to reference/skytraq.bin diff --git a/gpsbabel/reference/skytraq.gpx b/reference/skytraq.gpx similarity index 100% rename from gpsbabel/reference/skytraq.gpx rename to reference/skytraq.gpx diff --git a/gpsbabel/reference/stmsdf.txt b/reference/stmsdf.txt similarity index 100% rename from gpsbabel/reference/stmsdf.txt rename to reference/stmsdf.txt diff --git a/gpsbabel/reference/tomtom.gpx b/reference/tomtom.gpx similarity index 100% rename from gpsbabel/reference/tomtom.gpx rename to reference/tomtom.gpx diff --git a/gpsbabel/reference/tomtom.ov2 b/reference/tomtom.ov2 similarity index 100% rename from gpsbabel/reference/tomtom.ov2 rename to reference/tomtom.ov2 diff --git a/gpsbabel/reference/tomtom_poi.asc b/reference/tomtom_poi.asc similarity index 100% rename from gpsbabel/reference/tomtom_poi.asc rename to reference/tomtom_poi.asc diff --git a/gpsbabel/reference/topomapexample.txt b/reference/topomapexample.txt similarity index 100% rename from gpsbabel/reference/topomapexample.txt rename to reference/topomapexample.txt diff --git a/gpsbabel/reference/topomappro.txt b/reference/topomappro.txt similarity index 100% rename from gpsbabel/reference/topomappro.txt rename to reference/topomappro.txt diff --git a/gpsbabel/reference/tpg.tpg b/reference/tpg.tpg similarity index 100% rename from gpsbabel/reference/tpg.tpg rename to reference/tpg.tpg diff --git a/gpsbabel/reference/tpo-sample.tpo b/reference/tpo-sample.tpo similarity index 100% rename from gpsbabel/reference/tpo-sample.tpo rename to reference/tpo-sample.tpo diff --git a/gpsbabel/reference/tpo-sample3.gpx b/reference/tpo-sample3.gpx similarity index 100% rename from gpsbabel/reference/tpo-sample3.gpx rename to reference/tpo-sample3.gpx diff --git a/gpsbabel/reference/tpo-sample3.tpo b/reference/tpo-sample3.tpo similarity index 100% rename from gpsbabel/reference/tpo-sample3.tpo rename to reference/tpo-sample3.tpo diff --git a/gpsbabel/reference/track/GARMIN_ATRK.NVM b/reference/track/GARMIN_ATRK.NVM similarity index 100% rename from gpsbabel/reference/track/GARMIN_ATRK.NVM rename to reference/track/GARMIN_ATRK.NVM diff --git a/gpsbabel/reference/track/GARMIN_STRK.NVM b/reference/track/GARMIN_STRK.NVM similarity index 100% rename from gpsbabel/reference/track/GARMIN_STRK.NVM rename to reference/track/GARMIN_STRK.NVM diff --git a/gpsbabel/reference/track/TrkDB-GPil.pdb b/reference/track/TrkDB-GPil.pdb similarity index 100% rename from gpsbabel/reference/track/TrkDB-GPil.pdb rename to reference/track/TrkDB-GPil.pdb diff --git a/gpsbabel/reference/track/amod-cleansed b/reference/track/amod-cleansed similarity index 100% rename from gpsbabel/reference/track/amod-cleansed rename to reference/track/amod-cleansed diff --git a/gpsbabel/reference/track/amod-nmea b/reference/track/amod-nmea similarity index 100% rename from gpsbabel/reference/track/amod-nmea rename to reference/track/amod-nmea diff --git a/gpsbabel/reference/track/amod.gpx b/reference/track/amod.gpx similarity index 100% rename from gpsbabel/reference/track/amod.gpx rename to reference/track/amod.gpx diff --git a/gpsbabel/reference/track/axim-sample.gpb b/reference/track/axim-sample.gpb similarity index 100% rename from gpsbabel/reference/track/axim-sample.gpb rename to reference/track/axim-sample.gpb diff --git a/gpsbabel/reference/track/axim-sample.gpx b/reference/track/axim-sample.gpx similarity index 100% rename from gpsbabel/reference/track/axim-sample.gpx rename to reference/track/axim-sample.gpx diff --git a/gpsbabel/reference/track/bike.tcx b/reference/track/bike.tcx similarity index 100% rename from gpsbabel/reference/track/bike.tcx rename to reference/track/bike.tcx diff --git a/gpsbabel/reference/track/bike~gpx.gpx b/reference/track/bike~gpx.gpx similarity index 100% rename from gpsbabel/reference/track/bike~gpx.gpx rename to reference/track/bike~gpx.gpx diff --git a/gpsbabel/reference/track/bike~unicsv.csv b/reference/track/bike~unicsv.csv similarity index 100% rename from gpsbabel/reference/track/bike~unicsv.csv rename to reference/track/bike~unicsv.csv diff --git a/gpsbabel/reference/track/bounds-test-track.gpx b/reference/track/bounds-test-track.gpx similarity index 100% rename from gpsbabel/reference/track/bounds-test-track.gpx rename to reference/track/bounds-test-track.gpx diff --git a/gpsbabel/reference/track/bounds-test-track.kml b/reference/track/bounds-test-track.kml similarity index 100% rename from gpsbabel/reference/track/bounds-test-track.kml rename to reference/track/bounds-test-track.kml diff --git a/gpsbabel/reference/track/cetus-track.pdb b/reference/track/cetus-track.pdb similarity index 100% rename from gpsbabel/reference/track/cetus-track.pdb rename to reference/track/cetus-track.pdb diff --git a/gpsbabel/reference/track/cetus-track~gpx.gpx b/reference/track/cetus-track~gpx.gpx similarity index 100% rename from gpsbabel/reference/track/cetus-track~gpx.gpx rename to reference/track/cetus-track~gpx.gpx diff --git a/gpsbabel/reference/track/chi-mapsend.trk b/reference/track/chi-mapsend.trk similarity index 100% rename from gpsbabel/reference/track/chi-mapsend.trk rename to reference/track/chi-mapsend.trk diff --git a/gpsbabel/reference/track/compegps-trk.gpx b/reference/track/compegps-trk.gpx similarity index 100% rename from gpsbabel/reference/track/compegps-trk.gpx rename to reference/track/compegps-trk.gpx diff --git a/gpsbabel/reference/track/compegps.trk b/reference/track/compegps.trk similarity index 100% rename from gpsbabel/reference/track/compegps.trk rename to reference/track/compegps.trk diff --git a/gpsbabel/reference/track/course.tcx b/reference/track/course.tcx similarity index 100% rename from gpsbabel/reference/track/course.tcx rename to reference/track/course.tcx diff --git a/gpsbabel/reference/track/course~tcx.csv b/reference/track/course~tcx.csv similarity index 100% rename from gpsbabel/reference/track/course~tcx.csv rename to reference/track/course~tcx.csv diff --git a/gpsbabel/reference/track/course~tcx.gpx b/reference/track/course~tcx.gpx similarity index 100% rename from gpsbabel/reference/track/course~tcx.gpx rename to reference/track/course~tcx.gpx diff --git a/gpsbabel/reference/track/datalog.gpx b/reference/track/datalog.gpx similarity index 100% rename from gpsbabel/reference/track/datalog.gpx rename to reference/track/datalog.gpx diff --git a/gpsbabel/reference/track/datalog.sbp b/reference/track/datalog.sbp similarity index 100% rename from gpsbabel/reference/track/datalog.sbp rename to reference/track/datalog.sbp diff --git a/gpsbabel/reference/track/destinator_trl.dat b/reference/track/destinator_trl.dat similarity index 100% rename from gpsbabel/reference/track/destinator_trl.dat rename to reference/track/destinator_trl.dat diff --git a/gpsbabel/reference/track/destinator_trl.txt b/reference/track/destinator_trl.txt similarity index 100% rename from gpsbabel/reference/track/destinator_trl.txt rename to reference/track/destinator_trl.txt diff --git a/gpsbabel/reference/track/dmtlog-sample.gpx b/reference/track/dmtlog-sample.gpx similarity index 100% rename from gpsbabel/reference/track/dmtlog-sample.gpx rename to reference/track/dmtlog-sample.gpx diff --git a/gpsbabel/reference/track/energympro.cpo b/reference/track/energympro.cpo similarity index 100% rename from gpsbabel/reference/track/energympro.cpo rename to reference/track/energympro.cpo diff --git a/gpsbabel/reference/track/energympro.gpx b/reference/track/energympro.gpx similarity index 100% rename from gpsbabel/reference/track/energympro.gpx rename to reference/track/energympro.gpx diff --git a/gpsbabel/reference/track/expertgps.jtr b/reference/track/expertgps.jtr similarity index 100% rename from gpsbabel/reference/track/expertgps.jtr rename to reference/track/expertgps.jtr diff --git a/gpsbabel/reference/track/expertgps~jtr.gpx b/reference/track/expertgps~jtr.gpx similarity index 100% rename from gpsbabel/reference/track/expertgps~jtr.gpx rename to reference/track/expertgps~jtr.gpx diff --git a/gpsbabel/reference/track/f90g-sample.gpx b/reference/track/f90g-sample.gpx similarity index 100% rename from gpsbabel/reference/track/f90g-sample.gpx rename to reference/track/f90g-sample.gpx diff --git a/gpsbabel/reference/track/f90g-sample.map b/reference/track/f90g-sample.map similarity index 100% rename from gpsbabel/reference/track/f90g-sample.map rename to reference/track/f90g-sample.map diff --git a/gpsbabel/reference/track/fit-sample.fit b/reference/track/fit-sample.fit similarity index 100% rename from gpsbabel/reference/track/fit-sample.fit rename to reference/track/fit-sample.fit diff --git a/gpsbabel/reference/track/fit-sample.gpx b/reference/track/fit-sample.gpx similarity index 100% rename from gpsbabel/reference/track/fit-sample.gpx rename to reference/track/fit-sample.gpx diff --git a/gpsbabel/reference/track/fugawi.txt b/reference/track/fugawi.txt similarity index 100% rename from gpsbabel/reference/track/fugawi.txt rename to reference/track/fugawi.txt diff --git a/gpsbabel/reference/track/garmin-edge-200-output.fit b/reference/track/garmin-edge-200-output.fit similarity index 100% rename from gpsbabel/reference/track/garmin-edge-200-output.fit rename to reference/track/garmin-edge-200-output.fit diff --git a/gpsbabel/reference/track/garmin-edge-200-output.gpx b/reference/track/garmin-edge-200-output.gpx similarity index 100% rename from gpsbabel/reference/track/garmin-edge-200-output.gpx rename to reference/track/garmin-edge-200-output.gpx diff --git a/gpsbabel/reference/track/garmin-edge-800-output.gpx b/reference/track/garmin-edge-800-output.gpx similarity index 100% rename from gpsbabel/reference/track/garmin-edge-800-output.gpx rename to reference/track/garmin-edge-800-output.gpx diff --git a/gpsbabel/reference/track/garmin-edge-800.fit b/reference/track/garmin-edge-800.fit similarity index 100% rename from gpsbabel/reference/track/garmin-edge-800.fit rename to reference/track/garmin-edge-800.fit diff --git a/gpsbabel/reference/track/garmin-forerunner-10-output.gpx b/reference/track/garmin-forerunner-10-output.gpx similarity index 100% rename from gpsbabel/reference/track/garmin-forerunner-10-output.gpx rename to reference/track/garmin-forerunner-10-output.gpx diff --git a/gpsbabel/reference/track/garmin-forerunner-10.fit b/reference/track/garmin-forerunner-10.fit similarity index 100% rename from gpsbabel/reference/track/garmin-forerunner-10.fit rename to reference/track/garmin-forerunner-10.fit diff --git a/gpsbabel/reference/track/garmin_g1000.csv b/reference/track/garmin_g1000.csv similarity index 100% rename from gpsbabel/reference/track/garmin_g1000.csv rename to reference/track/garmin_g1000.csv diff --git a/gpsbabel/reference/track/garmin_g1000~gpx.gpx b/reference/track/garmin_g1000~gpx.gpx similarity index 100% rename from gpsbabel/reference/track/garmin_g1000~gpx.gpx rename to reference/track/garmin_g1000~gpx.gpx diff --git a/gpsbabel/reference/track/garmin_logbook.xml b/reference/track/garmin_logbook.xml similarity index 100% rename from gpsbabel/reference/track/garmin_logbook.xml rename to reference/track/garmin_logbook.xml diff --git a/gpsbabel/reference/track/garmin_xt_atrk.gpx b/reference/track/garmin_xt_atrk.gpx similarity index 100% rename from gpsbabel/reference/track/garmin_xt_atrk.gpx rename to reference/track/garmin_xt_atrk.gpx diff --git a/gpsbabel/reference/track/garmin_xt_strk.gpx b/reference/track/garmin_xt_strk.gpx similarity index 100% rename from gpsbabel/reference/track/garmin_xt_strk.gpx rename to reference/track/garmin_xt_strk.gpx diff --git a/gpsbabel/reference/track/ggv_log-sample.log b/reference/track/ggv_log-sample.log similarity index 100% rename from gpsbabel/reference/track/ggv_log-sample.log rename to reference/track/ggv_log-sample.log diff --git a/gpsbabel/reference/track/gnav_trl.trl b/reference/track/gnav_trl.trl similarity index 100% rename from gpsbabel/reference/track/gnav_trl.trl rename to reference/track/gnav_trl.trl diff --git a/gpsbabel/reference/track/gnav_trl~trl.csv b/reference/track/gnav_trl~trl.csv similarity index 100% rename from gpsbabel/reference/track/gnav_trl~trl.csv rename to reference/track/gnav_trl~trl.csv diff --git a/gpsbabel/reference/track/google_ext.kml b/reference/track/google_ext.kml similarity index 100% rename from gpsbabel/reference/track/google_ext.kml rename to reference/track/google_ext.kml diff --git a/gpsbabel/reference/track/google_ext~kml.gpx b/reference/track/google_ext~kml.gpx similarity index 100% rename from gpsbabel/reference/track/google_ext~kml.gpx rename to reference/track/google_ext~kml.gpx diff --git a/gpsbabel/reference/track/gpx_garmin_extensions-kml_track.kml b/reference/track/gpx_garmin_extensions-kml_track.kml similarity index 100% rename from gpsbabel/reference/track/gpx_garmin_extensions-kml_track.kml rename to reference/track/gpx_garmin_extensions-kml_track.kml diff --git a/gpsbabel/reference/track/gpx_garmin_extensions.gpx b/reference/track/gpx_garmin_extensions.gpx similarity index 100% rename from gpsbabel/reference/track/gpx_garmin_extensions.gpx rename to reference/track/gpx_garmin_extensions.gpx diff --git a/gpsbabel/reference/track/gpx_subsecond-sample.gpx b/reference/track/gpx_subsecond-sample.gpx similarity index 100% rename from gpsbabel/reference/track/gpx_subsecond-sample.gpx rename to reference/track/gpx_subsecond-sample.gpx diff --git a/gpsbabel/reference/track/gpx_subsecond-sample~subrip.srt b/reference/track/gpx_subsecond-sample~subrip.srt similarity index 100% rename from gpsbabel/reference/track/gpx_subsecond-sample~subrip.srt rename to reference/track/gpx_subsecond-sample~subrip.srt diff --git a/gpsbabel/reference/track/gtrnctr-lap_s.tcx b/reference/track/gtrnctr-lap_s.tcx similarity index 100% rename from gpsbabel/reference/track/gtrnctr-lap_s.tcx rename to reference/track/gtrnctr-lap_s.tcx diff --git a/gpsbabel/reference/track/gtrnctr-lap_s.tcx.gpx b/reference/track/gtrnctr-lap_s.tcx.gpx similarity index 100% rename from gpsbabel/reference/track/gtrnctr-lap_s.tcx.gpx rename to reference/track/gtrnctr-lap_s.tcx.gpx diff --git a/gpsbabel/reference/track/gtrnctr-readcp.gpx b/reference/track/gtrnctr-readcp.gpx similarity index 100% rename from gpsbabel/reference/track/gtrnctr-readcp.gpx rename to reference/track/gtrnctr-readcp.gpx diff --git a/gpsbabel/reference/track/gtrnctr-readcp.tcx b/reference/track/gtrnctr-readcp.tcx similarity index 100% rename from gpsbabel/reference/track/gtrnctr-readcp.tcx rename to reference/track/gtrnctr-readcp.tcx diff --git a/gpsbabel/reference/track/gtrnctr_power-kml.kml b/reference/track/gtrnctr_power-kml.kml similarity index 100% rename from gpsbabel/reference/track/gtrnctr_power-kml.kml rename to reference/track/gtrnctr_power-kml.kml diff --git a/gpsbabel/reference/track/gtrnctr_power.gpx b/reference/track/gtrnctr_power.gpx similarity index 100% rename from gpsbabel/reference/track/gtrnctr_power.gpx rename to reference/track/gtrnctr_power.gpx diff --git a/gpsbabel/reference/track/gtrnctr_power.tcx b/reference/track/gtrnctr_power.tcx similarity index 100% rename from gpsbabel/reference/track/gtrnctr_power.tcx rename to reference/track/gtrnctr_power.tcx diff --git a/gpsbabel/reference/track/height.gpx b/reference/track/height.gpx similarity index 100% rename from gpsbabel/reference/track/height.gpx rename to reference/track/height.gpx diff --git a/gpsbabel/reference/track/height_out.gpx b/reference/track/height_out.gpx similarity index 100% rename from gpsbabel/reference/track/height_out.gpx rename to reference/track/height_out.gpx diff --git a/gpsbabel/reference/track/history.tcx b/reference/track/history.tcx similarity index 100% rename from gpsbabel/reference/track/history.tcx rename to reference/track/history.tcx diff --git a/gpsbabel/reference/track/history~tcx.csv b/reference/track/history~tcx.csv similarity index 100% rename from gpsbabel/reference/track/history~tcx.csv rename to reference/track/history~tcx.csv diff --git a/gpsbabel/reference/track/history~tcx.gpx b/reference/track/history~tcx.gpx similarity index 100% rename from gpsbabel/reference/track/history~tcx.gpx rename to reference/track/history~tcx.gpx diff --git a/gpsbabel/reference/track/humminbird.ht b/reference/track/humminbird.ht similarity index 100% rename from gpsbabel/reference/track/humminbird.ht rename to reference/track/humminbird.ht diff --git a/gpsbabel/reference/track/i65.anr b/reference/track/i65.anr similarity index 100% rename from gpsbabel/reference/track/i65.anr rename to reference/track/i65.anr diff --git a/gpsbabel/reference/track/i65.anr.gpx b/reference/track/i65.anr.gpx similarity index 100% rename from gpsbabel/reference/track/i65.anr.gpx rename to reference/track/i65.anr.gpx diff --git a/gpsbabel/reference/track/iblue747.csv b/reference/track/iblue747.csv similarity index 100% rename from gpsbabel/reference/track/iblue747.csv rename to reference/track/iblue747.csv diff --git a/gpsbabel/reference/track/iblue747~csv.gpx b/reference/track/iblue747~csv.gpx similarity index 100% rename from gpsbabel/reference/track/iblue747~csv.gpx rename to reference/track/iblue747~csv.gpx diff --git a/gpsbabel/reference/track/ignrando-sample.gpx b/reference/track/ignrando-sample.gpx similarity index 100% rename from gpsbabel/reference/track/ignrando-sample.gpx rename to reference/track/ignrando-sample.gpx diff --git a/gpsbabel/reference/track/ignrando-sample.rdn b/reference/track/ignrando-sample.rdn similarity index 100% rename from gpsbabel/reference/track/ignrando-sample.rdn rename to reference/track/ignrando-sample.rdn diff --git a/gpsbabel/reference/track/igo8.trk b/reference/track/igo8.trk similarity index 100% rename from gpsbabel/reference/track/igo8.trk rename to reference/track/igo8.trk diff --git a/gpsbabel/reference/track/igo8_padded.trk b/reference/track/igo8_padded.trk similarity index 100% rename from gpsbabel/reference/track/igo8_padded.trk rename to reference/track/igo8_padded.trk diff --git a/gpsbabel/reference/track/igo8_padded~gpx.gpx b/reference/track/igo8_padded~gpx.gpx similarity index 100% rename from gpsbabel/reference/track/igo8_padded~gpx.gpx rename to reference/track/igo8_padded~gpx.gpx diff --git a/gpsbabel/reference/track/interptrack.gpx b/reference/track/interptrack.gpx similarity index 100% rename from gpsbabel/reference/track/interptrack.gpx rename to reference/track/interptrack.gpx diff --git a/gpsbabel/reference/track/jogmap-gpx.gpx b/reference/track/jogmap-gpx.gpx similarity index 100% rename from gpsbabel/reference/track/jogmap-gpx.gpx rename to reference/track/jogmap-gpx.gpx diff --git a/gpsbabel/reference/track/jogmap.xml b/reference/track/jogmap.xml similarity index 100% rename from gpsbabel/reference/track/jogmap.xml rename to reference/track/jogmap.xml diff --git a/gpsbabel/reference/track/kartex-out.ktf b/reference/track/kartex-out.ktf similarity index 100% rename from gpsbabel/reference/track/kartex-out.ktf rename to reference/track/kartex-out.ktf diff --git a/gpsbabel/reference/track/kartex.txt b/reference/track/kartex.txt similarity index 100% rename from gpsbabel/reference/track/kartex.txt rename to reference/track/kartex.txt diff --git a/gpsbabel/reference/track/kompass.tk b/reference/track/kompass.tk similarity index 100% rename from gpsbabel/reference/track/kompass.tk rename to reference/track/kompass.tk diff --git a/gpsbabel/reference/track/kona2013.tcx b/reference/track/kona2013.tcx similarity index 100% rename from gpsbabel/reference/track/kona2013.tcx rename to reference/track/kona2013.tcx diff --git a/gpsbabel/reference/track/kona2013~tcx.csv b/reference/track/kona2013~tcx.csv similarity index 100% rename from gpsbabel/reference/track/kona2013~tcx.csv rename to reference/track/kona2013~tcx.csv diff --git a/gpsbabel/reference/track/mainnav_mg-950d.gpx b/reference/track/mainnav_mg-950d.gpx similarity index 100% rename from gpsbabel/reference/track/mainnav_mg-950d.gpx rename to reference/track/mainnav_mg-950d.gpx diff --git a/gpsbabel/reference/track/mainnav_mg-950d.nav b/reference/track/mainnav_mg-950d.nav similarity index 100% rename from gpsbabel/reference/track/mainnav_mg-950d.nav rename to reference/track/mainnav_mg-950d.nav diff --git a/gpsbabel/reference/track/mapasia-tr7.tr7 b/reference/track/mapasia-tr7.tr7 similarity index 100% rename from gpsbabel/reference/track/mapasia-tr7.tr7 rename to reference/track/mapasia-tr7.tr7 diff --git a/gpsbabel/reference/track/mapasia~tr7.csv b/reference/track/mapasia~tr7.csv similarity index 100% rename from gpsbabel/reference/track/mapasia~tr7.csv rename to reference/track/mapasia~tr7.csv diff --git a/gpsbabel/reference/track/mapasia~tr7.gpx b/reference/track/mapasia~tr7.gpx similarity index 100% rename from gpsbabel/reference/track/mapasia~tr7.gpx rename to reference/track/mapasia~tr7.gpx diff --git a/gpsbabel/reference/track/mapbar.trk b/reference/track/mapbar.trk similarity index 100% rename from gpsbabel/reference/track/mapbar.trk rename to reference/track/mapbar.trk diff --git a/gpsbabel/reference/track/mapbar~gpx.gpx b/reference/track/mapbar~gpx.gpx similarity index 100% rename from gpsbabel/reference/track/mapbar~gpx.gpx rename to reference/track/mapbar~gpx.gpx diff --git a/gpsbabel/reference/track/mapsend.trk b/reference/track/mapsend.trk similarity index 100% rename from gpsbabel/reference/track/mapsend.trk rename to reference/track/mapsend.trk diff --git a/gpsbabel/reference/track/meridian.trk b/reference/track/meridian.trk similarity index 100% rename from gpsbabel/reference/track/meridian.trk rename to reference/track/meridian.trk diff --git a/gpsbabel/reference/track/motoactv.csv b/reference/track/motoactv.csv similarity index 100% rename from gpsbabel/reference/track/motoactv.csv rename to reference/track/motoactv.csv diff --git a/gpsbabel/reference/track/motoactv~gpx.gpx b/reference/track/motoactv~gpx.gpx similarity index 100% rename from gpsbabel/reference/track/motoactv~gpx.gpx rename to reference/track/motoactv~gpx.gpx diff --git a/gpsbabel/reference/track/mps-track.mps b/reference/track/mps-track.mps similarity index 100% rename from gpsbabel/reference/track/mps-track.mps rename to reference/track/mps-track.mps diff --git a/gpsbabel/reference/track/mtk_logger.bin b/reference/track/mtk_logger.bin similarity index 100% rename from gpsbabel/reference/track/mtk_logger.bin rename to reference/track/mtk_logger.bin diff --git a/gpsbabel/reference/track/mtk_logger.csv b/reference/track/mtk_logger.csv similarity index 100% rename from gpsbabel/reference/track/mtk_logger.csv rename to reference/track/mtk_logger.csv diff --git a/gpsbabel/reference/track/mtk_logger.gpx b/reference/track/mtk_logger.gpx similarity index 100% rename from gpsbabel/reference/track/mtk_logger.gpx rename to reference/track/mtk_logger.gpx diff --git a/gpsbabel/reference/track/mtk_logger_bt-qt1000xt.bin b/reference/track/mtk_logger_bt-qt1000xt.bin similarity index 100% rename from gpsbabel/reference/track/mtk_logger_bt-qt1000xt.bin rename to reference/track/mtk_logger_bt-qt1000xt.bin diff --git a/gpsbabel/reference/track/mtk_logger_bt-qt1000xt.csv b/reference/track/mtk_logger_bt-qt1000xt.csv similarity index 100% rename from gpsbabel/reference/track/mtk_logger_bt-qt1000xt.csv rename to reference/track/mtk_logger_bt-qt1000xt.csv diff --git a/gpsbabel/reference/track/mtk_logger_gp245.bin b/reference/track/mtk_logger_gp245.bin similarity index 100% rename from gpsbabel/reference/track/mtk_logger_gp245.bin rename to reference/track/mtk_logger_gp245.bin diff --git a/gpsbabel/reference/track/mtk_logger_gp245.gpx b/reference/track/mtk_logger_gp245.gpx similarity index 100% rename from gpsbabel/reference/track/mtk_logger_gp245.gpx rename to reference/track/mtk_logger_gp245.gpx diff --git a/gpsbabel/reference/track/mtk_logger_m241.bin b/reference/track/mtk_logger_m241.bin similarity index 100% rename from gpsbabel/reference/track/mtk_logger_m241.bin rename to reference/track/mtk_logger_m241.bin diff --git a/gpsbabel/reference/track/mtk_logger_m241.csv b/reference/track/mtk_logger_m241.csv similarity index 100% rename from gpsbabel/reference/track/mtk_logger_m241.csv rename to reference/track/mtk_logger_m241.csv diff --git a/gpsbabel/reference/track/mtk_logger_m241.gpx b/reference/track/mtk_logger_m241.gpx similarity index 100% rename from gpsbabel/reference/track/mtk_logger_m241.gpx rename to reference/track/mtk_logger_m241.gpx diff --git a/gpsbabel/reference/track/mynav.ftn b/reference/track/mynav.ftn similarity index 100% rename from gpsbabel/reference/track/mynav.ftn rename to reference/track/mynav.ftn diff --git a/gpsbabel/reference/track/mynav.trc b/reference/track/mynav.trc similarity index 100% rename from gpsbabel/reference/track/mynav.trc rename to reference/track/mynav.trc diff --git a/gpsbabel/reference/track/mynav1.gpx b/reference/track/mynav1.gpx similarity index 100% rename from gpsbabel/reference/track/mynav1.gpx rename to reference/track/mynav1.gpx diff --git a/gpsbabel/reference/track/mynav2.gpx b/reference/track/mynav2.gpx similarity index 100% rename from gpsbabel/reference/track/mynav2.gpx rename to reference/track/mynav2.gpx diff --git a/gpsbabel/reference/track/navitel_trk.bin b/reference/track/navitel_trk.bin similarity index 100% rename from gpsbabel/reference/track/navitel_trk.bin rename to reference/track/navitel_trk.bin diff --git a/gpsbabel/reference/track/nmea b/reference/track/nmea similarity index 100% rename from gpsbabel/reference/track/nmea rename to reference/track/nmea diff --git a/gpsbabel/reference/track/nmea+ms.gpx b/reference/track/nmea+ms.gpx similarity index 100% rename from gpsbabel/reference/track/nmea+ms.gpx rename to reference/track/nmea+ms.gpx diff --git a/gpsbabel/reference/track/nmea+ms.txt b/reference/track/nmea+ms.txt similarity index 100% rename from gpsbabel/reference/track/nmea+ms.txt rename to reference/track/nmea+ms.txt diff --git a/gpsbabel/reference/track/nmea.gpx b/reference/track/nmea.gpx similarity index 100% rename from gpsbabel/reference/track/nmea.gpx rename to reference/track/nmea.gpx diff --git a/gpsbabel/reference/track/pathaway.gpx b/reference/track/pathaway.gpx similarity index 100% rename from gpsbabel/reference/track/pathaway.gpx rename to reference/track/pathaway.gpx diff --git a/gpsbabel/reference/track/pathaway.pdb b/reference/track/pathaway.pdb similarity index 100% rename from gpsbabel/reference/track/pathaway.pdb rename to reference/track/pathaway.pdb diff --git a/gpsbabel/reference/track/pcx.trk b/reference/track/pcx.trk similarity index 100% rename from gpsbabel/reference/track/pcx.trk rename to reference/track/pcx.trk diff --git a/gpsbabel/reference/track/psittrks.txt b/reference/track/psittrks.txt similarity index 100% rename from gpsbabel/reference/track/psittrks.txt rename to reference/track/psittrks.txt diff --git a/gpsbabel/reference/track/sbn-v13.gpx b/reference/track/sbn-v13.gpx similarity index 100% rename from gpsbabel/reference/track/sbn-v13.gpx rename to reference/track/sbn-v13.gpx diff --git a/gpsbabel/reference/track/sbn-v13.sbn b/reference/track/sbn-v13.sbn similarity index 100% rename from gpsbabel/reference/track/sbn-v13.sbn rename to reference/track/sbn-v13.sbn diff --git a/gpsbabel/reference/track/sbn.SBN b/reference/track/sbn.SBN similarity index 100% rename from gpsbabel/reference/track/sbn.SBN rename to reference/track/sbn.SBN diff --git a/gpsbabel/reference/track/sbn.gpx b/reference/track/sbn.gpx similarity index 100% rename from gpsbabel/reference/track/sbn.gpx rename to reference/track/sbn.gpx diff --git a/gpsbabel/reference/track/seg2trk_test-seg.gpx b/reference/track/seg2trk_test-seg.gpx similarity index 100% rename from gpsbabel/reference/track/seg2trk_test-seg.gpx rename to reference/track/seg2trk_test-seg.gpx diff --git a/gpsbabel/reference/track/seg2trk_test.gpx b/reference/track/seg2trk_test.gpx similarity index 100% rename from gpsbabel/reference/track/seg2trk_test.gpx rename to reference/track/seg2trk_test.gpx diff --git a/gpsbabel/reference/track/segmented_tracks-track.kml b/reference/track/segmented_tracks-track.kml similarity index 100% rename from gpsbabel/reference/track/segmented_tracks-track.kml rename to reference/track/segmented_tracks-track.kml diff --git a/gpsbabel/reference/track/segmented_tracks.gpx b/reference/track/segmented_tracks.gpx similarity index 100% rename from gpsbabel/reference/track/segmented_tracks.gpx rename to reference/track/segmented_tracks.gpx diff --git a/gpsbabel/reference/track/segmented_tracks.kml b/reference/track/segmented_tracks.kml similarity index 100% rename from gpsbabel/reference/track/segmented_tracks.kml rename to reference/track/segmented_tracks.kml diff --git a/gpsbabel/reference/track/simpletrack.gpx b/reference/track/simpletrack.gpx similarity index 100% rename from gpsbabel/reference/track/simpletrack.gpx rename to reference/track/simpletrack.gpx diff --git a/gpsbabel/reference/track/simplify-relative.gpx b/reference/track/simplify-relative.gpx similarity index 100% rename from gpsbabel/reference/track/simplify-relative.gpx rename to reference/track/simplify-relative.gpx diff --git a/gpsbabel/reference/track/simplify-relative2.gpx b/reference/track/simplify-relative2.gpx similarity index 100% rename from gpsbabel/reference/track/simplify-relative2.gpx rename to reference/track/simplify-relative2.gpx diff --git a/gpsbabel/reference/track/skyforce_trk.gpx b/reference/track/skyforce_trk.gpx similarity index 100% rename from gpsbabel/reference/track/skyforce_trk.gpx rename to reference/track/skyforce_trk.gpx diff --git a/gpsbabel/reference/track/skyforce_trk.txt b/reference/track/skyforce_trk.txt similarity index 100% rename from gpsbabel/reference/track/skyforce_trk.txt rename to reference/track/skyforce_trk.txt diff --git a/gpsbabel/reference/track/split-raw.gpx b/reference/track/split-raw.gpx similarity index 100% rename from gpsbabel/reference/track/split-raw.gpx rename to reference/track/split-raw.gpx diff --git a/gpsbabel/reference/track/split-split.gpx b/reference/track/split-split.gpx similarity index 100% rename from gpsbabel/reference/track/split-split.gpx rename to reference/track/split-split.gpx diff --git a/gpsbabel/reference/track/sportsim-sample.txt b/reference/track/sportsim-sample.txt similarity index 100% rename from gpsbabel/reference/track/sportsim-sample.txt rename to reference/track/sportsim-sample.txt diff --git a/gpsbabel/reference/track/stmsdf-track.sdf b/reference/track/stmsdf-track.sdf similarity index 100% rename from gpsbabel/reference/track/stmsdf-track.sdf rename to reference/track/stmsdf-track.sdf diff --git a/gpsbabel/reference/track/stmwpp-route.gpx b/reference/track/stmwpp-route.gpx similarity index 100% rename from gpsbabel/reference/track/stmwpp-route.gpx rename to reference/track/stmwpp-route.gpx diff --git a/gpsbabel/reference/track/stmwpp-track.gpx b/reference/track/stmwpp-track.gpx similarity index 100% rename from gpsbabel/reference/track/stmwpp-track.gpx rename to reference/track/stmwpp-track.gpx diff --git a/gpsbabel/reference/track/stmwpp-track.txt b/reference/track/stmwpp-track.txt similarity index 100% rename from gpsbabel/reference/track/stmwpp-track.txt rename to reference/track/stmwpp-track.txt diff --git a/gpsbabel/reference/track/subrip-input.txt b/reference/track/subrip-input.txt similarity index 100% rename from gpsbabel/reference/track/subrip-input.txt rename to reference/track/subrip-input.txt diff --git a/gpsbabel/reference/track/subrip-output1.srt b/reference/track/subrip-output1.srt similarity index 100% rename from gpsbabel/reference/track/subrip-output1.srt rename to reference/track/subrip-output1.srt diff --git a/gpsbabel/reference/track/subrip-output2.srt b/reference/track/subrip-output2.srt similarity index 100% rename from gpsbabel/reference/track/subrip-output2.srt rename to reference/track/subrip-output2.srt diff --git a/gpsbabel/reference/track/tcxtest.gpx b/reference/track/tcxtest.gpx similarity index 100% rename from gpsbabel/reference/track/tcxtest.gpx rename to reference/track/tcxtest.gpx diff --git a/gpsbabel/reference/track/tcxtest~gpx-course.tcx b/reference/track/tcxtest~gpx-course.tcx similarity index 100% rename from gpsbabel/reference/track/tcxtest~gpx-course.tcx rename to reference/track/tcxtest~gpx-course.tcx diff --git a/gpsbabel/reference/track/tcxtest~gpx-history.tcx b/reference/track/tcxtest~gpx-history.tcx similarity index 100% rename from gpsbabel/reference/track/tcxtest~gpx-history.tcx rename to reference/track/tcxtest~gpx-history.tcx diff --git a/gpsbabel/reference/track/tef_xml.sample.xml b/reference/track/tef_xml.sample.xml similarity index 100% rename from gpsbabel/reference/track/tef_xml.sample.xml rename to reference/track/tef_xml.sample.xml diff --git a/gpsbabel/reference/track/teletype.gpx b/reference/track/teletype.gpx similarity index 100% rename from gpsbabel/reference/track/teletype.gpx rename to reference/track/teletype.gpx diff --git a/gpsbabel/reference/track/teletype.way b/reference/track/teletype.way similarity index 100% rename from gpsbabel/reference/track/teletype.way rename to reference/track/teletype.way diff --git a/gpsbabel/reference/track/tinterptrack.gpx b/reference/track/tinterptrack.gpx similarity index 100% rename from gpsbabel/reference/track/tinterptrack.gpx rename to reference/track/tinterptrack.gpx diff --git a/gpsbabel/reference/track/tpo-sample1.gpx b/reference/track/tpo-sample1.gpx similarity index 100% rename from gpsbabel/reference/track/tpo-sample1.gpx rename to reference/track/tpo-sample1.gpx diff --git a/gpsbabel/reference/track/tpo-sample1.tpo b/reference/track/tpo-sample1.tpo similarity index 100% rename from gpsbabel/reference/track/tpo-sample1.tpo rename to reference/track/tpo-sample1.tpo diff --git a/gpsbabel/reference/track/tpo-sample2.gpx b/reference/track/tpo-sample2.gpx similarity index 100% rename from gpsbabel/reference/track/tpo-sample2.gpx rename to reference/track/tpo-sample2.gpx diff --git a/gpsbabel/reference/track/tpo-sample2.tpo b/reference/track/tpo-sample2.tpo similarity index 100% rename from gpsbabel/reference/track/tpo-sample2.tpo rename to reference/track/tpo-sample2.tpo diff --git a/gpsbabel/reference/track/trackDMm.ktf b/reference/track/trackDMm.ktf similarity index 100% rename from gpsbabel/reference/track/trackDMm.ktf rename to reference/track/trackDMm.ktf diff --git a/gpsbabel/reference/track/trackDd.ktf b/reference/track/trackDd.ktf similarity index 100% rename from gpsbabel/reference/track/trackDd.ktf rename to reference/track/trackDd.ktf diff --git a/gpsbabel/reference/track/trackfilter-new.gpx b/reference/track/trackfilter-new.gpx similarity index 100% rename from gpsbabel/reference/track/trackfilter-new.gpx rename to reference/track/trackfilter-new.gpx diff --git a/gpsbabel/reference/track/trackfilter-sdistance.gpx b/reference/track/trackfilter-sdistance.gpx similarity index 100% rename from gpsbabel/reference/track/trackfilter-sdistance.gpx rename to reference/track/trackfilter-sdistance.gpx diff --git a/gpsbabel/reference/track/trackfilter-sdistance2.gpx b/reference/track/trackfilter-sdistance2.gpx similarity index 100% rename from gpsbabel/reference/track/trackfilter-sdistance2.gpx rename to reference/track/trackfilter-sdistance2.gpx diff --git a/gpsbabel/reference/track/trackfilter.gpx b/reference/track/trackfilter.gpx similarity index 100% rename from gpsbabel/reference/track/trackfilter.gpx rename to reference/track/trackfilter.gpx diff --git a/gpsbabel/reference/track/trackfilter_discard.gpx b/reference/track/trackfilter_discard.gpx similarity index 100% rename from gpsbabel/reference/track/trackfilter_discard.gpx rename to reference/track/trackfilter_discard.gpx diff --git a/gpsbabel/reference/track/trackfilter_discard_err.gpx b/reference/track/trackfilter_discard_err.gpx similarity index 100% rename from gpsbabel/reference/track/trackfilter_discard_err.gpx rename to reference/track/trackfilter_discard_err.gpx diff --git a/gpsbabel/reference/track/trackfilter_discard_out.gpx b/reference/track/trackfilter_discard_out.gpx similarity index 100% rename from gpsbabel/reference/track/trackfilter_discard_out.gpx rename to reference/track/trackfilter_discard_out.gpx diff --git a/gpsbabel/reference/track/trackfilter_faketime.gpx b/reference/track/trackfilter_faketime.gpx similarity index 100% rename from gpsbabel/reference/track/trackfilter_faketime.gpx rename to reference/track/trackfilter_faketime.gpx diff --git a/gpsbabel/reference/track/trackfilter_faketime.txt b/reference/track/trackfilter_faketime.txt similarity index 100% rename from gpsbabel/reference/track/trackfilter_faketime.txt rename to reference/track/trackfilter_faketime.txt diff --git a/gpsbabel/reference/track/trackfilter_faketime_forced.gpx b/reference/track/trackfilter_faketime_forced.gpx similarity index 100% rename from gpsbabel/reference/track/trackfilter_faketime_forced.gpx rename to reference/track/trackfilter_faketime_forced.gpx diff --git a/gpsbabel/reference/track/tracks.gpssim b/reference/track/tracks.gpssim similarity index 100% rename from gpsbabel/reference/track/tracks.gpssim rename to reference/track/tracks.gpssim diff --git a/gpsbabel/reference/track/tracks.gpx b/reference/track/tracks.gpx similarity index 100% rename from gpsbabel/reference/track/tracks.gpx rename to reference/track/tracks.gpx diff --git a/gpsbabel/reference/track/tracks~gpx.kml b/reference/track/tracks~gpx.kml similarity index 100% rename from gpsbabel/reference/track/tracks~gpx.kml rename to reference/track/tracks~gpx.kml diff --git a/gpsbabel/reference/track/trk_reverse_test-fwd.gpx b/reference/track/trk_reverse_test-fwd.gpx similarity index 100% rename from gpsbabel/reference/track/trk_reverse_test-fwd.gpx rename to reference/track/trk_reverse_test-fwd.gpx diff --git a/gpsbabel/reference/track/trk_reverse_test-rev.gpx b/reference/track/trk_reverse_test-rev.gpx similarity index 100% rename from gpsbabel/reference/track/trk_reverse_test-rev.gpx rename to reference/track/trk_reverse_test-rev.gpx diff --git a/gpsbabel/reference/track/vidaone.csv b/reference/track/vidaone.csv similarity index 100% rename from gpsbabel/reference/track/vidaone.csv rename to reference/track/vidaone.csv diff --git a/gpsbabel/reference/track/vidaone.gpb b/reference/track/vidaone.gpb similarity index 100% rename from gpsbabel/reference/track/vidaone.gpb rename to reference/track/vidaone.gpb diff --git a/gpsbabel/reference/track/vitosmt_t.gpx b/reference/track/vitosmt_t.gpx similarity index 100% rename from gpsbabel/reference/track/vitosmt_t.gpx rename to reference/track/vitosmt_t.gpx diff --git a/gpsbabel/reference/track/vitovtt-sample.gpx b/reference/track/vitovtt-sample.gpx similarity index 100% rename from gpsbabel/reference/track/vitovtt-sample.gpx rename to reference/track/vitovtt-sample.gpx diff --git a/gpsbabel/reference/track/vitovtt-sample.vtt b/reference/track/vitovtt-sample.vtt similarity index 100% rename from gpsbabel/reference/track/vitovtt-sample.vtt rename to reference/track/vitovtt-sample.vtt diff --git a/gpsbabel/reference/track/vpl_reference.gpx b/reference/track/vpl_reference.gpx similarity index 100% rename from gpsbabel/reference/track/vpl_reference.gpx rename to reference/track/vpl_reference.gpx diff --git a/gpsbabel/reference/track/vpl_reference.vpl b/reference/track/vpl_reference.vpl similarity index 100% rename from gpsbabel/reference/track/vpl_reference.vpl rename to reference/track/vpl_reference.vpl diff --git a/gpsbabel/reference/track/webpark1.gpl b/reference/track/webpark1.gpl similarity index 100% rename from gpsbabel/reference/track/webpark1.gpl rename to reference/track/webpark1.gpl diff --git a/gpsbabel/reference/track/wintec_tes.tes b/reference/track/wintec_tes.tes similarity index 100% rename from gpsbabel/reference/track/wintec_tes.tes rename to reference/track/wintec_tes.tes diff --git a/gpsbabel/reference/track/wintec_tes~gpx.gpx b/reference/track/wintec_tes~gpx.gpx similarity index 100% rename from gpsbabel/reference/track/wintec_tes~gpx.gpx rename to reference/track/wintec_tes~gpx.gpx diff --git a/gpsbabel/reference/track20080703_173036.trk b/reference/track20080703_173036.trk similarity index 100% rename from gpsbabel/reference/track20080703_173036.trk rename to reference/track20080703_173036.trk diff --git a/gpsbabel/reference/transform-names.gpx b/reference/transform-names.gpx similarity index 100% rename from gpsbabel/reference/transform-names.gpx rename to reference/transform-names.gpx diff --git a/gpsbabel/reference/transform-rte.gpx b/reference/transform-rte.gpx similarity index 100% rename from gpsbabel/reference/transform-rte.gpx rename to reference/transform-rte.gpx diff --git a/gpsbabel/reference/transform-wpt.gpx b/reference/transform-wpt.gpx similarity index 100% rename from gpsbabel/reference/transform-wpt.gpx rename to reference/transform-wpt.gpx diff --git a/gpsbabel/reference/umsonstdraussen.gpi b/reference/umsonstdraussen.gpi similarity index 100% rename from gpsbabel/reference/umsonstdraussen.gpi rename to reference/umsonstdraussen.gpi diff --git a/gpsbabel/reference/umsonstdraussen.gpx b/reference/umsonstdraussen.gpx similarity index 100% rename from gpsbabel/reference/umsonstdraussen.gpx rename to reference/umsonstdraussen.gpx diff --git a/gpsbabel/reference/unicsv.gpx b/reference/unicsv.gpx similarity index 100% rename from gpsbabel/reference/unicsv.gpx rename to reference/unicsv.gpx diff --git a/gpsbabel/reference/unicsv_encoding.csv b/reference/unicsv_encoding.csv similarity index 100% rename from gpsbabel/reference/unicsv_encoding.csv rename to reference/unicsv_encoding.csv diff --git a/gpsbabel/reference/unicsv_encoding.gpx b/reference/unicsv_encoding.gpx similarity index 100% rename from gpsbabel/reference/unicsv_encoding.gpx rename to reference/unicsv_encoding.gpx diff --git a/gpsbabel/reference/unicsv_subsec.csv b/reference/unicsv_subsec.csv similarity index 100% rename from gpsbabel/reference/unicsv_subsec.csv rename to reference/unicsv_subsec.csv diff --git a/gpsbabel/reference/v900_advanced_mode.csv b/reference/v900_advanced_mode.csv similarity index 100% rename from gpsbabel/reference/v900_advanced_mode.csv rename to reference/v900_advanced_mode.csv diff --git a/gpsbabel/reference/v900_advanced_mode.gpx b/reference/v900_advanced_mode.gpx similarity index 100% rename from gpsbabel/reference/v900_advanced_mode.gpx rename to reference/v900_advanced_mode.gpx diff --git a/gpsbabel/reference/v900_basic_mode.csv b/reference/v900_basic_mode.csv similarity index 100% rename from gpsbabel/reference/v900_basic_mode.csv rename to reference/v900_basic_mode.csv diff --git a/gpsbabel/reference/v900_basic_mode.gpx b/reference/v900_basic_mode.gpx similarity index 100% rename from gpsbabel/reference/v900_basic_mode.gpx rename to reference/v900_basic_mode.gpx diff --git a/gpsbabel/reference/vitosmt.gpx b/reference/vitosmt.gpx similarity index 100% rename from gpsbabel/reference/vitosmt.gpx rename to reference/vitosmt.gpx diff --git a/gpsbabel/reference/vitosmt.smt b/reference/vitosmt.smt similarity index 100% rename from gpsbabel/reference/vitosmt.smt rename to reference/vitosmt.smt diff --git a/gpsbabel/reference/waypoints.gpssim b/reference/waypoints.gpssim similarity index 100% rename from gpsbabel/reference/waypoints.gpssim rename to reference/waypoints.gpssim diff --git a/gpsbabel/reference/waypointsDMm.kwf b/reference/waypointsDMm.kwf similarity index 100% rename from gpsbabel/reference/waypointsDMm.kwf rename to reference/waypointsDMm.kwf diff --git a/gpsbabel/reference/waypointsDd.kwf b/reference/waypointsDd.kwf similarity index 100% rename from gpsbabel/reference/waypointsDd.kwf rename to reference/waypointsDd.kwf diff --git a/gpsbabel/reference/wbt-200.bin b/reference/wbt-200.bin similarity index 100% rename from gpsbabel/reference/wbt-200.bin rename to reference/wbt-200.bin diff --git a/gpsbabel/reference/wbt-200.gpx b/reference/wbt-200.gpx similarity index 100% rename from gpsbabel/reference/wbt-200.gpx rename to reference/wbt-200.gpx diff --git a/gpsbabel/reference/wbt-201.gpx b/reference/wbt-201.gpx similarity index 100% rename from gpsbabel/reference/wbt-201.gpx rename to reference/wbt-201.gpx diff --git a/gpsbabel/reference/wbt-201.tk1 b/reference/wbt-201.tk1 similarity index 100% rename from gpsbabel/reference/wbt-201.tk1 rename to reference/wbt-201.tk1 diff --git a/gpsbabel/reference/wfff.gpu b/reference/wfff.gpu similarity index 100% rename from gpsbabel/reference/wfff.gpu rename to reference/wfff.gpu diff --git a/gpsbabel/reference/wfff.xml b/reference/wfff.xml similarity index 100% rename from gpsbabel/reference/wfff.xml rename to reference/wfff.xml diff --git a/gpsbabel/reference/xmap b/reference/xmap similarity index 100% rename from gpsbabel/reference/xmap rename to reference/xmap diff --git a/gpsbabel/reference/xmapwpt.wpt b/reference/xmapwpt.wpt similarity index 100% rename from gpsbabel/reference/xmapwpt.wpt rename to reference/xmapwpt.wpt diff --git a/gpsbabel/reference/xol-sample-gpx.xol b/reference/xol-sample-gpx.xol similarity index 100% rename from gpsbabel/reference/xol-sample-gpx.xol rename to reference/xol-sample-gpx.xol diff --git a/gpsbabel/reference/xol-sample.gpx b/reference/xol-sample.gpx similarity index 100% rename from gpsbabel/reference/xol-sample.gpx rename to reference/xol-sample.gpx diff --git a/gpsbabel/reference/xol-sample.xol b/reference/xol-sample.xol similarity index 100% rename from gpsbabel/reference/xol-sample.xol rename to reference/xol-sample.xol diff --git a/gpsbabel/reverse_route.cc b/reverse_route.cc similarity index 100% rename from gpsbabel/reverse_route.cc rename to reverse_route.cc diff --git a/gpsbabel/rgbcolors.cc b/rgbcolors.cc similarity index 100% rename from gpsbabel/rgbcolors.cc rename to rgbcolors.cc diff --git a/gpsbabel/route.cc b/route.cc similarity index 100% rename from gpsbabel/route.cc rename to route.cc diff --git a/gpsbabel/saroute.cc b/saroute.cc similarity index 100% rename from gpsbabel/saroute.cc rename to saroute.cc diff --git a/gpsbabel/sbn.cc b/sbn.cc similarity index 100% rename from gpsbabel/sbn.cc rename to sbn.cc diff --git a/gpsbabel/sbp.cc b/sbp.cc similarity index 100% rename from gpsbabel/sbp.cc rename to sbp.cc diff --git a/gpsbabel/session.cc b/session.cc similarity index 100% rename from gpsbabel/session.cc rename to session.cc diff --git a/gpsbabel/session.h b/session.h similarity index 100% rename from gpsbabel/session.h rename to session.h diff --git a/gpsbabel/shape.cc b/shape.cc similarity index 100% rename from gpsbabel/shape.cc rename to shape.cc diff --git a/gpsbabel/shapelib/.gitignore b/shapelib/.gitignore similarity index 100% rename from gpsbabel/shapelib/.gitignore rename to shapelib/.gitignore diff --git a/gpsbabel/shapelib/Makefile.in b/shapelib/Makefile.in similarity index 100% rename from gpsbabel/shapelib/Makefile.in rename to shapelib/Makefile.in diff --git a/gpsbabel/shapelib/README.GPSBabel b/shapelib/README.GPSBabel similarity index 100% rename from gpsbabel/shapelib/README.GPSBabel rename to shapelib/README.GPSBabel diff --git a/gpsbabel/shapelib/dbf_api.html b/shapelib/dbf_api.html similarity index 100% rename from gpsbabel/shapelib/dbf_api.html rename to shapelib/dbf_api.html diff --git a/gpsbabel/shapelib/dbfopen.c b/shapelib/dbfopen.c similarity index 100% rename from gpsbabel/shapelib/dbfopen.c rename to shapelib/dbfopen.c diff --git a/gpsbabel/shapelib/safileio.c b/shapelib/safileio.c similarity index 100% rename from gpsbabel/shapelib/safileio.c rename to shapelib/safileio.c diff --git a/gpsbabel/shapelib/shapefil.h b/shapelib/shapefil.h similarity index 100% rename from gpsbabel/shapelib/shapefil.h rename to shapelib/shapefil.h diff --git a/gpsbabel/shapelib/shapelib.html b/shapelib/shapelib.html similarity index 100% rename from gpsbabel/shapelib/shapelib.html rename to shapelib/shapelib.html diff --git a/gpsbabel/shapelib/shp_api.html b/shapelib/shp_api.html similarity index 100% rename from gpsbabel/shapelib/shp_api.html rename to shapelib/shp_api.html diff --git a/gpsbabel/shapelib/shpopen.c b/shapelib/shpopen.c similarity index 100% rename from gpsbabel/shapelib/shpopen.c rename to shapelib/shpopen.c diff --git a/gpsbabel/shortname.cc b/shortname.cc similarity index 100% rename from gpsbabel/shortname.cc rename to shortname.cc diff --git a/gpsbabel/skyforce.cc b/skyforce.cc similarity index 100% rename from gpsbabel/skyforce.cc rename to skyforce.cc diff --git a/gpsbabel/skytraq.cc b/skytraq.cc similarity index 100% rename from gpsbabel/skytraq.cc rename to skytraq.cc diff --git a/gpsbabel/smplrout.cc b/smplrout.cc similarity index 100% rename from gpsbabel/smplrout.cc rename to smplrout.cc diff --git a/gpsbabel/sort.cc b/sort.cc similarity index 100% rename from gpsbabel/sort.cc rename to sort.cc diff --git a/gpsbabel/src/core/datetime.h b/src/core/datetime.h similarity index 100% rename from gpsbabel/src/core/datetime.h rename to src/core/datetime.h diff --git a/gpsbabel/src/core/file.h b/src/core/file.h similarity index 100% rename from gpsbabel/src/core/file.h rename to src/core/file.h diff --git a/gpsbabel/src/core/logging.h b/src/core/logging.h similarity index 100% rename from gpsbabel/src/core/logging.h rename to src/core/logging.h diff --git a/gpsbabel/src/core/optionaldouble.h b/src/core/optionaldouble.h similarity index 100% rename from gpsbabel/src/core/optionaldouble.h rename to src/core/optionaldouble.h diff --git a/gpsbabel/src/core/usasciicodec.cc b/src/core/usasciicodec.cc similarity index 100% rename from gpsbabel/src/core/usasciicodec.cc rename to src/core/usasciicodec.cc diff --git a/gpsbabel/src/core/usasciicodec.h b/src/core/usasciicodec.h similarity index 100% rename from gpsbabel/src/core/usasciicodec.h rename to src/core/usasciicodec.h diff --git a/gpsbabel/src/core/xmlstreamwriter.cc b/src/core/xmlstreamwriter.cc similarity index 100% rename from gpsbabel/src/core/xmlstreamwriter.cc rename to src/core/xmlstreamwriter.cc diff --git a/gpsbabel/src/core/xmlstreamwriter.h b/src/core/xmlstreamwriter.h similarity index 100% rename from gpsbabel/src/core/xmlstreamwriter.h rename to src/core/xmlstreamwriter.h diff --git a/gpsbabel/src/core/xmltag.h b/src/core/xmltag.h similarity index 100% rename from gpsbabel/src/core/xmltag.h rename to src/core/xmltag.h diff --git a/gpsbabel/src/core/ziparchive.cc b/src/core/ziparchive.cc similarity index 100% rename from gpsbabel/src/core/ziparchive.cc rename to src/core/ziparchive.cc diff --git a/gpsbabel/src/core/ziparchive.h b/src/core/ziparchive.h similarity index 100% rename from gpsbabel/src/core/ziparchive.h rename to src/core/ziparchive.h diff --git a/gpsbabel/stackfilter.cc b/stackfilter.cc similarity index 100% rename from gpsbabel/stackfilter.cc rename to stackfilter.cc diff --git a/gpsbabel/stmsdf.cc b/stmsdf.cc similarity index 100% rename from gpsbabel/stmsdf.cc rename to stmsdf.cc diff --git a/gpsbabel/stmwpp.cc b/stmwpp.cc similarity index 100% rename from gpsbabel/stmwpp.cc rename to stmwpp.cc diff --git a/gpsbabel/strptime.c b/strptime.c similarity index 100% rename from gpsbabel/strptime.c rename to strptime.c diff --git a/gpsbabel/strptime.h b/strptime.h similarity index 100% rename from gpsbabel/strptime.h rename to strptime.h diff --git a/gpsbabel/style/arc.style b/style/arc.style similarity index 100% rename from gpsbabel/style/arc.style rename to style/arc.style diff --git a/gpsbabel/style/cambridge.style b/style/cambridge.style similarity index 100% rename from gpsbabel/style/cambridge.style rename to style/cambridge.style diff --git a/gpsbabel/style/csv.style b/style/csv.style similarity index 100% rename from gpsbabel/style/csv.style rename to style/csv.style diff --git a/gpsbabel/style/cup.style b/style/cup.style similarity index 100% rename from gpsbabel/style/cup.style rename to style/cup.style diff --git a/gpsbabel/style/custom.style b/style/custom.style similarity index 100% rename from gpsbabel/style/custom.style rename to style/custom.style diff --git a/gpsbabel/style/deprecated/ktf2.style b/style/deprecated/ktf2.style similarity index 100% rename from gpsbabel/style/deprecated/ktf2.style rename to style/deprecated/ktf2.style diff --git a/gpsbabel/style/deprecated/kwf2.style b/style/deprecated/kwf2.style similarity index 100% rename from gpsbabel/style/deprecated/kwf2.style rename to style/deprecated/kwf2.style diff --git a/gpsbabel/style/deprecated/sportsim.style b/style/deprecated/sportsim.style similarity index 100% rename from gpsbabel/style/deprecated/sportsim.style rename to style/deprecated/sportsim.style diff --git a/gpsbabel/style/dna.style b/style/dna.style similarity index 100% rename from gpsbabel/style/dna.style rename to style/dna.style diff --git a/gpsbabel/style/flysight.style b/style/flysight.style similarity index 100% rename from gpsbabel/style/flysight.style rename to style/flysight.style diff --git a/gpsbabel/style/fugawi.style b/style/fugawi.style similarity index 100% rename from gpsbabel/style/fugawi.style rename to style/fugawi.style diff --git a/gpsbabel/style/garmin301.style b/style/garmin301.style similarity index 100% rename from gpsbabel/style/garmin301.style rename to style/garmin301.style diff --git a/gpsbabel/style/garmin_g1000.style b/style/garmin_g1000.style similarity index 100% rename from gpsbabel/style/garmin_g1000.style rename to style/garmin_g1000.style diff --git a/gpsbabel/style/garmin_poi.style b/style/garmin_poi.style similarity index 100% rename from gpsbabel/style/garmin_poi.style rename to style/garmin_poi.style diff --git a/gpsbabel/style/geonet.style b/style/geonet.style similarity index 100% rename from gpsbabel/style/geonet.style rename to style/geonet.style diff --git a/gpsbabel/style/gpsdrive.style b/style/gpsdrive.style similarity index 100% rename from gpsbabel/style/gpsdrive.style rename to style/gpsdrive.style diff --git a/gpsbabel/style/gpsdrivetrack.style b/style/gpsdrivetrack.style similarity index 100% rename from gpsbabel/style/gpsdrivetrack.style rename to style/gpsdrivetrack.style diff --git a/gpsbabel/style/gpsman.style b/style/gpsman.style similarity index 100% rename from gpsbabel/style/gpsman.style rename to style/gpsman.style diff --git a/gpsbabel/style/iblue747.style b/style/iblue747.style similarity index 100% rename from gpsbabel/style/iblue747.style rename to style/iblue747.style diff --git a/gpsbabel/style/iblue757.style b/style/iblue757.style similarity index 100% rename from gpsbabel/style/iblue757.style rename to style/iblue757.style diff --git a/gpsbabel/style/igo2008_poi.style b/style/igo2008_poi.style similarity index 100% rename from gpsbabel/style/igo2008_poi.style rename to style/igo2008_poi.style diff --git a/gpsbabel/style/kompass_tk.style b/style/kompass_tk.style similarity index 100% rename from gpsbabel/style/kompass_tk.style rename to style/kompass_tk.style diff --git a/gpsbabel/style/kompass_wp.style b/style/kompass_wp.style similarity index 100% rename from gpsbabel/style/kompass_wp.style rename to style/kompass_wp.style diff --git a/gpsbabel/style/land_air_sea.style b/style/land_air_sea.style similarity index 100% rename from gpsbabel/style/land_air_sea.style rename to style/land_air_sea.style diff --git a/gpsbabel/style/mainnav.style b/style/mainnav.style similarity index 100% rename from gpsbabel/style/mainnav.style rename to style/mainnav.style diff --git a/gpsbabel/style/mapconverter.style b/style/mapconverter.style similarity index 100% rename from gpsbabel/style/mapconverter.style rename to style/mapconverter.style diff --git a/gpsbabel/style/motoactv.style b/style/motoactv.style similarity index 100% rename from gpsbabel/style/motoactv.style rename to style/motoactv.style diff --git a/gpsbabel/style/mxf.style b/style/mxf.style similarity index 100% rename from gpsbabel/style/mxf.style rename to style/mxf.style diff --git a/gpsbabel/style/navigonwpt.style b/style/navigonwpt.style similarity index 100% rename from gpsbabel/style/navigonwpt.style rename to style/navigonwpt.style diff --git a/gpsbabel/style/nima.style b/style/nima.style similarity index 100% rename from gpsbabel/style/nima.style rename to style/nima.style diff --git a/gpsbabel/style/openoffice.style b/style/openoffice.style similarity index 100% rename from gpsbabel/style/openoffice.style rename to style/openoffice.style diff --git a/gpsbabel/style/ricoh.style b/style/ricoh.style similarity index 100% rename from gpsbabel/style/ricoh.style rename to style/ricoh.style diff --git a/gpsbabel/style/s_and_t.style b/style/s_and_t.style similarity index 100% rename from gpsbabel/style/s_and_t.style rename to style/s_and_t.style diff --git a/gpsbabel/style/saplus.style b/style/saplus.style similarity index 100% rename from gpsbabel/style/saplus.style rename to style/saplus.style diff --git a/gpsbabel/style/tabsep.style b/style/tabsep.style similarity index 100% rename from gpsbabel/style/tabsep.style rename to style/tabsep.style diff --git a/gpsbabel/style/tomtom_asc.style b/style/tomtom_asc.style similarity index 100% rename from gpsbabel/style/tomtom_asc.style rename to style/tomtom_asc.style diff --git a/gpsbabel/style/tomtom_itn.style b/style/tomtom_itn.style similarity index 100% rename from gpsbabel/style/tomtom_itn.style rename to style/tomtom_itn.style diff --git a/gpsbabel/style/tomtom_itn_places.style b/style/tomtom_itn_places.style similarity index 100% rename from gpsbabel/style/tomtom_itn_places.style rename to style/tomtom_itn_places.style diff --git a/gpsbabel/style/xmap.style b/style/xmap.style similarity index 100% rename from gpsbabel/style/xmap.style rename to style/xmap.style diff --git a/gpsbabel/style/xmap2006.style b/style/xmap2006.style similarity index 100% rename from gpsbabel/style/xmap2006.style rename to style/xmap2006.style diff --git a/gpsbabel/style/xmapwpt.style b/style/xmapwpt.style similarity index 100% rename from gpsbabel/style/xmapwpt.style rename to style/xmapwpt.style diff --git a/gpsbabel/subrip.cc b/subrip.cc similarity index 100% rename from gpsbabel/subrip.cc rename to subrip.cc diff --git a/gpsbabel/swapdata.cc b/swapdata.cc similarity index 100% rename from gpsbabel/swapdata.cc rename to swapdata.cc diff --git a/gpsbabel/tef_xml.cc b/tef_xml.cc similarity index 100% rename from gpsbabel/tef_xml.cc rename to tef_xml.cc diff --git a/gpsbabel/teletype.cc b/teletype.cc similarity index 100% rename from gpsbabel/teletype.cc rename to teletype.cc diff --git a/gpsbabel/test-all b/test-all similarity index 100% rename from gpsbabel/test-all rename to test-all diff --git a/gpsbabel/testc b/testc similarity index 100% rename from gpsbabel/testc rename to testc diff --git a/gpsbabel/testo b/testo similarity index 100% rename from gpsbabel/testo rename to testo diff --git a/gpsbabel/testo.d/alantrl.test b/testo.d/alantrl.test similarity index 100% rename from gpsbabel/testo.d/alantrl.test rename to testo.d/alantrl.test diff --git a/gpsbabel/testo.d/alanwpr.test b/testo.d/alanwpr.test similarity index 100% rename from gpsbabel/testo.d/alanwpr.test rename to testo.d/alanwpr.test diff --git a/gpsbabel/testo.d/an1.test b/testo.d/an1.test similarity index 100% rename from gpsbabel/testo.d/an1.test rename to testo.d/an1.test diff --git a/gpsbabel/testo.d/arc-project.test b/testo.d/arc-project.test similarity index 100% rename from gpsbabel/testo.d/arc-project.test rename to testo.d/arc-project.test diff --git a/gpsbabel/testo.d/arc.test b/testo.d/arc.test similarity index 100% rename from gpsbabel/testo.d/arc.test rename to testo.d/arc.test diff --git a/gpsbabel/testo.d/bcr.test b/testo.d/bcr.test similarity index 100% rename from gpsbabel/testo.d/bcr.test rename to testo.d/bcr.test diff --git a/gpsbabel/testo.d/bend.test b/testo.d/bend.test similarity index 100% rename from gpsbabel/testo.d/bend.test rename to testo.d/bend.test diff --git a/gpsbabel/testo.d/bushnell.test b/testo.d/bushnell.test similarity index 100% rename from gpsbabel/testo.d/bushnell.test rename to testo.d/bushnell.test diff --git a/gpsbabel/testo.d/classic-1.test b/testo.d/classic-1.test similarity index 100% rename from gpsbabel/testo.d/classic-1.test rename to testo.d/classic-1.test diff --git a/gpsbabel/testo.d/classic-2.test b/testo.d/classic-2.test similarity index 100% rename from gpsbabel/testo.d/classic-2.test rename to testo.d/classic-2.test diff --git a/gpsbabel/testo.d/classic-3.test b/testo.d/classic-3.test similarity index 100% rename from gpsbabel/testo.d/classic-3.test rename to testo.d/classic-3.test diff --git a/gpsbabel/testo.d/classic-4.test b/testo.d/classic-4.test similarity index 100% rename from gpsbabel/testo.d/classic-4.test rename to testo.d/classic-4.test diff --git a/gpsbabel/testo.d/compegps.test b/testo.d/compegps.test similarity index 100% rename from gpsbabel/testo.d/compegps.test rename to testo.d/compegps.test diff --git a/gpsbabel/testo.d/cst.test b/testo.d/cst.test similarity index 100% rename from gpsbabel/testo.d/cst.test rename to testo.d/cst.test diff --git a/gpsbabel/testo.d/csv.test b/testo.d/csv.test similarity index 100% rename from gpsbabel/testo.d/csv.test rename to testo.d/csv.test diff --git a/gpsbabel/testo.d/delgpl.test b/testo.d/delgpl.test similarity index 100% rename from gpsbabel/testo.d/delgpl.test rename to testo.d/delgpl.test diff --git a/gpsbabel/testo.d/deprecated/axim.test b/testo.d/deprecated/axim.test similarity index 100% rename from gpsbabel/testo.d/deprecated/axim.test rename to testo.d/deprecated/axim.test diff --git a/gpsbabel/testo.d/deprecated/cet.test b/testo.d/deprecated/cet.test similarity index 100% rename from gpsbabel/testo.d/deprecated/cet.test rename to testo.d/deprecated/cet.test diff --git a/gpsbabel/testo.d/deprecated/cetus.test b/testo.d/deprecated/cetus.test similarity index 100% rename from gpsbabel/testo.d/deprecated/cetus.test rename to testo.d/deprecated/cetus.test diff --git a/gpsbabel/testo.d/deprecated/coastexp.test b/testo.d/deprecated/coastexp.test similarity index 100% rename from gpsbabel/testo.d/deprecated/coastexp.test rename to testo.d/deprecated/coastexp.test diff --git a/gpsbabel/testo.d/deprecated/copilot.test b/testo.d/deprecated/copilot.test similarity index 100% rename from gpsbabel/testo.d/deprecated/copilot.test rename to testo.d/deprecated/copilot.test diff --git a/gpsbabel/testo.d/deprecated/coto.test b/testo.d/deprecated/coto.test similarity index 100% rename from gpsbabel/testo.d/deprecated/coto.test rename to testo.d/deprecated/coto.test diff --git a/gpsbabel/testo.d/deprecated/gcdb.test b/testo.d/deprecated/gcdb.test similarity index 100% rename from gpsbabel/testo.d/deprecated/gcdb.test rename to testo.d/deprecated/gcdb.test diff --git a/gpsbabel/testo.d/deprecated/geoniche.test b/testo.d/deprecated/geoniche.test similarity index 100% rename from gpsbabel/testo.d/deprecated/geoniche.test rename to testo.d/deprecated/geoniche.test diff --git a/gpsbabel/testo.d/deprecated/gpilots.test b/testo.d/deprecated/gpilots.test similarity index 100% rename from gpsbabel/testo.d/deprecated/gpilots.test rename to testo.d/deprecated/gpilots.test diff --git a/gpsbabel/testo.d/deprecated/gpspilot.test b/testo.d/deprecated/gpspilot.test similarity index 100% rename from gpsbabel/testo.d/deprecated/gpspilot.test rename to testo.d/deprecated/gpspilot.test diff --git a/gpsbabel/testo.d/deprecated/hsandv.test b/testo.d/deprecated/hsandv.test similarity index 100% rename from gpsbabel/testo.d/deprecated/hsandv.test rename to testo.d/deprecated/hsandv.test diff --git a/gpsbabel/testo.d/deprecated/humanwrite.test b/testo.d/deprecated/humanwrite.test similarity index 100% rename from gpsbabel/testo.d/deprecated/humanwrite.test rename to testo.d/deprecated/humanwrite.test diff --git a/gpsbabel/testo.d/deprecated/ktf.test b/testo.d/deprecated/ktf.test similarity index 100% rename from gpsbabel/testo.d/deprecated/ktf.test rename to testo.d/deprecated/ktf.test diff --git a/gpsbabel/testo.d/deprecated/mag_pdb.test b/testo.d/deprecated/mag_pdb.test similarity index 100% rename from gpsbabel/testo.d/deprecated/mag_pdb.test rename to testo.d/deprecated/mag_pdb.test diff --git a/gpsbabel/testo.d/deprecated/magnav.test b/testo.d/deprecated/magnav.test similarity index 100% rename from gpsbabel/testo.d/deprecated/magnav.test rename to testo.d/deprecated/magnav.test diff --git a/gpsbabel/testo.d/deprecated/msroute.test b/testo.d/deprecated/msroute.test similarity index 100% rename from gpsbabel/testo.d/deprecated/msroute.test rename to testo.d/deprecated/msroute.test diff --git a/gpsbabel/testo.d/deprecated/pathaway.test b/testo.d/deprecated/pathaway.test similarity index 100% rename from gpsbabel/testo.d/deprecated/pathaway.test rename to testo.d/deprecated/pathaway.test diff --git a/gpsbabel/testo.d/deprecated/psp.test b/testo.d/deprecated/psp.test similarity index 100% rename from gpsbabel/testo.d/deprecated/psp.test rename to testo.d/deprecated/psp.test diff --git a/gpsbabel/testo.d/deprecated/quovadis.test b/testo.d/deprecated/quovadis.test similarity index 100% rename from gpsbabel/testo.d/deprecated/quovadis.test rename to testo.d/deprecated/quovadis.test diff --git a/gpsbabel/testo.d/deprecated/sportsim.test b/testo.d/deprecated/sportsim.test similarity index 100% rename from gpsbabel/testo.d/deprecated/sportsim.test rename to testo.d/deprecated/sportsim.test diff --git a/gpsbabel/testo.d/destinator.test b/testo.d/destinator.test similarity index 100% rename from gpsbabel/testo.d/destinator.test rename to testo.d/destinator.test diff --git a/gpsbabel/testo.d/dmtlog.test b/testo.d/dmtlog.test similarity index 100% rename from gpsbabel/testo.d/dmtlog.test rename to testo.d/dmtlog.test diff --git a/gpsbabel/testo.d/dna.test b/testo.d/dna.test similarity index 100% rename from gpsbabel/testo.d/dna.test rename to testo.d/dna.test diff --git a/gpsbabel/testo.d/dop_filter.test b/testo.d/dop_filter.test similarity index 100% rename from gpsbabel/testo.d/dop_filter.test rename to testo.d/dop_filter.test diff --git a/gpsbabel/testo.d/duplicate.test b/testo.d/duplicate.test similarity index 100% rename from gpsbabel/testo.d/duplicate.test rename to testo.d/duplicate.test diff --git a/gpsbabel/testo.d/easygps.test b/testo.d/easygps.test similarity index 100% rename from gpsbabel/testo.d/easygps.test rename to testo.d/easygps.test diff --git a/gpsbabel/testo.d/energympro.test b/testo.d/energympro.test similarity index 100% rename from gpsbabel/testo.d/energympro.test rename to testo.d/energympro.test diff --git a/gpsbabel/testo.d/enigma.test b/testo.d/enigma.test similarity index 100% rename from gpsbabel/testo.d/enigma.test rename to testo.d/enigma.test diff --git a/gpsbabel/testo.d/exif.test b/testo.d/exif.test similarity index 100% rename from gpsbabel/testo.d/exif.test rename to testo.d/exif.test diff --git a/gpsbabel/testo.d/f90g.test b/testo.d/f90g.test similarity index 100% rename from gpsbabel/testo.d/f90g.test rename to testo.d/f90g.test diff --git a/gpsbabel/testo.d/fugawi.test b/testo.d/fugawi.test similarity index 100% rename from gpsbabel/testo.d/fugawi.test rename to testo.d/fugawi.test diff --git a/gpsbabel/testo.d/g7towin.test b/testo.d/g7towin.test similarity index 100% rename from gpsbabel/testo.d/g7towin.test rename to testo.d/g7towin.test diff --git a/gpsbabel/testo.d/garmin_fit.test b/testo.d/garmin_fit.test similarity index 100% rename from gpsbabel/testo.d/garmin_fit.test rename to testo.d/garmin_fit.test diff --git a/gpsbabel/testo.d/garmin_g1000.test b/testo.d/garmin_g1000.test similarity index 100% rename from gpsbabel/testo.d/garmin_g1000.test rename to testo.d/garmin_g1000.test diff --git a/gpsbabel/testo.d/garmin_gpi.test b/testo.d/garmin_gpi.test similarity index 100% rename from gpsbabel/testo.d/garmin_gpi.test rename to testo.d/garmin_gpi.test diff --git a/gpsbabel/testo.d/garmin_txt.test b/testo.d/garmin_txt.test similarity index 100% rename from gpsbabel/testo.d/garmin_txt.test rename to testo.d/garmin_txt.test diff --git a/gpsbabel/testo.d/garmin_xt.test b/testo.d/garmin_xt.test similarity index 100% rename from gpsbabel/testo.d/garmin_xt.test rename to testo.d/garmin_xt.test diff --git a/gpsbabel/testo.d/gdb.test b/testo.d/gdb.test similarity index 100% rename from gpsbabel/testo.d/gdb.test rename to testo.d/gdb.test diff --git a/gpsbabel/testo.d/geo.test b/testo.d/geo.test similarity index 100% rename from gpsbabel/testo.d/geo.test rename to testo.d/geo.test diff --git a/gpsbabel/testo.d/ggv_log.test b/testo.d/ggv_log.test similarity index 100% rename from gpsbabel/testo.d/ggv_log.test rename to testo.d/ggv_log.test diff --git a/gpsbabel/testo.d/ggv_ovl.test b/testo.d/ggv_ovl.test similarity index 100% rename from gpsbabel/testo.d/ggv_ovl.test rename to testo.d/ggv_ovl.test diff --git a/gpsbabel/testo.d/glogbook.test b/testo.d/glogbook.test similarity index 100% rename from gpsbabel/testo.d/glogbook.test rename to testo.d/glogbook.test diff --git a/gpsbabel/testo.d/gnav_trl.test b/testo.d/gnav_trl.test similarity index 100% rename from gpsbabel/testo.d/gnav_trl.test rename to testo.d/gnav_trl.test diff --git a/gpsbabel/testo.d/google.test b/testo.d/google.test similarity index 100% rename from gpsbabel/testo.d/google.test rename to testo.d/google.test diff --git a/gpsbabel/testo.d/googledir.test b/testo.d/googledir.test similarity index 100% rename from gpsbabel/testo.d/googledir.test rename to testo.d/googledir.test diff --git a/gpsbabel/testo.d/gopal.test b/testo.d/gopal.test similarity index 100% rename from gpsbabel/testo.d/gopal.test rename to testo.d/gopal.test diff --git a/gpsbabel/testo.d/gpsdrive.test b/testo.d/gpsdrive.test similarity index 100% rename from gpsbabel/testo.d/gpsdrive.test rename to testo.d/gpsdrive.test diff --git a/gpsbabel/testo.d/gpsman.test b/testo.d/gpsman.test similarity index 100% rename from gpsbabel/testo.d/gpsman.test rename to testo.d/gpsman.test diff --git a/gpsbabel/testo.d/gpssim.test b/testo.d/gpssim.test similarity index 100% rename from gpsbabel/testo.d/gpssim.test rename to testo.d/gpssim.test diff --git a/gpsbabel/testo.d/gpsutil.test b/testo.d/gpsutil.test similarity index 100% rename from gpsbabel/testo.d/gpsutil.test rename to testo.d/gpsutil.test diff --git a/gpsbabel/testo.d/gpx.test b/testo.d/gpx.test similarity index 100% rename from gpsbabel/testo.d/gpx.test rename to testo.d/gpx.test diff --git a/gpsbabel/testo.d/gtm.test b/testo.d/gtm.test similarity index 100% rename from gpsbabel/testo.d/gtm.test rename to testo.d/gtm.test diff --git a/gpsbabel/testo.d/gtrnctr.test b/testo.d/gtrnctr.test similarity index 100% rename from gpsbabel/testo.d/gtrnctr.test rename to testo.d/gtrnctr.test diff --git a/gpsbabel/testo.d/height.test b/testo.d/height.test similarity index 100% rename from gpsbabel/testo.d/height.test rename to testo.d/height.test diff --git a/gpsbabel/testo.d/hiketech.test b/testo.d/hiketech.test similarity index 100% rename from gpsbabel/testo.d/hiketech.test rename to testo.d/hiketech.test diff --git a/gpsbabel/testo.d/holux.test b/testo.d/holux.test similarity index 100% rename from gpsbabel/testo.d/holux.test rename to testo.d/holux.test diff --git a/gpsbabel/testo.d/humminbird.test b/testo.d/humminbird.test similarity index 100% rename from gpsbabel/testo.d/humminbird.test rename to testo.d/humminbird.test diff --git a/gpsbabel/testo.d/iblue747.test b/testo.d/iblue747.test similarity index 100% rename from gpsbabel/testo.d/iblue747.test rename to testo.d/iblue747.test diff --git a/gpsbabel/testo.d/igc.test b/testo.d/igc.test similarity index 100% rename from gpsbabel/testo.d/igc.test rename to testo.d/igc.test diff --git a/gpsbabel/testo.d/ignrando.test b/testo.d/ignrando.test similarity index 100% rename from gpsbabel/testo.d/ignrando.test rename to testo.d/ignrando.test diff --git a/gpsbabel/testo.d/igo2008_poi.test b/testo.d/igo2008_poi.test similarity index 100% rename from gpsbabel/testo.d/igo2008_poi.test rename to testo.d/igo2008_poi.test diff --git a/gpsbabel/testo.d/igo8.test b/testo.d/igo8.test similarity index 100% rename from gpsbabel/testo.d/igo8.test rename to testo.d/igo8.test diff --git a/gpsbabel/testo.d/ik3d.test b/testo.d/ik3d.test similarity index 100% rename from gpsbabel/testo.d/ik3d.test rename to testo.d/ik3d.test diff --git a/gpsbabel/testo.d/interpolate.test b/testo.d/interpolate.test similarity index 100% rename from gpsbabel/testo.d/interpolate.test rename to testo.d/interpolate.test diff --git a/gpsbabel/testo.d/itracku.test b/testo.d/itracku.test similarity index 100% rename from gpsbabel/testo.d/itracku.test rename to testo.d/itracku.test diff --git a/gpsbabel/testo.d/jogmap.test b/testo.d/jogmap.test similarity index 100% rename from gpsbabel/testo.d/jogmap.test rename to testo.d/jogmap.test diff --git a/gpsbabel/testo.d/jtr.test b/testo.d/jtr.test similarity index 100% rename from gpsbabel/testo.d/jtr.test rename to testo.d/jtr.test diff --git a/gpsbabel/testo.d/kml-read.test b/testo.d/kml-read.test similarity index 100% rename from gpsbabel/testo.d/kml-read.test rename to testo.d/kml-read.test diff --git a/gpsbabel/testo.d/kml.test b/testo.d/kml.test similarity index 100% rename from gpsbabel/testo.d/kml.test rename to testo.d/kml.test diff --git a/gpsbabel/testo.d/lmx.test b/testo.d/lmx.test similarity index 100% rename from gpsbabel/testo.d/lmx.test rename to testo.d/lmx.test diff --git a/gpsbabel/testo.d/lowranceusr.test b/testo.d/lowranceusr.test similarity index 100% rename from gpsbabel/testo.d/lowranceusr.test rename to testo.d/lowranceusr.test diff --git a/gpsbabel/testo.d/lowranceusr4.test b/testo.d/lowranceusr4.test similarity index 100% rename from gpsbabel/testo.d/lowranceusr4.test rename to testo.d/lowranceusr4.test diff --git a/gpsbabel/testo.d/magellan.test b/testo.d/magellan.test similarity index 100% rename from gpsbabel/testo.d/magellan.test rename to testo.d/magellan.test diff --git a/gpsbabel/testo.d/magellan_sd.test b/testo.d/magellan_sd.test similarity index 100% rename from gpsbabel/testo.d/magellan_sd.test rename to testo.d/magellan_sd.test diff --git a/gpsbabel/testo.d/maggeo.test b/testo.d/maggeo.test similarity index 100% rename from gpsbabel/testo.d/maggeo.test rename to testo.d/maggeo.test diff --git a/gpsbabel/testo.d/mainnav.test b/testo.d/mainnav.test similarity index 100% rename from gpsbabel/testo.d/mainnav.test rename to testo.d/mainnav.test diff --git a/gpsbabel/testo.d/mapasia.test b/testo.d/mapasia.test similarity index 100% rename from gpsbabel/testo.d/mapasia.test rename to testo.d/mapasia.test diff --git a/gpsbabel/testo.d/mapbar.test b/testo.d/mapbar.test similarity index 100% rename from gpsbabel/testo.d/mapbar.test rename to testo.d/mapbar.test diff --git a/gpsbabel/testo.d/mapfactor.test b/testo.d/mapfactor.test similarity index 100% rename from gpsbabel/testo.d/mapfactor.test rename to testo.d/mapfactor.test diff --git a/gpsbabel/testo.d/mapsend.test b/testo.d/mapsend.test similarity index 100% rename from gpsbabel/testo.d/mapsend.test rename to testo.d/mapsend.test diff --git a/gpsbabel/testo.d/mapsource.test b/testo.d/mapsource.test similarity index 100% rename from gpsbabel/testo.d/mapsource.test rename to testo.d/mapsource.test diff --git a/gpsbabel/testo.d/mmo.test b/testo.d/mmo.test similarity index 100% rename from gpsbabel/testo.d/mmo.test rename to testo.d/mmo.test diff --git a/gpsbabel/testo.d/motoactv.test b/testo.d/motoactv.test similarity index 100% rename from gpsbabel/testo.d/motoactv.test rename to testo.d/motoactv.test diff --git a/gpsbabel/testo.d/mtk.test b/testo.d/mtk.test similarity index 100% rename from gpsbabel/testo.d/mtk.test rename to testo.d/mtk.test diff --git a/gpsbabel/testo.d/mtk_locus.test b/testo.d/mtk_locus.test similarity index 100% rename from gpsbabel/testo.d/mtk_locus.test rename to testo.d/mtk_locus.test diff --git a/gpsbabel/testo.d/multiurlgpx.test b/testo.d/multiurlgpx.test similarity index 100% rename from gpsbabel/testo.d/multiurlgpx.test rename to testo.d/multiurlgpx.test diff --git a/gpsbabel/testo.d/mxf.test b/testo.d/mxf.test similarity index 100% rename from gpsbabel/testo.d/mxf.test rename to testo.d/mxf.test diff --git a/gpsbabel/testo.d/mynav.test b/testo.d/mynav.test similarity index 100% rename from gpsbabel/testo.d/mynav.test rename to testo.d/mynav.test diff --git a/gpsbabel/testo.d/navicache.test b/testo.d/navicache.test similarity index 100% rename from gpsbabel/testo.d/navicache.test rename to testo.d/navicache.test diff --git a/gpsbabel/testo.d/naviguide.test b/testo.d/naviguide.test similarity index 100% rename from gpsbabel/testo.d/naviguide.test rename to testo.d/naviguide.test diff --git a/gpsbabel/testo.d/navilink.test b/testo.d/navilink.test similarity index 100% rename from gpsbabel/testo.d/navilink.test rename to testo.d/navilink.test diff --git a/gpsbabel/testo.d/navitel.test b/testo.d/navitel.test similarity index 100% rename from gpsbabel/testo.d/navitel.test rename to testo.d/navitel.test diff --git a/gpsbabel/testo.d/netstumbler.test b/testo.d/netstumbler.test similarity index 100% rename from gpsbabel/testo.d/netstumbler.test rename to testo.d/netstumbler.test diff --git a/gpsbabel/testo.d/nmea.test b/testo.d/nmea.test similarity index 100% rename from gpsbabel/testo.d/nmea.test rename to testo.d/nmea.test diff --git a/gpsbabel/testo.d/nmn4.test b/testo.d/nmn4.test similarity index 100% rename from gpsbabel/testo.d/nmn4.test rename to testo.d/nmn4.test diff --git a/gpsbabel/testo.d/osm.test b/testo.d/osm.test similarity index 100% rename from gpsbabel/testo.d/osm.test rename to testo.d/osm.test diff --git a/gpsbabel/testo.d/ozi.test b/testo.d/ozi.test similarity index 100% rename from gpsbabel/testo.d/ozi.test rename to testo.d/ozi.test diff --git a/gpsbabel/testo.d/pcx.test b/testo.d/pcx.test similarity index 100% rename from gpsbabel/testo.d/pcx.test rename to testo.d/pcx.test diff --git a/gpsbabel/testo.d/pocketfms.test b/testo.d/pocketfms.test similarity index 100% rename from gpsbabel/testo.d/pocketfms.test rename to testo.d/pocketfms.test diff --git a/gpsbabel/testo.d/polygon.test b/testo.d/polygon.test similarity index 100% rename from gpsbabel/testo.d/polygon.test rename to testo.d/polygon.test diff --git a/gpsbabel/testo.d/position.test b/testo.d/position.test similarity index 100% rename from gpsbabel/testo.d/position.test rename to testo.d/position.test diff --git a/gpsbabel/testo.d/psitrex.test b/testo.d/psitrex.test similarity index 100% rename from gpsbabel/testo.d/psitrex.test rename to testo.d/psitrex.test diff --git a/gpsbabel/testo.d/radius.test b/testo.d/radius.test similarity index 100% rename from gpsbabel/testo.d/radius.test rename to testo.d/radius.test diff --git a/gpsbabel/testo.d/raymarine.test b/testo.d/raymarine.test similarity index 100% rename from gpsbabel/testo.d/raymarine.test rename to testo.d/raymarine.test diff --git a/gpsbabel/testo.d/route_reverse.test b/testo.d/route_reverse.test similarity index 100% rename from gpsbabel/testo.d/route_reverse.test rename to testo.d/route_reverse.test diff --git a/gpsbabel/testo.d/saroute.test b/testo.d/saroute.test similarity index 100% rename from gpsbabel/testo.d/saroute.test rename to testo.d/saroute.test diff --git a/gpsbabel/testo.d/sbn.test b/testo.d/sbn.test similarity index 100% rename from gpsbabel/testo.d/sbn.test rename to testo.d/sbn.test diff --git a/gpsbabel/testo.d/sbp.test b/testo.d/sbp.test similarity index 100% rename from gpsbabel/testo.d/sbp.test rename to testo.d/sbp.test diff --git a/gpsbabel/testo.d/simplify-relative.test b/testo.d/simplify-relative.test similarity index 100% rename from gpsbabel/testo.d/simplify-relative.test rename to testo.d/simplify-relative.test diff --git a/gpsbabel/testo.d/simplify.test b/testo.d/simplify.test similarity index 100% rename from gpsbabel/testo.d/simplify.test rename to testo.d/simplify.test diff --git a/gpsbabel/testo.d/skyforce.test b/testo.d/skyforce.test similarity index 100% rename from gpsbabel/testo.d/skyforce.test rename to testo.d/skyforce.test diff --git a/gpsbabel/testo.d/skytraq.test b/testo.d/skytraq.test similarity index 100% rename from gpsbabel/testo.d/skytraq.test rename to testo.d/skytraq.test diff --git a/gpsbabel/testo.d/stackfilter.test b/testo.d/stackfilter.test similarity index 100% rename from gpsbabel/testo.d/stackfilter.test rename to testo.d/stackfilter.test diff --git a/gpsbabel/testo.d/stmsdf.test b/testo.d/stmsdf.test similarity index 100% rename from gpsbabel/testo.d/stmsdf.test rename to testo.d/stmsdf.test diff --git a/gpsbabel/testo.d/stmwpp.test b/testo.d/stmwpp.test similarity index 100% rename from gpsbabel/testo.d/stmwpp.test rename to testo.d/stmwpp.test diff --git a/gpsbabel/testo.d/subrip.test b/testo.d/subrip.test similarity index 100% rename from gpsbabel/testo.d/subrip.test rename to testo.d/subrip.test diff --git a/gpsbabel/testo.d/tef.test b/testo.d/tef.test similarity index 100% rename from gpsbabel/testo.d/tef.test rename to testo.d/tef.test diff --git a/gpsbabel/testo.d/teletype.test b/testo.d/teletype.test similarity index 100% rename from gpsbabel/testo.d/teletype.test rename to testo.d/teletype.test diff --git a/gpsbabel/testo.d/text.test b/testo.d/text.test similarity index 100% rename from gpsbabel/testo.d/text.test rename to testo.d/text.test diff --git a/gpsbabel/testo.d/tiger.test b/testo.d/tiger.test similarity index 100% rename from gpsbabel/testo.d/tiger.test rename to testo.d/tiger.test diff --git a/gpsbabel/testo.d/tmpro.test b/testo.d/tmpro.test similarity index 100% rename from gpsbabel/testo.d/tmpro.test rename to testo.d/tmpro.test diff --git a/gpsbabel/testo.d/tomtom.test b/testo.d/tomtom.test similarity index 100% rename from gpsbabel/testo.d/tomtom.test rename to testo.d/tomtom.test diff --git a/gpsbabel/testo.d/tomtom_asc.test b/testo.d/tomtom_asc.test similarity index 100% rename from gpsbabel/testo.d/tomtom_asc.test rename to testo.d/tomtom_asc.test diff --git a/gpsbabel/testo.d/tomtom_itn.test b/testo.d/tomtom_itn.test similarity index 100% rename from gpsbabel/testo.d/tomtom_itn.test rename to testo.d/tomtom_itn.test diff --git a/gpsbabel/testo.d/tpg.test b/testo.d/tpg.test similarity index 100% rename from gpsbabel/testo.d/tpg.test rename to testo.d/tpg.test diff --git a/gpsbabel/testo.d/tpo.test b/testo.d/tpo.test similarity index 100% rename from gpsbabel/testo.d/tpo.test rename to testo.d/tpo.test diff --git a/gpsbabel/testo.d/track-discard.test b/testo.d/track-discard.test similarity index 100% rename from gpsbabel/testo.d/track-discard.test rename to testo.d/track-discard.test diff --git a/gpsbabel/testo.d/track.test b/testo.d/track.test similarity index 100% rename from gpsbabel/testo.d/track.test rename to testo.d/track.test diff --git a/gpsbabel/testo.d/transform.test b/testo.d/transform.test similarity index 100% rename from gpsbabel/testo.d/transform.test rename to testo.d/transform.test diff --git a/gpsbabel/testo.d/unicsv.test b/testo.d/unicsv.test similarity index 100% rename from gpsbabel/testo.d/unicsv.test rename to testo.d/unicsv.test diff --git a/gpsbabel/testo.d/unicsv_grids.test b/testo.d/unicsv_grids.test similarity index 100% rename from gpsbabel/testo.d/unicsv_grids.test rename to testo.d/unicsv_grids.test diff --git a/gpsbabel/testo.d/v900.test b/testo.d/v900.test similarity index 100% rename from gpsbabel/testo.d/v900.test rename to testo.d/v900.test diff --git a/gpsbabel/testo.d/vidaone.test b/testo.d/vidaone.test similarity index 100% rename from gpsbabel/testo.d/vidaone.test rename to testo.d/vidaone.test diff --git a/gpsbabel/testo.d/vitosmt.test b/testo.d/vitosmt.test similarity index 100% rename from gpsbabel/testo.d/vitosmt.test rename to testo.d/vitosmt.test diff --git a/gpsbabel/testo.d/vitovtt.test b/testo.d/vitovtt.test similarity index 100% rename from gpsbabel/testo.d/vitovtt.test rename to testo.d/vitovtt.test diff --git a/gpsbabel/testo.d/vpl.test b/testo.d/vpl.test similarity index 100% rename from gpsbabel/testo.d/vpl.test rename to testo.d/vpl.test diff --git a/gpsbabel/testo.d/wfff.test b/testo.d/wfff.test similarity index 100% rename from gpsbabel/testo.d/wfff.test rename to testo.d/wfff.test diff --git a/gpsbabel/testo.d/wintec_tes.test b/testo.d/wintec_tes.test similarity index 100% rename from gpsbabel/testo.d/wintec_tes.test rename to testo.d/wintec_tes.test diff --git a/gpsbabel/testo.d/xcsv.test b/testo.d/xcsv.test similarity index 100% rename from gpsbabel/testo.d/xcsv.test rename to testo.d/xcsv.test diff --git a/gpsbabel/testo.d/xmap.test b/testo.d/xmap.test similarity index 100% rename from gpsbabel/testo.d/xmap.test rename to testo.d/xmap.test diff --git a/gpsbabel/testo.d/xmapwpt.test b/testo.d/xmapwpt.test similarity index 100% rename from gpsbabel/testo.d/xmapwpt.test rename to testo.d/xmapwpt.test diff --git a/gpsbabel/testo.d/xol.test b/testo.d/xol.test similarity index 100% rename from gpsbabel/testo.d/xol.test rename to testo.d/xol.test diff --git a/gpsbabel/testw b/testw similarity index 100% rename from gpsbabel/testw rename to testw diff --git a/gpsbabel/text.cc b/text.cc similarity index 100% rename from gpsbabel/text.cc rename to text.cc diff --git a/gpsbabel/tiger.cc b/tiger.cc similarity index 100% rename from gpsbabel/tiger.cc rename to tiger.cc diff --git a/gpsbabel/tmpro.cc b/tmpro.cc similarity index 100% rename from gpsbabel/tmpro.cc rename to tmpro.cc diff --git a/gpsbabel/tomtom.cc b/tomtom.cc similarity index 100% rename from gpsbabel/tomtom.cc rename to tomtom.cc diff --git a/gpsbabel/tools/.gitignore b/tools/.gitignore similarity index 100% rename from gpsbabel/tools/.gitignore rename to tools/.gitignore diff --git a/gpsbabel/tools/cleardebug b/tools/cleardebug similarity index 100% rename from gpsbabel/tools/cleardebug rename to tools/cleardebug diff --git a/gpsbabel/tools/createGeoidGrid b/tools/createGeoidGrid similarity index 100% rename from gpsbabel/tools/createGeoidGrid rename to tools/createGeoidGrid diff --git a/gpsbabel/tools/cvslog b/tools/cvslog similarity index 100% rename from gpsbabel/tools/cvslog rename to tools/cvslog diff --git a/gpsbabel/tools/fix-svn-properties b/tools/fix-svn-properties similarity index 100% rename from gpsbabel/tools/fix-svn-properties rename to tools/fix-svn-properties diff --git a/gpsbabel/tools/fixdoc b/tools/fixdoc similarity index 100% rename from gpsbabel/tools/fixdoc rename to tools/fixdoc diff --git a/gpsbabel/tools/functions b/tools/functions similarity index 100% rename from gpsbabel/tools/functions rename to tools/functions diff --git a/gpsbabel/tools/gcfg b/tools/gcfg similarity index 100% rename from gpsbabel/tools/gcfg rename to tools/gcfg diff --git a/gpsbabel/tools/kml22-schema/atom-author-link.xsd b/tools/kml22-schema/atom-author-link.xsd similarity index 100% rename from gpsbabel/tools/kml22-schema/atom-author-link.xsd rename to tools/kml22-schema/atom-author-link.xsd diff --git a/gpsbabel/tools/kml22-schema/kml22gx.xsd b/tools/kml22-schema/kml22gx.xsd similarity index 100% rename from gpsbabel/tools/kml22-schema/kml22gx.xsd rename to tools/kml22-schema/kml22gx.xsd diff --git a/gpsbabel/tools/kml22-schema/ogckml22.xsd b/tools/kml22-schema/ogckml22.xsd similarity index 100% rename from gpsbabel/tools/kml22-schema/ogckml22.xsd rename to tools/kml22-schema/ogckml22.xsd diff --git a/gpsbabel/tools/kml22-schema/xAL.xsd b/tools/kml22-schema/xAL.xsd similarity index 100% rename from gpsbabel/tools/kml22-schema/xAL.xsd rename to tools/kml22-schema/xAL.xsd diff --git a/gpsbabel/tools/mac-config b/tools/mac-config similarity index 100% rename from gpsbabel/tools/mac-config rename to tools/mac-config diff --git a/gpsbabel/tools/mac-localize b/tools/mac-localize similarity index 100% rename from gpsbabel/tools/mac-localize rename to tools/mac-localize diff --git a/gpsbabel/tools/memdebug b/tools/memdebug similarity index 100% rename from gpsbabel/tools/memdebug rename to tools/memdebug diff --git a/gpsbabel/tools/mkcapabilities.in b/tools/mkcapabilities.in similarity index 100% rename from gpsbabel/tools/mkcapabilities.in rename to tools/mkcapabilities.in diff --git a/gpsbabel/tools/mkchangelog b/tools/mkchangelog similarity index 100% rename from gpsbabel/tools/mkchangelog rename to tools/mkchangelog diff --git a/gpsbabel/tools/mkchanges b/tools/mkchanges similarity index 100% rename from gpsbabel/tools/mkchanges rename to tools/mkchanges diff --git a/gpsbabel/tools/mkfilelist b/tools/mkfilelist similarity index 100% rename from gpsbabel/tools/mkfilelist rename to tools/mkfilelist diff --git a/gpsbabel/tools/mklanguage_status b/tools/mklanguage_status similarity index 100% rename from gpsbabel/tools/mklanguage_status rename to tools/mklanguage_status diff --git a/gpsbabel/tools/mkmoreclean b/tools/mkmoreclean similarity index 100% rename from gpsbabel/tools/mkmoreclean rename to tools/mkmoreclean diff --git a/gpsbabel/tools/mkrpm b/tools/mkrpm similarity index 100% rename from gpsbabel/tools/mkrpm rename to tools/mkrpm diff --git a/gpsbabel/tools/mkspec b/tools/mkspec similarity index 100% rename from gpsbabel/tools/mkspec rename to tools/mkspec diff --git a/gpsbabel/tools/rebuild b/tools/rebuild similarity index 100% rename from gpsbabel/tools/rebuild rename to tools/rebuild diff --git a/gpsbabel/tools/release-process b/tools/release-process similarity index 100% rename from gpsbabel/tools/release-process rename to tools/release-process diff --git a/gpsbabel/tools/skeleton-locversion-plist b/tools/skeleton-locversion-plist similarity index 100% rename from gpsbabel/tools/skeleton-locversion-plist rename to tools/skeleton-locversion-plist diff --git a/gpsbabel/tools/win-cross-config b/tools/win-cross-config similarity index 100% rename from gpsbabel/tools/win-cross-config rename to tools/win-cross-config diff --git a/gpsbabel/tools/win-qtcreator-config b/tools/win-qtcreator-config similarity index 100% rename from gpsbabel/tools/win-qtcreator-config rename to tools/win-qtcreator-config diff --git a/gpsbabel/torture_test b/torture_test similarity index 100% rename from gpsbabel/torture_test rename to torture_test diff --git a/gpsbabel/tpg.cc b/tpg.cc similarity index 100% rename from gpsbabel/tpg.cc rename to tpg.cc diff --git a/gpsbabel/tpo.cc b/tpo.cc similarity index 100% rename from gpsbabel/tpo.cc rename to tpo.cc diff --git a/gpsbabel/trackfilter.cc b/trackfilter.cc similarity index 100% rename from gpsbabel/trackfilter.cc rename to trackfilter.cc diff --git a/gpsbabel/transform.cc b/transform.cc similarity index 100% rename from gpsbabel/transform.cc rename to transform.cc diff --git a/gpsbabel/unicsv.cc b/unicsv.cc similarity index 100% rename from gpsbabel/unicsv.cc rename to unicsv.cc diff --git a/gpsbabel/units.cc b/units.cc similarity index 100% rename from gpsbabel/units.cc rename to units.cc diff --git a/gpsbabel/util.cc b/util.cc similarity index 100% rename from gpsbabel/util.cc rename to util.cc diff --git a/gpsbabel/util_crc.cc b/util_crc.cc similarity index 100% rename from gpsbabel/util_crc.cc rename to util_crc.cc diff --git a/gpsbabel/v900.cc b/v900.cc similarity index 100% rename from gpsbabel/v900.cc rename to v900.cc diff --git a/gpsbabel/validate.cc b/validate.cc similarity index 100% rename from gpsbabel/validate.cc rename to validate.cc diff --git a/gpsbabel/vcf.cc b/vcf.cc similarity index 100% rename from gpsbabel/vcf.cc rename to vcf.cc diff --git a/gpsbabel/vecs.cc b/vecs.cc similarity index 100% rename from gpsbabel/vecs.cc rename to vecs.cc diff --git a/gpsbabel/vidaone.cc b/vidaone.cc similarity index 100% rename from gpsbabel/vidaone.cc rename to vidaone.cc diff --git a/gpsbabel/vitosmt.cc b/vitosmt.cc similarity index 100% rename from gpsbabel/vitosmt.cc rename to vitosmt.cc diff --git a/gpsbabel/vitovtt.cc b/vitovtt.cc similarity index 100% rename from gpsbabel/vitovtt.cc rename to vitovtt.cc diff --git a/gpsbabel/vpl.cc b/vpl.cc similarity index 100% rename from gpsbabel/vpl.cc rename to vpl.cc diff --git a/gpsbabel/vtesto b/vtesto similarity index 100% rename from gpsbabel/vtesto rename to vtesto diff --git a/gpsbabel/waypt.cc b/waypt.cc similarity index 100% rename from gpsbabel/waypt.cc rename to waypt.cc diff --git a/gpsbabel/wbt-200.cc b/wbt-200.cc similarity index 100% rename from gpsbabel/wbt-200.cc rename to wbt-200.cc diff --git a/gpsbabel/wfff_xml.cc b/wfff_xml.cc similarity index 100% rename from gpsbabel/wfff_xml.cc rename to wfff_xml.cc diff --git a/gpsbabel/win32/.gitignore b/win32/.gitignore similarity index 100% rename from gpsbabel/win32/.gitignore rename to win32/.gitignore diff --git a/gpsbabel/win32/gpsbabel.ico b/win32/gpsbabel.ico similarity index 100% rename from gpsbabel/win32/gpsbabel.ico rename to win32/gpsbabel.ico diff --git a/gpsbabel/win32/gpsbabel.rc.in b/win32/gpsbabel.rc.in similarity index 100% rename from gpsbabel/win32/gpsbabel.rc.in rename to win32/gpsbabel.rc.in diff --git a/gpsbabel/wintec_tes.cc b/wintec_tes.cc similarity index 100% rename from gpsbabel/wintec_tes.cc rename to wintec_tes.cc diff --git a/gpsbabel/xcsv.cc b/xcsv.cc similarity index 100% rename from gpsbabel/xcsv.cc rename to xcsv.cc diff --git a/gpsbabel/xcsv_tokens.gperf b/xcsv_tokens.gperf similarity index 100% rename from gpsbabel/xcsv_tokens.gperf rename to xcsv_tokens.gperf diff --git a/gpsbabel/xcsv_tokens.in b/xcsv_tokens.in similarity index 100% rename from gpsbabel/xcsv_tokens.in rename to xcsv_tokens.in diff --git a/gpsbabel/xhtmlent.cc b/xhtmlent.cc similarity index 100% rename from gpsbabel/xhtmlent.cc rename to xhtmlent.cc diff --git a/gpsbabel/xmldoc/.gitignore b/xmldoc/.gitignore similarity index 100% rename from gpsbabel/xmldoc/.gitignore rename to xmldoc/.gitignore diff --git a/gpsbabel/xmldoc/babelmain.xsl b/xmldoc/babelmain.xsl similarity index 100% rename from gpsbabel/xmldoc/babelmain.xsl rename to xmldoc/babelmain.xsl diff --git a/gpsbabel/xmldoc/babelpdf.xsl b/xmldoc/babelpdf.xsl similarity index 100% rename from gpsbabel/xmldoc/babelpdf.xsl rename to xmldoc/babelpdf.xsl diff --git a/gpsbabel/xmldoc/chapters/_chapters.xml b/xmldoc/chapters/_chapters.xml similarity index 100% rename from gpsbabel/xmldoc/chapters/_chapters.xml rename to xmldoc/chapters/_chapters.xml diff --git a/gpsbabel/xmldoc/chapters/allchapters.xml b/xmldoc/chapters/allchapters.xml similarity index 100% rename from gpsbabel/xmldoc/chapters/allchapters.xml rename to xmldoc/chapters/allchapters.xml diff --git a/gpsbabel/xmldoc/chapters/build.xml b/xmldoc/chapters/build.xml similarity index 100% rename from gpsbabel/xmldoc/chapters/build.xml rename to xmldoc/chapters/build.xml diff --git a/gpsbabel/xmldoc/chapters/datums.xml b/xmldoc/chapters/datums.xml similarity index 100% rename from gpsbabel/xmldoc/chapters/datums.xml rename to xmldoc/chapters/datums.xml diff --git a/gpsbabel/xmldoc/chapters/filters.xml b/xmldoc/chapters/filters.xml similarity index 100% rename from gpsbabel/xmldoc/chapters/filters.xml rename to xmldoc/chapters/filters.xml diff --git a/gpsbabel/xmldoc/chapters/formats.xml b/xmldoc/chapters/formats.xml similarity index 100% rename from gpsbabel/xmldoc/chapters/formats.xml rename to xmldoc/chapters/formats.xml diff --git a/gpsbabel/xmldoc/chapters/garmin_icons.xml b/xmldoc/chapters/garmin_icons.xml similarity index 100% rename from gpsbabel/xmldoc/chapters/garmin_icons.xml rename to xmldoc/chapters/garmin_icons.xml diff --git a/gpsbabel/xmldoc/chapters/glossary.xml b/xmldoc/chapters/glossary.xml similarity index 100% rename from gpsbabel/xmldoc/chapters/glossary.xml rename to xmldoc/chapters/glossary.xml diff --git a/gpsbabel/xmldoc/chapters/preface.xml b/xmldoc/chapters/preface.xml similarity index 100% rename from gpsbabel/xmldoc/chapters/preface.xml rename to xmldoc/chapters/preface.xml diff --git a/gpsbabel/xmldoc/chapters/styles.xml b/xmldoc/chapters/styles.xml similarity index 100% rename from gpsbabel/xmldoc/chapters/styles.xml rename to xmldoc/chapters/styles.xml diff --git a/gpsbabel/xmldoc/chapters/use.xml b/xmldoc/chapters/use.xml similarity index 100% rename from gpsbabel/xmldoc/chapters/use.xml rename to xmldoc/chapters/use.xml diff --git a/gpsbabel/xmldoc/filters/arc-project.xml b/xmldoc/filters/arc-project.xml similarity index 100% rename from gpsbabel/xmldoc/filters/arc-project.xml rename to xmldoc/filters/arc-project.xml diff --git a/gpsbabel/xmldoc/filters/arc-rte.xml b/xmldoc/filters/arc-rte.xml similarity index 100% rename from gpsbabel/xmldoc/filters/arc-rte.xml rename to xmldoc/filters/arc-rte.xml diff --git a/gpsbabel/xmldoc/filters/arc-trk.xml b/xmldoc/filters/arc-trk.xml similarity index 100% rename from gpsbabel/xmldoc/filters/arc-trk.xml rename to xmldoc/filters/arc-trk.xml diff --git a/gpsbabel/xmldoc/filters/arc.xml b/xmldoc/filters/arc.xml similarity index 100% rename from gpsbabel/xmldoc/filters/arc.xml rename to xmldoc/filters/arc.xml diff --git a/gpsbabel/xmldoc/filters/bend.xml b/xmldoc/filters/bend.xml similarity index 100% rename from gpsbabel/xmldoc/filters/bend.xml rename to xmldoc/filters/bend.xml diff --git a/gpsbabel/xmldoc/filters/discard.xml b/xmldoc/filters/discard.xml similarity index 100% rename from gpsbabel/xmldoc/filters/discard.xml rename to xmldoc/filters/discard.xml diff --git a/gpsbabel/xmldoc/filters/duplicate.xml b/xmldoc/filters/duplicate.xml similarity index 100% rename from gpsbabel/xmldoc/filters/duplicate.xml rename to xmldoc/filters/duplicate.xml diff --git a/gpsbabel/xmldoc/filters/height.xml b/xmldoc/filters/height.xml similarity index 100% rename from gpsbabel/xmldoc/filters/height.xml rename to xmldoc/filters/height.xml diff --git a/gpsbabel/xmldoc/filters/interpolate.xml b/xmldoc/filters/interpolate.xml similarity index 100% rename from gpsbabel/xmldoc/filters/interpolate.xml rename to xmldoc/filters/interpolate.xml diff --git a/gpsbabel/xmldoc/filters/nuketypes.xml b/xmldoc/filters/nuketypes.xml similarity index 100% rename from gpsbabel/xmldoc/filters/nuketypes.xml rename to xmldoc/filters/nuketypes.xml diff --git a/gpsbabel/xmldoc/filters/options/arc-distance.xml b/xmldoc/filters/options/arc-distance.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/arc-distance.xml rename to xmldoc/filters/options/arc-distance.xml diff --git a/gpsbabel/xmldoc/filters/options/arc-exclude.xml b/xmldoc/filters/options/arc-exclude.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/arc-exclude.xml rename to xmldoc/filters/options/arc-exclude.xml diff --git a/gpsbabel/xmldoc/filters/options/arc-file.xml b/xmldoc/filters/options/arc-file.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/arc-file.xml rename to xmldoc/filters/options/arc-file.xml diff --git a/gpsbabel/xmldoc/filters/options/arc-points.xml b/xmldoc/filters/options/arc-points.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/arc-points.xml rename to xmldoc/filters/options/arc-points.xml diff --git a/gpsbabel/xmldoc/filters/options/arc-project.xml b/xmldoc/filters/options/arc-project.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/arc-project.xml rename to xmldoc/filters/options/arc-project.xml diff --git a/gpsbabel/xmldoc/filters/options/arc-rte.xml b/xmldoc/filters/options/arc-rte.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/arc-rte.xml rename to xmldoc/filters/options/arc-rte.xml diff --git a/gpsbabel/xmldoc/filters/options/arc-trk.xml b/xmldoc/filters/options/arc-trk.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/arc-trk.xml rename to xmldoc/filters/options/arc-trk.xml diff --git a/gpsbabel/xmldoc/filters/options/bend-distance.xml b/xmldoc/filters/options/bend-distance.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/bend-distance.xml rename to xmldoc/filters/options/bend-distance.xml diff --git a/gpsbabel/xmldoc/filters/options/bend-minangle.xml b/xmldoc/filters/options/bend-minangle.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/bend-minangle.xml rename to xmldoc/filters/options/bend-minangle.xml diff --git a/gpsbabel/xmldoc/filters/options/discard-elemax.xml b/xmldoc/filters/options/discard-elemax.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/discard-elemax.xml rename to xmldoc/filters/options/discard-elemax.xml diff --git a/gpsbabel/xmldoc/filters/options/discard-elemin.xml b/xmldoc/filters/options/discard-elemin.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/discard-elemin.xml rename to xmldoc/filters/options/discard-elemin.xml diff --git a/gpsbabel/xmldoc/filters/options/discard-fixnone.xml b/xmldoc/filters/options/discard-fixnone.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/discard-fixnone.xml rename to xmldoc/filters/options/discard-fixnone.xml diff --git a/gpsbabel/xmldoc/filters/options/discard-fixunknown.xml b/xmldoc/filters/options/discard-fixunknown.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/discard-fixunknown.xml rename to xmldoc/filters/options/discard-fixunknown.xml diff --git a/gpsbabel/xmldoc/filters/options/discard-hdop.xml b/xmldoc/filters/options/discard-hdop.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/discard-hdop.xml rename to xmldoc/filters/options/discard-hdop.xml diff --git a/gpsbabel/xmldoc/filters/options/discard-hdopandvdop.xml b/xmldoc/filters/options/discard-hdopandvdop.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/discard-hdopandvdop.xml rename to xmldoc/filters/options/discard-hdopandvdop.xml diff --git a/gpsbabel/xmldoc/filters/options/discard-matchcmt.xml b/xmldoc/filters/options/discard-matchcmt.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/discard-matchcmt.xml rename to xmldoc/filters/options/discard-matchcmt.xml diff --git a/gpsbabel/xmldoc/filters/options/discard-matchdesc.xml b/xmldoc/filters/options/discard-matchdesc.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/discard-matchdesc.xml rename to xmldoc/filters/options/discard-matchdesc.xml diff --git a/gpsbabel/xmldoc/filters/options/discard-matchicon.xml b/xmldoc/filters/options/discard-matchicon.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/discard-matchicon.xml rename to xmldoc/filters/options/discard-matchicon.xml diff --git a/gpsbabel/xmldoc/filters/options/discard-matchname.xml b/xmldoc/filters/options/discard-matchname.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/discard-matchname.xml rename to xmldoc/filters/options/discard-matchname.xml diff --git a/gpsbabel/xmldoc/filters/options/discard-sat.xml b/xmldoc/filters/options/discard-sat.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/discard-sat.xml rename to xmldoc/filters/options/discard-sat.xml diff --git a/gpsbabel/xmldoc/filters/options/discard-vdop.xml b/xmldoc/filters/options/discard-vdop.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/discard-vdop.xml rename to xmldoc/filters/options/discard-vdop.xml diff --git a/gpsbabel/xmldoc/filters/options/duplicate-all.xml b/xmldoc/filters/options/duplicate-all.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/duplicate-all.xml rename to xmldoc/filters/options/duplicate-all.xml diff --git a/gpsbabel/xmldoc/filters/options/duplicate-correct.xml b/xmldoc/filters/options/duplicate-correct.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/duplicate-correct.xml rename to xmldoc/filters/options/duplicate-correct.xml diff --git a/gpsbabel/xmldoc/filters/options/duplicate-location.xml b/xmldoc/filters/options/duplicate-location.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/duplicate-location.xml rename to xmldoc/filters/options/duplicate-location.xml diff --git a/gpsbabel/xmldoc/filters/options/duplicate-shortname.xml b/xmldoc/filters/options/duplicate-shortname.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/duplicate-shortname.xml rename to xmldoc/filters/options/duplicate-shortname.xml diff --git a/gpsbabel/xmldoc/filters/options/height-add.xml b/xmldoc/filters/options/height-add.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/height-add.xml rename to xmldoc/filters/options/height-add.xml diff --git a/gpsbabel/xmldoc/filters/options/height-wgs84tomsl.xml b/xmldoc/filters/options/height-wgs84tomsl.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/height-wgs84tomsl.xml rename to xmldoc/filters/options/height-wgs84tomsl.xml diff --git a/gpsbabel/xmldoc/filters/options/interpolate-distance.xml b/xmldoc/filters/options/interpolate-distance.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/interpolate-distance.xml rename to xmldoc/filters/options/interpolate-distance.xml diff --git a/gpsbabel/xmldoc/filters/options/interpolate-route.xml b/xmldoc/filters/options/interpolate-route.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/interpolate-route.xml rename to xmldoc/filters/options/interpolate-route.xml diff --git a/gpsbabel/xmldoc/filters/options/interpolate-time.xml b/xmldoc/filters/options/interpolate-time.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/interpolate-time.xml rename to xmldoc/filters/options/interpolate-time.xml diff --git a/gpsbabel/xmldoc/filters/options/nuketypes-routes.xml b/xmldoc/filters/options/nuketypes-routes.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/nuketypes-routes.xml rename to xmldoc/filters/options/nuketypes-routes.xml diff --git a/gpsbabel/xmldoc/filters/options/nuketypes-tracks.xml b/xmldoc/filters/options/nuketypes-tracks.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/nuketypes-tracks.xml rename to xmldoc/filters/options/nuketypes-tracks.xml diff --git a/gpsbabel/xmldoc/filters/options/nuketypes-waypoints.xml b/xmldoc/filters/options/nuketypes-waypoints.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/nuketypes-waypoints.xml rename to xmldoc/filters/options/nuketypes-waypoints.xml diff --git a/gpsbabel/xmldoc/filters/options/polygon-exclude.xml b/xmldoc/filters/options/polygon-exclude.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/polygon-exclude.xml rename to xmldoc/filters/options/polygon-exclude.xml diff --git a/gpsbabel/xmldoc/filters/options/polygon-file.xml b/xmldoc/filters/options/polygon-file.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/polygon-file.xml rename to xmldoc/filters/options/polygon-file.xml diff --git a/gpsbabel/xmldoc/filters/options/position-all.xml b/xmldoc/filters/options/position-all.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/position-all.xml rename to xmldoc/filters/options/position-all.xml diff --git a/gpsbabel/xmldoc/filters/options/position-distance.xml b/xmldoc/filters/options/position-distance.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/position-distance.xml rename to xmldoc/filters/options/position-distance.xml diff --git a/gpsbabel/xmldoc/filters/options/position-time.xml b/xmldoc/filters/options/position-time.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/position-time.xml rename to xmldoc/filters/options/position-time.xml diff --git a/gpsbabel/xmldoc/filters/options/radius-asroute.xml b/xmldoc/filters/options/radius-asroute.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/radius-asroute.xml rename to xmldoc/filters/options/radius-asroute.xml diff --git a/gpsbabel/xmldoc/filters/options/radius-distance.xml b/xmldoc/filters/options/radius-distance.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/radius-distance.xml rename to xmldoc/filters/options/radius-distance.xml diff --git a/gpsbabel/xmldoc/filters/options/radius-exclude.xml b/xmldoc/filters/options/radius-exclude.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/radius-exclude.xml rename to xmldoc/filters/options/radius-exclude.xml diff --git a/gpsbabel/xmldoc/filters/options/radius-lat.xml b/xmldoc/filters/options/radius-lat.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/radius-lat.xml rename to xmldoc/filters/options/radius-lat.xml diff --git a/gpsbabel/xmldoc/filters/options/radius-lon.xml b/xmldoc/filters/options/radius-lon.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/radius-lon.xml rename to xmldoc/filters/options/radius-lon.xml diff --git a/gpsbabel/xmldoc/filters/options/radius-maxcount.xml b/xmldoc/filters/options/radius-maxcount.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/radius-maxcount.xml rename to xmldoc/filters/options/radius-maxcount.xml diff --git a/gpsbabel/xmldoc/filters/options/radius-nosort.xml b/xmldoc/filters/options/radius-nosort.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/radius-nosort.xml rename to xmldoc/filters/options/radius-nosort.xml diff --git a/gpsbabel/xmldoc/filters/options/simplify-count.xml b/xmldoc/filters/options/simplify-count.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/simplify-count.xml rename to xmldoc/filters/options/simplify-count.xml diff --git a/gpsbabel/xmldoc/filters/options/simplify-crosstrack.xml b/xmldoc/filters/options/simplify-crosstrack.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/simplify-crosstrack.xml rename to xmldoc/filters/options/simplify-crosstrack.xml diff --git a/gpsbabel/xmldoc/filters/options/simplify-error.xml b/xmldoc/filters/options/simplify-error.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/simplify-error.xml rename to xmldoc/filters/options/simplify-error.xml diff --git a/gpsbabel/xmldoc/filters/options/simplify-length.xml b/xmldoc/filters/options/simplify-length.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/simplify-length.xml rename to xmldoc/filters/options/simplify-length.xml diff --git a/gpsbabel/xmldoc/filters/options/simplify-relative.xml b/xmldoc/filters/options/simplify-relative.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/simplify-relative.xml rename to xmldoc/filters/options/simplify-relative.xml diff --git a/gpsbabel/xmldoc/filters/options/sort-description.xml b/xmldoc/filters/options/sort-description.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/sort-description.xml rename to xmldoc/filters/options/sort-description.xml diff --git a/gpsbabel/xmldoc/filters/options/sort-gcid.xml b/xmldoc/filters/options/sort-gcid.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/sort-gcid.xml rename to xmldoc/filters/options/sort-gcid.xml diff --git a/gpsbabel/xmldoc/filters/options/sort-shortname.xml b/xmldoc/filters/options/sort-shortname.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/sort-shortname.xml rename to xmldoc/filters/options/sort-shortname.xml diff --git a/gpsbabel/xmldoc/filters/options/sort-time.xml b/xmldoc/filters/options/sort-time.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/sort-time.xml rename to xmldoc/filters/options/sort-time.xml diff --git a/gpsbabel/xmldoc/filters/options/stack-append.xml b/xmldoc/filters/options/stack-append.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/stack-append.xml rename to xmldoc/filters/options/stack-append.xml diff --git a/gpsbabel/xmldoc/filters/options/stack-copy.xml b/xmldoc/filters/options/stack-copy.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/stack-copy.xml rename to xmldoc/filters/options/stack-copy.xml diff --git a/gpsbabel/xmldoc/filters/options/stack-depth.xml b/xmldoc/filters/options/stack-depth.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/stack-depth.xml rename to xmldoc/filters/options/stack-depth.xml diff --git a/gpsbabel/xmldoc/filters/options/stack-discard.xml b/xmldoc/filters/options/stack-discard.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/stack-discard.xml rename to xmldoc/filters/options/stack-discard.xml diff --git a/gpsbabel/xmldoc/filters/options/stack-pop.xml b/xmldoc/filters/options/stack-pop.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/stack-pop.xml rename to xmldoc/filters/options/stack-pop.xml diff --git a/gpsbabel/xmldoc/filters/options/stack-push.xml b/xmldoc/filters/options/stack-push.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/stack-push.xml rename to xmldoc/filters/options/stack-push.xml diff --git a/gpsbabel/xmldoc/filters/options/stack-replace.xml b/xmldoc/filters/options/stack-replace.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/stack-replace.xml rename to xmldoc/filters/options/stack-replace.xml diff --git a/gpsbabel/xmldoc/filters/options/stack-swap.xml b/xmldoc/filters/options/stack-swap.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/stack-swap.xml rename to xmldoc/filters/options/stack-swap.xml diff --git a/gpsbabel/xmldoc/filters/options/track-course.xml b/xmldoc/filters/options/track-course.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/track-course.xml rename to xmldoc/filters/options/track-course.xml diff --git a/gpsbabel/xmldoc/filters/options/track-discard.xml b/xmldoc/filters/options/track-discard.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/track-discard.xml rename to xmldoc/filters/options/track-discard.xml diff --git a/gpsbabel/xmldoc/filters/options/track-faketime.xml b/xmldoc/filters/options/track-faketime.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/track-faketime.xml rename to xmldoc/filters/options/track-faketime.xml diff --git a/gpsbabel/xmldoc/filters/options/track-fix.xml b/xmldoc/filters/options/track-fix.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/track-fix.xml rename to xmldoc/filters/options/track-fix.xml diff --git a/gpsbabel/xmldoc/filters/options/track-merge.xml b/xmldoc/filters/options/track-merge.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/track-merge.xml rename to xmldoc/filters/options/track-merge.xml diff --git a/gpsbabel/xmldoc/filters/options/track-move.xml b/xmldoc/filters/options/track-move.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/track-move.xml rename to xmldoc/filters/options/track-move.xml diff --git a/gpsbabel/xmldoc/filters/options/track-name.xml b/xmldoc/filters/options/track-name.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/track-name.xml rename to xmldoc/filters/options/track-name.xml diff --git a/gpsbabel/xmldoc/filters/options/track-pack.xml b/xmldoc/filters/options/track-pack.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/track-pack.xml rename to xmldoc/filters/options/track-pack.xml diff --git a/gpsbabel/xmldoc/filters/options/track-sdistance.xml b/xmldoc/filters/options/track-sdistance.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/track-sdistance.xml rename to xmldoc/filters/options/track-sdistance.xml diff --git a/gpsbabel/xmldoc/filters/options/track-seg2trk.xml b/xmldoc/filters/options/track-seg2trk.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/track-seg2trk.xml rename to xmldoc/filters/options/track-seg2trk.xml diff --git a/gpsbabel/xmldoc/filters/options/track-segment.xml b/xmldoc/filters/options/track-segment.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/track-segment.xml rename to xmldoc/filters/options/track-segment.xml diff --git a/gpsbabel/xmldoc/filters/options/track-speed.xml b/xmldoc/filters/options/track-speed.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/track-speed.xml rename to xmldoc/filters/options/track-speed.xml diff --git a/gpsbabel/xmldoc/filters/options/track-split.xml b/xmldoc/filters/options/track-split.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/track-split.xml rename to xmldoc/filters/options/track-split.xml diff --git a/gpsbabel/xmldoc/filters/options/track-start.xml b/xmldoc/filters/options/track-start.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/track-start.xml rename to xmldoc/filters/options/track-start.xml diff --git a/gpsbabel/xmldoc/filters/options/track-stop.xml b/xmldoc/filters/options/track-stop.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/track-stop.xml rename to xmldoc/filters/options/track-stop.xml diff --git a/gpsbabel/xmldoc/filters/options/track-title.xml b/xmldoc/filters/options/track-title.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/track-title.xml rename to xmldoc/filters/options/track-title.xml diff --git a/gpsbabel/xmldoc/filters/options/track-trk2seg.xml b/xmldoc/filters/options/track-trk2seg.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/track-trk2seg.xml rename to xmldoc/filters/options/track-trk2seg.xml diff --git a/gpsbabel/xmldoc/filters/options/transform-del.xml b/xmldoc/filters/options/transform-del.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/transform-del.xml rename to xmldoc/filters/options/transform-del.xml diff --git a/gpsbabel/xmldoc/filters/options/transform-rptname.xml b/xmldoc/filters/options/transform-rptname.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/transform-rptname.xml rename to xmldoc/filters/options/transform-rptname.xml diff --git a/gpsbabel/xmldoc/filters/options/transform-rte.xml b/xmldoc/filters/options/transform-rte.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/transform-rte.xml rename to xmldoc/filters/options/transform-rte.xml diff --git a/gpsbabel/xmldoc/filters/options/transform-trk.xml b/xmldoc/filters/options/transform-trk.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/transform-trk.xml rename to xmldoc/filters/options/transform-trk.xml diff --git a/gpsbabel/xmldoc/filters/options/transform-wpt.xml b/xmldoc/filters/options/transform-wpt.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/transform-wpt.xml rename to xmldoc/filters/options/transform-wpt.xml diff --git a/gpsbabel/xmldoc/filters/options/validate-checkempty.xml b/xmldoc/filters/options/validate-checkempty.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/validate-checkempty.xml rename to xmldoc/filters/options/validate-checkempty.xml diff --git a/gpsbabel/xmldoc/filters/options/validate-debug.xml b/xmldoc/filters/options/validate-debug.xml similarity index 100% rename from gpsbabel/xmldoc/filters/options/validate-debug.xml rename to xmldoc/filters/options/validate-debug.xml diff --git a/gpsbabel/xmldoc/filters/polygon.xml b/xmldoc/filters/polygon.xml similarity index 100% rename from gpsbabel/xmldoc/filters/polygon.xml rename to xmldoc/filters/polygon.xml diff --git a/gpsbabel/xmldoc/filters/position.xml b/xmldoc/filters/position.xml similarity index 100% rename from gpsbabel/xmldoc/filters/position.xml rename to xmldoc/filters/position.xml diff --git a/gpsbabel/xmldoc/filters/radius.xml b/xmldoc/filters/radius.xml similarity index 100% rename from gpsbabel/xmldoc/filters/radius.xml rename to xmldoc/filters/radius.xml diff --git a/gpsbabel/xmldoc/filters/reverse.xml b/xmldoc/filters/reverse.xml similarity index 100% rename from gpsbabel/xmldoc/filters/reverse.xml rename to xmldoc/filters/reverse.xml diff --git a/gpsbabel/xmldoc/filters/simplify.xml b/xmldoc/filters/simplify.xml similarity index 100% rename from gpsbabel/xmldoc/filters/simplify.xml rename to xmldoc/filters/simplify.xml diff --git a/gpsbabel/xmldoc/filters/sort.xml b/xmldoc/filters/sort.xml similarity index 100% rename from gpsbabel/xmldoc/filters/sort.xml rename to xmldoc/filters/sort.xml diff --git a/gpsbabel/xmldoc/filters/stack.xml b/xmldoc/filters/stack.xml similarity index 100% rename from gpsbabel/xmldoc/filters/stack.xml rename to xmldoc/filters/stack.xml diff --git a/gpsbabel/xmldoc/filters/swap.xml b/xmldoc/filters/swap.xml similarity index 100% rename from gpsbabel/xmldoc/filters/swap.xml rename to xmldoc/filters/swap.xml diff --git a/gpsbabel/xmldoc/filters/track.xml b/xmldoc/filters/track.xml similarity index 100% rename from gpsbabel/xmldoc/filters/track.xml rename to xmldoc/filters/track.xml diff --git a/gpsbabel/xmldoc/filters/transform.xml b/xmldoc/filters/transform.xml similarity index 100% rename from gpsbabel/xmldoc/filters/transform.xml rename to xmldoc/filters/transform.xml diff --git a/gpsbabel/xmldoc/filters/validate.xml b/xmldoc/filters/validate.xml similarity index 100% rename from gpsbabel/xmldoc/filters/validate.xml rename to xmldoc/filters/validate.xml diff --git a/gpsbabel/xmldoc/formats/alantrl.xml b/xmldoc/formats/alantrl.xml similarity index 100% rename from gpsbabel/xmldoc/formats/alantrl.xml rename to xmldoc/formats/alantrl.xml diff --git a/gpsbabel/xmldoc/formats/alanwpr.xml b/xmldoc/formats/alanwpr.xml similarity index 100% rename from gpsbabel/xmldoc/formats/alanwpr.xml rename to xmldoc/formats/alanwpr.xml diff --git a/gpsbabel/xmldoc/formats/an1.xml b/xmldoc/formats/an1.xml similarity index 100% rename from gpsbabel/xmldoc/formats/an1.xml rename to xmldoc/formats/an1.xml diff --git a/gpsbabel/xmldoc/formats/arc.xml b/xmldoc/formats/arc.xml similarity index 100% rename from gpsbabel/xmldoc/formats/arc.xml rename to xmldoc/formats/arc.xml diff --git a/gpsbabel/xmldoc/formats/axim_gpb.xml b/xmldoc/formats/axim_gpb.xml similarity index 100% rename from gpsbabel/xmldoc/formats/axim_gpb.xml rename to xmldoc/formats/axim_gpb.xml diff --git a/gpsbabel/xmldoc/formats/baroiq.xml b/xmldoc/formats/baroiq.xml similarity index 100% rename from gpsbabel/xmldoc/formats/baroiq.xml rename to xmldoc/formats/baroiq.xml diff --git a/gpsbabel/xmldoc/formats/bcr.xml b/xmldoc/formats/bcr.xml similarity index 100% rename from gpsbabel/xmldoc/formats/bcr.xml rename to xmldoc/formats/bcr.xml diff --git a/gpsbabel/xmldoc/formats/bushnell.xml b/xmldoc/formats/bushnell.xml similarity index 100% rename from gpsbabel/xmldoc/formats/bushnell.xml rename to xmldoc/formats/bushnell.xml diff --git a/gpsbabel/xmldoc/formats/bushnell_trl.xml b/xmldoc/formats/bushnell_trl.xml similarity index 100% rename from gpsbabel/xmldoc/formats/bushnell_trl.xml rename to xmldoc/formats/bushnell_trl.xml diff --git a/gpsbabel/xmldoc/formats/cambridge.xml b/xmldoc/formats/cambridge.xml similarity index 100% rename from gpsbabel/xmldoc/formats/cambridge.xml rename to xmldoc/formats/cambridge.xml diff --git a/gpsbabel/xmldoc/formats/cetus.xml b/xmldoc/formats/cetus.xml similarity index 100% rename from gpsbabel/xmldoc/formats/cetus.xml rename to xmldoc/formats/cetus.xml diff --git a/gpsbabel/xmldoc/formats/coastexp.xml b/xmldoc/formats/coastexp.xml similarity index 100% rename from gpsbabel/xmldoc/formats/coastexp.xml rename to xmldoc/formats/coastexp.xml diff --git a/gpsbabel/xmldoc/formats/compegps.xml b/xmldoc/formats/compegps.xml similarity index 100% rename from gpsbabel/xmldoc/formats/compegps.xml rename to xmldoc/formats/compegps.xml diff --git a/gpsbabel/xmldoc/formats/copilot.xml b/xmldoc/formats/copilot.xml similarity index 100% rename from gpsbabel/xmldoc/formats/copilot.xml rename to xmldoc/formats/copilot.xml diff --git a/gpsbabel/xmldoc/formats/coto.xml b/xmldoc/formats/coto.xml similarity index 100% rename from gpsbabel/xmldoc/formats/coto.xml rename to xmldoc/formats/coto.xml diff --git a/gpsbabel/xmldoc/formats/cst.xml b/xmldoc/formats/cst.xml similarity index 100% rename from gpsbabel/xmldoc/formats/cst.xml rename to xmldoc/formats/cst.xml diff --git a/gpsbabel/xmldoc/formats/csv.xml b/xmldoc/formats/csv.xml similarity index 100% rename from gpsbabel/xmldoc/formats/csv.xml rename to xmldoc/formats/csv.xml diff --git a/gpsbabel/xmldoc/formats/cup.xml b/xmldoc/formats/cup.xml similarity index 100% rename from gpsbabel/xmldoc/formats/cup.xml rename to xmldoc/formats/cup.xml diff --git a/gpsbabel/xmldoc/formats/custom.xml b/xmldoc/formats/custom.xml similarity index 100% rename from gpsbabel/xmldoc/formats/custom.xml rename to xmldoc/formats/custom.xml diff --git a/gpsbabel/xmldoc/formats/delbin.xml b/xmldoc/formats/delbin.xml similarity index 100% rename from gpsbabel/xmldoc/formats/delbin.xml rename to xmldoc/formats/delbin.xml diff --git a/gpsbabel/xmldoc/formats/destinator_itn.xml b/xmldoc/formats/destinator_itn.xml similarity index 100% rename from gpsbabel/xmldoc/formats/destinator_itn.xml rename to xmldoc/formats/destinator_itn.xml diff --git a/gpsbabel/xmldoc/formats/destinator_poi.xml b/xmldoc/formats/destinator_poi.xml similarity index 100% rename from gpsbabel/xmldoc/formats/destinator_poi.xml rename to xmldoc/formats/destinator_poi.xml diff --git a/gpsbabel/xmldoc/formats/destinator_trl.xml b/xmldoc/formats/destinator_trl.xml similarity index 100% rename from gpsbabel/xmldoc/formats/destinator_trl.xml rename to xmldoc/formats/destinator_trl.xml diff --git a/gpsbabel/xmldoc/formats/dg-100.xml b/xmldoc/formats/dg-100.xml similarity index 100% rename from gpsbabel/xmldoc/formats/dg-100.xml rename to xmldoc/formats/dg-100.xml diff --git a/gpsbabel/xmldoc/formats/dg-200.xml b/xmldoc/formats/dg-200.xml similarity index 100% rename from gpsbabel/xmldoc/formats/dg-200.xml rename to xmldoc/formats/dg-200.xml diff --git a/gpsbabel/xmldoc/formats/dmtlog.xml b/xmldoc/formats/dmtlog.xml similarity index 100% rename from gpsbabel/xmldoc/formats/dmtlog.xml rename to xmldoc/formats/dmtlog.xml diff --git a/gpsbabel/xmldoc/formats/dna.xml b/xmldoc/formats/dna.xml similarity index 100% rename from gpsbabel/xmldoc/formats/dna.xml rename to xmldoc/formats/dna.xml diff --git a/gpsbabel/xmldoc/formats/easygps.xml b/xmldoc/formats/easygps.xml similarity index 100% rename from gpsbabel/xmldoc/formats/easygps.xml rename to xmldoc/formats/easygps.xml diff --git a/gpsbabel/xmldoc/formats/energympro.xml b/xmldoc/formats/energympro.xml similarity index 100% rename from gpsbabel/xmldoc/formats/energympro.xml rename to xmldoc/formats/energympro.xml diff --git a/gpsbabel/xmldoc/formats/enigma.xml b/xmldoc/formats/enigma.xml similarity index 100% rename from gpsbabel/xmldoc/formats/enigma.xml rename to xmldoc/formats/enigma.xml diff --git a/gpsbabel/xmldoc/formats/enigma_wp.xml b/xmldoc/formats/enigma_wp.xml similarity index 100% rename from gpsbabel/xmldoc/formats/enigma_wp.xml rename to xmldoc/formats/enigma_wp.xml diff --git a/gpsbabel/xmldoc/formats/exif.xml b/xmldoc/formats/exif.xml similarity index 100% rename from gpsbabel/xmldoc/formats/exif.xml rename to xmldoc/formats/exif.xml diff --git a/gpsbabel/xmldoc/formats/f90g.xml b/xmldoc/formats/f90g.xml similarity index 100% rename from gpsbabel/xmldoc/formats/f90g.xml rename to xmldoc/formats/f90g.xml diff --git a/gpsbabel/xmldoc/formats/fit.xml b/xmldoc/formats/fit.xml similarity index 100% rename from gpsbabel/xmldoc/formats/fit.xml rename to xmldoc/formats/fit.xml diff --git a/gpsbabel/xmldoc/formats/flysight.xml b/xmldoc/formats/flysight.xml similarity index 100% rename from gpsbabel/xmldoc/formats/flysight.xml rename to xmldoc/formats/flysight.xml diff --git a/gpsbabel/xmldoc/formats/fugawi.xml b/xmldoc/formats/fugawi.xml similarity index 100% rename from gpsbabel/xmldoc/formats/fugawi.xml rename to xmldoc/formats/fugawi.xml diff --git a/gpsbabel/xmldoc/formats/g7towin.xml b/xmldoc/formats/g7towin.xml similarity index 100% rename from gpsbabel/xmldoc/formats/g7towin.xml rename to xmldoc/formats/g7towin.xml diff --git a/gpsbabel/xmldoc/formats/garmin.xml b/xmldoc/formats/garmin.xml similarity index 100% rename from gpsbabel/xmldoc/formats/garmin.xml rename to xmldoc/formats/garmin.xml diff --git a/gpsbabel/xmldoc/formats/garmin301.xml b/xmldoc/formats/garmin301.xml similarity index 100% rename from gpsbabel/xmldoc/formats/garmin301.xml rename to xmldoc/formats/garmin301.xml diff --git a/gpsbabel/xmldoc/formats/garmin_fit.xml b/xmldoc/formats/garmin_fit.xml similarity index 100% rename from gpsbabel/xmldoc/formats/garmin_fit.xml rename to xmldoc/formats/garmin_fit.xml diff --git a/gpsbabel/xmldoc/formats/garmin_g1000.xml b/xmldoc/formats/garmin_g1000.xml similarity index 100% rename from gpsbabel/xmldoc/formats/garmin_g1000.xml rename to xmldoc/formats/garmin_g1000.xml diff --git a/gpsbabel/xmldoc/formats/garmin_gpi.xml b/xmldoc/formats/garmin_gpi.xml similarity index 100% rename from gpsbabel/xmldoc/formats/garmin_gpi.xml rename to xmldoc/formats/garmin_gpi.xml diff --git a/gpsbabel/xmldoc/formats/garmin_poi.xml b/xmldoc/formats/garmin_poi.xml similarity index 100% rename from gpsbabel/xmldoc/formats/garmin_poi.xml rename to xmldoc/formats/garmin_poi.xml diff --git a/gpsbabel/xmldoc/formats/garmin_txt.xml b/xmldoc/formats/garmin_txt.xml similarity index 100% rename from gpsbabel/xmldoc/formats/garmin_txt.xml rename to xmldoc/formats/garmin_txt.xml diff --git a/gpsbabel/xmldoc/formats/garmin_xt.xml b/xmldoc/formats/garmin_xt.xml similarity index 100% rename from gpsbabel/xmldoc/formats/garmin_xt.xml rename to xmldoc/formats/garmin_xt.xml diff --git a/gpsbabel/xmldoc/formats/gcdb.xml b/xmldoc/formats/gcdb.xml similarity index 100% rename from gpsbabel/xmldoc/formats/gcdb.xml rename to xmldoc/formats/gcdb.xml diff --git a/gpsbabel/xmldoc/formats/gdb.xml b/xmldoc/formats/gdb.xml similarity index 100% rename from gpsbabel/xmldoc/formats/gdb.xml rename to xmldoc/formats/gdb.xml diff --git a/gpsbabel/xmldoc/formats/geo.xml b/xmldoc/formats/geo.xml similarity index 100% rename from gpsbabel/xmldoc/formats/geo.xml rename to xmldoc/formats/geo.xml diff --git a/gpsbabel/xmldoc/formats/geonet.xml b/xmldoc/formats/geonet.xml similarity index 100% rename from gpsbabel/xmldoc/formats/geonet.xml rename to xmldoc/formats/geonet.xml diff --git a/gpsbabel/xmldoc/formats/geoniche.xml b/xmldoc/formats/geoniche.xml similarity index 100% rename from gpsbabel/xmldoc/formats/geoniche.xml rename to xmldoc/formats/geoniche.xml diff --git a/gpsbabel/xmldoc/formats/ggv_log.xml b/xmldoc/formats/ggv_log.xml similarity index 100% rename from gpsbabel/xmldoc/formats/ggv_log.xml rename to xmldoc/formats/ggv_log.xml diff --git a/gpsbabel/xmldoc/formats/ggv_ovl.xml b/xmldoc/formats/ggv_ovl.xml similarity index 100% rename from gpsbabel/xmldoc/formats/ggv_ovl.xml rename to xmldoc/formats/ggv_ovl.xml diff --git a/gpsbabel/xmldoc/formats/glogbook.xml b/xmldoc/formats/glogbook.xml similarity index 100% rename from gpsbabel/xmldoc/formats/glogbook.xml rename to xmldoc/formats/glogbook.xml diff --git a/gpsbabel/xmldoc/formats/gnav_trl.xml b/xmldoc/formats/gnav_trl.xml similarity index 100% rename from gpsbabel/xmldoc/formats/gnav_trl.xml rename to xmldoc/formats/gnav_trl.xml diff --git a/gpsbabel/xmldoc/formats/google.xml b/xmldoc/formats/google.xml similarity index 100% rename from gpsbabel/xmldoc/formats/google.xml rename to xmldoc/formats/google.xml diff --git a/gpsbabel/xmldoc/formats/googledir.xml b/xmldoc/formats/googledir.xml similarity index 100% rename from gpsbabel/xmldoc/formats/googledir.xml rename to xmldoc/formats/googledir.xml diff --git a/gpsbabel/xmldoc/formats/gopal.xml b/xmldoc/formats/gopal.xml similarity index 100% rename from gpsbabel/xmldoc/formats/gopal.xml rename to xmldoc/formats/gopal.xml diff --git a/gpsbabel/xmldoc/formats/gpilots.xml b/xmldoc/formats/gpilots.xml similarity index 100% rename from gpsbabel/xmldoc/formats/gpilots.xml rename to xmldoc/formats/gpilots.xml diff --git a/gpsbabel/xmldoc/formats/gpl.xml b/xmldoc/formats/gpl.xml similarity index 100% rename from gpsbabel/xmldoc/formats/gpl.xml rename to xmldoc/formats/gpl.xml diff --git a/gpsbabel/xmldoc/formats/gpsdrive.xml b/xmldoc/formats/gpsdrive.xml similarity index 100% rename from gpsbabel/xmldoc/formats/gpsdrive.xml rename to xmldoc/formats/gpsdrive.xml diff --git a/gpsbabel/xmldoc/formats/gpsdrivetrack.xml b/xmldoc/formats/gpsdrivetrack.xml similarity index 100% rename from gpsbabel/xmldoc/formats/gpsdrivetrack.xml rename to xmldoc/formats/gpsdrivetrack.xml diff --git a/gpsbabel/xmldoc/formats/gpsman.xml b/xmldoc/formats/gpsman.xml similarity index 100% rename from gpsbabel/xmldoc/formats/gpsman.xml rename to xmldoc/formats/gpsman.xml diff --git a/gpsbabel/xmldoc/formats/gpspilot.xml b/xmldoc/formats/gpspilot.xml similarity index 100% rename from gpsbabel/xmldoc/formats/gpspilot.xml rename to xmldoc/formats/gpspilot.xml diff --git a/gpsbabel/xmldoc/formats/gpssim.xml b/xmldoc/formats/gpssim.xml similarity index 100% rename from gpsbabel/xmldoc/formats/gpssim.xml rename to xmldoc/formats/gpssim.xml diff --git a/gpsbabel/xmldoc/formats/gpsutil.xml b/xmldoc/formats/gpsutil.xml similarity index 100% rename from gpsbabel/xmldoc/formats/gpsutil.xml rename to xmldoc/formats/gpsutil.xml diff --git a/gpsbabel/xmldoc/formats/gpx.xml b/xmldoc/formats/gpx.xml similarity index 100% rename from gpsbabel/xmldoc/formats/gpx.xml rename to xmldoc/formats/gpx.xml diff --git a/gpsbabel/xmldoc/formats/gtm.xml b/xmldoc/formats/gtm.xml similarity index 100% rename from gpsbabel/xmldoc/formats/gtm.xml rename to xmldoc/formats/gtm.xml diff --git a/gpsbabel/xmldoc/formats/gtrnctr.xml b/xmldoc/formats/gtrnctr.xml similarity index 100% rename from gpsbabel/xmldoc/formats/gtrnctr.xml rename to xmldoc/formats/gtrnctr.xml diff --git a/gpsbabel/xmldoc/formats/gtrnctr1.xml b/xmldoc/formats/gtrnctr1.xml similarity index 100% rename from gpsbabel/xmldoc/formats/gtrnctr1.xml rename to xmldoc/formats/gtrnctr1.xml diff --git a/gpsbabel/xmldoc/formats/hiketech.xml b/xmldoc/formats/hiketech.xml similarity index 100% rename from gpsbabel/xmldoc/formats/hiketech.xml rename to xmldoc/formats/hiketech.xml diff --git a/gpsbabel/xmldoc/formats/holux.xml b/xmldoc/formats/holux.xml similarity index 100% rename from gpsbabel/xmldoc/formats/holux.xml rename to xmldoc/formats/holux.xml diff --git a/gpsbabel/xmldoc/formats/hsandv.xml b/xmldoc/formats/hsandv.xml similarity index 100% rename from gpsbabel/xmldoc/formats/hsandv.xml rename to xmldoc/formats/hsandv.xml diff --git a/gpsbabel/xmldoc/formats/html.xml b/xmldoc/formats/html.xml similarity index 100% rename from gpsbabel/xmldoc/formats/html.xml rename to xmldoc/formats/html.xml diff --git a/gpsbabel/xmldoc/formats/humminbird.xml b/xmldoc/formats/humminbird.xml similarity index 100% rename from gpsbabel/xmldoc/formats/humminbird.xml rename to xmldoc/formats/humminbird.xml diff --git a/gpsbabel/xmldoc/formats/humminbird_ht.xml b/xmldoc/formats/humminbird_ht.xml similarity index 100% rename from gpsbabel/xmldoc/formats/humminbird_ht.xml rename to xmldoc/formats/humminbird_ht.xml diff --git a/gpsbabel/xmldoc/formats/iblue747.xml b/xmldoc/formats/iblue747.xml similarity index 100% rename from gpsbabel/xmldoc/formats/iblue747.xml rename to xmldoc/formats/iblue747.xml diff --git a/gpsbabel/xmldoc/formats/iblue757.xml b/xmldoc/formats/iblue757.xml similarity index 100% rename from gpsbabel/xmldoc/formats/iblue757.xml rename to xmldoc/formats/iblue757.xml diff --git a/gpsbabel/xmldoc/formats/igc.xml b/xmldoc/formats/igc.xml similarity index 100% rename from gpsbabel/xmldoc/formats/igc.xml rename to xmldoc/formats/igc.xml diff --git a/gpsbabel/xmldoc/formats/ignrando.xml b/xmldoc/formats/ignrando.xml similarity index 100% rename from gpsbabel/xmldoc/formats/ignrando.xml rename to xmldoc/formats/ignrando.xml diff --git a/gpsbabel/xmldoc/formats/igo2008_poi.xml b/xmldoc/formats/igo2008_poi.xml similarity index 100% rename from gpsbabel/xmldoc/formats/igo2008_poi.xml rename to xmldoc/formats/igo2008_poi.xml diff --git a/gpsbabel/xmldoc/formats/igo8.xml b/xmldoc/formats/igo8.xml similarity index 100% rename from gpsbabel/xmldoc/formats/igo8.xml rename to xmldoc/formats/igo8.xml diff --git a/gpsbabel/xmldoc/formats/ik3d.xml b/xmldoc/formats/ik3d.xml similarity index 100% rename from gpsbabel/xmldoc/formats/ik3d.xml rename to xmldoc/formats/ik3d.xml diff --git a/gpsbabel/xmldoc/formats/itracku-bin.xml b/xmldoc/formats/itracku-bin.xml similarity index 100% rename from gpsbabel/xmldoc/formats/itracku-bin.xml rename to xmldoc/formats/itracku-bin.xml diff --git a/gpsbabel/xmldoc/formats/itracku.xml b/xmldoc/formats/itracku.xml similarity index 100% rename from gpsbabel/xmldoc/formats/itracku.xml rename to xmldoc/formats/itracku.xml diff --git a/gpsbabel/xmldoc/formats/jogmap.xml b/xmldoc/formats/jogmap.xml similarity index 100% rename from gpsbabel/xmldoc/formats/jogmap.xml rename to xmldoc/formats/jogmap.xml diff --git a/gpsbabel/xmldoc/formats/jtr.xml b/xmldoc/formats/jtr.xml similarity index 100% rename from gpsbabel/xmldoc/formats/jtr.xml rename to xmldoc/formats/jtr.xml diff --git a/gpsbabel/xmldoc/formats/kml.xml b/xmldoc/formats/kml.xml similarity index 100% rename from gpsbabel/xmldoc/formats/kml.xml rename to xmldoc/formats/kml.xml diff --git a/gpsbabel/xmldoc/formats/kompass_tk.xml b/xmldoc/formats/kompass_tk.xml similarity index 100% rename from gpsbabel/xmldoc/formats/kompass_tk.xml rename to xmldoc/formats/kompass_tk.xml diff --git a/gpsbabel/xmldoc/formats/kompass_wp.xml b/xmldoc/formats/kompass_wp.xml similarity index 100% rename from gpsbabel/xmldoc/formats/kompass_wp.xml rename to xmldoc/formats/kompass_wp.xml diff --git a/gpsbabel/xmldoc/formats/ktf2.xml b/xmldoc/formats/ktf2.xml similarity index 100% rename from gpsbabel/xmldoc/formats/ktf2.xml rename to xmldoc/formats/ktf2.xml diff --git a/gpsbabel/xmldoc/formats/kwf2.xml b/xmldoc/formats/kwf2.xml similarity index 100% rename from gpsbabel/xmldoc/formats/kwf2.xml rename to xmldoc/formats/kwf2.xml diff --git a/gpsbabel/xmldoc/formats/land_air_sea.xml b/xmldoc/formats/land_air_sea.xml similarity index 100% rename from gpsbabel/xmldoc/formats/land_air_sea.xml rename to xmldoc/formats/land_air_sea.xml diff --git a/gpsbabel/xmldoc/formats/lmx.xml b/xmldoc/formats/lmx.xml similarity index 100% rename from gpsbabel/xmldoc/formats/lmx.xml rename to xmldoc/formats/lmx.xml diff --git a/gpsbabel/xmldoc/formats/lowranceusr.xml b/xmldoc/formats/lowranceusr.xml similarity index 100% rename from gpsbabel/xmldoc/formats/lowranceusr.xml rename to xmldoc/formats/lowranceusr.xml diff --git a/gpsbabel/xmldoc/formats/lowranceusr4.xml b/xmldoc/formats/lowranceusr4.xml similarity index 100% rename from gpsbabel/xmldoc/formats/lowranceusr4.xml rename to xmldoc/formats/lowranceusr4.xml diff --git a/gpsbabel/xmldoc/formats/m241-bin.xml b/xmldoc/formats/m241-bin.xml similarity index 100% rename from gpsbabel/xmldoc/formats/m241-bin.xml rename to xmldoc/formats/m241-bin.xml diff --git a/gpsbabel/xmldoc/formats/m241.xml b/xmldoc/formats/m241.xml similarity index 100% rename from gpsbabel/xmldoc/formats/m241.xml rename to xmldoc/formats/m241.xml diff --git a/gpsbabel/xmldoc/formats/mag_pdb.xml b/xmldoc/formats/mag_pdb.xml similarity index 100% rename from gpsbabel/xmldoc/formats/mag_pdb.xml rename to xmldoc/formats/mag_pdb.xml diff --git a/gpsbabel/xmldoc/formats/magellan.xml b/xmldoc/formats/magellan.xml similarity index 100% rename from gpsbabel/xmldoc/formats/magellan.xml rename to xmldoc/formats/magellan.xml diff --git a/gpsbabel/xmldoc/formats/magellan1.xml b/xmldoc/formats/magellan1.xml similarity index 100% rename from gpsbabel/xmldoc/formats/magellan1.xml rename to xmldoc/formats/magellan1.xml diff --git a/gpsbabel/xmldoc/formats/magellanx.xml b/xmldoc/formats/magellanx.xml similarity index 100% rename from gpsbabel/xmldoc/formats/magellanx.xml rename to xmldoc/formats/magellanx.xml diff --git a/gpsbabel/xmldoc/formats/maggeo.xml b/xmldoc/formats/maggeo.xml similarity index 100% rename from gpsbabel/xmldoc/formats/maggeo.xml rename to xmldoc/formats/maggeo.xml diff --git a/gpsbabel/xmldoc/formats/magnav.xml b/xmldoc/formats/magnav.xml similarity index 100% rename from gpsbabel/xmldoc/formats/magnav.xml rename to xmldoc/formats/magnav.xml diff --git a/gpsbabel/xmldoc/formats/mainnav.xml b/xmldoc/formats/mainnav.xml similarity index 100% rename from gpsbabel/xmldoc/formats/mainnav.xml rename to xmldoc/formats/mainnav.xml diff --git a/gpsbabel/xmldoc/formats/mapasia_tr7.xml b/xmldoc/formats/mapasia_tr7.xml similarity index 100% rename from gpsbabel/xmldoc/formats/mapasia_tr7.xml rename to xmldoc/formats/mapasia_tr7.xml diff --git a/gpsbabel/xmldoc/formats/mapbar.xml b/xmldoc/formats/mapbar.xml similarity index 100% rename from gpsbabel/xmldoc/formats/mapbar.xml rename to xmldoc/formats/mapbar.xml diff --git a/gpsbabel/xmldoc/formats/mapconverter.xml b/xmldoc/formats/mapconverter.xml similarity index 100% rename from gpsbabel/xmldoc/formats/mapconverter.xml rename to xmldoc/formats/mapconverter.xml diff --git a/gpsbabel/xmldoc/formats/mapfactor.xml b/xmldoc/formats/mapfactor.xml similarity index 100% rename from gpsbabel/xmldoc/formats/mapfactor.xml rename to xmldoc/formats/mapfactor.xml diff --git a/gpsbabel/xmldoc/formats/mapsend.xml b/xmldoc/formats/mapsend.xml similarity index 100% rename from gpsbabel/xmldoc/formats/mapsend.xml rename to xmldoc/formats/mapsend.xml diff --git a/gpsbabel/xmldoc/formats/mapsource.xml b/xmldoc/formats/mapsource.xml similarity index 100% rename from gpsbabel/xmldoc/formats/mapsource.xml rename to xmldoc/formats/mapsource.xml diff --git a/gpsbabel/xmldoc/formats/miniHomer.xml b/xmldoc/formats/miniHomer.xml similarity index 100% rename from gpsbabel/xmldoc/formats/miniHomer.xml rename to xmldoc/formats/miniHomer.xml diff --git a/gpsbabel/xmldoc/formats/mmo.xml b/xmldoc/formats/mmo.xml similarity index 100% rename from gpsbabel/xmldoc/formats/mmo.xml rename to xmldoc/formats/mmo.xml diff --git a/gpsbabel/xmldoc/formats/motoactv.xml b/xmldoc/formats/motoactv.xml similarity index 100% rename from gpsbabel/xmldoc/formats/motoactv.xml rename to xmldoc/formats/motoactv.xml diff --git a/gpsbabel/xmldoc/formats/msroute.xml b/xmldoc/formats/msroute.xml similarity index 100% rename from gpsbabel/xmldoc/formats/msroute.xml rename to xmldoc/formats/msroute.xml diff --git a/gpsbabel/xmldoc/formats/msroute1.xml b/xmldoc/formats/msroute1.xml similarity index 100% rename from gpsbabel/xmldoc/formats/msroute1.xml rename to xmldoc/formats/msroute1.xml diff --git a/gpsbabel/xmldoc/formats/mtk-bin.xml b/xmldoc/formats/mtk-bin.xml similarity index 100% rename from gpsbabel/xmldoc/formats/mtk-bin.xml rename to xmldoc/formats/mtk-bin.xml diff --git a/gpsbabel/xmldoc/formats/mtk.xml b/xmldoc/formats/mtk.xml similarity index 100% rename from gpsbabel/xmldoc/formats/mtk.xml rename to xmldoc/formats/mtk.xml diff --git a/gpsbabel/xmldoc/formats/mxf.xml b/xmldoc/formats/mxf.xml similarity index 100% rename from gpsbabel/xmldoc/formats/mxf.xml rename to xmldoc/formats/mxf.xml diff --git a/gpsbabel/xmldoc/formats/mynav.xml b/xmldoc/formats/mynav.xml similarity index 100% rename from gpsbabel/xmldoc/formats/mynav.xml rename to xmldoc/formats/mynav.xml diff --git a/gpsbabel/xmldoc/formats/navicache.xml b/xmldoc/formats/navicache.xml similarity index 100% rename from gpsbabel/xmldoc/formats/navicache.xml rename to xmldoc/formats/navicache.xml diff --git a/gpsbabel/xmldoc/formats/navigonwpt.xml b/xmldoc/formats/navigonwpt.xml similarity index 100% rename from gpsbabel/xmldoc/formats/navigonwpt.xml rename to xmldoc/formats/navigonwpt.xml diff --git a/gpsbabel/xmldoc/formats/naviguide.xml b/xmldoc/formats/naviguide.xml similarity index 100% rename from gpsbabel/xmldoc/formats/naviguide.xml rename to xmldoc/formats/naviguide.xml diff --git a/gpsbabel/xmldoc/formats/navilink.xml b/xmldoc/formats/navilink.xml similarity index 100% rename from gpsbabel/xmldoc/formats/navilink.xml rename to xmldoc/formats/navilink.xml diff --git a/gpsbabel/xmldoc/formats/navitel_trk.xml b/xmldoc/formats/navitel_trk.xml similarity index 100% rename from gpsbabel/xmldoc/formats/navitel_trk.xml rename to xmldoc/formats/navitel_trk.xml diff --git a/gpsbabel/xmldoc/formats/netstumbler.xml b/xmldoc/formats/netstumbler.xml similarity index 100% rename from gpsbabel/xmldoc/formats/netstumbler.xml rename to xmldoc/formats/netstumbler.xml diff --git a/gpsbabel/xmldoc/formats/nima.xml b/xmldoc/formats/nima.xml similarity index 100% rename from gpsbabel/xmldoc/formats/nima.xml rename to xmldoc/formats/nima.xml diff --git a/gpsbabel/xmldoc/formats/nmea.xml b/xmldoc/formats/nmea.xml similarity index 100% rename from gpsbabel/xmldoc/formats/nmea.xml rename to xmldoc/formats/nmea.xml diff --git a/gpsbabel/xmldoc/formats/nmn4.xml b/xmldoc/formats/nmn4.xml similarity index 100% rename from gpsbabel/xmldoc/formats/nmn4.xml rename to xmldoc/formats/nmn4.xml diff --git a/gpsbabel/xmldoc/formats/openoffice.xml b/xmldoc/formats/openoffice.xml similarity index 100% rename from gpsbabel/xmldoc/formats/openoffice.xml rename to xmldoc/formats/openoffice.xml diff --git a/gpsbabel/xmldoc/formats/options/an1-color.xml b/xmldoc/formats/options/an1-color.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/an1-color.xml rename to xmldoc/formats/options/an1-color.xml diff --git a/gpsbabel/xmldoc/formats/options/an1-deficon.xml b/xmldoc/formats/options/an1-deficon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/an1-deficon.xml rename to xmldoc/formats/options/an1-deficon.xml diff --git a/gpsbabel/xmldoc/formats/options/an1-nogc.xml b/xmldoc/formats/options/an1-nogc.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/an1-nogc.xml rename to xmldoc/formats/options/an1-nogc.xml diff --git a/gpsbabel/xmldoc/formats/options/an1-nourl.xml b/xmldoc/formats/options/an1-nourl.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/an1-nourl.xml rename to xmldoc/formats/options/an1-nourl.xml diff --git a/gpsbabel/xmldoc/formats/options/an1-radius.xml b/xmldoc/formats/options/an1-radius.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/an1-radius.xml rename to xmldoc/formats/options/an1-radius.xml diff --git a/gpsbabel/xmldoc/formats/options/an1-road.xml b/xmldoc/formats/options/an1-road.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/an1-road.xml rename to xmldoc/formats/options/an1-road.xml diff --git a/gpsbabel/xmldoc/formats/options/an1-type.xml b/xmldoc/formats/options/an1-type.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/an1-type.xml rename to xmldoc/formats/options/an1-type.xml diff --git a/gpsbabel/xmldoc/formats/options/an1-wpt_type.xml b/xmldoc/formats/options/an1-wpt_type.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/an1-wpt_type.xml rename to xmldoc/formats/options/an1-wpt_type.xml diff --git a/gpsbabel/xmldoc/formats/options/an1-zoom.xml b/xmldoc/formats/options/an1-zoom.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/an1-zoom.xml rename to xmldoc/formats/options/an1-zoom.xml diff --git a/gpsbabel/xmldoc/formats/options/bcr-index.xml b/xmldoc/formats/options/bcr-index.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/bcr-index.xml rename to xmldoc/formats/options/bcr-index.xml diff --git a/gpsbabel/xmldoc/formats/options/bcr-name.xml b/xmldoc/formats/options/bcr-name.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/bcr-name.xml rename to xmldoc/formats/options/bcr-name.xml diff --git a/gpsbabel/xmldoc/formats/options/bcr-prefer_shortnames.xml b/xmldoc/formats/options/bcr-prefer_shortnames.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/bcr-prefer_shortnames.xml rename to xmldoc/formats/options/bcr-prefer_shortnames.xml diff --git a/gpsbabel/xmldoc/formats/options/bcr-radius.xml b/xmldoc/formats/options/bcr-radius.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/bcr-radius.xml rename to xmldoc/formats/options/bcr-radius.xml diff --git a/gpsbabel/xmldoc/formats/options/cetus-appendicon.xml b/xmldoc/formats/options/cetus-appendicon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/cetus-appendicon.xml rename to xmldoc/formats/options/cetus-appendicon.xml diff --git a/gpsbabel/xmldoc/formats/options/cetus-dbname.xml b/xmldoc/formats/options/cetus-dbname.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/cetus-dbname.xml rename to xmldoc/formats/options/cetus-dbname.xml diff --git a/gpsbabel/xmldoc/formats/options/compegps-deficon.xml b/xmldoc/formats/options/compegps-deficon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/compegps-deficon.xml rename to xmldoc/formats/options/compegps-deficon.xml diff --git a/gpsbabel/xmldoc/formats/options/compegps-index.xml b/xmldoc/formats/options/compegps-index.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/compegps-index.xml rename to xmldoc/formats/options/compegps-index.xml diff --git a/gpsbabel/xmldoc/formats/options/compegps-radius.xml b/xmldoc/formats/options/compegps-radius.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/compegps-radius.xml rename to xmldoc/formats/options/compegps-radius.xml diff --git a/gpsbabel/xmldoc/formats/options/compegps-snlen.xml b/xmldoc/formats/options/compegps-snlen.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/compegps-snlen.xml rename to xmldoc/formats/options/compegps-snlen.xml diff --git a/gpsbabel/xmldoc/formats/options/coto-zerocat.xml b/xmldoc/formats/options/coto-zerocat.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/coto-zerocat.xml rename to xmldoc/formats/options/coto-zerocat.xml diff --git a/gpsbabel/xmldoc/formats/options/delbin-gcsym.xml b/xmldoc/formats/options/delbin-gcsym.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/delbin-gcsym.xml rename to xmldoc/formats/options/delbin-gcsym.xml diff --git a/gpsbabel/xmldoc/formats/options/delbin-get_posn.xml b/xmldoc/formats/options/delbin-get_posn.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/delbin-get_posn.xml rename to xmldoc/formats/options/delbin-get_posn.xml diff --git a/gpsbabel/xmldoc/formats/options/delbin-hint_at_and.xml b/xmldoc/formats/options/delbin-hint_at_and.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/delbin-hint_at_and.xml rename to xmldoc/formats/options/delbin-hint_at_and.xml diff --git a/gpsbabel/xmldoc/formats/options/delbin-hint_at_end.xml b/xmldoc/formats/options/delbin-hint_at_end.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/delbin-hint_at_end.xml rename to xmldoc/formats/options/delbin-hint_at_end.xml diff --git a/gpsbabel/xmldoc/formats/options/delbin-logs.xml b/xmldoc/formats/options/delbin-logs.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/delbin-logs.xml rename to xmldoc/formats/options/delbin-logs.xml diff --git a/gpsbabel/xmldoc/formats/options/delbin-long_notes.xml b/xmldoc/formats/options/delbin-long_notes.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/delbin-long_notes.xml rename to xmldoc/formats/options/delbin-long_notes.xml diff --git a/gpsbabel/xmldoc/formats/options/delbin-nukerte.xml b/xmldoc/formats/options/delbin-nukerte.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/delbin-nukerte.xml rename to xmldoc/formats/options/delbin-nukerte.xml diff --git a/gpsbabel/xmldoc/formats/options/delbin-nuketrk.xml b/xmldoc/formats/options/delbin-nuketrk.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/delbin-nuketrk.xml rename to xmldoc/formats/options/delbin-nuketrk.xml diff --git a/gpsbabel/xmldoc/formats/options/delbin-nukewpt.xml b/xmldoc/formats/options/delbin-nukewpt.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/delbin-nukewpt.xml rename to xmldoc/formats/options/delbin-nukewpt.xml diff --git a/gpsbabel/xmldoc/formats/options/dg-100-erase.xml b/xmldoc/formats/options/dg-100-erase.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/dg-100-erase.xml rename to xmldoc/formats/options/dg-100-erase.xml diff --git a/gpsbabel/xmldoc/formats/options/dg-100-erase_only.xml b/xmldoc/formats/options/dg-100-erase_only.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/dg-100-erase_only.xml rename to xmldoc/formats/options/dg-100-erase_only.xml diff --git a/gpsbabel/xmldoc/formats/options/dg-200-erase.xml b/xmldoc/formats/options/dg-200-erase.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/dg-200-erase.xml rename to xmldoc/formats/options/dg-200-erase.xml diff --git a/gpsbabel/xmldoc/formats/options/dg-200-erase_only.xml b/xmldoc/formats/options/dg-200-erase_only.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/dg-200-erase_only.xml rename to xmldoc/formats/options/dg-200-erase_only.xml diff --git a/gpsbabel/xmldoc/formats/options/dmtlog-index.xml b/xmldoc/formats/options/dmtlog-index.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/dmtlog-index.xml rename to xmldoc/formats/options/dmtlog-index.xml diff --git a/gpsbabel/xmldoc/formats/options/exif-filename.xml b/xmldoc/formats/options/exif-filename.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/exif-filename.xml rename to xmldoc/formats/options/exif-filename.xml diff --git a/gpsbabel/xmldoc/formats/options/exif-frame.xml b/xmldoc/formats/options/exif-frame.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/exif-frame.xml rename to xmldoc/formats/options/exif-frame.xml diff --git a/gpsbabel/xmldoc/formats/options/exif-name.xml b/xmldoc/formats/options/exif-name.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/exif-name.xml rename to xmldoc/formats/options/exif-name.xml diff --git a/gpsbabel/xmldoc/formats/options/exif-overwrite.xml b/xmldoc/formats/options/exif-overwrite.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/exif-overwrite.xml rename to xmldoc/formats/options/exif-overwrite.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin-baud.xml b/xmldoc/formats/options/garmin-baud.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin-baud.xml rename to xmldoc/formats/options/garmin-baud.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin-bitscategory.xml b/xmldoc/formats/options/garmin-bitscategory.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin-bitscategory.xml rename to xmldoc/formats/options/garmin-bitscategory.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin-category.xml b/xmldoc/formats/options/garmin-category.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin-category.xml rename to xmldoc/formats/options/garmin-category.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin-deficon.xml b/xmldoc/formats/options/garmin-deficon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin-deficon.xml rename to xmldoc/formats/options/garmin-deficon.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin-erase_t.xml b/xmldoc/formats/options/garmin-erase_t.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin-erase_t.xml rename to xmldoc/formats/options/garmin-erase_t.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin-get_posn.xml b/xmldoc/formats/options/garmin-get_posn.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin-get_posn.xml rename to xmldoc/formats/options/garmin-get_posn.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin-power_off.xml b/xmldoc/formats/options/garmin-power_off.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin-power_off.xml rename to xmldoc/formats/options/garmin-power_off.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin-resettime.xml b/xmldoc/formats/options/garmin-resettime.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin-resettime.xml rename to xmldoc/formats/options/garmin-resettime.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin-snlen.xml b/xmldoc/formats/options/garmin-snlen.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin-snlen.xml rename to xmldoc/formats/options/garmin-snlen.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin-snwhite.xml b/xmldoc/formats/options/garmin-snwhite.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin-snwhite.xml rename to xmldoc/formats/options/garmin-snwhite.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_gpi-alerts.xml b/xmldoc/formats/options/garmin_gpi-alerts.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_gpi-alerts.xml rename to xmldoc/formats/options/garmin_gpi-alerts.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_gpi-bitmap.xml b/xmldoc/formats/options/garmin_gpi-bitmap.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_gpi-bitmap.xml rename to xmldoc/formats/options/garmin_gpi-bitmap.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_gpi-category.xml b/xmldoc/formats/options/garmin_gpi-category.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_gpi-category.xml rename to xmldoc/formats/options/garmin_gpi-category.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_gpi-descr.xml b/xmldoc/formats/options/garmin_gpi-descr.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_gpi-descr.xml rename to xmldoc/formats/options/garmin_gpi-descr.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_gpi-hide.xml b/xmldoc/formats/options/garmin_gpi-hide.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_gpi-hide.xml rename to xmldoc/formats/options/garmin_gpi-hide.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_gpi-notes.xml b/xmldoc/formats/options/garmin_gpi-notes.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_gpi-notes.xml rename to xmldoc/formats/options/garmin_gpi-notes.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_gpi-position.xml b/xmldoc/formats/options/garmin_gpi-position.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_gpi-position.xml rename to xmldoc/formats/options/garmin_gpi-position.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_gpi-proximity.xml b/xmldoc/formats/options/garmin_gpi-proximity.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_gpi-proximity.xml rename to xmldoc/formats/options/garmin_gpi-proximity.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_gpi-sleep.xml b/xmldoc/formats/options/garmin_gpi-sleep.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_gpi-sleep.xml rename to xmldoc/formats/options/garmin_gpi-sleep.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_gpi-speed.xml b/xmldoc/formats/options/garmin_gpi-speed.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_gpi-speed.xml rename to xmldoc/formats/options/garmin_gpi-speed.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_gpi-unique.xml b/xmldoc/formats/options/garmin_gpi-unique.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_gpi-unique.xml rename to xmldoc/formats/options/garmin_gpi-unique.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_gpi-units.xml b/xmldoc/formats/options/garmin_gpi-units.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_gpi-units.xml rename to xmldoc/formats/options/garmin_gpi-units.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_txt-date.xml b/xmldoc/formats/options/garmin_txt-date.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_txt-date.xml rename to xmldoc/formats/options/garmin_txt-date.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_txt-datum.xml b/xmldoc/formats/options/garmin_txt-datum.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_txt-datum.xml rename to xmldoc/formats/options/garmin_txt-datum.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_txt-dist.xml b/xmldoc/formats/options/garmin_txt-dist.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_txt-dist.xml rename to xmldoc/formats/options/garmin_txt-dist.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_txt-grid.xml b/xmldoc/formats/options/garmin_txt-grid.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_txt-grid.xml rename to xmldoc/formats/options/garmin_txt-grid.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_txt-prec.xml b/xmldoc/formats/options/garmin_txt-prec.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_txt-prec.xml rename to xmldoc/formats/options/garmin_txt-prec.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_txt-temp.xml b/xmldoc/formats/options/garmin_txt-temp.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_txt-temp.xml rename to xmldoc/formats/options/garmin_txt-temp.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_txt-time.xml b/xmldoc/formats/options/garmin_txt-time.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_txt-time.xml rename to xmldoc/formats/options/garmin_txt-time.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_txt-utc.xml b/xmldoc/formats/options/garmin_txt-utc.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_txt-utc.xml rename to xmldoc/formats/options/garmin_txt-utc.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_xt-ftype.xml b/xmldoc/formats/options/garmin_xt-ftype.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_xt-ftype.xml rename to xmldoc/formats/options/garmin_xt-ftype.xml diff --git a/gpsbabel/xmldoc/formats/options/garmin_xt-trk_header.xml b/xmldoc/formats/options/garmin_xt-trk_header.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/garmin_xt-trk_header.xml rename to xmldoc/formats/options/garmin_xt-trk_header.xml diff --git a/gpsbabel/xmldoc/formats/options/gdb-bitscategory.xml b/xmldoc/formats/options/gdb-bitscategory.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gdb-bitscategory.xml rename to xmldoc/formats/options/gdb-bitscategory.xml diff --git a/gpsbabel/xmldoc/formats/options/gdb-cat.xml b/xmldoc/formats/options/gdb-cat.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gdb-cat.xml rename to xmldoc/formats/options/gdb-cat.xml diff --git a/gpsbabel/xmldoc/formats/options/gdb-roadbook.xml b/xmldoc/formats/options/gdb-roadbook.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gdb-roadbook.xml rename to xmldoc/formats/options/gdb-roadbook.xml diff --git a/gpsbabel/xmldoc/formats/options/gdb-ver.xml b/xmldoc/formats/options/gdb-ver.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gdb-ver.xml rename to xmldoc/formats/options/gdb-ver.xml diff --git a/gpsbabel/xmldoc/formats/options/gdb-via.xml b/xmldoc/formats/options/gdb-via.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gdb-via.xml rename to xmldoc/formats/options/gdb-via.xml diff --git a/gpsbabel/xmldoc/formats/options/geo-deficon.xml b/xmldoc/formats/options/geo-deficon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/geo-deficon.xml rename to xmldoc/formats/options/geo-deficon.xml diff --git a/gpsbabel/xmldoc/formats/options/geo-nuke_placer.xml b/xmldoc/formats/options/geo-nuke_placer.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/geo-nuke_placer.xml rename to xmldoc/formats/options/geo-nuke_placer.xml diff --git a/gpsbabel/xmldoc/formats/options/geoniche-category.xml b/xmldoc/formats/options/geoniche-category.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/geoniche-category.xml rename to xmldoc/formats/options/geoniche-category.xml diff --git a/gpsbabel/xmldoc/formats/options/geoniche-dbname.xml b/xmldoc/formats/options/geoniche-dbname.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/geoniche-dbname.xml rename to xmldoc/formats/options/geoniche-dbname.xml diff --git a/gpsbabel/xmldoc/formats/options/gopal-clean.xml b/xmldoc/formats/options/gopal-clean.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gopal-clean.xml rename to xmldoc/formats/options/gopal-clean.xml diff --git a/gpsbabel/xmldoc/formats/options/gopal-date.xml b/xmldoc/formats/options/gopal-date.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gopal-date.xml rename to xmldoc/formats/options/gopal-date.xml diff --git a/gpsbabel/xmldoc/formats/options/gopal-maxspeed.xml b/xmldoc/formats/options/gopal-maxspeed.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gopal-maxspeed.xml rename to xmldoc/formats/options/gopal-maxspeed.xml diff --git a/gpsbabel/xmldoc/formats/options/gopal-minspeed.xml b/xmldoc/formats/options/gopal-minspeed.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gopal-minspeed.xml rename to xmldoc/formats/options/gopal-minspeed.xml diff --git a/gpsbabel/xmldoc/formats/options/gpilots-dbname.xml b/xmldoc/formats/options/gpilots-dbname.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gpilots-dbname.xml rename to xmldoc/formats/options/gpilots-dbname.xml diff --git a/gpsbabel/xmldoc/formats/options/gpspilot-dbname.xml b/xmldoc/formats/options/gpspilot-dbname.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gpspilot-dbname.xml rename to xmldoc/formats/options/gpspilot-dbname.xml diff --git a/gpsbabel/xmldoc/formats/options/gpssim-split.xml b/xmldoc/formats/options/gpssim-split.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gpssim-split.xml rename to xmldoc/formats/options/gpssim-split.xml diff --git a/gpsbabel/xmldoc/formats/options/gpssim-wayptspd.xml b/xmldoc/formats/options/gpssim-wayptspd.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gpssim-wayptspd.xml rename to xmldoc/formats/options/gpssim-wayptspd.xml diff --git a/gpsbabel/xmldoc/formats/options/gpx-garminextensions.xml b/xmldoc/formats/options/gpx-garminextensions.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gpx-garminextensions.xml rename to xmldoc/formats/options/gpx-garminextensions.xml diff --git a/gpsbabel/xmldoc/formats/options/gpx-gpxver.xml b/xmldoc/formats/options/gpx-gpxver.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gpx-gpxver.xml rename to xmldoc/formats/options/gpx-gpxver.xml diff --git a/gpsbabel/xmldoc/formats/options/gpx-humminbirdextensions.xml b/xmldoc/formats/options/gpx-humminbirdextensions.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gpx-humminbirdextensions.xml rename to xmldoc/formats/options/gpx-humminbirdextensions.xml diff --git a/gpsbabel/xmldoc/formats/options/gpx-logpoint.xml b/xmldoc/formats/options/gpx-logpoint.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gpx-logpoint.xml rename to xmldoc/formats/options/gpx-logpoint.xml diff --git a/gpsbabel/xmldoc/formats/options/gpx-snlen.xml b/xmldoc/formats/options/gpx-snlen.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gpx-snlen.xml rename to xmldoc/formats/options/gpx-snlen.xml diff --git a/gpsbabel/xmldoc/formats/options/gpx-suppresswhite.xml b/xmldoc/formats/options/gpx-suppresswhite.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gpx-suppresswhite.xml rename to xmldoc/formats/options/gpx-suppresswhite.xml diff --git a/gpsbabel/xmldoc/formats/options/gpx-urlbase.xml b/xmldoc/formats/options/gpx-urlbase.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gpx-urlbase.xml rename to xmldoc/formats/options/gpx-urlbase.xml diff --git a/gpsbabel/xmldoc/formats/options/gtrnctr-course.xml b/xmldoc/formats/options/gtrnctr-course.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gtrnctr-course.xml rename to xmldoc/formats/options/gtrnctr-course.xml diff --git a/gpsbabel/xmldoc/formats/options/gtrnctr-sport.xml b/xmldoc/formats/options/gtrnctr-sport.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gtrnctr-sport.xml rename to xmldoc/formats/options/gtrnctr-sport.xml diff --git a/gpsbabel/xmldoc/formats/options/gtrnctr1-course.xml b/xmldoc/formats/options/gtrnctr1-course.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gtrnctr1-course.xml rename to xmldoc/formats/options/gtrnctr1-course.xml diff --git a/gpsbabel/xmldoc/formats/options/gtrnctr1-sport.xml b/xmldoc/formats/options/gtrnctr1-sport.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/gtrnctr1-sport.xml rename to xmldoc/formats/options/gtrnctr1-sport.xml diff --git a/gpsbabel/xmldoc/formats/options/height-add.xml b/xmldoc/formats/options/height-add.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/height-add.xml rename to xmldoc/formats/options/height-add.xml diff --git a/gpsbabel/xmldoc/formats/options/height-wgs84tomsl.xml b/xmldoc/formats/options/height-wgs84tomsl.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/height-wgs84tomsl.xml rename to xmldoc/formats/options/height-wgs84tomsl.xml diff --git a/gpsbabel/xmldoc/formats/options/html-altunits.xml b/xmldoc/formats/options/html-altunits.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/html-altunits.xml rename to xmldoc/formats/options/html-altunits.xml diff --git a/gpsbabel/xmldoc/formats/options/html-degformat.xml b/xmldoc/formats/options/html-degformat.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/html-degformat.xml rename to xmldoc/formats/options/html-degformat.xml diff --git a/gpsbabel/xmldoc/formats/options/html-encrypt.xml b/xmldoc/formats/options/html-encrypt.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/html-encrypt.xml rename to xmldoc/formats/options/html-encrypt.xml diff --git a/gpsbabel/xmldoc/formats/options/html-logs.xml b/xmldoc/formats/options/html-logs.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/html-logs.xml rename to xmldoc/formats/options/html-logs.xml diff --git a/gpsbabel/xmldoc/formats/options/html-stylesheet.xml b/xmldoc/formats/options/html-stylesheet.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/html-stylesheet.xml rename to xmldoc/formats/options/html-stylesheet.xml diff --git a/gpsbabel/xmldoc/formats/options/igc-timeadj.xml b/xmldoc/formats/options/igc-timeadj.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/igc-timeadj.xml rename to xmldoc/formats/options/igc-timeadj.xml diff --git a/gpsbabel/xmldoc/formats/options/ignrando-index.xml b/xmldoc/formats/options/ignrando-index.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/ignrando-index.xml rename to xmldoc/formats/options/ignrando-index.xml diff --git a/gpsbabel/xmldoc/formats/options/igo8-description.xml b/xmldoc/formats/options/igo8-description.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/igo8-description.xml rename to xmldoc/formats/options/igo8-description.xml diff --git a/gpsbabel/xmldoc/formats/options/igo8-title.xml b/xmldoc/formats/options/igo8-title.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/igo8-title.xml rename to xmldoc/formats/options/igo8-title.xml diff --git a/gpsbabel/xmldoc/formats/options/igo8-tracknum.xml b/xmldoc/formats/options/igo8-tracknum.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/igo8-tracknum.xml rename to xmldoc/formats/options/igo8-tracknum.xml diff --git a/gpsbabel/xmldoc/formats/options/itracku-backup.xml b/xmldoc/formats/options/itracku-backup.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/itracku-backup.xml rename to xmldoc/formats/options/itracku-backup.xml diff --git a/gpsbabel/xmldoc/formats/options/itracku-bin-backup.xml b/xmldoc/formats/options/itracku-bin-backup.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/itracku-bin-backup.xml rename to xmldoc/formats/options/itracku-bin-backup.xml diff --git a/gpsbabel/xmldoc/formats/options/itracku-bin-new.xml b/xmldoc/formats/options/itracku-bin-new.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/itracku-bin-new.xml rename to xmldoc/formats/options/itracku-bin-new.xml diff --git a/gpsbabel/xmldoc/formats/options/itracku-new.xml b/xmldoc/formats/options/itracku-new.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/itracku-new.xml rename to xmldoc/formats/options/itracku-new.xml diff --git a/gpsbabel/xmldoc/formats/options/kml-deficon.xml b/xmldoc/formats/options/kml-deficon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/kml-deficon.xml rename to xmldoc/formats/options/kml-deficon.xml diff --git a/gpsbabel/xmldoc/formats/options/kml-extrude.xml b/xmldoc/formats/options/kml-extrude.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/kml-extrude.xml rename to xmldoc/formats/options/kml-extrude.xml diff --git a/gpsbabel/xmldoc/formats/options/kml-floating.xml b/xmldoc/formats/options/kml-floating.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/kml-floating.xml rename to xmldoc/formats/options/kml-floating.xml diff --git a/gpsbabel/xmldoc/formats/options/kml-labels.xml b/xmldoc/formats/options/kml-labels.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/kml-labels.xml rename to xmldoc/formats/options/kml-labels.xml diff --git a/gpsbabel/xmldoc/formats/options/kml-line_color.xml b/xmldoc/formats/options/kml-line_color.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/kml-line_color.xml rename to xmldoc/formats/options/kml-line_color.xml diff --git a/gpsbabel/xmldoc/formats/options/kml-line_width.xml b/xmldoc/formats/options/kml-line_width.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/kml-line_width.xml rename to xmldoc/formats/options/kml-line_width.xml diff --git a/gpsbabel/xmldoc/formats/options/kml-lines.xml b/xmldoc/formats/options/kml-lines.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/kml-lines.xml rename to xmldoc/formats/options/kml-lines.xml diff --git a/gpsbabel/xmldoc/formats/options/kml-max_position_points.xml b/xmldoc/formats/options/kml-max_position_points.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/kml-max_position_points.xml rename to xmldoc/formats/options/kml-max_position_points.xml diff --git a/gpsbabel/xmldoc/formats/options/kml-points.xml b/xmldoc/formats/options/kml-points.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/kml-points.xml rename to xmldoc/formats/options/kml-points.xml diff --git a/gpsbabel/xmldoc/formats/options/kml-rotate_colors.xml b/xmldoc/formats/options/kml-rotate_colors.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/kml-rotate_colors.xml rename to xmldoc/formats/options/kml-rotate_colors.xml diff --git a/gpsbabel/xmldoc/formats/options/kml-track.xml b/xmldoc/formats/options/kml-track.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/kml-track.xml rename to xmldoc/formats/options/kml-track.xml diff --git a/gpsbabel/xmldoc/formats/options/kml-trackdata.xml b/xmldoc/formats/options/kml-trackdata.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/kml-trackdata.xml rename to xmldoc/formats/options/kml-trackdata.xml diff --git a/gpsbabel/xmldoc/formats/options/kml-trackdirection.xml b/xmldoc/formats/options/kml-trackdirection.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/kml-trackdirection.xml rename to xmldoc/formats/options/kml-trackdirection.xml diff --git a/gpsbabel/xmldoc/formats/options/kml-units.xml b/xmldoc/formats/options/kml-units.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/kml-units.xml rename to xmldoc/formats/options/kml-units.xml diff --git a/gpsbabel/xmldoc/formats/options/lmx-binary.xml b/xmldoc/formats/options/lmx-binary.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/lmx-binary.xml rename to xmldoc/formats/options/lmx-binary.xml diff --git a/gpsbabel/xmldoc/formats/options/lowranceusr-break.xml b/xmldoc/formats/options/lowranceusr-break.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/lowranceusr-break.xml rename to xmldoc/formats/options/lowranceusr-break.xml diff --git a/gpsbabel/xmldoc/formats/options/lowranceusr-ignoreicons.xml b/xmldoc/formats/options/lowranceusr-ignoreicons.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/lowranceusr-ignoreicons.xml rename to xmldoc/formats/options/lowranceusr-ignoreicons.xml diff --git a/gpsbabel/xmldoc/formats/options/lowranceusr-merge.xml b/xmldoc/formats/options/lowranceusr-merge.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/lowranceusr-merge.xml rename to xmldoc/formats/options/lowranceusr-merge.xml diff --git a/gpsbabel/xmldoc/formats/options/lowranceusr-writeasicons.xml b/xmldoc/formats/options/lowranceusr-writeasicons.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/lowranceusr-writeasicons.xml rename to xmldoc/formats/options/lowranceusr-writeasicons.xml diff --git a/gpsbabel/xmldoc/formats/options/lowranceusr-wversion.xml b/xmldoc/formats/options/lowranceusr-wversion.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/lowranceusr-wversion.xml rename to xmldoc/formats/options/lowranceusr-wversion.xml diff --git a/gpsbabel/xmldoc/formats/options/lowranceusr4-description.xml b/xmldoc/formats/options/lowranceusr4-description.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/lowranceusr4-description.xml rename to xmldoc/formats/options/lowranceusr4-description.xml diff --git a/gpsbabel/xmldoc/formats/options/lowranceusr4-serialnum.xml b/xmldoc/formats/options/lowranceusr4-serialnum.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/lowranceusr4-serialnum.xml rename to xmldoc/formats/options/lowranceusr4-serialnum.xml diff --git a/gpsbabel/xmldoc/formats/options/lowranceusr4-title.xml b/xmldoc/formats/options/lowranceusr4-title.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/lowranceusr4-title.xml rename to xmldoc/formats/options/lowranceusr4-title.xml diff --git a/gpsbabel/xmldoc/formats/options/m241-bin-csv.xml b/xmldoc/formats/options/m241-bin-csv.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/m241-bin-csv.xml rename to xmldoc/formats/options/m241-bin-csv.xml diff --git a/gpsbabel/xmldoc/formats/options/m241-csv.xml b/xmldoc/formats/options/m241-csv.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/m241-csv.xml rename to xmldoc/formats/options/m241-csv.xml diff --git a/gpsbabel/xmldoc/formats/options/m241-erase.xml b/xmldoc/formats/options/m241-erase.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/m241-erase.xml rename to xmldoc/formats/options/m241-erase.xml diff --git a/gpsbabel/xmldoc/formats/options/m241-erase_only.xml b/xmldoc/formats/options/m241-erase_only.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/m241-erase_only.xml rename to xmldoc/formats/options/m241-erase_only.xml diff --git a/gpsbabel/xmldoc/formats/options/m241-log_enable.xml b/xmldoc/formats/options/m241-log_enable.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/m241-log_enable.xml rename to xmldoc/formats/options/m241-log_enable.xml diff --git a/gpsbabel/xmldoc/formats/options/magellan-deficon.xml b/xmldoc/formats/options/magellan-deficon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/magellan-deficon.xml rename to xmldoc/formats/options/magellan-deficon.xml diff --git a/gpsbabel/xmldoc/formats/options/magellan-maxcmts.xml b/xmldoc/formats/options/magellan-maxcmts.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/magellan-maxcmts.xml rename to xmldoc/formats/options/magellan-maxcmts.xml diff --git a/gpsbabel/xmldoc/formats/options/magellan1-baud.xml b/xmldoc/formats/options/magellan1-baud.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/magellan1-baud.xml rename to xmldoc/formats/options/magellan1-baud.xml diff --git a/gpsbabel/xmldoc/formats/options/magellan1-deficon.xml b/xmldoc/formats/options/magellan1-deficon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/magellan1-deficon.xml rename to xmldoc/formats/options/magellan1-deficon.xml diff --git a/gpsbabel/xmldoc/formats/options/magellan1-maxcmts.xml b/xmldoc/formats/options/magellan1-maxcmts.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/magellan1-maxcmts.xml rename to xmldoc/formats/options/magellan1-maxcmts.xml diff --git a/gpsbabel/xmldoc/formats/options/magellan1-noack.xml b/xmldoc/formats/options/magellan1-noack.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/magellan1-noack.xml rename to xmldoc/formats/options/magellan1-noack.xml diff --git a/gpsbabel/xmldoc/formats/options/magellan1-nukewpt.xml b/xmldoc/formats/options/magellan1-nukewpt.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/magellan1-nukewpt.xml rename to xmldoc/formats/options/magellan1-nukewpt.xml diff --git a/gpsbabel/xmldoc/formats/options/magellanx-deficon.xml b/xmldoc/formats/options/magellanx-deficon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/magellanx-deficon.xml rename to xmldoc/formats/options/magellanx-deficon.xml diff --git a/gpsbabel/xmldoc/formats/options/magellanx-maxcmts.xml b/xmldoc/formats/options/magellanx-maxcmts.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/magellanx-maxcmts.xml rename to xmldoc/formats/options/magellanx-maxcmts.xml diff --git a/gpsbabel/xmldoc/formats/options/mapsend-trkver.xml b/xmldoc/formats/options/mapsend-trkver.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mapsend-trkver.xml rename to xmldoc/formats/options/mapsend-trkver.xml diff --git a/gpsbabel/xmldoc/formats/options/mapsource-mpsmergeout.xml b/xmldoc/formats/options/mapsource-mpsmergeout.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mapsource-mpsmergeout.xml rename to xmldoc/formats/options/mapsource-mpsmergeout.xml diff --git a/gpsbabel/xmldoc/formats/options/mapsource-mpsusedepth.xml b/xmldoc/formats/options/mapsource-mpsusedepth.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mapsource-mpsusedepth.xml rename to xmldoc/formats/options/mapsource-mpsusedepth.xml diff --git a/gpsbabel/xmldoc/formats/options/mapsource-mpsuseprox.xml b/xmldoc/formats/options/mapsource-mpsuseprox.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mapsource-mpsuseprox.xml rename to xmldoc/formats/options/mapsource-mpsuseprox.xml diff --git a/gpsbabel/xmldoc/formats/options/mapsource-mpsverout.xml b/xmldoc/formats/options/mapsource-mpsverout.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mapsource-mpsverout.xml rename to xmldoc/formats/options/mapsource-mpsverout.xml diff --git a/gpsbabel/xmldoc/formats/options/mapsource-snlen.xml b/xmldoc/formats/options/mapsource-snlen.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mapsource-snlen.xml rename to xmldoc/formats/options/mapsource-snlen.xml diff --git a/gpsbabel/xmldoc/formats/options/mapsource-snwhite.xml b/xmldoc/formats/options/mapsource-snwhite.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mapsource-snwhite.xml rename to xmldoc/formats/options/mapsource-snwhite.xml diff --git a/gpsbabel/xmldoc/formats/options/miniHomer-Bar.xml b/xmldoc/formats/options/miniHomer-Bar.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/miniHomer-Bar.xml rename to xmldoc/formats/options/miniHomer-Bar.xml diff --git a/gpsbabel/xmldoc/formats/options/miniHomer-Boat.xml b/xmldoc/formats/options/miniHomer-Boat.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/miniHomer-Boat.xml rename to xmldoc/formats/options/miniHomer-Boat.xml diff --git a/gpsbabel/xmldoc/formats/options/miniHomer-Car.xml b/xmldoc/formats/options/miniHomer-Car.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/miniHomer-Car.xml rename to xmldoc/formats/options/miniHomer-Car.xml diff --git a/gpsbabel/xmldoc/formats/options/miniHomer-Heart.xml b/xmldoc/formats/options/miniHomer-Heart.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/miniHomer-Heart.xml rename to xmldoc/formats/options/miniHomer-Heart.xml diff --git a/gpsbabel/xmldoc/formats/options/miniHomer-Home.xml b/xmldoc/formats/options/miniHomer-Home.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/miniHomer-Home.xml rename to xmldoc/formats/options/miniHomer-Home.xml diff --git a/gpsbabel/xmldoc/formats/options/miniHomer-baud.xml b/xmldoc/formats/options/miniHomer-baud.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/miniHomer-baud.xml rename to xmldoc/formats/options/miniHomer-baud.xml diff --git a/gpsbabel/xmldoc/formats/options/miniHomer-dump-file.xml b/xmldoc/formats/options/miniHomer-dump-file.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/miniHomer-dump-file.xml rename to xmldoc/formats/options/miniHomer-dump-file.xml diff --git a/gpsbabel/xmldoc/formats/options/miniHomer-erase.xml b/xmldoc/formats/options/miniHomer-erase.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/miniHomer-erase.xml rename to xmldoc/formats/options/miniHomer-erase.xml diff --git a/gpsbabel/xmldoc/formats/options/miniHomer-first-sector.xml b/xmldoc/formats/options/miniHomer-first-sector.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/miniHomer-first-sector.xml rename to xmldoc/formats/options/miniHomer-first-sector.xml diff --git a/gpsbabel/xmldoc/formats/options/miniHomer-initbaud.xml b/xmldoc/formats/options/miniHomer-initbaud.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/miniHomer-initbaud.xml rename to xmldoc/formats/options/miniHomer-initbaud.xml diff --git a/gpsbabel/xmldoc/formats/options/miniHomer-last-sector.xml b/xmldoc/formats/options/miniHomer-last-sector.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/miniHomer-last-sector.xml rename to xmldoc/formats/options/miniHomer-last-sector.xml diff --git a/gpsbabel/xmldoc/formats/options/miniHomer-no-output.xml b/xmldoc/formats/options/miniHomer-no-output.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/miniHomer-no-output.xml rename to xmldoc/formats/options/miniHomer-no-output.xml diff --git a/gpsbabel/xmldoc/formats/options/miniHomer-read-at-once.xml b/xmldoc/formats/options/miniHomer-read-at-once.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/miniHomer-read-at-once.xml rename to xmldoc/formats/options/miniHomer-read-at-once.xml diff --git a/gpsbabel/xmldoc/formats/options/mmo-locked.xml b/xmldoc/formats/options/mmo-locked.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mmo-locked.xml rename to xmldoc/formats/options/mmo-locked.xml diff --git a/gpsbabel/xmldoc/formats/options/mmo-ver.xml b/xmldoc/formats/options/mmo-ver.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mmo-ver.xml rename to xmldoc/formats/options/mmo-ver.xml diff --git a/gpsbabel/xmldoc/formats/options/mmo-visible.xml b/xmldoc/formats/options/mmo-visible.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mmo-visible.xml rename to xmldoc/formats/options/mmo-visible.xml diff --git a/gpsbabel/xmldoc/formats/options/mtk-bin-csv.xml b/xmldoc/formats/options/mtk-bin-csv.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mtk-bin-csv.xml rename to xmldoc/formats/options/mtk-bin-csv.xml diff --git a/gpsbabel/xmldoc/formats/options/mtk-csv.xml b/xmldoc/formats/options/mtk-csv.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mtk-csv.xml rename to xmldoc/formats/options/mtk-csv.xml diff --git a/gpsbabel/xmldoc/formats/options/mtk-erase.xml b/xmldoc/formats/options/mtk-erase.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mtk-erase.xml rename to xmldoc/formats/options/mtk-erase.xml diff --git a/gpsbabel/xmldoc/formats/options/mtk-erase_only.xml b/xmldoc/formats/options/mtk-erase_only.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mtk-erase_only.xml rename to xmldoc/formats/options/mtk-erase_only.xml diff --git a/gpsbabel/xmldoc/formats/options/mtk-log_enable.xml b/xmldoc/formats/options/mtk-log_enable.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mtk-log_enable.xml rename to xmldoc/formats/options/mtk-log_enable.xml diff --git a/gpsbabel/xmldoc/formats/options/mtk_locus-baudrate.xml b/xmldoc/formats/options/mtk_locus-baudrate.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mtk_locus-baudrate.xml rename to xmldoc/formats/options/mtk_locus-baudrate.xml diff --git a/gpsbabel/xmldoc/formats/options/mtk_locus-download.xml b/xmldoc/formats/options/mtk_locus-download.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mtk_locus-download.xml rename to xmldoc/formats/options/mtk_locus-download.xml diff --git a/gpsbabel/xmldoc/formats/options/mtk_locus-enable.xml b/xmldoc/formats/options/mtk_locus-enable.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mtk_locus-enable.xml rename to xmldoc/formats/options/mtk_locus-enable.xml diff --git a/gpsbabel/xmldoc/formats/options/mtk_locus-erase.xml b/xmldoc/formats/options/mtk_locus-erase.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mtk_locus-erase.xml rename to xmldoc/formats/options/mtk_locus-erase.xml diff --git a/gpsbabel/xmldoc/formats/options/mtk_locus-status.xml b/xmldoc/formats/options/mtk_locus-status.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/mtk_locus-status.xml rename to xmldoc/formats/options/mtk_locus-status.xml diff --git a/gpsbabel/xmldoc/formats/options/navicache-noretired.xml b/xmldoc/formats/options/navicache-noretired.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/navicache-noretired.xml rename to xmldoc/formats/options/navicache-noretired.xml diff --git a/gpsbabel/xmldoc/formats/options/naviguide-output.xml b/xmldoc/formats/options/naviguide-output.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/naviguide-output.xml rename to xmldoc/formats/options/naviguide-output.xml diff --git a/gpsbabel/xmldoc/formats/options/naviguide-reorder.xml b/xmldoc/formats/options/naviguide-reorder.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/naviguide-reorder.xml rename to xmldoc/formats/options/naviguide-reorder.xml diff --git a/gpsbabel/xmldoc/formats/options/navilink-datalog.xml b/xmldoc/formats/options/navilink-datalog.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/navilink-datalog.xml rename to xmldoc/formats/options/navilink-datalog.xml diff --git a/gpsbabel/xmldoc/formats/options/navilink-nukedlg.xml b/xmldoc/formats/options/navilink-nukedlg.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/navilink-nukedlg.xml rename to xmldoc/formats/options/navilink-nukedlg.xml diff --git a/gpsbabel/xmldoc/formats/options/navilink-nukerte.xml b/xmldoc/formats/options/navilink-nukerte.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/navilink-nukerte.xml rename to xmldoc/formats/options/navilink-nukerte.xml diff --git a/gpsbabel/xmldoc/formats/options/navilink-nuketrk.xml b/xmldoc/formats/options/navilink-nuketrk.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/navilink-nuketrk.xml rename to xmldoc/formats/options/navilink-nuketrk.xml diff --git a/gpsbabel/xmldoc/formats/options/navilink-nukewpt.xml b/xmldoc/formats/options/navilink-nukewpt.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/navilink-nukewpt.xml rename to xmldoc/formats/options/navilink-nukewpt.xml diff --git a/gpsbabel/xmldoc/formats/options/navilink-power_off.xml b/xmldoc/formats/options/navilink-power_off.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/navilink-power_off.xml rename to xmldoc/formats/options/navilink-power_off.xml diff --git a/gpsbabel/xmldoc/formats/options/netstumbler-nseicon.xml b/xmldoc/formats/options/netstumbler-nseicon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/netstumbler-nseicon.xml rename to xmldoc/formats/options/netstumbler-nseicon.xml diff --git a/gpsbabel/xmldoc/formats/options/netstumbler-nsneicon.xml b/xmldoc/formats/options/netstumbler-nsneicon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/netstumbler-nsneicon.xml rename to xmldoc/formats/options/netstumbler-nsneicon.xml diff --git a/gpsbabel/xmldoc/formats/options/netstumbler-seicon.xml b/xmldoc/formats/options/netstumbler-seicon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/netstumbler-seicon.xml rename to xmldoc/formats/options/netstumbler-seicon.xml diff --git a/gpsbabel/xmldoc/formats/options/netstumbler-sneicon.xml b/xmldoc/formats/options/netstumbler-sneicon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/netstumbler-sneicon.xml rename to xmldoc/formats/options/netstumbler-sneicon.xml diff --git a/gpsbabel/xmldoc/formats/options/netstumbler-snmac.xml b/xmldoc/formats/options/netstumbler-snmac.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/netstumbler-snmac.xml rename to xmldoc/formats/options/netstumbler-snmac.xml diff --git a/gpsbabel/xmldoc/formats/options/nmea-append_positioning.xml b/xmldoc/formats/options/nmea-append_positioning.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/nmea-append_positioning.xml rename to xmldoc/formats/options/nmea-append_positioning.xml diff --git a/gpsbabel/xmldoc/formats/options/nmea-baud.xml b/xmldoc/formats/options/nmea-baud.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/nmea-baud.xml rename to xmldoc/formats/options/nmea-baud.xml diff --git a/gpsbabel/xmldoc/formats/options/nmea-date.xml b/xmldoc/formats/options/nmea-date.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/nmea-date.xml rename to xmldoc/formats/options/nmea-date.xml diff --git a/gpsbabel/xmldoc/formats/options/nmea-get_posn.xml b/xmldoc/formats/options/nmea-get_posn.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/nmea-get_posn.xml rename to xmldoc/formats/options/nmea-get_posn.xml diff --git a/gpsbabel/xmldoc/formats/options/nmea-gisteq.xml b/xmldoc/formats/options/nmea-gisteq.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/nmea-gisteq.xml rename to xmldoc/formats/options/nmea-gisteq.xml diff --git a/gpsbabel/xmldoc/formats/options/nmea-gpgga.xml b/xmldoc/formats/options/nmea-gpgga.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/nmea-gpgga.xml rename to xmldoc/formats/options/nmea-gpgga.xml diff --git a/gpsbabel/xmldoc/formats/options/nmea-gpgsa.xml b/xmldoc/formats/options/nmea-gpgsa.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/nmea-gpgsa.xml rename to xmldoc/formats/options/nmea-gpgsa.xml diff --git a/gpsbabel/xmldoc/formats/options/nmea-gprmc.xml b/xmldoc/formats/options/nmea-gprmc.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/nmea-gprmc.xml rename to xmldoc/formats/options/nmea-gprmc.xml diff --git a/gpsbabel/xmldoc/formats/options/nmea-gpvtg.xml b/xmldoc/formats/options/nmea-gpvtg.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/nmea-gpvtg.xml rename to xmldoc/formats/options/nmea-gpvtg.xml diff --git a/gpsbabel/xmldoc/formats/options/nmea-ignore_fix.xml b/xmldoc/formats/options/nmea-ignore_fix.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/nmea-ignore_fix.xml rename to xmldoc/formats/options/nmea-ignore_fix.xml diff --git a/gpsbabel/xmldoc/formats/options/nmea-pause.xml b/xmldoc/formats/options/nmea-pause.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/nmea-pause.xml rename to xmldoc/formats/options/nmea-pause.xml diff --git a/gpsbabel/xmldoc/formats/options/nmea-snlen.xml b/xmldoc/formats/options/nmea-snlen.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/nmea-snlen.xml rename to xmldoc/formats/options/nmea-snlen.xml diff --git a/gpsbabel/xmldoc/formats/options/nmn4-index.xml b/xmldoc/formats/options/nmn4-index.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/nmn4-index.xml rename to xmldoc/formats/options/nmn4-index.xml diff --git a/gpsbabel/xmldoc/formats/options/osm-created_by.xml b/xmldoc/formats/options/osm-created_by.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/osm-created_by.xml rename to xmldoc/formats/options/osm-created_by.xml diff --git a/gpsbabel/xmldoc/formats/options/osm-tag.xml b/xmldoc/formats/options/osm-tag.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/osm-tag.xml rename to xmldoc/formats/options/osm-tag.xml diff --git a/gpsbabel/xmldoc/formats/options/osm-tagnd.xml b/xmldoc/formats/options/osm-tagnd.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/osm-tagnd.xml rename to xmldoc/formats/options/osm-tagnd.xml diff --git a/gpsbabel/xmldoc/formats/options/ozi-altunit.xml b/xmldoc/formats/options/ozi-altunit.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/ozi-altunit.xml rename to xmldoc/formats/options/ozi-altunit.xml diff --git a/gpsbabel/xmldoc/formats/options/ozi-pack.xml b/xmldoc/formats/options/ozi-pack.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/ozi-pack.xml rename to xmldoc/formats/options/ozi-pack.xml diff --git a/gpsbabel/xmldoc/formats/options/ozi-proximity.xml b/xmldoc/formats/options/ozi-proximity.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/ozi-proximity.xml rename to xmldoc/formats/options/ozi-proximity.xml diff --git a/gpsbabel/xmldoc/formats/options/ozi-proxunit.xml b/xmldoc/formats/options/ozi-proxunit.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/ozi-proxunit.xml rename to xmldoc/formats/options/ozi-proxunit.xml diff --git a/gpsbabel/xmldoc/formats/options/ozi-snlen.xml b/xmldoc/formats/options/ozi-snlen.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/ozi-snlen.xml rename to xmldoc/formats/options/ozi-snlen.xml diff --git a/gpsbabel/xmldoc/formats/options/ozi-snunique.xml b/xmldoc/formats/options/ozi-snunique.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/ozi-snunique.xml rename to xmldoc/formats/options/ozi-snunique.xml diff --git a/gpsbabel/xmldoc/formats/options/ozi-snupper.xml b/xmldoc/formats/options/ozi-snupper.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/ozi-snupper.xml rename to xmldoc/formats/options/ozi-snupper.xml diff --git a/gpsbabel/xmldoc/formats/options/ozi-snwhite.xml b/xmldoc/formats/options/ozi-snwhite.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/ozi-snwhite.xml rename to xmldoc/formats/options/ozi-snwhite.xml diff --git a/gpsbabel/xmldoc/formats/options/ozi-wptbgcolor.xml b/xmldoc/formats/options/ozi-wptbgcolor.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/ozi-wptbgcolor.xml rename to xmldoc/formats/options/ozi-wptbgcolor.xml diff --git a/gpsbabel/xmldoc/formats/options/ozi-wptfgcolor.xml b/xmldoc/formats/options/ozi-wptfgcolor.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/ozi-wptfgcolor.xml rename to xmldoc/formats/options/ozi-wptfgcolor.xml diff --git a/gpsbabel/xmldoc/formats/options/palmdoc-bookmarks_short.xml b/xmldoc/formats/options/palmdoc-bookmarks_short.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/palmdoc-bookmarks_short.xml rename to xmldoc/formats/options/palmdoc-bookmarks_short.xml diff --git a/gpsbabel/xmldoc/formats/options/palmdoc-dbname.xml b/xmldoc/formats/options/palmdoc-dbname.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/palmdoc-dbname.xml rename to xmldoc/formats/options/palmdoc-dbname.xml diff --git a/gpsbabel/xmldoc/formats/options/palmdoc-encrypt.xml b/xmldoc/formats/options/palmdoc-encrypt.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/palmdoc-encrypt.xml rename to xmldoc/formats/options/palmdoc-encrypt.xml diff --git a/gpsbabel/xmldoc/formats/options/palmdoc-logs.xml b/xmldoc/formats/options/palmdoc-logs.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/palmdoc-logs.xml rename to xmldoc/formats/options/palmdoc-logs.xml diff --git a/gpsbabel/xmldoc/formats/options/palmdoc-nosep.xml b/xmldoc/formats/options/palmdoc-nosep.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/palmdoc-nosep.xml rename to xmldoc/formats/options/palmdoc-nosep.xml diff --git a/gpsbabel/xmldoc/formats/options/pathaway-date.xml b/xmldoc/formats/options/pathaway-date.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/pathaway-date.xml rename to xmldoc/formats/options/pathaway-date.xml diff --git a/gpsbabel/xmldoc/formats/options/pathaway-dbicon.xml b/xmldoc/formats/options/pathaway-dbicon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/pathaway-dbicon.xml rename to xmldoc/formats/options/pathaway-dbicon.xml diff --git a/gpsbabel/xmldoc/formats/options/pathaway-dbname.xml b/xmldoc/formats/options/pathaway-dbname.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/pathaway-dbname.xml rename to xmldoc/formats/options/pathaway-dbname.xml diff --git a/gpsbabel/xmldoc/formats/options/pathaway-deficon.xml b/xmldoc/formats/options/pathaway-deficon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/pathaway-deficon.xml rename to xmldoc/formats/options/pathaway-deficon.xml diff --git a/gpsbabel/xmldoc/formats/options/pathaway-snlen.xml b/xmldoc/formats/options/pathaway-snlen.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/pathaway-snlen.xml rename to xmldoc/formats/options/pathaway-snlen.xml diff --git a/gpsbabel/xmldoc/formats/options/pcx-cartoexploreur.xml b/xmldoc/formats/options/pcx-cartoexploreur.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/pcx-cartoexploreur.xml rename to xmldoc/formats/options/pcx-cartoexploreur.xml diff --git a/gpsbabel/xmldoc/formats/options/pcx-deficon.xml b/xmldoc/formats/options/pcx-deficon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/pcx-deficon.xml rename to xmldoc/formats/options/pcx-deficon.xml diff --git a/gpsbabel/xmldoc/formats/options/quovadis-dbname.xml b/xmldoc/formats/options/quovadis-dbname.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/quovadis-dbname.xml rename to xmldoc/formats/options/quovadis-dbname.xml diff --git a/gpsbabel/xmldoc/formats/options/raymarine-location.xml b/xmldoc/formats/options/raymarine-location.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/raymarine-location.xml rename to xmldoc/formats/options/raymarine-location.xml diff --git a/gpsbabel/xmldoc/formats/options/saroute-controls.xml b/xmldoc/formats/options/saroute-controls.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/saroute-controls.xml rename to xmldoc/formats/options/saroute-controls.xml diff --git a/gpsbabel/xmldoc/formats/options/saroute-split.xml b/xmldoc/formats/options/saroute-split.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/saroute-split.xml rename to xmldoc/formats/options/saroute-split.xml diff --git a/gpsbabel/xmldoc/formats/options/saroute-times.xml b/xmldoc/formats/options/saroute-times.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/saroute-times.xml rename to xmldoc/formats/options/saroute-times.xml diff --git a/gpsbabel/xmldoc/formats/options/saroute-turns_important.xml b/xmldoc/formats/options/saroute-turns_important.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/saroute-turns_important.xml rename to xmldoc/formats/options/saroute-turns_important.xml diff --git a/gpsbabel/xmldoc/formats/options/saroute-turns_only.xml b/xmldoc/formats/options/saroute-turns_only.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/saroute-turns_only.xml rename to xmldoc/formats/options/saroute-turns_only.xml diff --git a/gpsbabel/xmldoc/formats/options/skytraq-baud.xml b/xmldoc/formats/options/skytraq-baud.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/skytraq-baud.xml rename to xmldoc/formats/options/skytraq-baud.xml diff --git a/gpsbabel/xmldoc/formats/options/skytraq-bin-first-sector.xml b/xmldoc/formats/options/skytraq-bin-first-sector.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/skytraq-bin-first-sector.xml rename to xmldoc/formats/options/skytraq-bin-first-sector.xml diff --git a/gpsbabel/xmldoc/formats/options/skytraq-bin-last-sector.xml b/xmldoc/formats/options/skytraq-bin-last-sector.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/skytraq-bin-last-sector.xml rename to xmldoc/formats/options/skytraq-bin-last-sector.xml diff --git a/gpsbabel/xmldoc/formats/options/skytraq-configlog.xml b/xmldoc/formats/options/skytraq-configlog.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/skytraq-configlog.xml rename to xmldoc/formats/options/skytraq-configlog.xml diff --git a/gpsbabel/xmldoc/formats/options/skytraq-dump-file.xml b/xmldoc/formats/options/skytraq-dump-file.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/skytraq-dump-file.xml rename to xmldoc/formats/options/skytraq-dump-file.xml diff --git a/gpsbabel/xmldoc/formats/options/skytraq-erase.xml b/xmldoc/formats/options/skytraq-erase.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/skytraq-erase.xml rename to xmldoc/formats/options/skytraq-erase.xml diff --git a/gpsbabel/xmldoc/formats/options/skytraq-first-sector.xml b/xmldoc/formats/options/skytraq-first-sector.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/skytraq-first-sector.xml rename to xmldoc/formats/options/skytraq-first-sector.xml diff --git a/gpsbabel/xmldoc/formats/options/skytraq-initbaud.xml b/xmldoc/formats/options/skytraq-initbaud.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/skytraq-initbaud.xml rename to xmldoc/formats/options/skytraq-initbaud.xml diff --git a/gpsbabel/xmldoc/formats/options/skytraq-last-sector.xml b/xmldoc/formats/options/skytraq-last-sector.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/skytraq-last-sector.xml rename to xmldoc/formats/options/skytraq-last-sector.xml diff --git a/gpsbabel/xmldoc/formats/options/skytraq-no-output.xml b/xmldoc/formats/options/skytraq-no-output.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/skytraq-no-output.xml rename to xmldoc/formats/options/skytraq-no-output.xml diff --git a/gpsbabel/xmldoc/formats/options/skytraq-read-at-once.xml b/xmldoc/formats/options/skytraq-read-at-once.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/skytraq-read-at-once.xml rename to xmldoc/formats/options/skytraq-read-at-once.xml diff --git a/gpsbabel/xmldoc/formats/options/skytraq-targetlocation.xml b/xmldoc/formats/options/skytraq-targetlocation.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/skytraq-targetlocation.xml rename to xmldoc/formats/options/skytraq-targetlocation.xml diff --git a/gpsbabel/xmldoc/formats/options/stmsdf-index.xml b/xmldoc/formats/options/stmsdf-index.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/stmsdf-index.xml rename to xmldoc/formats/options/stmsdf-index.xml diff --git a/gpsbabel/xmldoc/formats/options/stmwpp-index.xml b/xmldoc/formats/options/stmwpp-index.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/stmwpp-index.xml rename to xmldoc/formats/options/stmwpp-index.xml diff --git a/gpsbabel/xmldoc/formats/options/subrip-format.xml b/xmldoc/formats/options/subrip-format.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/subrip-format.xml rename to xmldoc/formats/options/subrip-format.xml diff --git a/gpsbabel/xmldoc/formats/options/subrip-gps_date.xml b/xmldoc/formats/options/subrip-gps_date.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/subrip-gps_date.xml rename to xmldoc/formats/options/subrip-gps_date.xml diff --git a/gpsbabel/xmldoc/formats/options/subrip-gps_time.xml b/xmldoc/formats/options/subrip-gps_time.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/subrip-gps_time.xml rename to xmldoc/formats/options/subrip-gps_time.xml diff --git a/gpsbabel/xmldoc/formats/options/subrip-video_time.xml b/xmldoc/formats/options/subrip-video_time.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/subrip-video_time.xml rename to xmldoc/formats/options/subrip-video_time.xml diff --git a/gpsbabel/xmldoc/formats/options/tef-routevia.xml b/xmldoc/formats/options/tef-routevia.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/tef-routevia.xml rename to xmldoc/formats/options/tef-routevia.xml diff --git a/gpsbabel/xmldoc/formats/options/text-altunits.xml b/xmldoc/formats/options/text-altunits.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/text-altunits.xml rename to xmldoc/formats/options/text-altunits.xml diff --git a/gpsbabel/xmldoc/formats/options/text-degformat.xml b/xmldoc/formats/options/text-degformat.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/text-degformat.xml rename to xmldoc/formats/options/text-degformat.xml diff --git a/gpsbabel/xmldoc/formats/options/text-encrypt.xml b/xmldoc/formats/options/text-encrypt.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/text-encrypt.xml rename to xmldoc/formats/options/text-encrypt.xml diff --git a/gpsbabel/xmldoc/formats/options/text-logs.xml b/xmldoc/formats/options/text-logs.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/text-logs.xml rename to xmldoc/formats/options/text-logs.xml diff --git a/gpsbabel/xmldoc/formats/options/text-nosep.xml b/xmldoc/formats/options/text-nosep.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/text-nosep.xml rename to xmldoc/formats/options/text-nosep.xml diff --git a/gpsbabel/xmldoc/formats/options/text-splitoutput.xml b/xmldoc/formats/options/text-splitoutput.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/text-splitoutput.xml rename to xmldoc/formats/options/text-splitoutput.xml diff --git a/gpsbabel/xmldoc/formats/options/tiger-genurl.xml b/xmldoc/formats/options/tiger-genurl.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/tiger-genurl.xml rename to xmldoc/formats/options/tiger-genurl.xml diff --git a/gpsbabel/xmldoc/formats/options/tiger-iconismarker.xml b/xmldoc/formats/options/tiger-iconismarker.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/tiger-iconismarker.xml rename to xmldoc/formats/options/tiger-iconismarker.xml diff --git a/gpsbabel/xmldoc/formats/options/tiger-margin.xml b/xmldoc/formats/options/tiger-margin.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/tiger-margin.xml rename to xmldoc/formats/options/tiger-margin.xml diff --git a/gpsbabel/xmldoc/formats/options/tiger-newmarker.xml b/xmldoc/formats/options/tiger-newmarker.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/tiger-newmarker.xml rename to xmldoc/formats/options/tiger-newmarker.xml diff --git a/gpsbabel/xmldoc/formats/options/tiger-nolabels.xml b/xmldoc/formats/options/tiger-nolabels.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/tiger-nolabels.xml rename to xmldoc/formats/options/tiger-nolabels.xml diff --git a/gpsbabel/xmldoc/formats/options/tiger-oldmarker.xml b/xmldoc/formats/options/tiger-oldmarker.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/tiger-oldmarker.xml rename to xmldoc/formats/options/tiger-oldmarker.xml diff --git a/gpsbabel/xmldoc/formats/options/tiger-oldthresh.xml b/xmldoc/formats/options/tiger-oldthresh.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/tiger-oldthresh.xml rename to xmldoc/formats/options/tiger-oldthresh.xml diff --git a/gpsbabel/xmldoc/formats/options/tiger-snlen.xml b/xmldoc/formats/options/tiger-snlen.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/tiger-snlen.xml rename to xmldoc/formats/options/tiger-snlen.xml diff --git a/gpsbabel/xmldoc/formats/options/tiger-suppresswhite.xml b/xmldoc/formats/options/tiger-suppresswhite.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/tiger-suppresswhite.xml rename to xmldoc/formats/options/tiger-suppresswhite.xml diff --git a/gpsbabel/xmldoc/formats/options/tiger-unfoundmarker.xml b/xmldoc/formats/options/tiger-unfoundmarker.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/tiger-unfoundmarker.xml rename to xmldoc/formats/options/tiger-unfoundmarker.xml diff --git a/gpsbabel/xmldoc/formats/options/tiger-xpixels.xml b/xmldoc/formats/options/tiger-xpixels.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/tiger-xpixels.xml rename to xmldoc/formats/options/tiger-xpixels.xml diff --git a/gpsbabel/xmldoc/formats/options/tiger-ypixels.xml b/xmldoc/formats/options/tiger-ypixels.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/tiger-ypixels.xml rename to xmldoc/formats/options/tiger-ypixels.xml diff --git a/gpsbabel/xmldoc/formats/options/tpg-datum.xml b/xmldoc/formats/options/tpg-datum.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/tpg-datum.xml rename to xmldoc/formats/options/tpg-datum.xml diff --git a/gpsbabel/xmldoc/formats/options/transform-rptdigits.xml b/xmldoc/formats/options/transform-rptdigits.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/transform-rptdigits.xml rename to xmldoc/formats/options/transform-rptdigits.xml diff --git a/gpsbabel/xmldoc/formats/options/transform-rptname.xml b/xmldoc/formats/options/transform-rptname.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/transform-rptname.xml rename to xmldoc/formats/options/transform-rptname.xml diff --git a/gpsbabel/xmldoc/formats/options/unicsv-datum.xml b/xmldoc/formats/options/unicsv-datum.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/unicsv-datum.xml rename to xmldoc/formats/options/unicsv-datum.xml diff --git a/gpsbabel/xmldoc/formats/options/unicsv-filename.xml b/xmldoc/formats/options/unicsv-filename.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/unicsv-filename.xml rename to xmldoc/formats/options/unicsv-filename.xml diff --git a/gpsbabel/xmldoc/formats/options/unicsv-format.xml b/xmldoc/formats/options/unicsv-format.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/unicsv-format.xml rename to xmldoc/formats/options/unicsv-format.xml diff --git a/gpsbabel/xmldoc/formats/options/unicsv-grid.xml b/xmldoc/formats/options/unicsv-grid.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/unicsv-grid.xml rename to xmldoc/formats/options/unicsv-grid.xml diff --git a/gpsbabel/xmldoc/formats/options/unicsv-utc.xml b/xmldoc/formats/options/unicsv-utc.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/unicsv-utc.xml rename to xmldoc/formats/options/unicsv-utc.xml diff --git a/gpsbabel/xmldoc/formats/options/vcard-encrypt.xml b/xmldoc/formats/options/vcard-encrypt.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/vcard-encrypt.xml rename to xmldoc/formats/options/vcard-encrypt.xml diff --git a/gpsbabel/xmldoc/formats/options/vidaone-ver.xml b/xmldoc/formats/options/vidaone-ver.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/vidaone-ver.xml rename to xmldoc/formats/options/vidaone-ver.xml diff --git a/gpsbabel/xmldoc/formats/options/wbt-erase.xml b/xmldoc/formats/options/wbt-erase.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/wbt-erase.xml rename to xmldoc/formats/options/wbt-erase.xml diff --git a/gpsbabel/xmldoc/formats/options/wfff-ahcicon.xml b/xmldoc/formats/options/wfff-ahcicon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/wfff-ahcicon.xml rename to xmldoc/formats/options/wfff-ahcicon.xml diff --git a/gpsbabel/xmldoc/formats/options/wfff-ahoicon.xml b/xmldoc/formats/options/wfff-ahoicon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/wfff-ahoicon.xml rename to xmldoc/formats/options/wfff-ahoicon.xml diff --git a/gpsbabel/xmldoc/formats/options/wfff-aicicon.xml b/xmldoc/formats/options/wfff-aicicon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/wfff-aicicon.xml rename to xmldoc/formats/options/wfff-aicicon.xml diff --git a/gpsbabel/xmldoc/formats/options/wfff-aioicon.xml b/xmldoc/formats/options/wfff-aioicon.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/wfff-aioicon.xml rename to xmldoc/formats/options/wfff-aioicon.xml diff --git a/gpsbabel/xmldoc/formats/options/wfff-snmac.xml b/xmldoc/formats/options/wfff-snmac.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/wfff-snmac.xml rename to xmldoc/formats/options/wfff-snmac.xml diff --git a/gpsbabel/xmldoc/formats/options/xcsv-datum.xml b/xmldoc/formats/options/xcsv-datum.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/xcsv-datum.xml rename to xmldoc/formats/options/xcsv-datum.xml diff --git a/gpsbabel/xmldoc/formats/options/xcsv-prefer_shortnames.xml b/xmldoc/formats/options/xcsv-prefer_shortnames.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/xcsv-prefer_shortnames.xml rename to xmldoc/formats/options/xcsv-prefer_shortnames.xml diff --git a/gpsbabel/xmldoc/formats/options/xcsv-snlen.xml b/xmldoc/formats/options/xcsv-snlen.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/xcsv-snlen.xml rename to xmldoc/formats/options/xcsv-snlen.xml diff --git a/gpsbabel/xmldoc/formats/options/xcsv-snunique.xml b/xmldoc/formats/options/xcsv-snunique.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/xcsv-snunique.xml rename to xmldoc/formats/options/xcsv-snunique.xml diff --git a/gpsbabel/xmldoc/formats/options/xcsv-snupper.xml b/xmldoc/formats/options/xcsv-snupper.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/xcsv-snupper.xml rename to xmldoc/formats/options/xcsv-snupper.xml diff --git a/gpsbabel/xmldoc/formats/options/xcsv-snwhite.xml b/xmldoc/formats/options/xcsv-snwhite.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/xcsv-snwhite.xml rename to xmldoc/formats/options/xcsv-snwhite.xml diff --git a/gpsbabel/xmldoc/formats/options/xcsv-style.xml b/xmldoc/formats/options/xcsv-style.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/xcsv-style.xml rename to xmldoc/formats/options/xcsv-style.xml diff --git a/gpsbabel/xmldoc/formats/options/xcsv-urlbase.xml b/xmldoc/formats/options/xcsv-urlbase.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/xcsv-urlbase.xml rename to xmldoc/formats/options/xcsv-urlbase.xml diff --git a/gpsbabel/xmldoc/formats/options/xmappdb-dbname.xml b/xmldoc/formats/options/xmappdb-dbname.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/xmappdb-dbname.xml rename to xmldoc/formats/options/xmappdb-dbname.xml diff --git a/gpsbabel/xmldoc/formats/options/yahoo-addrsep.xml b/xmldoc/formats/options/yahoo-addrsep.xml similarity index 100% rename from gpsbabel/xmldoc/formats/options/yahoo-addrsep.xml rename to xmldoc/formats/options/yahoo-addrsep.xml diff --git a/gpsbabel/xmldoc/formats/osm.xml b/xmldoc/formats/osm.xml similarity index 100% rename from gpsbabel/xmldoc/formats/osm.xml rename to xmldoc/formats/osm.xml diff --git a/gpsbabel/xmldoc/formats/ozi.xml b/xmldoc/formats/ozi.xml similarity index 100% rename from gpsbabel/xmldoc/formats/ozi.xml rename to xmldoc/formats/ozi.xml diff --git a/gpsbabel/xmldoc/formats/palmdoc.xml b/xmldoc/formats/palmdoc.xml similarity index 100% rename from gpsbabel/xmldoc/formats/palmdoc.xml rename to xmldoc/formats/palmdoc.xml diff --git a/gpsbabel/xmldoc/formats/pathaway.xml b/xmldoc/formats/pathaway.xml similarity index 100% rename from gpsbabel/xmldoc/formats/pathaway.xml rename to xmldoc/formats/pathaway.xml diff --git a/gpsbabel/xmldoc/formats/pcx.xml b/xmldoc/formats/pcx.xml similarity index 100% rename from gpsbabel/xmldoc/formats/pcx.xml rename to xmldoc/formats/pcx.xml diff --git a/gpsbabel/xmldoc/formats/pocketfms_bc.xml b/xmldoc/formats/pocketfms_bc.xml similarity index 100% rename from gpsbabel/xmldoc/formats/pocketfms_bc.xml rename to xmldoc/formats/pocketfms_bc.xml diff --git a/gpsbabel/xmldoc/formats/pocketfms_fp.xml b/xmldoc/formats/pocketfms_fp.xml similarity index 100% rename from gpsbabel/xmldoc/formats/pocketfms_fp.xml rename to xmldoc/formats/pocketfms_fp.xml diff --git a/gpsbabel/xmldoc/formats/pocketfms_wp.xml b/xmldoc/formats/pocketfms_wp.xml similarity index 100% rename from gpsbabel/xmldoc/formats/pocketfms_wp.xml rename to xmldoc/formats/pocketfms_wp.xml diff --git a/gpsbabel/xmldoc/formats/psitrex.xml b/xmldoc/formats/psitrex.xml similarity index 100% rename from gpsbabel/xmldoc/formats/psitrex.xml rename to xmldoc/formats/psitrex.xml diff --git a/gpsbabel/xmldoc/formats/psp.xml b/xmldoc/formats/psp.xml similarity index 100% rename from gpsbabel/xmldoc/formats/psp.xml rename to xmldoc/formats/psp.xml diff --git a/gpsbabel/xmldoc/formats/quovadis.xml b/xmldoc/formats/quovadis.xml similarity index 100% rename from gpsbabel/xmldoc/formats/quovadis.xml rename to xmldoc/formats/quovadis.xml diff --git a/gpsbabel/xmldoc/formats/raymarine.xml b/xmldoc/formats/raymarine.xml similarity index 100% rename from gpsbabel/xmldoc/formats/raymarine.xml rename to xmldoc/formats/raymarine.xml diff --git a/gpsbabel/xmldoc/formats/ricoh.xml b/xmldoc/formats/ricoh.xml similarity index 100% rename from gpsbabel/xmldoc/formats/ricoh.xml rename to xmldoc/formats/ricoh.xml diff --git a/gpsbabel/xmldoc/formats/s_and_t.xml b/xmldoc/formats/s_and_t.xml similarity index 100% rename from gpsbabel/xmldoc/formats/s_and_t.xml rename to xmldoc/formats/s_and_t.xml diff --git a/gpsbabel/xmldoc/formats/saplus.xml b/xmldoc/formats/saplus.xml similarity index 100% rename from gpsbabel/xmldoc/formats/saplus.xml rename to xmldoc/formats/saplus.xml diff --git a/gpsbabel/xmldoc/formats/saroute.xml b/xmldoc/formats/saroute.xml similarity index 100% rename from gpsbabel/xmldoc/formats/saroute.xml rename to xmldoc/formats/saroute.xml diff --git a/gpsbabel/xmldoc/formats/sbn.xml b/xmldoc/formats/sbn.xml similarity index 100% rename from gpsbabel/xmldoc/formats/sbn.xml rename to xmldoc/formats/sbn.xml diff --git a/gpsbabel/xmldoc/formats/sbp.xml b/xmldoc/formats/sbp.xml similarity index 100% rename from gpsbabel/xmldoc/formats/sbp.xml rename to xmldoc/formats/sbp.xml diff --git a/gpsbabel/xmldoc/formats/shape.xml b/xmldoc/formats/shape.xml similarity index 100% rename from gpsbabel/xmldoc/formats/shape.xml rename to xmldoc/formats/shape.xml diff --git a/gpsbabel/xmldoc/formats/skyforce.xml b/xmldoc/formats/skyforce.xml similarity index 100% rename from gpsbabel/xmldoc/formats/skyforce.xml rename to xmldoc/formats/skyforce.xml diff --git a/gpsbabel/xmldoc/formats/skytraq-bin.xml b/xmldoc/formats/skytraq-bin.xml similarity index 100% rename from gpsbabel/xmldoc/formats/skytraq-bin.xml rename to xmldoc/formats/skytraq-bin.xml diff --git a/gpsbabel/xmldoc/formats/skytraq.xml b/xmldoc/formats/skytraq.xml similarity index 100% rename from gpsbabel/xmldoc/formats/skytraq.xml rename to xmldoc/formats/skytraq.xml diff --git a/gpsbabel/xmldoc/formats/sportsim.xml b/xmldoc/formats/sportsim.xml similarity index 100% rename from gpsbabel/xmldoc/formats/sportsim.xml rename to xmldoc/formats/sportsim.xml diff --git a/gpsbabel/xmldoc/formats/stmsdf.xml b/xmldoc/formats/stmsdf.xml similarity index 100% rename from gpsbabel/xmldoc/formats/stmsdf.xml rename to xmldoc/formats/stmsdf.xml diff --git a/gpsbabel/xmldoc/formats/stmwpp.xml b/xmldoc/formats/stmwpp.xml similarity index 100% rename from gpsbabel/xmldoc/formats/stmwpp.xml rename to xmldoc/formats/stmwpp.xml diff --git a/gpsbabel/xmldoc/formats/subrip.xml b/xmldoc/formats/subrip.xml similarity index 100% rename from gpsbabel/xmldoc/formats/subrip.xml rename to xmldoc/formats/subrip.xml diff --git a/gpsbabel/xmldoc/formats/tabsep.xml b/xmldoc/formats/tabsep.xml similarity index 100% rename from gpsbabel/xmldoc/formats/tabsep.xml rename to xmldoc/formats/tabsep.xml diff --git a/gpsbabel/xmldoc/formats/tef.xml b/xmldoc/formats/tef.xml similarity index 100% rename from gpsbabel/xmldoc/formats/tef.xml rename to xmldoc/formats/tef.xml diff --git a/gpsbabel/xmldoc/formats/teletype.xml b/xmldoc/formats/teletype.xml similarity index 100% rename from gpsbabel/xmldoc/formats/teletype.xml rename to xmldoc/formats/teletype.xml diff --git a/gpsbabel/xmldoc/formats/text.xml b/xmldoc/formats/text.xml similarity index 100% rename from gpsbabel/xmldoc/formats/text.xml rename to xmldoc/formats/text.xml diff --git a/gpsbabel/xmldoc/formats/tiger.xml b/xmldoc/formats/tiger.xml similarity index 100% rename from gpsbabel/xmldoc/formats/tiger.xml rename to xmldoc/formats/tiger.xml diff --git a/gpsbabel/xmldoc/formats/tmpro.xml b/xmldoc/formats/tmpro.xml similarity index 100% rename from gpsbabel/xmldoc/formats/tmpro.xml rename to xmldoc/formats/tmpro.xml diff --git a/gpsbabel/xmldoc/formats/tomtom.xml b/xmldoc/formats/tomtom.xml similarity index 100% rename from gpsbabel/xmldoc/formats/tomtom.xml rename to xmldoc/formats/tomtom.xml diff --git a/gpsbabel/xmldoc/formats/tomtom_asc.xml b/xmldoc/formats/tomtom_asc.xml similarity index 100% rename from gpsbabel/xmldoc/formats/tomtom_asc.xml rename to xmldoc/formats/tomtom_asc.xml diff --git a/gpsbabel/xmldoc/formats/tomtom_itn.xml b/xmldoc/formats/tomtom_itn.xml similarity index 100% rename from gpsbabel/xmldoc/formats/tomtom_itn.xml rename to xmldoc/formats/tomtom_itn.xml diff --git a/gpsbabel/xmldoc/formats/tomtom_itn_places.xml b/xmldoc/formats/tomtom_itn_places.xml similarity index 100% rename from gpsbabel/xmldoc/formats/tomtom_itn_places.xml rename to xmldoc/formats/tomtom_itn_places.xml diff --git a/gpsbabel/xmldoc/formats/tpg.xml b/xmldoc/formats/tpg.xml similarity index 100% rename from gpsbabel/xmldoc/formats/tpg.xml rename to xmldoc/formats/tpg.xml diff --git a/gpsbabel/xmldoc/formats/tpo.xml b/xmldoc/formats/tpo.xml similarity index 100% rename from gpsbabel/xmldoc/formats/tpo.xml rename to xmldoc/formats/tpo.xml diff --git a/gpsbabel/xmldoc/formats/tpo2.xml b/xmldoc/formats/tpo2.xml similarity index 100% rename from gpsbabel/xmldoc/formats/tpo2.xml rename to xmldoc/formats/tpo2.xml diff --git a/gpsbabel/xmldoc/formats/tpo3.xml b/xmldoc/formats/tpo3.xml similarity index 100% rename from gpsbabel/xmldoc/formats/tpo3.xml rename to xmldoc/formats/tpo3.xml diff --git a/gpsbabel/xmldoc/formats/unicsv.xml b/xmldoc/formats/unicsv.xml similarity index 100% rename from gpsbabel/xmldoc/formats/unicsv.xml rename to xmldoc/formats/unicsv.xml diff --git a/gpsbabel/xmldoc/formats/v900.xml b/xmldoc/formats/v900.xml similarity index 100% rename from gpsbabel/xmldoc/formats/v900.xml rename to xmldoc/formats/v900.xml diff --git a/gpsbabel/xmldoc/formats/vcard.xml b/xmldoc/formats/vcard.xml similarity index 100% rename from gpsbabel/xmldoc/formats/vcard.xml rename to xmldoc/formats/vcard.xml diff --git a/gpsbabel/xmldoc/formats/vidaone.xml b/xmldoc/formats/vidaone.xml similarity index 100% rename from gpsbabel/xmldoc/formats/vidaone.xml rename to xmldoc/formats/vidaone.xml diff --git a/gpsbabel/xmldoc/formats/vitosmt.xml b/xmldoc/formats/vitosmt.xml similarity index 100% rename from gpsbabel/xmldoc/formats/vitosmt.xml rename to xmldoc/formats/vitosmt.xml diff --git a/gpsbabel/xmldoc/formats/vitovtt.xml b/xmldoc/formats/vitovtt.xml similarity index 100% rename from gpsbabel/xmldoc/formats/vitovtt.xml rename to xmldoc/formats/vitovtt.xml diff --git a/gpsbabel/xmldoc/formats/vpl.xml b/xmldoc/formats/vpl.xml similarity index 100% rename from gpsbabel/xmldoc/formats/vpl.xml rename to xmldoc/formats/vpl.xml diff --git a/gpsbabel/xmldoc/formats/wbt-bin.xml b/xmldoc/formats/wbt-bin.xml similarity index 100% rename from gpsbabel/xmldoc/formats/wbt-bin.xml rename to xmldoc/formats/wbt-bin.xml diff --git a/gpsbabel/xmldoc/formats/wbt-tk1.xml b/xmldoc/formats/wbt-tk1.xml similarity index 100% rename from gpsbabel/xmldoc/formats/wbt-tk1.xml rename to xmldoc/formats/wbt-tk1.xml diff --git a/gpsbabel/xmldoc/formats/wbt.xml b/xmldoc/formats/wbt.xml similarity index 100% rename from gpsbabel/xmldoc/formats/wbt.xml rename to xmldoc/formats/wbt.xml diff --git a/gpsbabel/xmldoc/formats/wfff.xml b/xmldoc/formats/wfff.xml similarity index 100% rename from gpsbabel/xmldoc/formats/wfff.xml rename to xmldoc/formats/wfff.xml diff --git a/gpsbabel/xmldoc/formats/wintec_tes.xml b/xmldoc/formats/wintec_tes.xml similarity index 100% rename from gpsbabel/xmldoc/formats/wintec_tes.xml rename to xmldoc/formats/wintec_tes.xml diff --git a/gpsbabel/xmldoc/formats/xcsv.xml b/xmldoc/formats/xcsv.xml similarity index 100% rename from gpsbabel/xmldoc/formats/xcsv.xml rename to xmldoc/formats/xcsv.xml diff --git a/gpsbabel/xmldoc/formats/xmap.xml b/xmldoc/formats/xmap.xml similarity index 100% rename from gpsbabel/xmldoc/formats/xmap.xml rename to xmldoc/formats/xmap.xml diff --git a/gpsbabel/xmldoc/formats/xmap2006.xml b/xmldoc/formats/xmap2006.xml similarity index 100% rename from gpsbabel/xmldoc/formats/xmap2006.xml rename to xmldoc/formats/xmap2006.xml diff --git a/gpsbabel/xmldoc/formats/xmapwpt.xml b/xmldoc/formats/xmapwpt.xml similarity index 100% rename from gpsbabel/xmldoc/formats/xmapwpt.xml rename to xmldoc/formats/xmapwpt.xml diff --git a/gpsbabel/xmldoc/formats/xol.xml b/xmldoc/formats/xol.xml similarity index 100% rename from gpsbabel/xmldoc/formats/xol.xml rename to xmldoc/formats/xol.xml diff --git a/gpsbabel/xmldoc/formats/yahoo.xml b/xmldoc/formats/yahoo.xml similarity index 100% rename from gpsbabel/xmldoc/formats/yahoo.xml rename to xmldoc/formats/yahoo.xml diff --git a/gpsbabel/xmldoc/gpsbabel_man.xml b/xmldoc/gpsbabel_man.xml similarity index 100% rename from gpsbabel/xmldoc/gpsbabel_man.xml rename to xmldoc/gpsbabel_man.xml diff --git a/gpsbabel/xmldoc/makedoc.in b/xmldoc/makedoc.in similarity index 100% rename from gpsbabel/xmldoc/makedoc.in rename to xmldoc/makedoc.in diff --git a/gpsbabel/xmldoc/readme.xml b/xmldoc/readme.xml similarity index 100% rename from gpsbabel/xmldoc/readme.xml rename to xmldoc/readme.xml diff --git a/gpsbabel/xmlgeneric.cc b/xmlgeneric.cc similarity index 100% rename from gpsbabel/xmlgeneric.cc rename to xmlgeneric.cc diff --git a/gpsbabel/xmlgeneric.h b/xmlgeneric.h similarity index 100% rename from gpsbabel/xmlgeneric.h rename to xmlgeneric.h diff --git a/gpsbabel/xmltag.cc b/xmltag.cc similarity index 100% rename from gpsbabel/xmltag.cc rename to xmltag.cc diff --git a/gpsbabel/xol.cc b/xol.cc similarity index 100% rename from gpsbabel/xol.cc rename to xol.cc diff --git a/gpsbabel/yahoo.cc b/yahoo.cc similarity index 100% rename from gpsbabel/yahoo.cc rename to yahoo.cc diff --git a/gpsbabel/zlib/.gitignore b/zlib/.gitignore similarity index 100% rename from gpsbabel/zlib/.gitignore rename to zlib/.gitignore diff --git a/gpsbabel/zlib/ChangeLog b/zlib/ChangeLog similarity index 100% rename from gpsbabel/zlib/ChangeLog rename to zlib/ChangeLog diff --git a/gpsbabel/zlib/FAQ b/zlib/FAQ similarity index 100% rename from gpsbabel/zlib/FAQ rename to zlib/FAQ diff --git a/gpsbabel/zlib/Makefile.in.zlib b/zlib/Makefile.in.zlib similarity index 100% rename from gpsbabel/zlib/Makefile.in.zlib rename to zlib/Makefile.in.zlib diff --git a/gpsbabel/zlib/README b/zlib/README similarity index 100% rename from gpsbabel/zlib/README rename to zlib/README diff --git a/gpsbabel/zlib/README.gpsbabel b/zlib/README.gpsbabel similarity index 100% rename from gpsbabel/zlib/README.gpsbabel rename to zlib/README.gpsbabel diff --git a/gpsbabel/zlib/adler32.c b/zlib/adler32.c similarity index 100% rename from gpsbabel/zlib/adler32.c rename to zlib/adler32.c diff --git a/gpsbabel/zlib/algorithm.txt b/zlib/algorithm.txt similarity index 100% rename from gpsbabel/zlib/algorithm.txt rename to zlib/algorithm.txt diff --git a/gpsbabel/zlib/compress.c b/zlib/compress.c similarity index 100% rename from gpsbabel/zlib/compress.c rename to zlib/compress.c diff --git a/gpsbabel/zlib/contrib/minizip/Makefile b/zlib/contrib/minizip/Makefile similarity index 100% rename from gpsbabel/zlib/contrib/minizip/Makefile rename to zlib/contrib/minizip/Makefile diff --git a/gpsbabel/zlib/contrib/minizip/Makefile.am b/zlib/contrib/minizip/Makefile.am similarity index 100% rename from gpsbabel/zlib/contrib/minizip/Makefile.am rename to zlib/contrib/minizip/Makefile.am diff --git a/gpsbabel/zlib/contrib/minizip/MiniZip64_Changes.txt b/zlib/contrib/minizip/MiniZip64_Changes.txt similarity index 100% rename from gpsbabel/zlib/contrib/minizip/MiniZip64_Changes.txt rename to zlib/contrib/minizip/MiniZip64_Changes.txt diff --git a/gpsbabel/zlib/contrib/minizip/MiniZip64_info.txt b/zlib/contrib/minizip/MiniZip64_info.txt similarity index 100% rename from gpsbabel/zlib/contrib/minizip/MiniZip64_info.txt rename to zlib/contrib/minizip/MiniZip64_info.txt diff --git a/gpsbabel/zlib/contrib/minizip/configure.ac b/zlib/contrib/minizip/configure.ac similarity index 100% rename from gpsbabel/zlib/contrib/minizip/configure.ac rename to zlib/contrib/minizip/configure.ac diff --git a/gpsbabel/zlib/contrib/minizip/crypt.h b/zlib/contrib/minizip/crypt.h similarity index 100% rename from gpsbabel/zlib/contrib/minizip/crypt.h rename to zlib/contrib/minizip/crypt.h diff --git a/gpsbabel/zlib/contrib/minizip/ioapi.c b/zlib/contrib/minizip/ioapi.c similarity index 100% rename from gpsbabel/zlib/contrib/minizip/ioapi.c rename to zlib/contrib/minizip/ioapi.c diff --git a/gpsbabel/zlib/contrib/minizip/ioapi.h b/zlib/contrib/minizip/ioapi.h similarity index 100% rename from gpsbabel/zlib/contrib/minizip/ioapi.h rename to zlib/contrib/minizip/ioapi.h diff --git a/gpsbabel/zlib/contrib/minizip/iowin32.c b/zlib/contrib/minizip/iowin32.c similarity index 100% rename from gpsbabel/zlib/contrib/minizip/iowin32.c rename to zlib/contrib/minizip/iowin32.c diff --git a/gpsbabel/zlib/contrib/minizip/iowin32.h b/zlib/contrib/minizip/iowin32.h similarity index 100% rename from gpsbabel/zlib/contrib/minizip/iowin32.h rename to zlib/contrib/minizip/iowin32.h diff --git a/gpsbabel/zlib/contrib/minizip/make_vms.com b/zlib/contrib/minizip/make_vms.com similarity index 100% rename from gpsbabel/zlib/contrib/minizip/make_vms.com rename to zlib/contrib/minizip/make_vms.com diff --git a/gpsbabel/zlib/contrib/minizip/miniunz.c b/zlib/contrib/minizip/miniunz.c similarity index 100% rename from gpsbabel/zlib/contrib/minizip/miniunz.c rename to zlib/contrib/minizip/miniunz.c diff --git a/gpsbabel/zlib/contrib/minizip/miniunzip.1 b/zlib/contrib/minizip/miniunzip.1 similarity index 100% rename from gpsbabel/zlib/contrib/minizip/miniunzip.1 rename to zlib/contrib/minizip/miniunzip.1 diff --git a/gpsbabel/zlib/contrib/minizip/minizip.1 b/zlib/contrib/minizip/minizip.1 similarity index 100% rename from gpsbabel/zlib/contrib/minizip/minizip.1 rename to zlib/contrib/minizip/minizip.1 diff --git a/gpsbabel/zlib/contrib/minizip/minizip.c b/zlib/contrib/minizip/minizip.c similarity index 100% rename from gpsbabel/zlib/contrib/minizip/minizip.c rename to zlib/contrib/minizip/minizip.c diff --git a/gpsbabel/zlib/contrib/minizip/minizip.pc.in b/zlib/contrib/minizip/minizip.pc.in similarity index 100% rename from gpsbabel/zlib/contrib/minizip/minizip.pc.in rename to zlib/contrib/minizip/minizip.pc.in diff --git a/gpsbabel/zlib/contrib/minizip/mztools.c b/zlib/contrib/minizip/mztools.c similarity index 100% rename from gpsbabel/zlib/contrib/minizip/mztools.c rename to zlib/contrib/minizip/mztools.c diff --git a/gpsbabel/zlib/contrib/minizip/mztools.h b/zlib/contrib/minizip/mztools.h similarity index 100% rename from gpsbabel/zlib/contrib/minizip/mztools.h rename to zlib/contrib/minizip/mztools.h diff --git a/gpsbabel/zlib/contrib/minizip/unzip.c b/zlib/contrib/minizip/unzip.c similarity index 100% rename from gpsbabel/zlib/contrib/minizip/unzip.c rename to zlib/contrib/minizip/unzip.c diff --git a/gpsbabel/zlib/contrib/minizip/unzip.h b/zlib/contrib/minizip/unzip.h similarity index 100% rename from gpsbabel/zlib/contrib/minizip/unzip.h rename to zlib/contrib/minizip/unzip.h diff --git a/gpsbabel/zlib/contrib/minizip/zip.c b/zlib/contrib/minizip/zip.c similarity index 100% rename from gpsbabel/zlib/contrib/minizip/zip.c rename to zlib/contrib/minizip/zip.c diff --git a/gpsbabel/zlib/contrib/minizip/zip.h b/zlib/contrib/minizip/zip.h similarity index 100% rename from gpsbabel/zlib/contrib/minizip/zip.h rename to zlib/contrib/minizip/zip.h diff --git a/gpsbabel/zlib/crc32.c b/zlib/crc32.c similarity index 100% rename from gpsbabel/zlib/crc32.c rename to zlib/crc32.c diff --git a/gpsbabel/zlib/crc32.h b/zlib/crc32.h similarity index 100% rename from gpsbabel/zlib/crc32.h rename to zlib/crc32.h diff --git a/gpsbabel/zlib/deflate.c b/zlib/deflate.c similarity index 100% rename from gpsbabel/zlib/deflate.c rename to zlib/deflate.c diff --git a/gpsbabel/zlib/deflate.h b/zlib/deflate.h similarity index 100% rename from gpsbabel/zlib/deflate.h rename to zlib/deflate.h diff --git a/gpsbabel/zlib/empty.in b/zlib/empty.in similarity index 100% rename from gpsbabel/zlib/empty.in rename to zlib/empty.in diff --git a/gpsbabel/zlib/gzclose.c b/zlib/gzclose.c similarity index 100% rename from gpsbabel/zlib/gzclose.c rename to zlib/gzclose.c diff --git a/gpsbabel/zlib/gzguts.h b/zlib/gzguts.h similarity index 100% rename from gpsbabel/zlib/gzguts.h rename to zlib/gzguts.h diff --git a/gpsbabel/zlib/gzlib.c b/zlib/gzlib.c similarity index 100% rename from gpsbabel/zlib/gzlib.c rename to zlib/gzlib.c diff --git a/gpsbabel/zlib/gzlib.patch b/zlib/gzlib.patch similarity index 100% rename from gpsbabel/zlib/gzlib.patch rename to zlib/gzlib.patch diff --git a/gpsbabel/zlib/gzread.c b/zlib/gzread.c similarity index 100% rename from gpsbabel/zlib/gzread.c rename to zlib/gzread.c diff --git a/gpsbabel/zlib/gzwrite.c b/zlib/gzwrite.c similarity index 100% rename from gpsbabel/zlib/gzwrite.c rename to zlib/gzwrite.c diff --git a/gpsbabel/zlib/infback.c b/zlib/infback.c similarity index 100% rename from gpsbabel/zlib/infback.c rename to zlib/infback.c diff --git a/gpsbabel/zlib/inffast.c b/zlib/inffast.c similarity index 100% rename from gpsbabel/zlib/inffast.c rename to zlib/inffast.c diff --git a/gpsbabel/zlib/inffast.h b/zlib/inffast.h similarity index 100% rename from gpsbabel/zlib/inffast.h rename to zlib/inffast.h diff --git a/gpsbabel/zlib/inffixed.h b/zlib/inffixed.h similarity index 100% rename from gpsbabel/zlib/inffixed.h rename to zlib/inffixed.h diff --git a/gpsbabel/zlib/inflate.c b/zlib/inflate.c similarity index 100% rename from gpsbabel/zlib/inflate.c rename to zlib/inflate.c diff --git a/gpsbabel/zlib/inflate.h b/zlib/inflate.h similarity index 100% rename from gpsbabel/zlib/inflate.h rename to zlib/inflate.h diff --git a/gpsbabel/zlib/inftrees.c b/zlib/inftrees.c similarity index 100% rename from gpsbabel/zlib/inftrees.c rename to zlib/inftrees.c diff --git a/gpsbabel/zlib/inftrees.h b/zlib/inftrees.h similarity index 100% rename from gpsbabel/zlib/inftrees.h rename to zlib/inftrees.h diff --git a/gpsbabel/zlib/trees.c b/zlib/trees.c similarity index 100% rename from gpsbabel/zlib/trees.c rename to zlib/trees.c diff --git a/gpsbabel/zlib/trees.h b/zlib/trees.h similarity index 100% rename from gpsbabel/zlib/trees.h rename to zlib/trees.h diff --git a/gpsbabel/zlib/uncompr.c b/zlib/uncompr.c similarity index 100% rename from gpsbabel/zlib/uncompr.c rename to zlib/uncompr.c diff --git a/gpsbabel/zlib/zconf.h b/zlib/zconf.h similarity index 100% rename from gpsbabel/zlib/zconf.h rename to zlib/zconf.h diff --git a/gpsbabel/zlib/zconf.in.h b/zlib/zconf.in.h similarity index 100% rename from gpsbabel/zlib/zconf.in.h rename to zlib/zconf.in.h diff --git a/gpsbabel/zlib/zlib.3 b/zlib/zlib.3 similarity index 100% rename from gpsbabel/zlib/zlib.3 rename to zlib/zlib.3 diff --git a/gpsbabel/zlib/zlib.h b/zlib/zlib.h similarity index 100% rename from gpsbabel/zlib/zlib.h rename to zlib/zlib.h diff --git a/gpsbabel/zlib/zutil.c b/zlib/zutil.c similarity index 100% rename from gpsbabel/zlib/zutil.c rename to zlib/zutil.c diff --git a/gpsbabel/zlib/zutil.h b/zlib/zutil.h similarity index 100% rename from gpsbabel/zlib/zutil.h rename to zlib/zutil.h