diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 3709b8f3..db48e203 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -9,8 +9,11 @@ - [Squash Commit Summary](#squash-commit-summary) - [Release](#release) - [Automatic CHANGELOG creation](#automatic-changelog-creation) + - [PyPI commands](#pypi-commands) - [Structure of the repository](#structure-of-the-repository) +- [User directory](#user-directory) - [Anaconda environment](#anaconda-environment) +- [Other command](#other-command) ## How to Contribute 1. Create a branch by forking the repository and apply your change. @@ -73,15 +76,31 @@ To generate the CHANGELOG.md for a upcoming release (no tag exists yet), the fol git-chglog -o CHANGELOG.md --next-tag v0.10.0 ``` +### PyPI commands +1. Change the version in setup.cfg and gdal-user.yml +2. Build a new release to publish to PyPI: +``` +py -m build +``` +3. Publish these files to PyPI: +``` +twine upload dist\* +``` + ## Structure of the repository There is one python coding base for both Windows and for macOS. Differences between the different OS are the used programs. The folders in the repo have the following purposes: -- common_download - all downloaded files are saved and extracted here -- common_python - custom python files -- common_resources - config, json files -- tooling - programs, scripts used by Windows and macOS -- tooling_win - programs, scripts for Windows +- `wahoo_mc` - custom python files +- `wahoo_mc/resources` - config, json files +- `wahoo_mc/tooling_win` - programs, scripts for Windows +- `tooling` - programs, scripts used by Windows and macOS to test and check the generated maps + +## User directory +Files which are processed through the tool are stored in the user directory to be release-independent. The name of the directory is: `$user_directory/wahooMapsCreatorData` and has the follwing folders: +- root - generated files are saved here +- `_download` - all downloaded files are saved and extracted here +- `_tiles` - intermediate files per tile are stored here ## Anaconda environment - /conda_env/gdal-user.yml is for creating Anaconda environment for users @@ -99,4 +118,10 @@ conda env export > environment.yml The installation of Anaconda envirionments is described [here](docs/QUICKSTART_ANACONDA.md) -more information on [documentation for sharing Anaconda environments](https://conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html#exporting-an-environment-file-across-platforms) \ No newline at end of file +more information on [documentation for sharing Anaconda environments](https://conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html#exporting-an-environment-file-across-platforms) + +## Other command +Run pylint for all relevant directories/files +``` +pylint -j 0 ./wahoomc ./tests +``` \ No newline at end of file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4bcae6b0..bdad12e2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,18 +10,18 @@ jobs: matrix: python-version: ["3.9", "3.10"] steps: - - uses: actions/checkout@v3 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install pylint - pip install mock - pip install requests - - name: Analysing the code with pylint - run: | - pylint -j 0 ./wahoo_mc ./tests - continue-on-error: false \ No newline at end of file + - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install pylint + pip install mock + pip install requests + - name: Analysing the code with pylint + run: | + pylint -j 0 ./wahoomc ./tests + continue-on-error: false diff --git a/.gitignore b/.gitignore index 1829d855..7a81f402 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,6 @@ /!.vscode/settings.json # top level -/dist -/envs osmconvert_tempfile.* # in all folders @@ -17,4 +15,11 @@ osmconvert_tempfile.* # mac/unix #windows -/wahoo_mc/tooling_win/osmconvert_tempfile.* +/wahoomc/tooling_win/osmconvert_tempfile.* + +# build artefacts +*.pyc +.eggs/ +/wahoomc.egg-info/ +/dist/ +/build/ \ No newline at end of file diff --git a/README.md b/README.md index cbdb2986..4df539f3 100644 --- a/README.md +++ b/README.md @@ -38,11 +38,11 @@ conda activate gdal-user ``` Run wahooMapsCreator via GUI ``` -python -m wahoo_mc gui +python -m wahoomc gui ``` Or run wahooMapsCreator via CLI ``` -python -m wahoo_mc cli -co malta +python -m wahoomc cli -co malta ``` A detailled description of the usage is documented [:computer: here](docs/USAGE.md#usage-of-wahoomapscreator) diff --git a/conda_env/gdal-dev.yml b/conda_env/gdal-dev.yml index b87cfcbd..2998b7d4 100644 --- a/conda_env/gdal-dev.yml +++ b/conda_env/gdal-dev.yml @@ -9,3 +9,8 @@ dependencies: - geojson=2.5.* - shapely=1.8.* - autopep8=1.6.* + - mock + - twine + - pip + - pip: + - build diff --git a/conda_env/gdal-user.yml b/conda_env/gdal-user.yml index 30370ac8..61f702ed 100644 --- a/conda_env/gdal-user.yml +++ b/conda_env/gdal-user.yml @@ -5,5 +5,6 @@ dependencies: - python=3.7 - geojson=2.5.* - gdal=3.4.* - - requests=2.27.* - - shapely=1.8.* + - pip + - pip: + - wahoomc==2.0.0a5 diff --git a/copyFilesToDist.sh b/copyFilesToDist.sh index 920e895a..d6a95b6f 100755 --- a/copyFilesToDist.sh +++ b/copyFilesToDist.sh @@ -20,19 +20,19 @@ cd ../.. cd dist/${FOLDER_NAME_MAC} # create empty sub-folders -mkdir -p ./wahoo_mc -mkdir -p ./wahoo_mc/resources +mkdir -p ./wahoomc +mkdir -p ./wahoomc/resources mkdir -p ./conda_env mkdir -p ./tooling mkdir -p ./docs # copy files into dist-folder -cp -a ../../wahoo_mc/*.py ./wahoo_mc/ -cp -a ../../wahoo_mc/resources/*.xml ./wahoo_mc/resources/ -cp -a ../../wahoo_mc/resources/*.osm ../../wahoo_mc/resources/*.py ./wahoo_mc/resources/ -cp -a ../../wahoo_mc/resources/json/ ./wahoo_mc/resources/json -cp -a ../../wahoo_mc/resources/tag_wahoo_adjusted/ ./wahoo_mc/resources/tag_wahoo_adjusted -cp -a ../../wahoo_mc/resources/tag_wahoo_initial/ ./wahoo_mc/resources/tag_wahoo_initial +cp -a ../../wahoomc/*.py ./wahoomc/ +cp -a ../../wahoomc/resources/*.xml ./wahoomc/resources/ +cp -a ../../wahoomc/resources/*.osm ../../wahoomc/resources/*.py ./wahoomc/resources/ +cp -a ../../wahoomc/resources/json/ ./wahoomc/resources/json +cp -a ../../wahoomc/resources/tag_wahoo_adjusted/ ./wahoomc/resources/tag_wahoo_adjusted +cp -a ../../wahoomc/resources/tag_wahoo_initial/ ./wahoomc/resources/tag_wahoo_initial cp -a ../../docs/*.md ./docs/ cp -a ../../CHANGELOG.md ../../README.md ./ diff --git a/docs/COPY_TO_WAHOO.md b/docs/COPY_TO_WAHOO.md index 2a6cb055..ce96015b 100644 --- a/docs/COPY_TO_WAHOO.md +++ b/docs/COPY_TO_WAHOO.md @@ -2,7 +2,7 @@ #### Table of contents - [Steps to carry out](#steps-to-carry-out) - - [Unzip Files](#unzip-files) + - [Location of the generated maps](#location-of-the-generated-maps) - [Install adb](#install-adb) - [Authorize Wahoo device](#authorize-wahoo-device) - [Copy map files](#copy-map-files) @@ -12,8 +12,10 @@ - [Troubleshooting](#troubleshooting) # Steps to carry out -## Unzip Files -unzip the desired country files +## Location of the generated maps +The generated maps are saved in the user directory in folder: `$user_directory/wahooMapsCreatorData`. + +There is a folder per country or for the X/Y combination with the relevant tiles. ## Install adb You can download the lates adb-tools (included in the SDK Platform Tools) for your OS here: @@ -38,7 +40,7 @@ adb devices ``` ## Copy map files -copy the unzipped map folders to \ELEMNT-BOLT\USB storage\maps\tiles\8\ +copy map folders per tile to \ELEMNT-BOLT\USB storage\maps\tiles\8\ These tools can be helpful if you want to copy the files with a GUI and not via CLI: - Windows: https://github.com/hexadezi/adbGUI diff --git a/docs/QUICKSTART_ANACONDA.md b/docs/QUICKSTART_ANACONDA.md index 649ca63e..c2518afa 100644 --- a/docs/QUICKSTART_ANACONDA.md +++ b/docs/QUICKSTART_ANACONDA.md @@ -8,8 +8,13 @@ - [homebrew](#homebrew) - [OSM-tools](#osm-tools) - [wahooMapsCreator](#wahoomapscreator) -- [Create Anaconda Environment](#create-anaconda-environment) + - [Create Anaconda Environment](#create-anaconda-environment) + - [Install wahooMapsCreator into Anaconda environment](#install-wahoomapscreator-into-anaconda-environment) + - [Update wahooMapsCreator](#update-wahoomapscreator) - [Run wahooMapsCreator](#run-wahoomapscreator) +- [Archive](#archive) + - [old but still valid way to get wahooMapsCreator](#old-but-still-valid-way-to-get-wahoomapscreator) + - [Create Anaconda Environment](#create-anaconda-environment-1) # Download and Install required programs @@ -54,11 +59,45 @@ brew install osmosis * more information: https://github.com/mapsforge/mapsforge/blob/master/docs/Getting-Started-Map-Writer.md#plugin-installation # wahooMapsCreator -Download the latest .zip file from the [Releases](https://github.com/treee111/wahooMapsCreator/releases) page for your OS and save the folder on your drive. Extract the folder. +## Create Anaconda Environment +1. Open terminal (macOS/Linux) or **Anaconda Prompt** (Windows, via Startmenu) +2. Create a new Anaconda environment with needed packages +``` +conda create -n gdal-user python=3.7 geojson=2.5.* gdal=3.4.* pip --channel conda-forge +``` +3. activate Anaconda environment with the command printed out (this needs to be done each time you want to use wahooMapsCreator maps) +``` +conda activate gdal-user +``` +## Install wahooMapsCreator into Anaconda environment +``` +pip install wahoomc +``` + +### Update wahooMapsCreator +If you have wahooMapsCreator already installed via pip and you want to install a newer version this can be done via: +``` +pip install wahoomc --upgrade +``` + +If you want to upgrade to a version other than the release actual one, use this command: +``` +pip install wahoomc==2.0.0a5 --upgrade +``` + +# Run wahooMapsCreator +Run wahooMapsCreater as described in the [README](../README.md/#Run-wahooMapsCreator) + + +# Archive +## old but still valid way to get wahooMapsCreator +This was the way to install wahooMapsCreator until release v1.1.1 + +Download the latest .zip file from the [Releases](https://github.com/treee111/wahooMapsCreator/releases) page for your OS and save the folder on your drive. Extract the folder. You can also clone the repository to have the latest coding. -# Create Anaconda Environment +### Create Anaconda Environment 1. Open (or change to) the root of the extracted wahooMapsCreator folder in terminal (macOS/Linux) or **Anaconda Prompt** (Windows, via Startmenu) 2. Create a new Anaconda environment via @@ -77,5 +116,4 @@ conda activate gdal-user Additional informations: https://opensourceoptions.com/blog/how-to-install-gdal-with-anaconda/ -# Run wahooMapsCreator -Run wahooMapsCreater as described in the [README](../README.md/#Run-wahooMapsCreator) \ No newline at end of file +continue with [Run wahooMapsCreator](#run-wahoomapscreator) to use wahooMapsCreator diff --git a/docs/USAGE.md b/docs/USAGE.md index be3e600b..5cd89cc3 100644 --- a/docs/USAGE.md +++ b/docs/USAGE.md @@ -5,6 +5,8 @@ wahooMapsCreator can be used in two different ways: Both ways support the same arguments to be used for the map-creation process. You can choose the arguments via GUI or as [CLI-arguments](#advanced-cli-usage). +### Always activate environment first + ## Run wahooMapsCreator for your country It might be a good idea to run wahooMapsCreator first for a small country e.g. Malta to check if everything is running fine. In a next step you can run it for your own country. @@ -12,7 +14,7 @@ In a next step you can run it for your own country. ## GUI (Graphical User Interface) From the `root` folder of wahooMapsCreator, run: - - `python -m wahoo_mc gui` + - `python -m wahoomc gui` Set your arguments as required via the window: @@ -21,34 +23,34 @@ Set your arguments as required via the window: ## CLI (Command Line Interface) From the `root` folder of wahooMapsCreator, run: -- `python -m wahoo_mc cli -co ` +- `python -m wahoomc cli -co ` Examples: -- for Malta: `python -m wahoo_mc cli -co malta` -- for Ireland: `python -m wahoo_mc cli -co ireland` +- for Malta: `python -m wahoomc cli -co malta` +- for Ireland: `python -m wahoomc cli -co ireland` ## Advanced CLI-Usage The script supports many arguments via command line. For a list of all supported arguments, run: -- `python -m wahoo_mc cli -h` +- `python -m wahoomc cli -h` ### Main arguments **Create maps for a country** -- `python -m wahoo_mc cli -co ` +- `python -m wahoomc cli -co ` **Create maps for X/Y coordinates** In particular for testing adjustments in configuration-files or coding it is helpful to create maps for only one tile or a handful of tiles! To create maps for only one tile and not a whole country, one can use the X/Y coordinates of that tile. X/Y coordinates can be retrieved from this in zoom-level 8: [link](http://tools.geofabrik.de/map/#8/50.3079/8.8026&type=Geofabrik_Standard&grid=1). -- `python -m wahoo_mc cli -xy ` +- `python -m wahoomc cli -xy ` ### Examples - for Malta, download new maps if existing maps are older than 100 days and process files even if files exist - - `python -m wahoo_mc cli -co malta -md 100 -fp` + - `python -m wahoomc cli -co malta -md 100 -fp` - for Germany, download and process whole tiles which involves other countries than the given - - `python -m wahoo_mc cli -co germany -bc` + - `python -m wahoomc cli -co germany -bc` - to create maps for only one tile - - `python -m wahoo_mc cli -xy 134/88` + - `python -m wahoomc cli -xy 134/88` - for multiple tiles - - `python -m wahoo_mc cli -xy 134/88,133/88` \ No newline at end of file + - `python -m wahoomc cli -xy 134/88,133/88` \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000..b5a3c468 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,6 @@ +[build-system] +requires = [ + "setuptools>=42", + "wheel" +] +build-backend = "setuptools.build_meta" \ No newline at end of file diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 00000000..34b69219 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,25 @@ +[metadata] +name = wahoomc +version = 2.0.0a5 +author = Benjamin Kreuscher +author_email = benni.kreuscher@gmail.com +description = Create maps for your Wahoo bike computer based on latest OSM maps +long_description = file: README.md +long_description_content_type = text/markdown +url = https://github.com/treee111/wahooMapsCreator +project_urls = + Bug Tracker = https://github.com/treee111/wahooMapsCreator/issues +classifiers = + Programming Language :: Python :: 3 + License :: OSI Approved :: MIT License + Operating System :: OS Independent + +[options] +packages = wahoomc +python_requires = >=3.7 +install_requires = + requests==2.27.* + shapely==1.8.* + +[options.package_data] +wahoomc = resources/*.*, resources/**/*.*, resources/*/*/*.*, resources/*/*/*/*.* \ No newline at end of file diff --git a/tests/test_cli.py b/tests/test_cli.py index 5201bf36..5ae26f78 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -17,7 +17,7 @@ def test_top_parser_help(self): tests, if help of top parser can be called """ - result = os.system("python -h wahoo_mc -h") + result = os.system("python -h wahoomc -h") self.assertEqual(result, 0) @@ -26,7 +26,7 @@ def test_cli_help(self): tests, if CLI help can be called """ - result = os.system("python -h wahoo_mc cli -h") + result = os.system("python -h wahoomc cli -h") self.assertEqual(result, 0) @@ -35,7 +35,7 @@ def test_gui_help(self): tests, if GUI help can be called """ - result = os.system("python -h wahoo_mc gui -h") + result = os.system("python -h wahoomc gui -h") self.assertEqual(result, 0) diff --git a/tests/test_constants.py b/tests/test_constants.py index b8ef1b2c..730eb006 100644 --- a/tests/test_constants.py +++ b/tests/test_constants.py @@ -5,8 +5,8 @@ from mock import patch -from wahoo_mc.constants_functions import translate_country_input_to_geofabrik -from wahoo_mc.constants_functions import translate_tags_to_keep +from wahoomc.constants_functions import translate_country_input_to_geofabrik +from wahoomc.constants_functions import translate_tags_to_keep class TestTranslateCountries(unittest.TestCase): @@ -85,7 +85,7 @@ class TestTranslateTags(unittest.TestCase): tests for translating tags-constants between the universal format and OS-specific formats """ - @patch('wahoo_mc.constants.TAGS_TO_KEEP_UNIVERSAL', tags_universal_simple) + @patch('wahoomc.constants.TAGS_TO_KEEP_UNIVERSAL', tags_universal_simple) def test_translate_tags_to_keep_simple_macos(self): """ Test translating tags to keep from universal format to macOS @@ -96,7 +96,7 @@ def test_translate_tags_to_keep_simple_macos(self): transl_tags = translate_tags_to_keep() self.assertEqual(tags, transl_tags) - @patch('wahoo_mc.constants.TAGS_TO_KEEP_UNIVERSAL', tags_universal_simple) + @patch('wahoomc.constants.TAGS_TO_KEEP_UNIVERSAL', tags_universal_simple) def test_translate_tags_to_keep_simple_win(self): """ Test translating tags to keep from universal format to Windows @@ -107,7 +107,7 @@ def test_translate_tags_to_keep_simple_win(self): transl_tags = translate_tags_to_keep(sys_platform='Windows') self.assertEqual(tags_win, transl_tags) - @patch('wahoo_mc.constants.TAGS_TO_KEEP_UNIVERSAL', tags_universal_adv) + @patch('wahoomc.constants.TAGS_TO_KEEP_UNIVERSAL', tags_universal_adv) def test_translate_tags_to_keep_adv_macos(self): """ Test translating tags to keep from universal format to macOS @@ -119,7 +119,7 @@ def test_translate_tags_to_keep_adv_macos(self): transl_tags = translate_tags_to_keep() self.assertEqual(tags, transl_tags) - @patch('wahoo_mc.constants.TAGS_TO_KEEP_UNIVERSAL', tags_universal_adv) + @patch('wahoomc.constants.TAGS_TO_KEEP_UNIVERSAL', tags_universal_adv) def test_translate_tags_to_keep_adv_win(self): """ Test translating tags to keep from universal format to Windows @@ -130,7 +130,7 @@ def test_translate_tags_to_keep_adv_win(self): transl_tags = translate_tags_to_keep(sys_platform='Windows') self.assertEqual(tags_win, transl_tags) - # @patch('wahoo_mc.constants.TAGS_TO_KEEP_UNIVERSAL', tags_universal_full) + # @patch('wahoomc.constants.TAGS_TO_KEEP_UNIVERSAL', tags_universal_full) def test_translate_tags_to_keep_full_macos(self): """ Test translating tags to keep from universal format to macOS // all "tags to keep" @@ -145,7 +145,7 @@ def test_translate_tags_to_keep_full_macos(self): transl_tags = translate_tags_to_keep() self.assertEqual(tags, transl_tags) - # @patch('wahoo_mc.constants.TAGS_TO_KEEP_UNIVERSAL', tags_universal_full) + # @patch('wahoomc.constants.TAGS_TO_KEEP_UNIVERSAL', tags_universal_full) def test_translate_tags_to_keep_full_win(self): """ Test translating tags to keep from universal format to Windows // all "tags to keep" @@ -156,7 +156,7 @@ def test_translate_tags_to_keep_full_win(self): transl_tags = translate_tags_to_keep(sys_platform='Windows') self.assertEqual(tags_win, transl_tags) - # @patch('wahoo_mc.constants.NAME_TAGS_TO_KEEP_UNIVERSAL', name_tags_universal_full) + # @patch('wahoomc.constants.NAME_TAGS_TO_KEEP_UNIVERSAL', name_tags_universal_full) def test_translate_name_tags_to_keep_full_macos(self): """ Test translating name tags to keep from universal format to Windows // all "name tags to keep" @@ -168,7 +168,7 @@ def test_translate_name_tags_to_keep_full_macos(self): transl_tags = translate_tags_to_keep(name_tags=True) self.assertEqual(names_tags, transl_tags) - # @patch('wahoo_mc.constants.NAME_TAGS_TO_KEEP_UNIVERSAL', name_tags_universal_full) + # @patch('wahoomc.constants.NAME_TAGS_TO_KEEP_UNIVERSAL', name_tags_universal_full) def test_translate_name_tags_to_keep_full_win(self): """ Test translating name tags to keep from universal format to macOS // all "name tags to keep" diff --git a/tests/test_downloader.py b/tests/test_downloader.py index cbd84656..e81cb2ff 100644 --- a/tests/test_downloader.py +++ b/tests/test_downloader.py @@ -9,11 +9,11 @@ # import custom python packages # sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from wahoo_mc.downloader import older_than_x_days -from wahoo_mc.downloader import download_file -from wahoo_mc.downloader import get_osm_pbf_filepath_url -from wahoo_mc.downloader import Downloader -from wahoo_mc import file_directory_functions as fd_fct +from wahoomc.downloader import older_than_x_days +from wahoomc.downloader import download_file +from wahoomc.downloader import get_osm_pbf_filepath_url +from wahoomc.downloader import Downloader +from wahoomc import file_directory_functions as fd_fct class TestDownloader(unittest.TestCase): diff --git a/tests/test_generated_files.py b/tests/test_generated_files.py index 4c1be65d..b4954c97 100644 --- a/tests/test_generated_files.py +++ b/tests/test_generated_files.py @@ -13,7 +13,7 @@ # import custom python packages -from wahoo_mc import file_directory_functions as fd_fct +from wahoomc import file_directory_functions as fd_fct dirname_of_file = os.path.dirname(__file__) @@ -209,7 +209,7 @@ def run_wahoomapscreator_cli(self, country, given_osm_pbf): cli_command = "python3" result = os.system( - f'{cli_command} -m wahoo_mc cli -co {country} -tag tag-wahoo.xml -fp -c -md 100') + f'{cli_command} -m wahoomc cli -co {country} -tag tag-wahoo.xml -fp -c -md 100') # check if run was successful self.assertEqual(result, 0) diff --git a/tests/test_geofabrik.py b/tests/test_geofabrik.py index 3d4de04b..d0ba3c1d 100644 --- a/tests/test_geofabrik.py +++ b/tests/test_geofabrik.py @@ -6,10 +6,10 @@ import unittest # import custom python packages -from wahoo_mc.geofabrik import Geofabrik -from wahoo_mc import file_directory_functions as fd_fct -from wahoo_mc import constants_functions as const_fct -from wahoo_mc.downloader import Downloader +from wahoomc.geofabrik import Geofabrik +from wahoomc import file_directory_functions as fd_fct +from wahoomc import constants_functions as const_fct +from wahoomc.downloader import Downloader def calc_tiles_via_geofabrik_json(input_argument): diff --git a/tests/test_osm_maps.py b/tests/test_osm_maps.py index 29e64f04..8557bda0 100644 --- a/tests/test_osm_maps.py +++ b/tests/test_osm_maps.py @@ -8,14 +8,14 @@ # import custom python packages # sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from wahoo_mc.osm_maps_functions import OsmMaps -from wahoo_mc.osm_maps_functions import get_tile_by_one_xy_combination_from_jsons -from wahoo_mc.osm_maps_functions import get_xy_coordinates_from_input -from wahoo_mc.osm_maps_functions import TileNotFoundError -from wahoo_mc.input import InputData -from wahoo_mc import file_directory_functions as fd_fct -from wahoo_mc import constants_functions as const_fct -from wahoo_mc import constants +from wahoomc.osm_maps_functions import OsmMaps +from wahoomc.osm_maps_functions import get_tile_by_one_xy_combination_from_jsons +from wahoomc.osm_maps_functions import get_xy_coordinates_from_input +from wahoomc.osm_maps_functions import TileNotFoundError +from wahoomc.input import InputData +from wahoomc import file_directory_functions as fd_fct +from wahoomc import constants_functions as const_fct +from wahoomc import constants class TestOsmMaps(unittest.TestCase): @@ -293,7 +293,7 @@ def calculate_path_to_static_tile_json(self, country, exp_path): def test_go_through_folders(self): """ - go through all files in the common_resources/json directory + go through all files in the wahoo_mc/resources/json directory - check if correct .json will be evaluated through get_path_to_static_tile_json function """ for folder in fd_fct.get_folders_in_folder(os.path.join(fd_fct.RESOURCES_DIR, 'json')): diff --git a/wahoo_mc/__main__.py b/wahoo_mc/__main__.py deleted file mode 100644 index a1173164..00000000 --- a/wahoo_mc/__main__.py +++ /dev/null @@ -1,7 +0,0 @@ -""" -can be directly called via `python -m wahoo_mc -h` -""" -from wahoo_mc import main - -if __name__ == '__main__': - main.run() diff --git a/wahoo_mc/__init__.py b/wahoomc/__init__.py similarity index 100% rename from wahoo_mc/__init__.py rename to wahoomc/__init__.py diff --git a/wahoomc/__main__.py b/wahoomc/__main__.py new file mode 100644 index 00000000..d2deeee8 --- /dev/null +++ b/wahoomc/__main__.py @@ -0,0 +1,7 @@ +""" +can be directly called via `python -m wahoomc -h` +""" +from wahoomc import main + +if __name__ == '__main__': + main.run() diff --git a/wahoo_mc/constants.py b/wahoomc/constants.py similarity index 100% rename from wahoo_mc/constants.py rename to wahoomc/constants.py diff --git a/wahoo_mc/constants_functions.py b/wahoomc/constants_functions.py similarity index 98% rename from wahoo_mc/constants_functions.py rename to wahoomc/constants_functions.py index 497a014e..4b9b4b94 100644 --- a/wahoo_mc/constants_functions.py +++ b/wahoomc/constants_functions.py @@ -9,8 +9,8 @@ import os # import custom python packages -from wahoo_mc import constants -from wahoo_mc import file_directory_functions as fd_fct +from wahoomc import constants +from wahoomc import file_directory_functions as fd_fct log = logging.getLogger('main-logger') diff --git a/wahoo_mc/downloader.py b/wahoomc/downloader.py similarity index 98% rename from wahoo_mc/downloader.py rename to wahoomc/downloader.py index fda2a7d3..8f8e13d0 100644 --- a/wahoo_mc/downloader.py +++ b/wahoomc/downloader.py @@ -12,8 +12,8 @@ import logging # import custom python packages -from wahoo_mc import file_directory_functions as fd_fct -from wahoo_mc import constants_functions as const_fct +from wahoomc import file_directory_functions as fd_fct +from wahoomc import constants_functions as const_fct log = logging.getLogger('main-logger') diff --git a/wahoo_mc/file_directory_functions.py b/wahoomc/file_directory_functions.py similarity index 100% rename from wahoo_mc/file_directory_functions.py rename to wahoomc/file_directory_functions.py diff --git a/wahoo_mc/geofabrik.py b/wahoomc/geofabrik.py similarity index 99% rename from wahoo_mc/geofabrik.py rename to wahoomc/geofabrik.py index 4d9a4f23..216b2c1d 100644 --- a/wahoo_mc/geofabrik.py +++ b/wahoomc/geofabrik.py @@ -12,8 +12,8 @@ from shapely.geometry import Polygon, shape # import custom python packages -from wahoo_mc import file_directory_functions as fd_fct -from wahoo_mc import constants +from wahoomc import file_directory_functions as fd_fct +from wahoomc import constants log = logging.getLogger('main-logger') diff --git a/wahoo_mc/input.py b/wahoomc/input.py similarity index 97% rename from wahoo_mc/input.py rename to wahoomc/input.py index f64ddc71..6122a6b0 100644 --- a/wahoo_mc/input.py +++ b/wahoomc/input.py @@ -13,7 +13,7 @@ from tkinter import ttk # import custom python packages -from wahoo_mc import constants +from wahoomc import constants def process_call_of_the_tool(): @@ -70,10 +70,10 @@ def process_call_of_the_tool(): # Save uncompressed maps for Cruiser if True options_args.add_argument('-c', '--cruiser', action='store_true', help="save uncompressed maps for Cruiser") - # specify the file with tags to keep in the output // file needs to be in common_resources + # specify the file with tags to keep in the output // file needs to be in wahoo_mc/resources/tag_wahoo_adjusted options_args.add_argument('-tag', '--tag_wahoo_xml', default=InputData().tag_wahoo_xml, help="file with tags to keep in the output") - # specify the file with tags to keep in the output // file needs to be in common_resources + # only merge - used for special usecases options_args.add_argument('-om', '--only_merge', action='store_true', help="only merge, do no other processing") # option to keep the /output/country/ and /output/country-maps folders in the output @@ -93,7 +93,7 @@ def process_call_of_the_tool(): if args.subparser_name == 'gui': # Prevents the initialisation of the graphical GUI on WSL. if 'microsoft' in uname().release: - sys.exit("GUI can not be startet because no graphical interface is available. Start with 'wahoo_maps_creator.py cli -h' or 'wahoo_maps_creator.py -h' to see command line options.") + sys.exit("GUI can not be startet because no graphical interface is available. Start with 'python -m wahoo_mc cli -h' or 'python -m wahoo_mc -h' to see command line options.") o_input_data = GuiInput().start_gui() return o_input_data @@ -161,7 +161,7 @@ def __init__(self): # Way of calculating the relevant tiles for given input (country) # True - Use geofabrik index-v1.json file - # False - Use .json files from folder /common_resources/json + # False - Use .json files from folder wahoo_mc/resources/json self.geofabrik_tiles = False self.zip_folder = False diff --git a/wahoo_mc/main.py b/wahoomc/main.py similarity index 89% rename from wahoo_mc/main.py rename to wahoomc/main.py index d471cc98..48301fed 100644 --- a/wahoo_mc/main.py +++ b/wahoomc/main.py @@ -7,10 +7,10 @@ import logging # import custom python packages -from wahoo_mc.input import process_call_of_the_tool -from wahoo_mc.file_directory_functions import initialize_work_directories -from wahoo_mc.file_directory_functions import move_old_content_into_new_dirs -from wahoo_mc.osm_maps_functions import OsmMaps +from wahoomc.input import process_call_of_the_tool +from wahoomc.file_directory_functions import initialize_work_directories +from wahoomc.file_directory_functions import move_old_content_into_new_dirs +from wahoomc.osm_maps_functions import OsmMaps # logging used in the terminal output: # # means top-level command diff --git a/wahoo_mc/osm_maps_functions.py b/wahoomc/osm_maps_functions.py similarity index 99% rename from wahoo_mc/osm_maps_functions.py rename to wahoomc/osm_maps_functions.py index 4fcc0ba4..b0f73387 100644 --- a/wahoo_mc/osm_maps_functions.py +++ b/wahoomc/osm_maps_functions.py @@ -15,11 +15,11 @@ import logging # import custom python packages -from wahoo_mc import file_directory_functions as fd_fct -from wahoo_mc import constants_functions as const_fct +from wahoomc import file_directory_functions as fd_fct +from wahoomc import constants_functions as const_fct -from wahoo_mc.downloader import Downloader -from wahoo_mc.geofabrik import Geofabrik +from wahoomc.downloader import Downloader +from wahoomc.geofabrik import Geofabrik log = logging.getLogger('main-logger') diff --git a/wahoo_mc/resources/json/africa/algeria.json b/wahoomc/resources/json/africa/algeria.json similarity index 100% rename from wahoo_mc/resources/json/africa/algeria.json rename to wahoomc/resources/json/africa/algeria.json diff --git a/wahoo_mc/resources/json/africa/angola.json b/wahoomc/resources/json/africa/angola.json similarity index 100% rename from wahoo_mc/resources/json/africa/angola.json rename to wahoomc/resources/json/africa/angola.json diff --git a/wahoo_mc/resources/json/africa/benin.json b/wahoomc/resources/json/africa/benin.json similarity index 100% rename from wahoo_mc/resources/json/africa/benin.json rename to wahoomc/resources/json/africa/benin.json diff --git a/wahoo_mc/resources/json/africa/botswana.json b/wahoomc/resources/json/africa/botswana.json similarity index 100% rename from wahoo_mc/resources/json/africa/botswana.json rename to wahoomc/resources/json/africa/botswana.json diff --git a/wahoo_mc/resources/json/africa/burkina_faso.json b/wahoomc/resources/json/africa/burkina_faso.json similarity index 100% rename from wahoo_mc/resources/json/africa/burkina_faso.json rename to wahoomc/resources/json/africa/burkina_faso.json diff --git a/wahoo_mc/resources/json/africa/burundi.json b/wahoomc/resources/json/africa/burundi.json similarity index 100% rename from wahoo_mc/resources/json/africa/burundi.json rename to wahoomc/resources/json/africa/burundi.json diff --git a/wahoo_mc/resources/json/africa/cameroon.json b/wahoomc/resources/json/africa/cameroon.json similarity index 100% rename from wahoo_mc/resources/json/africa/cameroon.json rename to wahoomc/resources/json/africa/cameroon.json diff --git a/wahoo_mc/resources/json/africa/cape_verde.json b/wahoomc/resources/json/africa/cape_verde.json similarity index 100% rename from wahoo_mc/resources/json/africa/cape_verde.json rename to wahoomc/resources/json/africa/cape_verde.json diff --git a/wahoo_mc/resources/json/africa/central_african_republic.json b/wahoomc/resources/json/africa/central_african_republic.json similarity index 100% rename from wahoo_mc/resources/json/africa/central_african_republic.json rename to wahoomc/resources/json/africa/central_african_republic.json diff --git a/wahoo_mc/resources/json/africa/chad.json b/wahoomc/resources/json/africa/chad.json similarity index 100% rename from wahoo_mc/resources/json/africa/chad.json rename to wahoomc/resources/json/africa/chad.json diff --git a/wahoo_mc/resources/json/africa/comoros.json b/wahoomc/resources/json/africa/comoros.json similarity index 100% rename from wahoo_mc/resources/json/africa/comoros.json rename to wahoomc/resources/json/africa/comoros.json diff --git a/wahoo_mc/resources/json/africa/cote_d_ivoire.json b/wahoomc/resources/json/africa/cote_d_ivoire.json similarity index 100% rename from wahoo_mc/resources/json/africa/cote_d_ivoire.json rename to wahoomc/resources/json/africa/cote_d_ivoire.json diff --git a/wahoo_mc/resources/json/africa/democratic_republic_of_the_congo.json b/wahoomc/resources/json/africa/democratic_republic_of_the_congo.json similarity index 100% rename from wahoo_mc/resources/json/africa/democratic_republic_of_the_congo.json rename to wahoomc/resources/json/africa/democratic_republic_of_the_congo.json diff --git a/wahoo_mc/resources/json/africa/djibouti.json b/wahoomc/resources/json/africa/djibouti.json similarity index 100% rename from wahoo_mc/resources/json/africa/djibouti.json rename to wahoomc/resources/json/africa/djibouti.json diff --git a/wahoo_mc/resources/json/africa/egypt.json b/wahoomc/resources/json/africa/egypt.json similarity index 100% rename from wahoo_mc/resources/json/africa/egypt.json rename to wahoomc/resources/json/africa/egypt.json diff --git a/wahoo_mc/resources/json/africa/equatorial_guinea.json b/wahoomc/resources/json/africa/equatorial_guinea.json similarity index 100% rename from wahoo_mc/resources/json/africa/equatorial_guinea.json rename to wahoomc/resources/json/africa/equatorial_guinea.json diff --git a/wahoo_mc/resources/json/africa/eritrea.json b/wahoomc/resources/json/africa/eritrea.json similarity index 100% rename from wahoo_mc/resources/json/africa/eritrea.json rename to wahoomc/resources/json/africa/eritrea.json diff --git a/wahoo_mc/resources/json/africa/ethiopia.json b/wahoomc/resources/json/africa/ethiopia.json similarity index 100% rename from wahoo_mc/resources/json/africa/ethiopia.json rename to wahoomc/resources/json/africa/ethiopia.json diff --git a/wahoo_mc/resources/json/africa/french_southern_territories.json b/wahoomc/resources/json/africa/french_southern_territories.json similarity index 100% rename from wahoo_mc/resources/json/africa/french_southern_territories.json rename to wahoomc/resources/json/africa/french_southern_territories.json diff --git a/wahoo_mc/resources/json/africa/gabon.json b/wahoomc/resources/json/africa/gabon.json similarity index 100% rename from wahoo_mc/resources/json/africa/gabon.json rename to wahoomc/resources/json/africa/gabon.json diff --git a/wahoo_mc/resources/json/africa/gambia.json b/wahoomc/resources/json/africa/gambia.json similarity index 100% rename from wahoo_mc/resources/json/africa/gambia.json rename to wahoomc/resources/json/africa/gambia.json diff --git a/wahoo_mc/resources/json/africa/ghana.json b/wahoomc/resources/json/africa/ghana.json similarity index 100% rename from wahoo_mc/resources/json/africa/ghana.json rename to wahoomc/resources/json/africa/ghana.json diff --git a/wahoo_mc/resources/json/africa/guinea-bissau.json b/wahoomc/resources/json/africa/guinea-bissau.json similarity index 100% rename from wahoo_mc/resources/json/africa/guinea-bissau.json rename to wahoomc/resources/json/africa/guinea-bissau.json diff --git a/wahoo_mc/resources/json/africa/guinea.json b/wahoomc/resources/json/africa/guinea.json similarity index 100% rename from wahoo_mc/resources/json/africa/guinea.json rename to wahoomc/resources/json/africa/guinea.json diff --git a/wahoo_mc/resources/json/africa/kenya.json b/wahoomc/resources/json/africa/kenya.json similarity index 100% rename from wahoo_mc/resources/json/africa/kenya.json rename to wahoomc/resources/json/africa/kenya.json diff --git a/wahoo_mc/resources/json/africa/lesotho.json b/wahoomc/resources/json/africa/lesotho.json similarity index 100% rename from wahoo_mc/resources/json/africa/lesotho.json rename to wahoomc/resources/json/africa/lesotho.json diff --git a/wahoo_mc/resources/json/africa/liberia.json b/wahoomc/resources/json/africa/liberia.json similarity index 100% rename from wahoo_mc/resources/json/africa/liberia.json rename to wahoomc/resources/json/africa/liberia.json diff --git a/wahoo_mc/resources/json/africa/libya.json b/wahoomc/resources/json/africa/libya.json similarity index 100% rename from wahoo_mc/resources/json/africa/libya.json rename to wahoomc/resources/json/africa/libya.json diff --git a/wahoo_mc/resources/json/africa/madagascar.json b/wahoomc/resources/json/africa/madagascar.json similarity index 100% rename from wahoo_mc/resources/json/africa/madagascar.json rename to wahoomc/resources/json/africa/madagascar.json diff --git a/wahoo_mc/resources/json/africa/malawi.json b/wahoomc/resources/json/africa/malawi.json similarity index 100% rename from wahoo_mc/resources/json/africa/malawi.json rename to wahoomc/resources/json/africa/malawi.json diff --git a/wahoo_mc/resources/json/africa/mali.json b/wahoomc/resources/json/africa/mali.json similarity index 100% rename from wahoo_mc/resources/json/africa/mali.json rename to wahoomc/resources/json/africa/mali.json diff --git a/wahoo_mc/resources/json/africa/mauritania.json b/wahoomc/resources/json/africa/mauritania.json similarity index 100% rename from wahoo_mc/resources/json/africa/mauritania.json rename to wahoomc/resources/json/africa/mauritania.json diff --git a/wahoo_mc/resources/json/africa/mauritius.json b/wahoomc/resources/json/africa/mauritius.json similarity index 100% rename from wahoo_mc/resources/json/africa/mauritius.json rename to wahoomc/resources/json/africa/mauritius.json diff --git a/wahoo_mc/resources/json/africa/mayotte.json b/wahoomc/resources/json/africa/mayotte.json similarity index 100% rename from wahoo_mc/resources/json/africa/mayotte.json rename to wahoomc/resources/json/africa/mayotte.json diff --git a/wahoo_mc/resources/json/africa/morocco.json b/wahoomc/resources/json/africa/morocco.json similarity index 100% rename from wahoo_mc/resources/json/africa/morocco.json rename to wahoomc/resources/json/africa/morocco.json diff --git a/wahoo_mc/resources/json/africa/mozambique.json b/wahoomc/resources/json/africa/mozambique.json similarity index 100% rename from wahoo_mc/resources/json/africa/mozambique.json rename to wahoomc/resources/json/africa/mozambique.json diff --git a/wahoo_mc/resources/json/africa/namibia.json b/wahoomc/resources/json/africa/namibia.json similarity index 100% rename from wahoo_mc/resources/json/africa/namibia.json rename to wahoomc/resources/json/africa/namibia.json diff --git a/wahoo_mc/resources/json/africa/niger.json b/wahoomc/resources/json/africa/niger.json similarity index 100% rename from wahoo_mc/resources/json/africa/niger.json rename to wahoomc/resources/json/africa/niger.json diff --git a/wahoo_mc/resources/json/africa/nigeria.json b/wahoomc/resources/json/africa/nigeria.json similarity index 100% rename from wahoo_mc/resources/json/africa/nigeria.json rename to wahoomc/resources/json/africa/nigeria.json diff --git a/wahoo_mc/resources/json/africa/republic_of_congo.json b/wahoomc/resources/json/africa/republic_of_congo.json similarity index 100% rename from wahoo_mc/resources/json/africa/republic_of_congo.json rename to wahoomc/resources/json/africa/republic_of_congo.json diff --git a/wahoo_mc/resources/json/africa/reunion.json b/wahoomc/resources/json/africa/reunion.json similarity index 100% rename from wahoo_mc/resources/json/africa/reunion.json rename to wahoomc/resources/json/africa/reunion.json diff --git a/wahoo_mc/resources/json/africa/rwanda.json b/wahoomc/resources/json/africa/rwanda.json similarity index 100% rename from wahoo_mc/resources/json/africa/rwanda.json rename to wahoomc/resources/json/africa/rwanda.json diff --git a/wahoo_mc/resources/json/africa/saint_helena.json b/wahoomc/resources/json/africa/saint_helena.json similarity index 100% rename from wahoo_mc/resources/json/africa/saint_helena.json rename to wahoomc/resources/json/africa/saint_helena.json diff --git a/wahoo_mc/resources/json/africa/sao_tome_and_principe.json b/wahoomc/resources/json/africa/sao_tome_and_principe.json similarity index 100% rename from wahoo_mc/resources/json/africa/sao_tome_and_principe.json rename to wahoomc/resources/json/africa/sao_tome_and_principe.json diff --git a/wahoo_mc/resources/json/africa/senegal.json b/wahoomc/resources/json/africa/senegal.json similarity index 100% rename from wahoo_mc/resources/json/africa/senegal.json rename to wahoomc/resources/json/africa/senegal.json diff --git a/wahoo_mc/resources/json/africa/seychelles.json b/wahoomc/resources/json/africa/seychelles.json similarity index 100% rename from wahoo_mc/resources/json/africa/seychelles.json rename to wahoomc/resources/json/africa/seychelles.json diff --git a/wahoo_mc/resources/json/africa/sierra_leone.json b/wahoomc/resources/json/africa/sierra_leone.json similarity index 100% rename from wahoo_mc/resources/json/africa/sierra_leone.json rename to wahoomc/resources/json/africa/sierra_leone.json diff --git a/wahoo_mc/resources/json/africa/somalia.json b/wahoomc/resources/json/africa/somalia.json similarity index 100% rename from wahoo_mc/resources/json/africa/somalia.json rename to wahoomc/resources/json/africa/somalia.json diff --git a/wahoo_mc/resources/json/africa/south_africa.json b/wahoomc/resources/json/africa/south_africa.json similarity index 100% rename from wahoo_mc/resources/json/africa/south_africa.json rename to wahoomc/resources/json/africa/south_africa.json diff --git a/wahoo_mc/resources/json/africa/sudan.json b/wahoomc/resources/json/africa/sudan.json similarity index 100% rename from wahoo_mc/resources/json/africa/sudan.json rename to wahoomc/resources/json/africa/sudan.json diff --git a/wahoo_mc/resources/json/africa/swaziland.json b/wahoomc/resources/json/africa/swaziland.json similarity index 100% rename from wahoo_mc/resources/json/africa/swaziland.json rename to wahoomc/resources/json/africa/swaziland.json diff --git a/wahoo_mc/resources/json/africa/tanzania.json b/wahoomc/resources/json/africa/tanzania.json similarity index 100% rename from wahoo_mc/resources/json/africa/tanzania.json rename to wahoomc/resources/json/africa/tanzania.json diff --git a/wahoo_mc/resources/json/africa/togo.json b/wahoomc/resources/json/africa/togo.json similarity index 100% rename from wahoo_mc/resources/json/africa/togo.json rename to wahoomc/resources/json/africa/togo.json diff --git a/wahoo_mc/resources/json/africa/tunisia.json b/wahoomc/resources/json/africa/tunisia.json similarity index 100% rename from wahoo_mc/resources/json/africa/tunisia.json rename to wahoomc/resources/json/africa/tunisia.json diff --git a/wahoo_mc/resources/json/africa/uganda.json b/wahoomc/resources/json/africa/uganda.json similarity index 100% rename from wahoo_mc/resources/json/africa/uganda.json rename to wahoomc/resources/json/africa/uganda.json diff --git a/wahoo_mc/resources/json/africa/western_sahara.json b/wahoomc/resources/json/africa/western_sahara.json similarity index 100% rename from wahoo_mc/resources/json/africa/western_sahara.json rename to wahoomc/resources/json/africa/western_sahara.json diff --git a/wahoo_mc/resources/json/africa/zambia.json b/wahoomc/resources/json/africa/zambia.json similarity index 100% rename from wahoo_mc/resources/json/africa/zambia.json rename to wahoomc/resources/json/africa/zambia.json diff --git a/wahoo_mc/resources/json/africa/zimbabwe.json b/wahoomc/resources/json/africa/zimbabwe.json similarity index 100% rename from wahoo_mc/resources/json/africa/zimbabwe.json rename to wahoomc/resources/json/africa/zimbabwe.json diff --git a/wahoo_mc/resources/json/antarctica/antarctica.json b/wahoomc/resources/json/antarctica/antarctica.json similarity index 100% rename from wahoo_mc/resources/json/antarctica/antarctica.json rename to wahoomc/resources/json/antarctica/antarctica.json diff --git a/wahoo_mc/resources/json/antarctica/bouvet_island.json b/wahoomc/resources/json/antarctica/bouvet_island.json similarity index 100% rename from wahoo_mc/resources/json/antarctica/bouvet_island.json rename to wahoomc/resources/json/antarctica/bouvet_island.json diff --git a/wahoo_mc/resources/json/antarctica/heard_island_and_mcdonald_islands.json b/wahoomc/resources/json/antarctica/heard_island_and_mcdonald_islands.json similarity index 100% rename from wahoo_mc/resources/json/antarctica/heard_island_and_mcdonald_islands.json rename to wahoomc/resources/json/antarctica/heard_island_and_mcdonald_islands.json diff --git a/wahoo_mc/resources/json/antarctica/south_georgia_and_the_south_sandwich_islands.json b/wahoomc/resources/json/antarctica/south_georgia_and_the_south_sandwich_islands.json similarity index 100% rename from wahoo_mc/resources/json/antarctica/south_georgia_and_the_south_sandwich_islands.json rename to wahoomc/resources/json/antarctica/south_georgia_and_the_south_sandwich_islands.json diff --git a/wahoo_mc/resources/json/asia/afghanistan.json b/wahoomc/resources/json/asia/afghanistan.json similarity index 100% rename from wahoo_mc/resources/json/asia/afghanistan.json rename to wahoomc/resources/json/asia/afghanistan.json diff --git a/wahoo_mc/resources/json/asia/armenia.json b/wahoomc/resources/json/asia/armenia.json similarity index 100% rename from wahoo_mc/resources/json/asia/armenia.json rename to wahoomc/resources/json/asia/armenia.json diff --git a/wahoo_mc/resources/json/asia/azerbaijan.json b/wahoomc/resources/json/asia/azerbaijan.json similarity index 100% rename from wahoo_mc/resources/json/asia/azerbaijan.json rename to wahoomc/resources/json/asia/azerbaijan.json diff --git a/wahoo_mc/resources/json/asia/bahrain.json b/wahoomc/resources/json/asia/bahrain.json similarity index 100% rename from wahoo_mc/resources/json/asia/bahrain.json rename to wahoomc/resources/json/asia/bahrain.json diff --git a/wahoo_mc/resources/json/asia/bangladesh.json b/wahoomc/resources/json/asia/bangladesh.json similarity index 100% rename from wahoo_mc/resources/json/asia/bangladesh.json rename to wahoomc/resources/json/asia/bangladesh.json diff --git a/wahoo_mc/resources/json/asia/bhutan.json b/wahoomc/resources/json/asia/bhutan.json similarity index 100% rename from wahoo_mc/resources/json/asia/bhutan.json rename to wahoomc/resources/json/asia/bhutan.json diff --git a/wahoo_mc/resources/json/asia/british_indian_ocean_territory.json b/wahoomc/resources/json/asia/british_indian_ocean_territory.json similarity index 100% rename from wahoo_mc/resources/json/asia/british_indian_ocean_territory.json rename to wahoomc/resources/json/asia/british_indian_ocean_territory.json diff --git a/wahoo_mc/resources/json/asia/brunei.json b/wahoomc/resources/json/asia/brunei.json similarity index 100% rename from wahoo_mc/resources/json/asia/brunei.json rename to wahoomc/resources/json/asia/brunei.json diff --git a/wahoo_mc/resources/json/asia/cambodia.json b/wahoomc/resources/json/asia/cambodia.json similarity index 100% rename from wahoo_mc/resources/json/asia/cambodia.json rename to wahoomc/resources/json/asia/cambodia.json diff --git a/wahoo_mc/resources/json/asia/china.json b/wahoomc/resources/json/asia/china.json similarity index 100% rename from wahoo_mc/resources/json/asia/china.json rename to wahoomc/resources/json/asia/china.json diff --git a/wahoo_mc/resources/json/asia/christmas_island.json b/wahoomc/resources/json/asia/christmas_island.json similarity index 100% rename from wahoo_mc/resources/json/asia/christmas_island.json rename to wahoomc/resources/json/asia/christmas_island.json diff --git a/wahoo_mc/resources/json/asia/cocos_islands.json b/wahoomc/resources/json/asia/cocos_islands.json similarity index 100% rename from wahoo_mc/resources/json/asia/cocos_islands.json rename to wahoomc/resources/json/asia/cocos_islands.json diff --git a/wahoo_mc/resources/json/asia/cyprus.json b/wahoomc/resources/json/asia/cyprus.json similarity index 100% rename from wahoo_mc/resources/json/asia/cyprus.json rename to wahoomc/resources/json/asia/cyprus.json diff --git a/wahoo_mc/resources/json/asia/east_timor.json b/wahoomc/resources/json/asia/east_timor.json similarity index 100% rename from wahoo_mc/resources/json/asia/east_timor.json rename to wahoomc/resources/json/asia/east_timor.json diff --git a/wahoo_mc/resources/json/asia/hong_kong.json b/wahoomc/resources/json/asia/hong_kong.json similarity index 100% rename from wahoo_mc/resources/json/asia/hong_kong.json rename to wahoomc/resources/json/asia/hong_kong.json diff --git a/wahoo_mc/resources/json/asia/india.json b/wahoomc/resources/json/asia/india.json similarity index 100% rename from wahoo_mc/resources/json/asia/india.json rename to wahoomc/resources/json/asia/india.json diff --git a/wahoo_mc/resources/json/asia/indonesia.json b/wahoomc/resources/json/asia/indonesia.json similarity index 100% rename from wahoo_mc/resources/json/asia/indonesia.json rename to wahoomc/resources/json/asia/indonesia.json diff --git a/wahoo_mc/resources/json/asia/iran.json b/wahoomc/resources/json/asia/iran.json similarity index 100% rename from wahoo_mc/resources/json/asia/iran.json rename to wahoomc/resources/json/asia/iran.json diff --git a/wahoo_mc/resources/json/asia/iraq.json b/wahoomc/resources/json/asia/iraq.json similarity index 100% rename from wahoo_mc/resources/json/asia/iraq.json rename to wahoomc/resources/json/asia/iraq.json diff --git a/wahoo_mc/resources/json/asia/israel.json b/wahoomc/resources/json/asia/israel.json similarity index 100% rename from wahoo_mc/resources/json/asia/israel.json rename to wahoomc/resources/json/asia/israel.json diff --git a/wahoo_mc/resources/json/asia/japan.json b/wahoomc/resources/json/asia/japan.json similarity index 100% rename from wahoo_mc/resources/json/asia/japan.json rename to wahoomc/resources/json/asia/japan.json diff --git a/wahoo_mc/resources/json/asia/jordan.json b/wahoomc/resources/json/asia/jordan.json similarity index 100% rename from wahoo_mc/resources/json/asia/jordan.json rename to wahoomc/resources/json/asia/jordan.json diff --git a/wahoo_mc/resources/json/asia/kazakhstan.json b/wahoomc/resources/json/asia/kazakhstan.json similarity index 100% rename from wahoo_mc/resources/json/asia/kazakhstan.json rename to wahoomc/resources/json/asia/kazakhstan.json diff --git a/wahoo_mc/resources/json/asia/kuwait.json b/wahoomc/resources/json/asia/kuwait.json similarity index 100% rename from wahoo_mc/resources/json/asia/kuwait.json rename to wahoomc/resources/json/asia/kuwait.json diff --git a/wahoo_mc/resources/json/asia/kyrgyzstan.json b/wahoomc/resources/json/asia/kyrgyzstan.json similarity index 100% rename from wahoo_mc/resources/json/asia/kyrgyzstan.json rename to wahoomc/resources/json/asia/kyrgyzstan.json diff --git a/wahoo_mc/resources/json/asia/laos.json b/wahoomc/resources/json/asia/laos.json similarity index 100% rename from wahoo_mc/resources/json/asia/laos.json rename to wahoomc/resources/json/asia/laos.json diff --git a/wahoo_mc/resources/json/asia/lebanon.json b/wahoomc/resources/json/asia/lebanon.json similarity index 100% rename from wahoo_mc/resources/json/asia/lebanon.json rename to wahoomc/resources/json/asia/lebanon.json diff --git a/wahoo_mc/resources/json/asia/macao.json b/wahoomc/resources/json/asia/macao.json similarity index 100% rename from wahoo_mc/resources/json/asia/macao.json rename to wahoomc/resources/json/asia/macao.json diff --git a/wahoo_mc/resources/json/asia/malaysia.json b/wahoomc/resources/json/asia/malaysia.json similarity index 100% rename from wahoo_mc/resources/json/asia/malaysia.json rename to wahoomc/resources/json/asia/malaysia.json diff --git a/wahoo_mc/resources/json/asia/maldives.json b/wahoomc/resources/json/asia/maldives.json similarity index 100% rename from wahoo_mc/resources/json/asia/maldives.json rename to wahoomc/resources/json/asia/maldives.json diff --git a/wahoo_mc/resources/json/asia/mongolia.json b/wahoomc/resources/json/asia/mongolia.json similarity index 100% rename from wahoo_mc/resources/json/asia/mongolia.json rename to wahoomc/resources/json/asia/mongolia.json diff --git a/wahoo_mc/resources/json/asia/myanmar.json b/wahoomc/resources/json/asia/myanmar.json similarity index 100% rename from wahoo_mc/resources/json/asia/myanmar.json rename to wahoomc/resources/json/asia/myanmar.json diff --git a/wahoo_mc/resources/json/asia/nepal.json b/wahoomc/resources/json/asia/nepal.json similarity index 100% rename from wahoo_mc/resources/json/asia/nepal.json rename to wahoomc/resources/json/asia/nepal.json diff --git a/wahoo_mc/resources/json/asia/north_korea.json b/wahoomc/resources/json/asia/north_korea.json similarity index 100% rename from wahoo_mc/resources/json/asia/north_korea.json rename to wahoomc/resources/json/asia/north_korea.json diff --git a/wahoo_mc/resources/json/asia/oman.json b/wahoomc/resources/json/asia/oman.json similarity index 100% rename from wahoo_mc/resources/json/asia/oman.json rename to wahoomc/resources/json/asia/oman.json diff --git a/wahoo_mc/resources/json/asia/pakistan.json b/wahoomc/resources/json/asia/pakistan.json similarity index 100% rename from wahoo_mc/resources/json/asia/pakistan.json rename to wahoomc/resources/json/asia/pakistan.json diff --git a/wahoo_mc/resources/json/asia/palestina.json b/wahoomc/resources/json/asia/palestina.json similarity index 100% rename from wahoo_mc/resources/json/asia/palestina.json rename to wahoomc/resources/json/asia/palestina.json diff --git a/wahoo_mc/resources/json/asia/paracel_islands.json b/wahoomc/resources/json/asia/paracel_islands.json similarity index 100% rename from wahoo_mc/resources/json/asia/paracel_islands.json rename to wahoomc/resources/json/asia/paracel_islands.json diff --git a/wahoo_mc/resources/json/asia/philippines.json b/wahoomc/resources/json/asia/philippines.json similarity index 100% rename from wahoo_mc/resources/json/asia/philippines.json rename to wahoomc/resources/json/asia/philippines.json diff --git a/wahoo_mc/resources/json/asia/qatar.json b/wahoomc/resources/json/asia/qatar.json similarity index 100% rename from wahoo_mc/resources/json/asia/qatar.json rename to wahoomc/resources/json/asia/qatar.json diff --git a/wahoo_mc/resources/json/asia/saudi_arabia.json b/wahoomc/resources/json/asia/saudi_arabia.json similarity index 100% rename from wahoo_mc/resources/json/asia/saudi_arabia.json rename to wahoomc/resources/json/asia/saudi_arabia.json diff --git a/wahoo_mc/resources/json/asia/singapore.json b/wahoomc/resources/json/asia/singapore.json similarity index 100% rename from wahoo_mc/resources/json/asia/singapore.json rename to wahoomc/resources/json/asia/singapore.json diff --git a/wahoo_mc/resources/json/asia/south_korea.json b/wahoomc/resources/json/asia/south_korea.json similarity index 100% rename from wahoo_mc/resources/json/asia/south_korea.json rename to wahoomc/resources/json/asia/south_korea.json diff --git a/wahoo_mc/resources/json/asia/spratly_islands.json b/wahoomc/resources/json/asia/spratly_islands.json similarity index 100% rename from wahoo_mc/resources/json/asia/spratly_islands.json rename to wahoomc/resources/json/asia/spratly_islands.json diff --git a/wahoo_mc/resources/json/asia/sri_lanka.json b/wahoomc/resources/json/asia/sri_lanka.json similarity index 100% rename from wahoo_mc/resources/json/asia/sri_lanka.json rename to wahoomc/resources/json/asia/sri_lanka.json diff --git a/wahoo_mc/resources/json/asia/syria.json b/wahoomc/resources/json/asia/syria.json similarity index 100% rename from wahoo_mc/resources/json/asia/syria.json rename to wahoomc/resources/json/asia/syria.json diff --git a/wahoo_mc/resources/json/asia/taiwan.json b/wahoomc/resources/json/asia/taiwan.json similarity index 100% rename from wahoo_mc/resources/json/asia/taiwan.json rename to wahoomc/resources/json/asia/taiwan.json diff --git a/wahoo_mc/resources/json/asia/tajikistan.json b/wahoomc/resources/json/asia/tajikistan.json similarity index 100% rename from wahoo_mc/resources/json/asia/tajikistan.json rename to wahoomc/resources/json/asia/tajikistan.json diff --git a/wahoo_mc/resources/json/asia/thailand.json b/wahoomc/resources/json/asia/thailand.json similarity index 100% rename from wahoo_mc/resources/json/asia/thailand.json rename to wahoomc/resources/json/asia/thailand.json diff --git a/wahoo_mc/resources/json/asia/turkey.json b/wahoomc/resources/json/asia/turkey.json similarity index 100% rename from wahoo_mc/resources/json/asia/turkey.json rename to wahoomc/resources/json/asia/turkey.json diff --git a/wahoo_mc/resources/json/asia/turkmenistan.json b/wahoomc/resources/json/asia/turkmenistan.json similarity index 100% rename from wahoo_mc/resources/json/asia/turkmenistan.json rename to wahoomc/resources/json/asia/turkmenistan.json diff --git a/wahoo_mc/resources/json/asia/united_arab_emirates.json b/wahoomc/resources/json/asia/united_arab_emirates.json similarity index 100% rename from wahoo_mc/resources/json/asia/united_arab_emirates.json rename to wahoomc/resources/json/asia/united_arab_emirates.json diff --git a/wahoo_mc/resources/json/asia/uzbekistan.json b/wahoomc/resources/json/asia/uzbekistan.json similarity index 100% rename from wahoo_mc/resources/json/asia/uzbekistan.json rename to wahoomc/resources/json/asia/uzbekistan.json diff --git a/wahoo_mc/resources/json/asia/vietnam.json b/wahoomc/resources/json/asia/vietnam.json similarity index 100% rename from wahoo_mc/resources/json/asia/vietnam.json rename to wahoomc/resources/json/asia/vietnam.json diff --git a/wahoo_mc/resources/json/asia/yemen.json b/wahoomc/resources/json/asia/yemen.json similarity index 100% rename from wahoo_mc/resources/json/asia/yemen.json rename to wahoomc/resources/json/asia/yemen.json diff --git a/wahoo_mc/resources/json/europe/albania.json b/wahoomc/resources/json/europe/albania.json similarity index 100% rename from wahoo_mc/resources/json/europe/albania.json rename to wahoomc/resources/json/europe/albania.json diff --git a/wahoo_mc/resources/json/europe/andorra.json b/wahoomc/resources/json/europe/andorra.json similarity index 100% rename from wahoo_mc/resources/json/europe/andorra.json rename to wahoomc/resources/json/europe/andorra.json diff --git a/wahoo_mc/resources/json/europe/austria.json b/wahoomc/resources/json/europe/austria.json similarity index 100% rename from wahoo_mc/resources/json/europe/austria.json rename to wahoomc/resources/json/europe/austria.json diff --git a/wahoo_mc/resources/json/europe/belarus.json b/wahoomc/resources/json/europe/belarus.json similarity index 100% rename from wahoo_mc/resources/json/europe/belarus.json rename to wahoomc/resources/json/europe/belarus.json diff --git a/wahoo_mc/resources/json/europe/belgium.json b/wahoomc/resources/json/europe/belgium.json similarity index 100% rename from wahoo_mc/resources/json/europe/belgium.json rename to wahoomc/resources/json/europe/belgium.json diff --git a/wahoo_mc/resources/json/europe/bosnia_and_herzegovina.json b/wahoomc/resources/json/europe/bosnia_and_herzegovina.json similarity index 100% rename from wahoo_mc/resources/json/europe/bosnia_and_herzegovina.json rename to wahoomc/resources/json/europe/bosnia_and_herzegovina.json diff --git a/wahoo_mc/resources/json/europe/bulgaria.json b/wahoomc/resources/json/europe/bulgaria.json similarity index 100% rename from wahoo_mc/resources/json/europe/bulgaria.json rename to wahoomc/resources/json/europe/bulgaria.json diff --git a/wahoo_mc/resources/json/europe/croatia.json b/wahoomc/resources/json/europe/croatia.json similarity index 100% rename from wahoo_mc/resources/json/europe/croatia.json rename to wahoomc/resources/json/europe/croatia.json diff --git a/wahoo_mc/resources/json/europe/czech_republic.json b/wahoomc/resources/json/europe/czech_republic.json similarity index 100% rename from wahoo_mc/resources/json/europe/czech_republic.json rename to wahoomc/resources/json/europe/czech_republic.json diff --git a/wahoo_mc/resources/json/europe/denmark.json b/wahoomc/resources/json/europe/denmark.json similarity index 100% rename from wahoo_mc/resources/json/europe/denmark.json rename to wahoomc/resources/json/europe/denmark.json diff --git a/wahoo_mc/resources/json/europe/estonia.json b/wahoomc/resources/json/europe/estonia.json similarity index 100% rename from wahoo_mc/resources/json/europe/estonia.json rename to wahoomc/resources/json/europe/estonia.json diff --git a/wahoo_mc/resources/json/europe/faroe_islands.json b/wahoomc/resources/json/europe/faroe_islands.json similarity index 100% rename from wahoo_mc/resources/json/europe/faroe_islands.json rename to wahoomc/resources/json/europe/faroe_islands.json diff --git a/wahoo_mc/resources/json/europe/finland.json b/wahoomc/resources/json/europe/finland.json similarity index 100% rename from wahoo_mc/resources/json/europe/finland.json rename to wahoomc/resources/json/europe/finland.json diff --git a/wahoo_mc/resources/json/europe/france.json b/wahoomc/resources/json/europe/france.json similarity index 100% rename from wahoo_mc/resources/json/europe/france.json rename to wahoomc/resources/json/europe/france.json diff --git a/wahoo_mc/resources/json/europe/germany.json b/wahoomc/resources/json/europe/germany.json similarity index 100% rename from wahoo_mc/resources/json/europe/germany.json rename to wahoomc/resources/json/europe/germany.json diff --git a/wahoo_mc/resources/json/europe/gibraltar.json b/wahoomc/resources/json/europe/gibraltar.json similarity index 100% rename from wahoo_mc/resources/json/europe/gibraltar.json rename to wahoomc/resources/json/europe/gibraltar.json diff --git a/wahoo_mc/resources/json/europe/greece.json b/wahoomc/resources/json/europe/greece.json similarity index 100% rename from wahoo_mc/resources/json/europe/greece.json rename to wahoomc/resources/json/europe/greece.json diff --git a/wahoo_mc/resources/json/europe/guernsey.json b/wahoomc/resources/json/europe/guernsey.json similarity index 100% rename from wahoo_mc/resources/json/europe/guernsey.json rename to wahoomc/resources/json/europe/guernsey.json diff --git a/wahoo_mc/resources/json/europe/hungary.json b/wahoomc/resources/json/europe/hungary.json similarity index 100% rename from wahoo_mc/resources/json/europe/hungary.json rename to wahoomc/resources/json/europe/hungary.json diff --git a/wahoo_mc/resources/json/europe/iceland.json b/wahoomc/resources/json/europe/iceland.json similarity index 100% rename from wahoo_mc/resources/json/europe/iceland.json rename to wahoomc/resources/json/europe/iceland.json diff --git a/wahoo_mc/resources/json/europe/ireland.json b/wahoomc/resources/json/europe/ireland.json similarity index 100% rename from wahoo_mc/resources/json/europe/ireland.json rename to wahoomc/resources/json/europe/ireland.json diff --git a/wahoo_mc/resources/json/europe/isle_of_man.json b/wahoomc/resources/json/europe/isle_of_man.json similarity index 100% rename from wahoo_mc/resources/json/europe/isle_of_man.json rename to wahoomc/resources/json/europe/isle_of_man.json diff --git a/wahoo_mc/resources/json/europe/italy.json b/wahoomc/resources/json/europe/italy.json similarity index 100% rename from wahoo_mc/resources/json/europe/italy.json rename to wahoomc/resources/json/europe/italy.json diff --git a/wahoo_mc/resources/json/europe/jersey.json b/wahoomc/resources/json/europe/jersey.json similarity index 100% rename from wahoo_mc/resources/json/europe/jersey.json rename to wahoomc/resources/json/europe/jersey.json diff --git a/wahoo_mc/resources/json/europe/latvia.json b/wahoomc/resources/json/europe/latvia.json similarity index 100% rename from wahoo_mc/resources/json/europe/latvia.json rename to wahoomc/resources/json/europe/latvia.json diff --git a/wahoo_mc/resources/json/europe/liechtenstein.json b/wahoomc/resources/json/europe/liechtenstein.json similarity index 100% rename from wahoo_mc/resources/json/europe/liechtenstein.json rename to wahoomc/resources/json/europe/liechtenstein.json diff --git a/wahoo_mc/resources/json/europe/lithuania.json b/wahoomc/resources/json/europe/lithuania.json similarity index 100% rename from wahoo_mc/resources/json/europe/lithuania.json rename to wahoomc/resources/json/europe/lithuania.json diff --git a/wahoo_mc/resources/json/europe/luxembourg.json b/wahoomc/resources/json/europe/luxembourg.json similarity index 100% rename from wahoo_mc/resources/json/europe/luxembourg.json rename to wahoomc/resources/json/europe/luxembourg.json diff --git a/wahoo_mc/resources/json/europe/macedonia.json b/wahoomc/resources/json/europe/macedonia.json similarity index 100% rename from wahoo_mc/resources/json/europe/macedonia.json rename to wahoomc/resources/json/europe/macedonia.json diff --git a/wahoo_mc/resources/json/europe/malta.json b/wahoomc/resources/json/europe/malta.json similarity index 100% rename from wahoo_mc/resources/json/europe/malta.json rename to wahoomc/resources/json/europe/malta.json diff --git a/wahoo_mc/resources/json/europe/moldova.json b/wahoomc/resources/json/europe/moldova.json similarity index 100% rename from wahoo_mc/resources/json/europe/moldova.json rename to wahoomc/resources/json/europe/moldova.json diff --git a/wahoo_mc/resources/json/europe/monaco.json b/wahoomc/resources/json/europe/monaco.json similarity index 100% rename from wahoo_mc/resources/json/europe/monaco.json rename to wahoomc/resources/json/europe/monaco.json diff --git a/wahoo_mc/resources/json/europe/montenegro.json b/wahoomc/resources/json/europe/montenegro.json similarity index 100% rename from wahoo_mc/resources/json/europe/montenegro.json rename to wahoomc/resources/json/europe/montenegro.json diff --git a/wahoo_mc/resources/json/europe/netherlands.json b/wahoomc/resources/json/europe/netherlands.json similarity index 100% rename from wahoo_mc/resources/json/europe/netherlands.json rename to wahoomc/resources/json/europe/netherlands.json diff --git a/wahoo_mc/resources/json/europe/norway.json b/wahoomc/resources/json/europe/norway.json similarity index 100% rename from wahoo_mc/resources/json/europe/norway.json rename to wahoomc/resources/json/europe/norway.json diff --git a/wahoo_mc/resources/json/europe/poland.json b/wahoomc/resources/json/europe/poland.json similarity index 100% rename from wahoo_mc/resources/json/europe/poland.json rename to wahoomc/resources/json/europe/poland.json diff --git a/wahoo_mc/resources/json/europe/portugal.json b/wahoomc/resources/json/europe/portugal.json similarity index 100% rename from wahoo_mc/resources/json/europe/portugal.json rename to wahoomc/resources/json/europe/portugal.json diff --git a/wahoo_mc/resources/json/europe/romania.json b/wahoomc/resources/json/europe/romania.json similarity index 100% rename from wahoo_mc/resources/json/europe/romania.json rename to wahoomc/resources/json/europe/romania.json diff --git a/wahoo_mc/resources/json/europe/russia.json b/wahoomc/resources/json/europe/russia.json similarity index 100% rename from wahoo_mc/resources/json/europe/russia.json rename to wahoomc/resources/json/europe/russia.json diff --git a/wahoo_mc/resources/json/europe/san_marino.json b/wahoomc/resources/json/europe/san_marino.json similarity index 100% rename from wahoo_mc/resources/json/europe/san_marino.json rename to wahoomc/resources/json/europe/san_marino.json diff --git a/wahoo_mc/resources/json/europe/serbia.json b/wahoomc/resources/json/europe/serbia.json similarity index 100% rename from wahoo_mc/resources/json/europe/serbia.json rename to wahoomc/resources/json/europe/serbia.json diff --git a/wahoo_mc/resources/json/europe/slovakia.json b/wahoomc/resources/json/europe/slovakia.json similarity index 100% rename from wahoo_mc/resources/json/europe/slovakia.json rename to wahoomc/resources/json/europe/slovakia.json diff --git a/wahoo_mc/resources/json/europe/slovenia.json b/wahoomc/resources/json/europe/slovenia.json similarity index 100% rename from wahoo_mc/resources/json/europe/slovenia.json rename to wahoomc/resources/json/europe/slovenia.json diff --git a/wahoo_mc/resources/json/europe/spain.json b/wahoomc/resources/json/europe/spain.json similarity index 100% rename from wahoo_mc/resources/json/europe/spain.json rename to wahoomc/resources/json/europe/spain.json diff --git a/wahoo_mc/resources/json/europe/svalbard_and_jan_mayen.json b/wahoomc/resources/json/europe/svalbard_and_jan_mayen.json similarity index 100% rename from wahoo_mc/resources/json/europe/svalbard_and_jan_mayen.json rename to wahoomc/resources/json/europe/svalbard_and_jan_mayen.json diff --git a/wahoo_mc/resources/json/europe/sweden.json b/wahoomc/resources/json/europe/sweden.json similarity index 100% rename from wahoo_mc/resources/json/europe/sweden.json rename to wahoomc/resources/json/europe/sweden.json diff --git a/wahoo_mc/resources/json/europe/switzerland.json b/wahoomc/resources/json/europe/switzerland.json similarity index 100% rename from wahoo_mc/resources/json/europe/switzerland.json rename to wahoomc/resources/json/europe/switzerland.json diff --git a/wahoo_mc/resources/json/europe/ukraine.json b/wahoomc/resources/json/europe/ukraine.json similarity index 100% rename from wahoo_mc/resources/json/europe/ukraine.json rename to wahoomc/resources/json/europe/ukraine.json diff --git a/wahoo_mc/resources/json/europe/united_kingdom.json b/wahoomc/resources/json/europe/united_kingdom.json similarity index 100% rename from wahoo_mc/resources/json/europe/united_kingdom.json rename to wahoomc/resources/json/europe/united_kingdom.json diff --git a/wahoo_mc/resources/json/europe/vatican_city.json b/wahoomc/resources/json/europe/vatican_city.json similarity index 100% rename from wahoo_mc/resources/json/europe/vatican_city.json rename to wahoomc/resources/json/europe/vatican_city.json diff --git "a/wahoo_mc/resources/json/europe/\303\245land.json" "b/wahoomc/resources/json/europe/\303\245land.json" similarity index 100% rename from "wahoo_mc/resources/json/europe/\303\245land.json" rename to "wahoomc/resources/json/europe/\303\245land.json" diff --git a/wahoo_mc/resources/json/north_america/anguilla.json b/wahoomc/resources/json/north_america/anguilla.json similarity index 100% rename from wahoo_mc/resources/json/north_america/anguilla.json rename to wahoomc/resources/json/north_america/anguilla.json diff --git a/wahoo_mc/resources/json/north_america/antigua_and_barbuda.json b/wahoomc/resources/json/north_america/antigua_and_barbuda.json similarity index 100% rename from wahoo_mc/resources/json/north_america/antigua_and_barbuda.json rename to wahoomc/resources/json/north_america/antigua_and_barbuda.json diff --git a/wahoo_mc/resources/json/north_america/bahamas.json b/wahoomc/resources/json/north_america/bahamas.json similarity index 100% rename from wahoo_mc/resources/json/north_america/bahamas.json rename to wahoomc/resources/json/north_america/bahamas.json diff --git a/wahoo_mc/resources/json/north_america/barbados.json b/wahoomc/resources/json/north_america/barbados.json similarity index 100% rename from wahoo_mc/resources/json/north_america/barbados.json rename to wahoomc/resources/json/north_america/barbados.json diff --git a/wahoo_mc/resources/json/north_america/belize.json b/wahoomc/resources/json/north_america/belize.json similarity index 100% rename from wahoo_mc/resources/json/north_america/belize.json rename to wahoomc/resources/json/north_america/belize.json diff --git a/wahoo_mc/resources/json/north_america/bermuda.json b/wahoomc/resources/json/north_america/bermuda.json similarity index 100% rename from wahoo_mc/resources/json/north_america/bermuda.json rename to wahoomc/resources/json/north_america/bermuda.json diff --git a/wahoo_mc/resources/json/north_america/british_virgin_islands.json b/wahoomc/resources/json/north_america/british_virgin_islands.json similarity index 100% rename from wahoo_mc/resources/json/north_america/british_virgin_islands.json rename to wahoomc/resources/json/north_america/british_virgin_islands.json diff --git a/wahoo_mc/resources/json/north_america/canada.json b/wahoomc/resources/json/north_america/canada.json similarity index 100% rename from wahoo_mc/resources/json/north_america/canada.json rename to wahoomc/resources/json/north_america/canada.json diff --git a/wahoo_mc/resources/json/north_america/cayman_islands.json b/wahoomc/resources/json/north_america/cayman_islands.json similarity index 100% rename from wahoo_mc/resources/json/north_america/cayman_islands.json rename to wahoomc/resources/json/north_america/cayman_islands.json diff --git a/wahoo_mc/resources/json/north_america/costa_rica.json b/wahoomc/resources/json/north_america/costa_rica.json similarity index 100% rename from wahoo_mc/resources/json/north_america/costa_rica.json rename to wahoomc/resources/json/north_america/costa_rica.json diff --git a/wahoo_mc/resources/json/north_america/cuba.json b/wahoomc/resources/json/north_america/cuba.json similarity index 100% rename from wahoo_mc/resources/json/north_america/cuba.json rename to wahoomc/resources/json/north_america/cuba.json diff --git a/wahoo_mc/resources/json/north_america/dominica.json b/wahoomc/resources/json/north_america/dominica.json similarity index 100% rename from wahoo_mc/resources/json/north_america/dominica.json rename to wahoomc/resources/json/north_america/dominica.json diff --git a/wahoo_mc/resources/json/north_america/dominican_republic.json b/wahoomc/resources/json/north_america/dominican_republic.json similarity index 100% rename from wahoo_mc/resources/json/north_america/dominican_republic.json rename to wahoomc/resources/json/north_america/dominican_republic.json diff --git a/wahoo_mc/resources/json/north_america/el_salvador.json b/wahoomc/resources/json/north_america/el_salvador.json similarity index 100% rename from wahoo_mc/resources/json/north_america/el_salvador.json rename to wahoomc/resources/json/north_america/el_salvador.json diff --git a/wahoo_mc/resources/json/north_america/greenland.json b/wahoomc/resources/json/north_america/greenland.json similarity index 100% rename from wahoo_mc/resources/json/north_america/greenland.json rename to wahoomc/resources/json/north_america/greenland.json diff --git a/wahoo_mc/resources/json/north_america/grenada.json b/wahoomc/resources/json/north_america/grenada.json similarity index 100% rename from wahoo_mc/resources/json/north_america/grenada.json rename to wahoomc/resources/json/north_america/grenada.json diff --git a/wahoo_mc/resources/json/north_america/guadeloupe.json b/wahoomc/resources/json/north_america/guadeloupe.json similarity index 100% rename from wahoo_mc/resources/json/north_america/guadeloupe.json rename to wahoomc/resources/json/north_america/guadeloupe.json diff --git a/wahoo_mc/resources/json/north_america/guatemala.json b/wahoomc/resources/json/north_america/guatemala.json similarity index 100% rename from wahoo_mc/resources/json/north_america/guatemala.json rename to wahoomc/resources/json/north_america/guatemala.json diff --git a/wahoo_mc/resources/json/north_america/haiti.json b/wahoomc/resources/json/north_america/haiti.json similarity index 100% rename from wahoo_mc/resources/json/north_america/haiti.json rename to wahoomc/resources/json/north_america/haiti.json diff --git a/wahoo_mc/resources/json/north_america/honduras.json b/wahoomc/resources/json/north_america/honduras.json similarity index 100% rename from wahoo_mc/resources/json/north_america/honduras.json rename to wahoomc/resources/json/north_america/honduras.json diff --git a/wahoo_mc/resources/json/north_america/jamaica.json b/wahoomc/resources/json/north_america/jamaica.json similarity index 100% rename from wahoo_mc/resources/json/north_america/jamaica.json rename to wahoomc/resources/json/north_america/jamaica.json diff --git a/wahoo_mc/resources/json/north_america/martinique.json b/wahoomc/resources/json/north_america/martinique.json similarity index 100% rename from wahoo_mc/resources/json/north_america/martinique.json rename to wahoomc/resources/json/north_america/martinique.json diff --git a/wahoo_mc/resources/json/north_america/mexico.json b/wahoomc/resources/json/north_america/mexico.json similarity index 100% rename from wahoo_mc/resources/json/north_america/mexico.json rename to wahoomc/resources/json/north_america/mexico.json diff --git a/wahoo_mc/resources/json/north_america/montserrat.json b/wahoomc/resources/json/north_america/montserrat.json similarity index 100% rename from wahoo_mc/resources/json/north_america/montserrat.json rename to wahoomc/resources/json/north_america/montserrat.json diff --git a/wahoo_mc/resources/json/north_america/nicaragua.json b/wahoomc/resources/json/north_america/nicaragua.json similarity index 100% rename from wahoo_mc/resources/json/north_america/nicaragua.json rename to wahoomc/resources/json/north_america/nicaragua.json diff --git a/wahoo_mc/resources/json/north_america/panama.json b/wahoomc/resources/json/north_america/panama.json similarity index 100% rename from wahoo_mc/resources/json/north_america/panama.json rename to wahoomc/resources/json/north_america/panama.json diff --git "a/wahoo_mc/resources/json/north_america/saint-barth\303\251lemy.json" "b/wahoomc/resources/json/north_america/saint-barth\303\251lemy.json" similarity index 100% rename from "wahoo_mc/resources/json/north_america/saint-barth\303\251lemy.json" rename to "wahoomc/resources/json/north_america/saint-barth\303\251lemy.json" diff --git a/wahoo_mc/resources/json/north_america/saint-martin.json b/wahoomc/resources/json/north_america/saint-martin.json similarity index 100% rename from wahoo_mc/resources/json/north_america/saint-martin.json rename to wahoomc/resources/json/north_america/saint-martin.json diff --git a/wahoo_mc/resources/json/north_america/saint_kitts_and_nevis.json b/wahoomc/resources/json/north_america/saint_kitts_and_nevis.json similarity index 100% rename from wahoo_mc/resources/json/north_america/saint_kitts_and_nevis.json rename to wahoomc/resources/json/north_america/saint_kitts_and_nevis.json diff --git a/wahoo_mc/resources/json/north_america/saint_lucia.json b/wahoomc/resources/json/north_america/saint_lucia.json similarity index 100% rename from wahoo_mc/resources/json/north_america/saint_lucia.json rename to wahoomc/resources/json/north_america/saint_lucia.json diff --git a/wahoo_mc/resources/json/north_america/saint_vincent_and_the_grenadines.json b/wahoomc/resources/json/north_america/saint_vincent_and_the_grenadines.json similarity index 100% rename from wahoo_mc/resources/json/north_america/saint_vincent_and_the_grenadines.json rename to wahoomc/resources/json/north_america/saint_vincent_and_the_grenadines.json diff --git a/wahoo_mc/resources/json/north_america/sint_maarten.json b/wahoomc/resources/json/north_america/sint_maarten.json similarity index 100% rename from wahoo_mc/resources/json/north_america/sint_maarten.json rename to wahoomc/resources/json/north_america/sint_maarten.json diff --git a/wahoo_mc/resources/json/north_america/turks_and_caicos_islands.json b/wahoomc/resources/json/north_america/turks_and_caicos_islands.json similarity index 100% rename from wahoo_mc/resources/json/north_america/turks_and_caicos_islands.json rename to wahoomc/resources/json/north_america/turks_and_caicos_islands.json diff --git a/wahoo_mc/resources/json/north_america/virgin_islands_u.s..json b/wahoomc/resources/json/north_america/virgin_islands_u.s..json similarity index 100% rename from wahoo_mc/resources/json/north_america/virgin_islands_u.s..json rename to wahoomc/resources/json/north_america/virgin_islands_u.s..json diff --git a/wahoo_mc/resources/json/oceania/australia.json b/wahoomc/resources/json/oceania/australia.json similarity index 100% rename from wahoo_mc/resources/json/oceania/australia.json rename to wahoomc/resources/json/oceania/australia.json diff --git a/wahoo_mc/resources/json/oceania/cook_islands.json b/wahoomc/resources/json/oceania/cook_islands.json similarity index 100% rename from wahoo_mc/resources/json/oceania/cook_islands.json rename to wahoomc/resources/json/oceania/cook_islands.json diff --git a/wahoo_mc/resources/json/oceania/fiji.json b/wahoomc/resources/json/oceania/fiji.json similarity index 100% rename from wahoo_mc/resources/json/oceania/fiji.json rename to wahoomc/resources/json/oceania/fiji.json diff --git a/wahoo_mc/resources/json/oceania/french_polynesia.json b/wahoomc/resources/json/oceania/french_polynesia.json similarity index 100% rename from wahoo_mc/resources/json/oceania/french_polynesia.json rename to wahoomc/resources/json/oceania/french_polynesia.json diff --git a/wahoo_mc/resources/json/oceania/kiribati.json b/wahoomc/resources/json/oceania/kiribati.json similarity index 100% rename from wahoo_mc/resources/json/oceania/kiribati.json rename to wahoomc/resources/json/oceania/kiribati.json diff --git a/wahoo_mc/resources/json/oceania/marshall_islands.json b/wahoomc/resources/json/oceania/marshall_islands.json similarity index 100% rename from wahoo_mc/resources/json/oceania/marshall_islands.json rename to wahoomc/resources/json/oceania/marshall_islands.json diff --git a/wahoo_mc/resources/json/oceania/micronesia.json b/wahoomc/resources/json/oceania/micronesia.json similarity index 100% rename from wahoo_mc/resources/json/oceania/micronesia.json rename to wahoomc/resources/json/oceania/micronesia.json diff --git a/wahoo_mc/resources/json/oceania/nauru.json b/wahoomc/resources/json/oceania/nauru.json similarity index 100% rename from wahoo_mc/resources/json/oceania/nauru.json rename to wahoomc/resources/json/oceania/nauru.json diff --git a/wahoo_mc/resources/json/oceania/new_caledonia.json b/wahoomc/resources/json/oceania/new_caledonia.json similarity index 100% rename from wahoo_mc/resources/json/oceania/new_caledonia.json rename to wahoomc/resources/json/oceania/new_caledonia.json diff --git a/wahoo_mc/resources/json/oceania/new_zealand.json b/wahoomc/resources/json/oceania/new_zealand.json similarity index 100% rename from wahoo_mc/resources/json/oceania/new_zealand.json rename to wahoomc/resources/json/oceania/new_zealand.json diff --git a/wahoo_mc/resources/json/oceania/niue.json b/wahoomc/resources/json/oceania/niue.json similarity index 100% rename from wahoo_mc/resources/json/oceania/niue.json rename to wahoomc/resources/json/oceania/niue.json diff --git a/wahoo_mc/resources/json/oceania/norfolk_island.json b/wahoomc/resources/json/oceania/norfolk_island.json similarity index 100% rename from wahoo_mc/resources/json/oceania/norfolk_island.json rename to wahoomc/resources/json/oceania/norfolk_island.json diff --git a/wahoo_mc/resources/json/oceania/northern_mariana_islands.json b/wahoomc/resources/json/oceania/northern_mariana_islands.json similarity index 100% rename from wahoo_mc/resources/json/oceania/northern_mariana_islands.json rename to wahoomc/resources/json/oceania/northern_mariana_islands.json diff --git a/wahoo_mc/resources/json/oceania/palau.json b/wahoomc/resources/json/oceania/palau.json similarity index 100% rename from wahoo_mc/resources/json/oceania/palau.json rename to wahoomc/resources/json/oceania/palau.json diff --git a/wahoo_mc/resources/json/oceania/papua_new_guinea.json b/wahoomc/resources/json/oceania/papua_new_guinea.json similarity index 100% rename from wahoo_mc/resources/json/oceania/papua_new_guinea.json rename to wahoomc/resources/json/oceania/papua_new_guinea.json diff --git a/wahoo_mc/resources/json/oceania/pitcairn_islands.json b/wahoomc/resources/json/oceania/pitcairn_islands.json similarity index 100% rename from wahoo_mc/resources/json/oceania/pitcairn_islands.json rename to wahoomc/resources/json/oceania/pitcairn_islands.json diff --git a/wahoo_mc/resources/json/oceania/samoa.json b/wahoomc/resources/json/oceania/samoa.json similarity index 100% rename from wahoo_mc/resources/json/oceania/samoa.json rename to wahoomc/resources/json/oceania/samoa.json diff --git a/wahoo_mc/resources/json/oceania/solomon_islands.json b/wahoomc/resources/json/oceania/solomon_islands.json similarity index 100% rename from wahoo_mc/resources/json/oceania/solomon_islands.json rename to wahoomc/resources/json/oceania/solomon_islands.json diff --git a/wahoo_mc/resources/json/oceania/tokelau.json b/wahoomc/resources/json/oceania/tokelau.json similarity index 100% rename from wahoo_mc/resources/json/oceania/tokelau.json rename to wahoomc/resources/json/oceania/tokelau.json diff --git a/wahoo_mc/resources/json/oceania/tonga.json b/wahoomc/resources/json/oceania/tonga.json similarity index 100% rename from wahoo_mc/resources/json/oceania/tonga.json rename to wahoomc/resources/json/oceania/tonga.json diff --git a/wahoo_mc/resources/json/oceania/tuvalu.json b/wahoomc/resources/json/oceania/tuvalu.json similarity index 100% rename from wahoo_mc/resources/json/oceania/tuvalu.json rename to wahoomc/resources/json/oceania/tuvalu.json diff --git a/wahoo_mc/resources/json/oceania/united_states_minor_outlying_islands.json b/wahoomc/resources/json/oceania/united_states_minor_outlying_islands.json similarity index 100% rename from wahoo_mc/resources/json/oceania/united_states_minor_outlying_islands.json rename to wahoomc/resources/json/oceania/united_states_minor_outlying_islands.json diff --git a/wahoo_mc/resources/json/oceania/vanuatu.json b/wahoomc/resources/json/oceania/vanuatu.json similarity index 100% rename from wahoo_mc/resources/json/oceania/vanuatu.json rename to wahoomc/resources/json/oceania/vanuatu.json diff --git a/wahoo_mc/resources/json/oceania/wallis_and_futuna.json b/wahoomc/resources/json/oceania/wallis_and_futuna.json similarity index 100% rename from wahoo_mc/resources/json/oceania/wallis_and_futuna.json rename to wahoomc/resources/json/oceania/wallis_and_futuna.json diff --git a/wahoo_mc/resources/json/south_america/argentina.json b/wahoomc/resources/json/south_america/argentina.json similarity index 100% rename from wahoo_mc/resources/json/south_america/argentina.json rename to wahoomc/resources/json/south_america/argentina.json diff --git a/wahoo_mc/resources/json/south_america/aruba.json b/wahoomc/resources/json/south_america/aruba.json similarity index 100% rename from wahoo_mc/resources/json/south_america/aruba.json rename to wahoomc/resources/json/south_america/aruba.json diff --git a/wahoo_mc/resources/json/south_america/bolivia.json b/wahoomc/resources/json/south_america/bolivia.json similarity index 100% rename from wahoo_mc/resources/json/south_america/bolivia.json rename to wahoomc/resources/json/south_america/bolivia.json diff --git a/wahoo_mc/resources/json/south_america/bonaire_saint_eustatius_and_saba.json b/wahoomc/resources/json/south_america/bonaire_saint_eustatius_and_saba.json similarity index 100% rename from wahoo_mc/resources/json/south_america/bonaire_saint_eustatius_and_saba.json rename to wahoomc/resources/json/south_america/bonaire_saint_eustatius_and_saba.json diff --git a/wahoo_mc/resources/json/south_america/brazil.json b/wahoomc/resources/json/south_america/brazil.json similarity index 100% rename from wahoo_mc/resources/json/south_america/brazil.json rename to wahoomc/resources/json/south_america/brazil.json diff --git a/wahoo_mc/resources/json/south_america/chile.json b/wahoomc/resources/json/south_america/chile.json similarity index 100% rename from wahoo_mc/resources/json/south_america/chile.json rename to wahoomc/resources/json/south_america/chile.json diff --git a/wahoo_mc/resources/json/south_america/clipperton_island.json b/wahoomc/resources/json/south_america/clipperton_island.json similarity index 100% rename from wahoo_mc/resources/json/south_america/clipperton_island.json rename to wahoomc/resources/json/south_america/clipperton_island.json diff --git a/wahoo_mc/resources/json/south_america/colombia.json b/wahoomc/resources/json/south_america/colombia.json similarity index 100% rename from wahoo_mc/resources/json/south_america/colombia.json rename to wahoomc/resources/json/south_america/colombia.json diff --git a/wahoo_mc/resources/json/south_america/curacao.json b/wahoomc/resources/json/south_america/curacao.json similarity index 100% rename from wahoo_mc/resources/json/south_america/curacao.json rename to wahoomc/resources/json/south_america/curacao.json diff --git a/wahoo_mc/resources/json/south_america/ecuador.json b/wahoomc/resources/json/south_america/ecuador.json similarity index 100% rename from wahoo_mc/resources/json/south_america/ecuador.json rename to wahoomc/resources/json/south_america/ecuador.json diff --git a/wahoo_mc/resources/json/south_america/falkland_islands.json b/wahoomc/resources/json/south_america/falkland_islands.json similarity index 100% rename from wahoo_mc/resources/json/south_america/falkland_islands.json rename to wahoomc/resources/json/south_america/falkland_islands.json diff --git a/wahoo_mc/resources/json/south_america/french_guiana.json b/wahoomc/resources/json/south_america/french_guiana.json similarity index 100% rename from wahoo_mc/resources/json/south_america/french_guiana.json rename to wahoomc/resources/json/south_america/french_guiana.json diff --git a/wahoo_mc/resources/json/south_america/guyana.json b/wahoomc/resources/json/south_america/guyana.json similarity index 100% rename from wahoo_mc/resources/json/south_america/guyana.json rename to wahoomc/resources/json/south_america/guyana.json diff --git a/wahoo_mc/resources/json/south_america/paraguay.json b/wahoomc/resources/json/south_america/paraguay.json similarity index 100% rename from wahoo_mc/resources/json/south_america/paraguay.json rename to wahoomc/resources/json/south_america/paraguay.json diff --git a/wahoo_mc/resources/json/south_america/peru.json b/wahoomc/resources/json/south_america/peru.json similarity index 100% rename from wahoo_mc/resources/json/south_america/peru.json rename to wahoomc/resources/json/south_america/peru.json diff --git a/wahoo_mc/resources/json/south_america/saint_pierre_and_miquelon.json b/wahoomc/resources/json/south_america/saint_pierre_and_miquelon.json similarity index 100% rename from wahoo_mc/resources/json/south_america/saint_pierre_and_miquelon.json rename to wahoomc/resources/json/south_america/saint_pierre_and_miquelon.json diff --git a/wahoo_mc/resources/json/south_america/suriname.json b/wahoomc/resources/json/south_america/suriname.json similarity index 100% rename from wahoo_mc/resources/json/south_america/suriname.json rename to wahoomc/resources/json/south_america/suriname.json diff --git a/wahoo_mc/resources/json/south_america/trinidad_and_tobago.json b/wahoomc/resources/json/south_america/trinidad_and_tobago.json similarity index 100% rename from wahoo_mc/resources/json/south_america/trinidad_and_tobago.json rename to wahoomc/resources/json/south_america/trinidad_and_tobago.json diff --git a/wahoo_mc/resources/json/south_america/uruguay.json b/wahoomc/resources/json/south_america/uruguay.json similarity index 100% rename from wahoo_mc/resources/json/south_america/uruguay.json rename to wahoomc/resources/json/south_america/uruguay.json diff --git a/wahoo_mc/resources/json/south_america/venezuela.json b/wahoomc/resources/json/south_america/venezuela.json similarity index 100% rename from wahoo_mc/resources/json/south_america/venezuela.json rename to wahoomc/resources/json/south_america/venezuela.json diff --git a/wahoo_mc/resources/json/united_states/alabama.json b/wahoomc/resources/json/united_states/alabama.json similarity index 100% rename from wahoo_mc/resources/json/united_states/alabama.json rename to wahoomc/resources/json/united_states/alabama.json diff --git a/wahoo_mc/resources/json/united_states/alaska.json b/wahoomc/resources/json/united_states/alaska.json similarity index 100% rename from wahoo_mc/resources/json/united_states/alaska.json rename to wahoomc/resources/json/united_states/alaska.json diff --git a/wahoo_mc/resources/json/united_states/american_samoa.json b/wahoomc/resources/json/united_states/american_samoa.json similarity index 100% rename from wahoo_mc/resources/json/united_states/american_samoa.json rename to wahoomc/resources/json/united_states/american_samoa.json diff --git a/wahoo_mc/resources/json/united_states/arizona.json b/wahoomc/resources/json/united_states/arizona.json similarity index 100% rename from wahoo_mc/resources/json/united_states/arizona.json rename to wahoomc/resources/json/united_states/arizona.json diff --git a/wahoo_mc/resources/json/united_states/arkansas.json b/wahoomc/resources/json/united_states/arkansas.json similarity index 100% rename from wahoo_mc/resources/json/united_states/arkansas.json rename to wahoomc/resources/json/united_states/arkansas.json diff --git a/wahoo_mc/resources/json/united_states/california.json b/wahoomc/resources/json/united_states/california.json similarity index 100% rename from wahoo_mc/resources/json/united_states/california.json rename to wahoomc/resources/json/united_states/california.json diff --git a/wahoo_mc/resources/json/united_states/colorado.json b/wahoomc/resources/json/united_states/colorado.json similarity index 100% rename from wahoo_mc/resources/json/united_states/colorado.json rename to wahoomc/resources/json/united_states/colorado.json diff --git a/wahoo_mc/resources/json/united_states/commonwealth_of_the_northern_mariana_islands.json b/wahoomc/resources/json/united_states/commonwealth_of_the_northern_mariana_islands.json similarity index 100% rename from wahoo_mc/resources/json/united_states/commonwealth_of_the_northern_mariana_islands.json rename to wahoomc/resources/json/united_states/commonwealth_of_the_northern_mariana_islands.json diff --git a/wahoo_mc/resources/json/united_states/connecticut.json b/wahoomc/resources/json/united_states/connecticut.json similarity index 100% rename from wahoo_mc/resources/json/united_states/connecticut.json rename to wahoomc/resources/json/united_states/connecticut.json diff --git a/wahoo_mc/resources/json/united_states/delaware.json b/wahoomc/resources/json/united_states/delaware.json similarity index 100% rename from wahoo_mc/resources/json/united_states/delaware.json rename to wahoomc/resources/json/united_states/delaware.json diff --git a/wahoo_mc/resources/json/united_states/district_of_columbia.json b/wahoomc/resources/json/united_states/district_of_columbia.json similarity index 100% rename from wahoo_mc/resources/json/united_states/district_of_columbia.json rename to wahoomc/resources/json/united_states/district_of_columbia.json diff --git a/wahoo_mc/resources/json/united_states/florida.json b/wahoomc/resources/json/united_states/florida.json similarity index 100% rename from wahoo_mc/resources/json/united_states/florida.json rename to wahoomc/resources/json/united_states/florida.json diff --git a/wahoo_mc/resources/json/united_states/georgia.json b/wahoomc/resources/json/united_states/georgia.json similarity index 100% rename from wahoo_mc/resources/json/united_states/georgia.json rename to wahoomc/resources/json/united_states/georgia.json diff --git a/wahoo_mc/resources/json/united_states/guam.json b/wahoomc/resources/json/united_states/guam.json similarity index 100% rename from wahoo_mc/resources/json/united_states/guam.json rename to wahoomc/resources/json/united_states/guam.json diff --git a/wahoo_mc/resources/json/united_states/hawaii.json b/wahoomc/resources/json/united_states/hawaii.json similarity index 100% rename from wahoo_mc/resources/json/united_states/hawaii.json rename to wahoomc/resources/json/united_states/hawaii.json diff --git a/wahoo_mc/resources/json/united_states/idaho.json b/wahoomc/resources/json/united_states/idaho.json similarity index 100% rename from wahoo_mc/resources/json/united_states/idaho.json rename to wahoomc/resources/json/united_states/idaho.json diff --git a/wahoo_mc/resources/json/united_states/illinois.json b/wahoomc/resources/json/united_states/illinois.json similarity index 100% rename from wahoo_mc/resources/json/united_states/illinois.json rename to wahoomc/resources/json/united_states/illinois.json diff --git a/wahoo_mc/resources/json/united_states/indiana.json b/wahoomc/resources/json/united_states/indiana.json similarity index 100% rename from wahoo_mc/resources/json/united_states/indiana.json rename to wahoomc/resources/json/united_states/indiana.json diff --git a/wahoo_mc/resources/json/united_states/iowa.json b/wahoomc/resources/json/united_states/iowa.json similarity index 100% rename from wahoo_mc/resources/json/united_states/iowa.json rename to wahoomc/resources/json/united_states/iowa.json diff --git a/wahoo_mc/resources/json/united_states/kansas.json b/wahoomc/resources/json/united_states/kansas.json similarity index 100% rename from wahoo_mc/resources/json/united_states/kansas.json rename to wahoomc/resources/json/united_states/kansas.json diff --git a/wahoo_mc/resources/json/united_states/kentucky.json b/wahoomc/resources/json/united_states/kentucky.json similarity index 100% rename from wahoo_mc/resources/json/united_states/kentucky.json rename to wahoomc/resources/json/united_states/kentucky.json diff --git a/wahoo_mc/resources/json/united_states/louisiana.json b/wahoomc/resources/json/united_states/louisiana.json similarity index 100% rename from wahoo_mc/resources/json/united_states/louisiana.json rename to wahoomc/resources/json/united_states/louisiana.json diff --git a/wahoo_mc/resources/json/united_states/maine.json b/wahoomc/resources/json/united_states/maine.json similarity index 100% rename from wahoo_mc/resources/json/united_states/maine.json rename to wahoomc/resources/json/united_states/maine.json diff --git a/wahoo_mc/resources/json/united_states/maryland.json b/wahoomc/resources/json/united_states/maryland.json similarity index 100% rename from wahoo_mc/resources/json/united_states/maryland.json rename to wahoomc/resources/json/united_states/maryland.json diff --git a/wahoo_mc/resources/json/united_states/massachusetts.json b/wahoomc/resources/json/united_states/massachusetts.json similarity index 100% rename from wahoo_mc/resources/json/united_states/massachusetts.json rename to wahoomc/resources/json/united_states/massachusetts.json diff --git a/wahoo_mc/resources/json/united_states/michigan.json b/wahoomc/resources/json/united_states/michigan.json similarity index 100% rename from wahoo_mc/resources/json/united_states/michigan.json rename to wahoomc/resources/json/united_states/michigan.json diff --git a/wahoo_mc/resources/json/united_states/minnesota.json b/wahoomc/resources/json/united_states/minnesota.json similarity index 100% rename from wahoo_mc/resources/json/united_states/minnesota.json rename to wahoomc/resources/json/united_states/minnesota.json diff --git a/wahoo_mc/resources/json/united_states/mississippi.json b/wahoomc/resources/json/united_states/mississippi.json similarity index 100% rename from wahoo_mc/resources/json/united_states/mississippi.json rename to wahoomc/resources/json/united_states/mississippi.json diff --git a/wahoo_mc/resources/json/united_states/missouri.json b/wahoomc/resources/json/united_states/missouri.json similarity index 100% rename from wahoo_mc/resources/json/united_states/missouri.json rename to wahoomc/resources/json/united_states/missouri.json diff --git a/wahoo_mc/resources/json/united_states/montana.json b/wahoomc/resources/json/united_states/montana.json similarity index 100% rename from wahoo_mc/resources/json/united_states/montana.json rename to wahoomc/resources/json/united_states/montana.json diff --git a/wahoo_mc/resources/json/united_states/nebraska.json b/wahoomc/resources/json/united_states/nebraska.json similarity index 100% rename from wahoo_mc/resources/json/united_states/nebraska.json rename to wahoomc/resources/json/united_states/nebraska.json diff --git a/wahoo_mc/resources/json/united_states/nevada.json b/wahoomc/resources/json/united_states/nevada.json similarity index 100% rename from wahoo_mc/resources/json/united_states/nevada.json rename to wahoomc/resources/json/united_states/nevada.json diff --git a/wahoo_mc/resources/json/united_states/new_hampshire.json b/wahoomc/resources/json/united_states/new_hampshire.json similarity index 100% rename from wahoo_mc/resources/json/united_states/new_hampshire.json rename to wahoomc/resources/json/united_states/new_hampshire.json diff --git a/wahoo_mc/resources/json/united_states/new_jersey.json b/wahoomc/resources/json/united_states/new_jersey.json similarity index 100% rename from wahoo_mc/resources/json/united_states/new_jersey.json rename to wahoomc/resources/json/united_states/new_jersey.json diff --git a/wahoo_mc/resources/json/united_states/new_mexico.json b/wahoomc/resources/json/united_states/new_mexico.json similarity index 100% rename from wahoo_mc/resources/json/united_states/new_mexico.json rename to wahoomc/resources/json/united_states/new_mexico.json diff --git a/wahoo_mc/resources/json/united_states/new_york.json b/wahoomc/resources/json/united_states/new_york.json similarity index 100% rename from wahoo_mc/resources/json/united_states/new_york.json rename to wahoomc/resources/json/united_states/new_york.json diff --git a/wahoo_mc/resources/json/united_states/north_carolina.json b/wahoomc/resources/json/united_states/north_carolina.json similarity index 100% rename from wahoo_mc/resources/json/united_states/north_carolina.json rename to wahoomc/resources/json/united_states/north_carolina.json diff --git a/wahoo_mc/resources/json/united_states/north_dakota.json b/wahoomc/resources/json/united_states/north_dakota.json similarity index 100% rename from wahoo_mc/resources/json/united_states/north_dakota.json rename to wahoomc/resources/json/united_states/north_dakota.json diff --git a/wahoo_mc/resources/json/united_states/ohio.json b/wahoomc/resources/json/united_states/ohio.json similarity index 100% rename from wahoo_mc/resources/json/united_states/ohio.json rename to wahoomc/resources/json/united_states/ohio.json diff --git a/wahoo_mc/resources/json/united_states/oklahoma.json b/wahoomc/resources/json/united_states/oklahoma.json similarity index 100% rename from wahoo_mc/resources/json/united_states/oklahoma.json rename to wahoomc/resources/json/united_states/oklahoma.json diff --git a/wahoo_mc/resources/json/united_states/oregon.json b/wahoomc/resources/json/united_states/oregon.json similarity index 100% rename from wahoo_mc/resources/json/united_states/oregon.json rename to wahoomc/resources/json/united_states/oregon.json diff --git a/wahoo_mc/resources/json/united_states/pennsylvania.json b/wahoomc/resources/json/united_states/pennsylvania.json similarity index 100% rename from wahoo_mc/resources/json/united_states/pennsylvania.json rename to wahoomc/resources/json/united_states/pennsylvania.json diff --git a/wahoo_mc/resources/json/united_states/puerto_rico.json b/wahoomc/resources/json/united_states/puerto_rico.json similarity index 100% rename from wahoo_mc/resources/json/united_states/puerto_rico.json rename to wahoomc/resources/json/united_states/puerto_rico.json diff --git a/wahoo_mc/resources/json/united_states/rhode_island.json b/wahoomc/resources/json/united_states/rhode_island.json similarity index 100% rename from wahoo_mc/resources/json/united_states/rhode_island.json rename to wahoomc/resources/json/united_states/rhode_island.json diff --git a/wahoo_mc/resources/json/united_states/south_carolina.json b/wahoomc/resources/json/united_states/south_carolina.json similarity index 100% rename from wahoo_mc/resources/json/united_states/south_carolina.json rename to wahoomc/resources/json/united_states/south_carolina.json diff --git a/wahoo_mc/resources/json/united_states/south_dakota.json b/wahoomc/resources/json/united_states/south_dakota.json similarity index 100% rename from wahoo_mc/resources/json/united_states/south_dakota.json rename to wahoomc/resources/json/united_states/south_dakota.json diff --git a/wahoo_mc/resources/json/united_states/tennessee.json b/wahoomc/resources/json/united_states/tennessee.json similarity index 100% rename from wahoo_mc/resources/json/united_states/tennessee.json rename to wahoomc/resources/json/united_states/tennessee.json diff --git a/wahoo_mc/resources/json/united_states/texas.json b/wahoomc/resources/json/united_states/texas.json similarity index 100% rename from wahoo_mc/resources/json/united_states/texas.json rename to wahoomc/resources/json/united_states/texas.json diff --git a/wahoo_mc/resources/json/united_states/united_states_virgin_islands.json b/wahoomc/resources/json/united_states/united_states_virgin_islands.json similarity index 100% rename from wahoo_mc/resources/json/united_states/united_states_virgin_islands.json rename to wahoomc/resources/json/united_states/united_states_virgin_islands.json diff --git a/wahoo_mc/resources/json/united_states/utah.json b/wahoomc/resources/json/united_states/utah.json similarity index 100% rename from wahoo_mc/resources/json/united_states/utah.json rename to wahoomc/resources/json/united_states/utah.json diff --git a/wahoo_mc/resources/json/united_states/vermont.json b/wahoomc/resources/json/united_states/vermont.json similarity index 100% rename from wahoo_mc/resources/json/united_states/vermont.json rename to wahoomc/resources/json/united_states/vermont.json diff --git a/wahoo_mc/resources/json/united_states/virginia.json b/wahoomc/resources/json/united_states/virginia.json similarity index 100% rename from wahoo_mc/resources/json/united_states/virginia.json rename to wahoomc/resources/json/united_states/virginia.json diff --git a/wahoo_mc/resources/json/united_states/washington.json b/wahoomc/resources/json/united_states/washington.json similarity index 100% rename from wahoo_mc/resources/json/united_states/washington.json rename to wahoomc/resources/json/united_states/washington.json diff --git a/wahoo_mc/resources/json/united_states/west_virginia.json b/wahoomc/resources/json/united_states/west_virginia.json similarity index 100% rename from wahoo_mc/resources/json/united_states/west_virginia.json rename to wahoomc/resources/json/united_states/west_virginia.json diff --git a/wahoo_mc/resources/json/united_states/wisconsin.json b/wahoomc/resources/json/united_states/wisconsin.json similarity index 100% rename from wahoo_mc/resources/json/united_states/wisconsin.json rename to wahoomc/resources/json/united_states/wisconsin.json diff --git a/wahoo_mc/resources/json/united_states/wyoming.json b/wahoomc/resources/json/united_states/wyoming.json similarity index 100% rename from wahoo_mc/resources/json/united_states/wyoming.json rename to wahoomc/resources/json/united_states/wyoming.json diff --git a/wahoo_mc/resources/sea.osm b/wahoomc/resources/sea.osm similarity index 100% rename from wahoo_mc/resources/sea.osm rename to wahoomc/resources/sea.osm diff --git a/wahoo_mc/resources/shape2osm.py b/wahoomc/resources/shape2osm.py similarity index 100% rename from wahoo_mc/resources/shape2osm.py rename to wahoomc/resources/shape2osm.py diff --git a/wahoo_mc/resources/tag_wahoo_adjusted/tag-wahoo-hidrive2.xml b/wahoomc/resources/tag_wahoo_adjusted/tag-wahoo-hidrive2.xml similarity index 100% rename from wahoo_mc/resources/tag_wahoo_adjusted/tag-wahoo-hidrive2.xml rename to wahoomc/resources/tag_wahoo_adjusted/tag-wahoo-hidrive2.xml diff --git a/wahoo_mc/resources/tag_wahoo_adjusted/tag-wahoo-v12.xml b/wahoomc/resources/tag_wahoo_adjusted/tag-wahoo-v12.xml similarity index 100% rename from wahoo_mc/resources/tag_wahoo_adjusted/tag-wahoo-v12.xml rename to wahoomc/resources/tag_wahoo_adjusted/tag-wahoo-v12.xml diff --git a/wahoo_mc/resources/tag_wahoo_adjusted/tag-wahoo.xml b/wahoomc/resources/tag_wahoo_adjusted/tag-wahoo.xml similarity index 100% rename from wahoo_mc/resources/tag_wahoo_adjusted/tag-wahoo.xml rename to wahoomc/resources/tag_wahoo_adjusted/tag-wahoo.xml diff --git a/wahoo_mc/resources/tag_wahoo_adjusted/tag-wahoo_2.xml b/wahoomc/resources/tag_wahoo_adjusted/tag-wahoo_2.xml similarity index 100% rename from wahoo_mc/resources/tag_wahoo_adjusted/tag-wahoo_2.xml rename to wahoomc/resources/tag_wahoo_adjusted/tag-wahoo_2.xml diff --git a/wahoo_mc/resources/tag_wahoo_initial/tag-wahoo_original.xml b/wahoomc/resources/tag_wahoo_initial/tag-wahoo_original.xml similarity index 100% rename from wahoo_mc/resources/tag_wahoo_initial/tag-wahoo_original.xml rename to wahoomc/resources/tag_wahoo_initial/tag-wahoo_original.xml diff --git a/wahoo_mc/resources/tunnel-transform.xml b/wahoomc/resources/tunnel-transform.xml similarity index 100% rename from wahoo_mc/resources/tunnel-transform.xml rename to wahoomc/resources/tunnel-transform.xml diff --git a/wahoo_mc/tooling_win/7za.dll b/wahoomc/tooling_win/7za.dll similarity index 100% rename from wahoo_mc/tooling_win/7za.dll rename to wahoomc/tooling_win/7za.dll diff --git a/wahoo_mc/tooling_win/7za.exe b/wahoomc/tooling_win/7za.exe similarity index 100% rename from wahoo_mc/tooling_win/7za.exe rename to wahoomc/tooling_win/7za.exe diff --git a/wahoo_mc/tooling_win/7zxa.dll b/wahoomc/tooling_win/7zxa.dll similarity index 100% rename from wahoo_mc/tooling_win/7zxa.dll rename to wahoomc/tooling_win/7zxa.dll diff --git a/wahoo_mc/tooling_win/Osmosis/bin/osmosis b/wahoomc/tooling_win/Osmosis/bin/osmosis similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/bin/osmosis rename to wahoomc/tooling_win/Osmosis/bin/osmosis diff --git a/wahoo_mc/tooling_win/Osmosis/bin/osmosis-extract-apidb-0.6 b/wahoomc/tooling_win/Osmosis/bin/osmosis-extract-apidb-0.6 similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/bin/osmosis-extract-apidb-0.6 rename to wahoomc/tooling_win/Osmosis/bin/osmosis-extract-apidb-0.6 diff --git a/wahoo_mc/tooling_win/Osmosis/bin/osmosis-extract-mysql-0.6 b/wahoomc/tooling_win/Osmosis/bin/osmosis-extract-mysql-0.6 similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/bin/osmosis-extract-mysql-0.6 rename to wahoomc/tooling_win/Osmosis/bin/osmosis-extract-mysql-0.6 diff --git a/wahoo_mc/tooling_win/Osmosis/bin/osmosis.bat b/wahoomc/tooling_win/Osmosis/bin/osmosis.bat similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/bin/osmosis.bat rename to wahoomc/tooling_win/Osmosis/bin/osmosis.bat diff --git a/wahoo_mc/tooling_win/Osmosis/changes.txt b/wahoomc/tooling_win/Osmosis/changes.txt similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/changes.txt rename to wahoomc/tooling_win/Osmosis/changes.txt diff --git a/wahoo_mc/tooling_win/Osmosis/config/plexus.conf b/wahoomc/tooling_win/Osmosis/config/plexus.conf similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/config/plexus.conf rename to wahoomc/tooling_win/Osmosis/config/plexus.conf diff --git a/wahoo_mc/tooling_win/Osmosis/copying.txt b/wahoomc/tooling_win/Osmosis/copying.txt similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/copying.txt rename to wahoomc/tooling_win/Osmosis/copying.txt diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/animal-sniffer-annotations-1.14.jar b/wahoomc/tooling_win/Osmosis/lib/default/animal-sniffer-annotations-1.14.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/animal-sniffer-annotations-1.14.jar rename to wahoomc/tooling_win/Osmosis/lib/default/animal-sniffer-annotations-1.14.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/checker-qual-2.5.2.jar b/wahoomc/tooling_win/Osmosis/lib/default/checker-qual-2.5.2.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/checker-qual-2.5.2.jar rename to wahoomc/tooling_win/Osmosis/lib/default/checker-qual-2.5.2.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/commons-codec-1.11.jar b/wahoomc/tooling_win/Osmosis/lib/default/commons-codec-1.11.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/commons-codec-1.11.jar rename to wahoomc/tooling_win/Osmosis/lib/default/commons-codec-1.11.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/commons-compress-1.18.jar b/wahoomc/tooling_win/Osmosis/lib/default/commons-compress-1.18.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/commons-compress-1.18.jar rename to wahoomc/tooling_win/Osmosis/lib/default/commons-compress-1.18.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/commons-csv-1.7.jar b/wahoomc/tooling_win/Osmosis/lib/default/commons-csv-1.7.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/commons-csv-1.7.jar rename to wahoomc/tooling_win/Osmosis/lib/default/commons-csv-1.7.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/commons-dbcp-1.4.jar b/wahoomc/tooling_win/Osmosis/lib/default/commons-dbcp-1.4.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/commons-dbcp-1.4.jar rename to wahoomc/tooling_win/Osmosis/lib/default/commons-dbcp-1.4.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/commons-io-2.6.jar b/wahoomc/tooling_win/Osmosis/lib/default/commons-io-2.6.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/commons-io-2.6.jar rename to wahoomc/tooling_win/Osmosis/lib/default/commons-io-2.6.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/commons-logging-1.0.4.jar b/wahoomc/tooling_win/Osmosis/lib/default/commons-logging-1.0.4.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/commons-logging-1.0.4.jar rename to wahoomc/tooling_win/Osmosis/lib/default/commons-logging-1.0.4.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/commons-pool-1.5.4.jar b/wahoomc/tooling_win/Osmosis/lib/default/commons-pool-1.5.4.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/commons-pool-1.5.4.jar rename to wahoomc/tooling_win/Osmosis/lib/default/commons-pool-1.5.4.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/error_prone_annotations-2.1.3.jar b/wahoomc/tooling_win/Osmosis/lib/default/error_prone_annotations-2.1.3.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/error_prone_annotations-2.1.3.jar rename to wahoomc/tooling_win/Osmosis/lib/default/error_prone_annotations-2.1.3.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/guava-26.0-jre.jar b/wahoomc/tooling_win/Osmosis/lib/default/guava-26.0-jre.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/guava-26.0-jre.jar rename to wahoomc/tooling_win/Osmosis/lib/default/guava-26.0-jre.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/j2objc-annotations-1.1.jar b/wahoomc/tooling_win/Osmosis/lib/default/j2objc-annotations-1.1.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/j2objc-annotations-1.1.jar rename to wahoomc/tooling_win/Osmosis/lib/default/j2objc-annotations-1.1.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/jpf-1.5.jar b/wahoomc/tooling_win/Osmosis/lib/default/jpf-1.5.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/jpf-1.5.jar rename to wahoomc/tooling_win/Osmosis/lib/default/jpf-1.5.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/jsr305-3.0.2.jar b/wahoomc/tooling_win/Osmosis/lib/default/jsr305-3.0.2.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/jsr305-3.0.2.jar rename to wahoomc/tooling_win/Osmosis/lib/default/jsr305-3.0.2.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/mapsforge.jar b/wahoomc/tooling_win/Osmosis/lib/default/mapsforge.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/mapsforge.jar rename to wahoomc/tooling_win/Osmosis/lib/default/mapsforge.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/mapsforge.jar.old b/wahoomc/tooling_win/Osmosis/lib/default/mapsforge.jar.old similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/mapsforge.jar.old rename to wahoomc/tooling_win/Osmosis/lib/default/mapsforge.jar.old diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/mysql-connector-java-8.0.12.jar b/wahoomc/tooling_win/Osmosis/lib/default/mysql-connector-java-8.0.12.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/mysql-connector-java-8.0.12.jar rename to wahoomc/tooling_win/Osmosis/lib/default/mysql-connector-java-8.0.12.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/netty-3.10.6.Final.jar b/wahoomc/tooling_win/Osmosis/lib/default/netty-3.10.6.Final.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/netty-3.10.6.Final.jar rename to wahoomc/tooling_win/Osmosis/lib/default/netty-3.10.6.Final.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-apidb-0.48.3.jar b/wahoomc/tooling_win/Osmosis/lib/default/osmosis-apidb-0.48.3.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-apidb-0.48.3.jar rename to wahoomc/tooling_win/Osmosis/lib/default/osmosis-apidb-0.48.3.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-areafilter-0.48.3.jar b/wahoomc/tooling_win/Osmosis/lib/default/osmosis-areafilter-0.48.3.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-areafilter-0.48.3.jar rename to wahoomc/tooling_win/Osmosis/lib/default/osmosis-areafilter-0.48.3.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-core-0.48.3.jar b/wahoomc/tooling_win/Osmosis/lib/default/osmosis-core-0.48.3.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-core-0.48.3.jar rename to wahoomc/tooling_win/Osmosis/lib/default/osmosis-core-0.48.3.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-dataset-0.48.3.jar b/wahoomc/tooling_win/Osmosis/lib/default/osmosis-dataset-0.48.3.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-dataset-0.48.3.jar rename to wahoomc/tooling_win/Osmosis/lib/default/osmosis-dataset-0.48.3.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-extract-0.48.3.jar b/wahoomc/tooling_win/Osmosis/lib/default/osmosis-extract-0.48.3.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-extract-0.48.3.jar rename to wahoomc/tooling_win/Osmosis/lib/default/osmosis-extract-0.48.3.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-hstore-jdbc-0.48.3.jar b/wahoomc/tooling_win/Osmosis/lib/default/osmosis-hstore-jdbc-0.48.3.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-hstore-jdbc-0.48.3.jar rename to wahoomc/tooling_win/Osmosis/lib/default/osmosis-hstore-jdbc-0.48.3.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-osm-binary-0.48.3.jar b/wahoomc/tooling_win/Osmosis/lib/default/osmosis-osm-binary-0.48.3.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-osm-binary-0.48.3.jar rename to wahoomc/tooling_win/Osmosis/lib/default/osmosis-osm-binary-0.48.3.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-pbf-0.48.3.jar b/wahoomc/tooling_win/Osmosis/lib/default/osmosis-pbf-0.48.3.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-pbf-0.48.3.jar rename to wahoomc/tooling_win/Osmosis/lib/default/osmosis-pbf-0.48.3.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-pbf2-0.48.3.jar b/wahoomc/tooling_win/Osmosis/lib/default/osmosis-pbf2-0.48.3.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-pbf2-0.48.3.jar rename to wahoomc/tooling_win/Osmosis/lib/default/osmosis-pbf2-0.48.3.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-pgsimple-0.48.3.jar b/wahoomc/tooling_win/Osmosis/lib/default/osmosis-pgsimple-0.48.3.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-pgsimple-0.48.3.jar rename to wahoomc/tooling_win/Osmosis/lib/default/osmosis-pgsimple-0.48.3.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-pgsnapshot-0.48.3.jar b/wahoomc/tooling_win/Osmosis/lib/default/osmosis-pgsnapshot-0.48.3.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-pgsnapshot-0.48.3.jar rename to wahoomc/tooling_win/Osmosis/lib/default/osmosis-pgsnapshot-0.48.3.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-replication-0.48.3.jar b/wahoomc/tooling_win/Osmosis/lib/default/osmosis-replication-0.48.3.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-replication-0.48.3.jar rename to wahoomc/tooling_win/Osmosis/lib/default/osmosis-replication-0.48.3.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-replication-http-0.48.3.jar b/wahoomc/tooling_win/Osmosis/lib/default/osmosis-replication-http-0.48.3.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-replication-http-0.48.3.jar rename to wahoomc/tooling_win/Osmosis/lib/default/osmosis-replication-http-0.48.3.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-set-0.48.3.jar b/wahoomc/tooling_win/Osmosis/lib/default/osmosis-set-0.48.3.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-set-0.48.3.jar rename to wahoomc/tooling_win/Osmosis/lib/default/osmosis-set-0.48.3.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-tagfilter-0.48.3.jar b/wahoomc/tooling_win/Osmosis/lib/default/osmosis-tagfilter-0.48.3.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-tagfilter-0.48.3.jar rename to wahoomc/tooling_win/Osmosis/lib/default/osmosis-tagfilter-0.48.3.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-tagtransform-0.48.3.jar b/wahoomc/tooling_win/Osmosis/lib/default/osmosis-tagtransform-0.48.3.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-tagtransform-0.48.3.jar rename to wahoomc/tooling_win/Osmosis/lib/default/osmosis-tagtransform-0.48.3.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-xml-0.48.3.jar b/wahoomc/tooling_win/Osmosis/lib/default/osmosis-xml-0.48.3.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/osmosis-xml-0.48.3.jar rename to wahoomc/tooling_win/Osmosis/lib/default/osmosis-xml-0.48.3.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/plexus-classworlds-2.5.2.jar b/wahoomc/tooling_win/Osmosis/lib/default/plexus-classworlds-2.5.2.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/plexus-classworlds-2.5.2.jar rename to wahoomc/tooling_win/Osmosis/lib/default/plexus-classworlds-2.5.2.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/postgis-jdbc-2.2.1.jar b/wahoomc/tooling_win/Osmosis/lib/default/postgis-jdbc-2.2.1.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/postgis-jdbc-2.2.1.jar rename to wahoomc/tooling_win/Osmosis/lib/default/postgis-jdbc-2.2.1.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/postgresql-42.2.5.jar b/wahoomc/tooling_win/Osmosis/lib/default/postgresql-42.2.5.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/postgresql-42.2.5.jar rename to wahoomc/tooling_win/Osmosis/lib/default/postgresql-42.2.5.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/protobuf-java-3.12.2.jar b/wahoomc/tooling_win/Osmosis/lib/default/protobuf-java-3.12.2.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/protobuf-java-3.12.2.jar rename to wahoomc/tooling_win/Osmosis/lib/default/protobuf-java-3.12.2.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/spring-beans-5.1.0.RELEASE.jar b/wahoomc/tooling_win/Osmosis/lib/default/spring-beans-5.1.0.RELEASE.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/spring-beans-5.1.0.RELEASE.jar rename to wahoomc/tooling_win/Osmosis/lib/default/spring-beans-5.1.0.RELEASE.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/spring-core-5.1.0.RELEASE.jar b/wahoomc/tooling_win/Osmosis/lib/default/spring-core-5.1.0.RELEASE.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/spring-core-5.1.0.RELEASE.jar rename to wahoomc/tooling_win/Osmosis/lib/default/spring-core-5.1.0.RELEASE.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/spring-jcl-5.1.0.RELEASE.jar b/wahoomc/tooling_win/Osmosis/lib/default/spring-jcl-5.1.0.RELEASE.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/spring-jcl-5.1.0.RELEASE.jar rename to wahoomc/tooling_win/Osmosis/lib/default/spring-jcl-5.1.0.RELEASE.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/spring-jdbc-5.1.0.RELEASE.jar b/wahoomc/tooling_win/Osmosis/lib/default/spring-jdbc-5.1.0.RELEASE.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/spring-jdbc-5.1.0.RELEASE.jar rename to wahoomc/tooling_win/Osmosis/lib/default/spring-jdbc-5.1.0.RELEASE.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/spring-tx-5.1.0.RELEASE.jar b/wahoomc/tooling_win/Osmosis/lib/default/spring-tx-5.1.0.RELEASE.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/spring-tx-5.1.0.RELEASE.jar rename to wahoomc/tooling_win/Osmosis/lib/default/spring-tx-5.1.0.RELEASE.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/stax2-api-4.1.jar b/wahoomc/tooling_win/Osmosis/lib/default/stax2-api-4.1.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/stax2-api-4.1.jar rename to wahoomc/tooling_win/Osmosis/lib/default/stax2-api-4.1.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/woodstox-core-5.1.0.jar b/wahoomc/tooling_win/Osmosis/lib/default/woodstox-core-5.1.0.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/woodstox-core-5.1.0.jar rename to wahoomc/tooling_win/Osmosis/lib/default/woodstox-core-5.1.0.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/xercesImpl-2.12.0.jar b/wahoomc/tooling_win/Osmosis/lib/default/xercesImpl-2.12.0.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/xercesImpl-2.12.0.jar rename to wahoomc/tooling_win/Osmosis/lib/default/xercesImpl-2.12.0.jar diff --git a/wahoo_mc/tooling_win/Osmosis/lib/default/xml-apis-1.4.01.jar b/wahoomc/tooling_win/Osmosis/lib/default/xml-apis-1.4.01.jar similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/lib/default/xml-apis-1.4.01.jar rename to wahoomc/tooling_win/Osmosis/lib/default/xml-apis-1.4.01.jar diff --git a/wahoo_mc/tooling_win/Osmosis/readme.txt b/wahoomc/tooling_win/Osmosis/readme.txt similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/readme.txt rename to wahoomc/tooling_win/Osmosis/readme.txt diff --git a/wahoo_mc/tooling_win/Osmosis/script/contrib/CreateGeometryForWays.sql b/wahoomc/tooling_win/Osmosis/script/contrib/CreateGeometryForWays.sql similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/contrib/CreateGeometryForWays.sql rename to wahoomc/tooling_win/Osmosis/script/contrib/CreateGeometryForWays.sql diff --git a/wahoo_mc/tooling_win/Osmosis/script/contrib/apidb_0.6.sql b/wahoomc/tooling_win/Osmosis/script/contrib/apidb_0.6.sql similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/contrib/apidb_0.6.sql rename to wahoomc/tooling_win/Osmosis/script/contrib/apidb_0.6.sql diff --git a/wahoo_mc/tooling_win/Osmosis/script/contrib/apidb_0.6_osmosis_xid_indexing.sql b/wahoomc/tooling_win/Osmosis/script/contrib/apidb_0.6_osmosis_xid_indexing.sql similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/contrib/apidb_0.6_osmosis_xid_indexing.sql rename to wahoomc/tooling_win/Osmosis/script/contrib/apidb_0.6_osmosis_xid_indexing.sql diff --git a/wahoo_mc/tooling_win/Osmosis/script/contrib/dump_apidb.sh b/wahoomc/tooling_win/Osmosis/script/contrib/dump_apidb.sh similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/contrib/dump_apidb.sh rename to wahoomc/tooling_win/Osmosis/script/contrib/dump_apidb.sh diff --git a/wahoo_mc/tooling_win/Osmosis/script/contrib/replicate_osm_file.sh b/wahoomc/tooling_win/Osmosis/script/contrib/replicate_osm_file.sh similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/contrib/replicate_osm_file.sh rename to wahoomc/tooling_win/Osmosis/script/contrib/replicate_osm_file.sh diff --git a/wahoo_mc/tooling_win/Osmosis/script/fix_line_endings.sh b/wahoomc/tooling_win/Osmosis/script/fix_line_endings.sh similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/fix_line_endings.sh rename to wahoomc/tooling_win/Osmosis/script/fix_line_endings.sh diff --git a/wahoo_mc/tooling_win/Osmosis/script/munin/README b/wahoomc/tooling_win/Osmosis/script/munin/README similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/munin/README rename to wahoomc/tooling_win/Osmosis/script/munin/README diff --git a/wahoo_mc/tooling_win/Osmosis/script/munin/osm_replication.conf b/wahoomc/tooling_win/Osmosis/script/munin/osm_replication.conf similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/munin/osm_replication.conf rename to wahoomc/tooling_win/Osmosis/script/munin/osm_replication.conf diff --git a/wahoo_mc/tooling_win/Osmosis/script/munin/osm_replication_lag b/wahoomc/tooling_win/Osmosis/script/munin/osm_replication_lag similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/munin/osm_replication_lag rename to wahoomc/tooling_win/Osmosis/script/munin/osm_replication_lag diff --git a/wahoo_mc/tooling_win/Osmosis/script/pgsimple_load_0.6.sql b/wahoomc/tooling_win/Osmosis/script/pgsimple_load_0.6.sql similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/pgsimple_load_0.6.sql rename to wahoomc/tooling_win/Osmosis/script/pgsimple_load_0.6.sql diff --git a/wahoo_mc/tooling_win/Osmosis/script/pgsimple_schema_0.6.sql b/wahoomc/tooling_win/Osmosis/script/pgsimple_schema_0.6.sql similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/pgsimple_schema_0.6.sql rename to wahoomc/tooling_win/Osmosis/script/pgsimple_schema_0.6.sql diff --git a/wahoo_mc/tooling_win/Osmosis/script/pgsimple_schema_0.6_action.sql b/wahoomc/tooling_win/Osmosis/script/pgsimple_schema_0.6_action.sql similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/pgsimple_schema_0.6_action.sql rename to wahoomc/tooling_win/Osmosis/script/pgsimple_schema_0.6_action.sql diff --git a/wahoo_mc/tooling_win/Osmosis/script/pgsimple_schema_0.6_bbox.sql b/wahoomc/tooling_win/Osmosis/script/pgsimple_schema_0.6_bbox.sql similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/pgsimple_schema_0.6_bbox.sql rename to wahoomc/tooling_win/Osmosis/script/pgsimple_schema_0.6_bbox.sql diff --git a/wahoo_mc/tooling_win/Osmosis/script/pgsimple_schema_0.6_linestring.sql b/wahoomc/tooling_win/Osmosis/script/pgsimple_schema_0.6_linestring.sql similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/pgsimple_schema_0.6_linestring.sql rename to wahoomc/tooling_win/Osmosis/script/pgsimple_schema_0.6_linestring.sql diff --git a/wahoo_mc/tooling_win/Osmosis/script/pgsnapshot_and_pgsimple.txt b/wahoomc/tooling_win/Osmosis/script/pgsnapshot_and_pgsimple.txt similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/pgsnapshot_and_pgsimple.txt rename to wahoomc/tooling_win/Osmosis/script/pgsnapshot_and_pgsimple.txt diff --git a/wahoo_mc/tooling_win/Osmosis/script/pgsnapshot_load_0.6.sql b/wahoomc/tooling_win/Osmosis/script/pgsnapshot_load_0.6.sql similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/pgsnapshot_load_0.6.sql rename to wahoomc/tooling_win/Osmosis/script/pgsnapshot_load_0.6.sql diff --git a/wahoo_mc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6.sql b/wahoomc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6.sql similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6.sql rename to wahoomc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6.sql diff --git a/wahoo_mc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_action.sql b/wahoomc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_action.sql similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_action.sql rename to wahoomc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_action.sql diff --git a/wahoo_mc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_bbox.sql b/wahoomc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_bbox.sql similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_bbox.sql rename to wahoomc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_bbox.sql diff --git a/wahoo_mc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_changes.sql b/wahoomc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_changes.sql similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_changes.sql rename to wahoomc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_changes.sql diff --git a/wahoo_mc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_linestring.sql b/wahoomc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_linestring.sql similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_linestring.sql rename to wahoomc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_linestring.sql diff --git a/wahoo_mc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_upgrade_4-5.sql b/wahoomc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_upgrade_4-5.sql similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_upgrade_4-5.sql rename to wahoomc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_upgrade_4-5.sql diff --git a/wahoo_mc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_upgrade_5-6.sql b/wahoomc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_upgrade_5-6.sql similarity index 100% rename from wahoo_mc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_upgrade_5-6.sql rename to wahoomc/tooling_win/Osmosis/script/pgsnapshot_schema_0.6_upgrade_5-6.sql diff --git a/wahoo_mc/tooling_win/lzma.exe b/wahoomc/tooling_win/lzma.exe similarity index 100% rename from wahoo_mc/tooling_win/lzma.exe rename to wahoomc/tooling_win/lzma.exe diff --git a/wahoo_mc/tooling_win/osmconvert.exe b/wahoomc/tooling_win/osmconvert.exe similarity index 100% rename from wahoo_mc/tooling_win/osmconvert.exe rename to wahoomc/tooling_win/osmconvert.exe diff --git a/wahoo_mc/tooling_win/osmconvert64-0.8.8p.exe b/wahoomc/tooling_win/osmconvert64-0.8.8p.exe similarity index 100% rename from wahoo_mc/tooling_win/osmconvert64-0.8.8p.exe rename to wahoomc/tooling_win/osmconvert64-0.8.8p.exe diff --git a/wahoo_mc/tooling_win/osmfilter.exe b/wahoomc/tooling_win/osmfilter.exe similarity index 100% rename from wahoo_mc/tooling_win/osmfilter.exe rename to wahoomc/tooling_win/osmfilter.exe