diff --git a/Makefile b/amcr_viewer/Makefile
similarity index 100%
rename from Makefile
rename to amcr_viewer/Makefile
diff --git a/__init__.py b/amcr_viewer/__init__.py
similarity index 100%
rename from __init__.py
rename to amcr_viewer/__init__.py
diff --git a/amcr_codelists.py b/amcr_viewer/amcr_codelists.py
similarity index 100%
rename from amcr_codelists.py
rename to amcr_viewer/amcr_codelists.py
diff --git a/amcr_dialog.py b/amcr_viewer/amcr_dialog.py
similarity index 100%
rename from amcr_dialog.py
rename to amcr_viewer/amcr_dialog.py
diff --git a/amcr_tools.py b/amcr_viewer/amcr_tools.py
similarity index 100%
rename from amcr_tools.py
rename to amcr_viewer/amcr_tools.py
diff --git a/amcr_viewer.py b/amcr_viewer/amcr_viewer.py
similarity index 100%
rename from amcr_viewer.py
rename to amcr_viewer/amcr_viewer.py
diff --git a/amcr_viewer_dialog.py b/amcr_viewer/amcr_viewer_dialog.py
similarity index 100%
rename from amcr_viewer_dialog.py
rename to amcr_viewer/amcr_viewer_dialog.py
diff --git a/amcr_viewer_dialog_base.ui b/amcr_viewer/amcr_viewer_dialog_base.ui
similarity index 100%
rename from amcr_viewer_dialog_base.ui
rename to amcr_viewer/amcr_viewer_dialog_base.ui
diff --git a/codelists/heslar.csv b/amcr_viewer/codelists/heslar.csv
similarity index 100%
rename from codelists/heslar.csv
rename to amcr_viewer/codelists/heslar.csv
diff --git a/download.png b/amcr_viewer/download.png
similarity index 100%
rename from download.png
rename to amcr_viewer/download.png
diff --git a/i18n/af.ts b/amcr_viewer/i18n/af.ts
similarity index 100%
rename from i18n/af.ts
rename to amcr_viewer/i18n/af.ts
diff --git a/info.png b/amcr_viewer/info.png
similarity index 100%
rename from info.png
rename to amcr_viewer/info.png
diff --git a/metadata.txt b/amcr_viewer/metadata.txt
similarity index 100%
rename from metadata.txt
rename to amcr_viewer/metadata.txt
diff --git a/pb_tool.cfg b/amcr_viewer/pb_tool.cfg
similarity index 100%
rename from pb_tool.cfg
rename to amcr_viewer/pb_tool.cfg
diff --git a/plugin_upload.py b/amcr_viewer/plugin_upload.py
similarity index 100%
rename from plugin_upload.py
rename to amcr_viewer/plugin_upload.py
diff --git a/pylintrc b/amcr_viewer/pylintrc
similarity index 100%
rename from pylintrc
rename to amcr_viewer/pylintrc
diff --git a/resources.py b/amcr_viewer/resources.py
similarity index 100%
rename from resources.py
rename to amcr_viewer/resources.py
diff --git a/resources.qrc b/amcr_viewer/resources.qrc
similarity index 100%
rename from resources.qrc
rename to amcr_viewer/resources.qrc
diff --git a/scripts/compile-strings.sh b/amcr_viewer/scripts/compile-strings.sh
similarity index 100%
rename from scripts/compile-strings.sh
rename to amcr_viewer/scripts/compile-strings.sh
diff --git a/scripts/run-env-linux.sh b/amcr_viewer/scripts/run-env-linux.sh
similarity index 100%
rename from scripts/run-env-linux.sh
rename to amcr_viewer/scripts/run-env-linux.sh
diff --git a/scripts/update-strings.sh b/amcr_viewer/scripts/update-strings.sh
similarity index 100%
rename from scripts/update-strings.sh
rename to amcr_viewer/scripts/update-strings.sh
diff --git a/test/__init__.py b/amcr_viewer/test/__init__.py
similarity index 100%
rename from test/__init__.py
rename to amcr_viewer/test/__init__.py
diff --git a/test/qgis_interface.py b/amcr_viewer/test/qgis_interface.py
similarity index 100%
rename from test/qgis_interface.py
rename to amcr_viewer/test/qgis_interface.py
diff --git a/test/tenbytenraster.asc b/amcr_viewer/test/tenbytenraster.asc
similarity index 100%
rename from test/tenbytenraster.asc
rename to amcr_viewer/test/tenbytenraster.asc
diff --git a/test/tenbytenraster.asc.aux.xml b/amcr_viewer/test/tenbytenraster.asc.aux.xml
similarity index 100%
rename from test/tenbytenraster.asc.aux.xml
rename to amcr_viewer/test/tenbytenraster.asc.aux.xml
diff --git a/test/tenbytenraster.keywords b/amcr_viewer/test/tenbytenraster.keywords
similarity index 100%
rename from test/tenbytenraster.keywords
rename to amcr_viewer/test/tenbytenraster.keywords
diff --git a/test/tenbytenraster.lic b/amcr_viewer/test/tenbytenraster.lic
similarity index 100%
rename from test/tenbytenraster.lic
rename to amcr_viewer/test/tenbytenraster.lic
diff --git a/test/tenbytenraster.prj b/amcr_viewer/test/tenbytenraster.prj
similarity index 100%
rename from test/tenbytenraster.prj
rename to amcr_viewer/test/tenbytenraster.prj
diff --git a/test/tenbytenraster.qml b/amcr_viewer/test/tenbytenraster.qml
similarity index 100%
rename from test/tenbytenraster.qml
rename to amcr_viewer/test/tenbytenraster.qml
diff --git a/test/test_amcr_viewer_dialog.py b/amcr_viewer/test/test_amcr_viewer_dialog.py
similarity index 100%
rename from test/test_amcr_viewer_dialog.py
rename to amcr_viewer/test/test_amcr_viewer_dialog.py
diff --git a/test/test_init.py b/amcr_viewer/test/test_init.py
similarity index 100%
rename from test/test_init.py
rename to amcr_viewer/test/test_init.py
diff --git a/test/test_qgis_environment.py b/amcr_viewer/test/test_qgis_environment.py
similarity index 100%
rename from test/test_qgis_environment.py
rename to amcr_viewer/test/test_qgis_environment.py
diff --git a/test/test_resources.py b/amcr_viewer/test/test_resources.py
similarity index 100%
rename from test/test_resources.py
rename to amcr_viewer/test/test_resources.py
diff --git a/test/test_translations.py b/amcr_viewer/test/test_translations.py
similarity index 100%
rename from test/test_translations.py
rename to amcr_viewer/test/test_translations.py
diff --git a/test/utilities.py b/amcr_viewer/test/utilities.py
similarity index 100%
rename from test/utilities.py
rename to amcr_viewer/test/utilities.py