diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 070bcec..da276fc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -72,8 +72,8 @@ jobs:
         export PYTHONUSERBASE=${HOME}/.local
         pip install --user wheel
         pip install --user -r requirements.txt
-        ${PYTHONUSERBASE}/bin/pylint ${GITHUB_WORKSPACE}/mrmat_python_api_flask
-        PYTHONPATH=${GITHUB_WORKSPACE} python -m pytest --cov=mrmat_python_api_flask
+        ${PYTHONUSERBASE}/bin/pylint ${GITHUB_WORKSPACE}/src/python/mrmat_python_api_flask
+        PYTHONPATH=${GITHUB_WORKSPACE}/src/python python -m pytest --cov=mrmat_python_api_flask
         PYTHONPATH=${GITHUB_WORKSPACE} python -m build --wheel -n
 
     - name: Upload test results
diff --git a/.idea/mrmat-python-api-flask.iml b/.idea/mrmat-python-api-flask.iml
index 6334ba1..510d78f 100644
--- a/.idea/mrmat-python-api-flask.iml
+++ b/.idea/mrmat-python-api-flask.iml
@@ -6,7 +6,7 @@
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/mrmat_python_api_flask" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/python" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/dist" />
       <excludeFolder url="file://$MODULE_DIR$/mrmat_python_api_flask.egg-info" />
diff --git a/.idea/pylint.xml b/.idea/pylint.xml
index 161503e..46ea4e7 100644
--- a/.idea/pylint.xml
+++ b/.idea/pylint.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="PylintConfigService">
-    <option name="customPylintPath" value="C:\Users\imfeldma\var\venv\mrmat-python-api-flask\Scripts\pylint.exe" />
     <option name="pylintrcPath" value=".pylintrc" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/docker__nostromo_.xml b/.idea/runConfigurations/docker__nostromo_.xml
deleted file mode 100644
index 94c0d6f..0000000
--- a/.idea/runConfigurations/docker__nostromo_.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="docker (nostromo)" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="mrmat-python-api-flask:0.0.1" />
-        <option name="containerName" value="mrmat-python-api-flask" />
-        <option name="contextFolderPath" value="." />
-        <option name="portBindings">
-          <list>
-            <DockerPortBindingImpl>
-              <option name="containerPort" value="8080" />
-              <option name="hostIp" value="127.0.0.1" />
-              <option name="hostPort" value="10080" />
-            </DockerPortBindingImpl>
-          </list>
-        </option>
-        <option name="sourceFilePath" value="var/docker/Dockerfile" />
-        <option name="volumeBindings">
-          <list>
-            <DockerVolumeBindingImpl>
-              <option name="containerPath" value="/app/instance" />
-              <option name="hostPath" value="/opt/dyn/mrmat-python-api-flask" />
-            </DockerVolumeBindingImpl>
-          </list>
-        </option>
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/lint.xml b/.idea/runConfigurations/lint.xml
new file mode 100644
index 0000000..ed038d7
--- /dev/null
+++ b/.idea/runConfigurations/lint.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="lint" type="PythonConfigurationType" factoryName="Python">
+    <module name="mrmat-python-api-flask" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="pylint" />
+    <option name="PARAMETERS" value="src/python/mrmat_python_api_flask" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="true" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/mrmat_python_api_flask__local_infrastructure_.xml b/.idea/runConfigurations/mrmat_python_api_flask__local_infrastructure_.xml
index 7cbd771..74625bb 100644
--- a/.idea/runConfigurations/mrmat_python_api_flask__local_infrastructure_.xml
+++ b/.idea/runConfigurations/mrmat_python_api_flask__local_infrastructure_.xml
@@ -8,7 +8,9 @@
     <option name="PARENT_ENVS" value="true" />
     <envs>
       <env name="APP_CONFIG" value="$USER_HOME$/etc/mpaf-local.json" />
+      <env name="FLASK_APP" value="mrmat_python_api_flask" />
       <env name="HTTPLIB2_CA_CERTS" value="$USER_HOME$/var/ca/mrmat-ca/ca.crt" />
+      <env name="FLASK_ENV" value="production" />
     </envs>
     <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
diff --git a/.idea/runConfigurations/mrmat_python_api_flask__no_infrastructure_.xml b/.idea/runConfigurations/mrmat_python_api_flask__no_infrastructure_.xml
index b30fe57..1064238 100644
--- a/.idea/runConfigurations/mrmat_python_api_flask__no_infrastructure_.xml
+++ b/.idea/runConfigurations/mrmat_python_api_flask__no_infrastructure_.xml
@@ -5,6 +5,10 @@
     <option name="targetType" value="PYTHON" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="FLASK_APP" value="mrmat_python_api_flask" />
+      <env name="FLASK_ENV" value="development" />
+    </envs>
     <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="IS_MODULE_SDK" value="true" />
diff --git a/.idea/runConfigurations/mrmat_python_api_flask__no_infrastructure__debug_.xml b/.idea/runConfigurations/mrmat_python_api_flask__no_infrastructure__debug_.xml
index b5d7e44..1e68fed 100644
--- a/.idea/runConfigurations/mrmat_python_api_flask__no_infrastructure__debug_.xml
+++ b/.idea/runConfigurations/mrmat_python_api_flask__no_infrastructure__debug_.xml
@@ -6,6 +6,11 @@
     <option name="targetType" value="PYTHON" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="FLASK_APP" value="mrmat_python_api_flask" />
+      <env name="FLASK_ENV" value="development" />
+      <env name="FLASK_DEBUG" value="1" />
+    </envs>
     <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="IS_MODULE_SDK" value="true" />
diff --git a/README.md b/README.md
index 4d607ad..7e60e01 100644
--- a/README.md
+++ b/README.md
@@ -84,8 +84,8 @@ You have the choice of running this
 You can, of course, run this as a Flask app straight from the project directory:
 
 ```shell
-$ export FLASK_APP=mrmat_python_api_flask
-$ flask run
+$ cd src/python
+$ FLASK_APP=mrmat_python_api_flask flask run
  * Serving Flask app 'mrmat_python_api_flask' (lazy loading)
  * Environment: production
    WARNING: This is a development server. Do not use it in a production deployment.
diff --git a/requirements.txt b/requirements.txt
index d37b27b..fc8ec84 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,21 +5,21 @@
 
 # Build/Test requirements
 
-build~=0.7.0             # MIT
+build~=0.8.0             # MIT
 wheel~=0.37.1            # MIT
-pylint~=2.12.2           # GPL-2.0-or-later
-pytest~=7.0.1            # MIT
+pylint~=2.14.5           # GPL-2.0-or-later
+pytest~=7.1.2            # MIT
 pytest-cov~=3.0.0        # MIT
-pyjwt~=2.3.0             # MIT
-python-keycloak~=0.27.0  # MIT
+pyjwt~=2.4.0             # MIT
+python-keycloak~=2.1.1  # MIT
 
 # Runtime requirements
 
-rich~=11.2.0                    # MIT
-Flask~=2.0.3                    # BSD 3-Clause
+rich~=12.5.1                    # MIT
+Flask~=2.1.3                    # BSD 3-Clause
 Flask-SQLAlchemy~=2.5.1         # BSD 3-Clause
 Flask-Migrate~=3.1.0            # MIT
-flask-smorest~=0.37.0           # MIT
+flask-smorest~=0.38.1           # MIT
 Flask-Marshmallow~=0.14.0       # MIT
 marshmallow-sqlalchemy~=0.27.0  # MIT
 psycopg2-binary~=2.9.3          # LGPL with exceptions
diff --git a/setup.cfg b/setup.cfg
index 7185e4a..433c54a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,7 +14,10 @@ classifiers =
     Programming Language :: Python :: 3.9
 
 [options]
+package_dir =
+    =src/python
 packages = find:
+include_package_data = True
 install_requires =
     rich~=11.2.0
     Flask~=2.0.3
@@ -34,5 +37,10 @@ console_scripts =
     mrmat-python-api-flask-client = mrmat_python_api_flask.client:main
 
 [options.packages.find]
+where=src/python
 exclude =
     ci
+
+[options.package_data]
+mrmat_python_api_flask.migrations =
+    *
diff --git a/mrmat_python_api_flask/__init__.py b/src/python/mrmat_python_api_flask/__init__.py
similarity index 97%
rename from mrmat_python_api_flask/__init__.py
rename to src/python/mrmat_python_api_flask/__init__.py
index 863e83c..0ddd4f0 100644
--- a/mrmat_python_api_flask/__init__.py
+++ b/src/python/mrmat_python_api_flask/__init__.py
@@ -99,11 +99,11 @@ def format(self, record):
 try:
     __version__ = importlib.metadata.version('mrmat-python-api-flask')
 except importlib.metadata.PackageNotFoundError:
-    # You have not actually installed the wheel yet. We may be within CI so pick that version or fall back
-    __version__ = os.environ.get('MRMAT_VERSION', '0.0.0.dev0')
+    # You have not yet installed this as a package, likely because you're hacking on it in some IDE
+    __version__ = '0.0.0.dev0'
 
 #
-# Initialise supporting services
+# Initialize supporting services
 
 db = SQLAlchemy()
 ma = Marshmallow()
diff --git a/mrmat_python_api_flask/apis/__init__.py b/src/python/mrmat_python_api_flask/apis/__init__.py
similarity index 100%
rename from mrmat_python_api_flask/apis/__init__.py
rename to src/python/mrmat_python_api_flask/apis/__init__.py
diff --git a/mrmat_python_api_flask/apis/greeting/__init__.py b/src/python/mrmat_python_api_flask/apis/greeting/__init__.py
similarity index 100%
rename from mrmat_python_api_flask/apis/greeting/__init__.py
rename to src/python/mrmat_python_api_flask/apis/greeting/__init__.py
diff --git a/mrmat_python_api_flask/apis/greeting/v1/__init__.py b/src/python/mrmat_python_api_flask/apis/greeting/v1/__init__.py
similarity index 100%
rename from mrmat_python_api_flask/apis/greeting/v1/__init__.py
rename to src/python/mrmat_python_api_flask/apis/greeting/v1/__init__.py
diff --git a/mrmat_python_api_flask/apis/greeting/v1/api.py b/src/python/mrmat_python_api_flask/apis/greeting/v1/api.py
similarity index 100%
rename from mrmat_python_api_flask/apis/greeting/v1/api.py
rename to src/python/mrmat_python_api_flask/apis/greeting/v1/api.py
diff --git a/mrmat_python_api_flask/apis/greeting/v1/model.py b/src/python/mrmat_python_api_flask/apis/greeting/v1/model.py
similarity index 100%
rename from mrmat_python_api_flask/apis/greeting/v1/model.py
rename to src/python/mrmat_python_api_flask/apis/greeting/v1/model.py
diff --git a/mrmat_python_api_flask/apis/greeting/v2/__init__.py b/src/python/mrmat_python_api_flask/apis/greeting/v2/__init__.py
similarity index 100%
rename from mrmat_python_api_flask/apis/greeting/v2/__init__.py
rename to src/python/mrmat_python_api_flask/apis/greeting/v2/__init__.py
diff --git a/mrmat_python_api_flask/apis/greeting/v2/api.py b/src/python/mrmat_python_api_flask/apis/greeting/v2/api.py
similarity index 100%
rename from mrmat_python_api_flask/apis/greeting/v2/api.py
rename to src/python/mrmat_python_api_flask/apis/greeting/v2/api.py
diff --git a/mrmat_python_api_flask/apis/greeting/v2/model.py b/src/python/mrmat_python_api_flask/apis/greeting/v2/model.py
similarity index 100%
rename from mrmat_python_api_flask/apis/greeting/v2/model.py
rename to src/python/mrmat_python_api_flask/apis/greeting/v2/model.py
diff --git a/mrmat_python_api_flask/apis/greeting/v3/__init__.py b/src/python/mrmat_python_api_flask/apis/greeting/v3/__init__.py
similarity index 100%
rename from mrmat_python_api_flask/apis/greeting/v3/__init__.py
rename to src/python/mrmat_python_api_flask/apis/greeting/v3/__init__.py
diff --git a/mrmat_python_api_flask/apis/greeting/v3/api.py b/src/python/mrmat_python_api_flask/apis/greeting/v3/api.py
similarity index 100%
rename from mrmat_python_api_flask/apis/greeting/v3/api.py
rename to src/python/mrmat_python_api_flask/apis/greeting/v3/api.py
diff --git a/mrmat_python_api_flask/apis/greeting/v3/model.py b/src/python/mrmat_python_api_flask/apis/greeting/v3/model.py
similarity index 100%
rename from mrmat_python_api_flask/apis/greeting/v3/model.py
rename to src/python/mrmat_python_api_flask/apis/greeting/v3/model.py
diff --git a/mrmat_python_api_flask/apis/healthz/__init__.py b/src/python/mrmat_python_api_flask/apis/healthz/__init__.py
similarity index 100%
rename from mrmat_python_api_flask/apis/healthz/__init__.py
rename to src/python/mrmat_python_api_flask/apis/healthz/__init__.py
diff --git a/mrmat_python_api_flask/apis/healthz/api.py b/src/python/mrmat_python_api_flask/apis/healthz/api.py
similarity index 100%
rename from mrmat_python_api_flask/apis/healthz/api.py
rename to src/python/mrmat_python_api_flask/apis/healthz/api.py
diff --git a/mrmat_python_api_flask/apis/resource/__init__.py b/src/python/mrmat_python_api_flask/apis/resource/__init__.py
similarity index 100%
rename from mrmat_python_api_flask/apis/resource/__init__.py
rename to src/python/mrmat_python_api_flask/apis/resource/__init__.py
diff --git a/mrmat_python_api_flask/apis/resource/v1/__init__.py b/src/python/mrmat_python_api_flask/apis/resource/v1/__init__.py
similarity index 100%
rename from mrmat_python_api_flask/apis/resource/v1/__init__.py
rename to src/python/mrmat_python_api_flask/apis/resource/v1/__init__.py
diff --git a/mrmat_python_api_flask/apis/resource/v1/api.py b/src/python/mrmat_python_api_flask/apis/resource/v1/api.py
similarity index 100%
rename from mrmat_python_api_flask/apis/resource/v1/api.py
rename to src/python/mrmat_python_api_flask/apis/resource/v1/api.py
diff --git a/mrmat_python_api_flask/apis/resource/v1/model.py b/src/python/mrmat_python_api_flask/apis/resource/v1/model.py
similarity index 100%
rename from mrmat_python_api_flask/apis/resource/v1/model.py
rename to src/python/mrmat_python_api_flask/apis/resource/v1/model.py
diff --git a/mrmat_python_api_flask/client.py b/src/python/mrmat_python_api_flask/client.py
similarity index 100%
rename from mrmat_python_api_flask/client.py
rename to src/python/mrmat_python_api_flask/client.py
diff --git a/mrmat_python_api_flask/cui.py b/src/python/mrmat_python_api_flask/cui.py
similarity index 100%
rename from mrmat_python_api_flask/cui.py
rename to src/python/mrmat_python_api_flask/cui.py
diff --git a/migrations/README b/src/python/mrmat_python_api_flask/migrations/README
similarity index 100%
rename from migrations/README
rename to src/python/mrmat_python_api_flask/migrations/README
diff --git a/migrations/alembic.ini b/src/python/mrmat_python_api_flask/migrations/alembic.ini
similarity index 100%
rename from migrations/alembic.ini
rename to src/python/mrmat_python_api_flask/migrations/alembic.ini
diff --git a/migrations/env.py b/src/python/mrmat_python_api_flask/migrations/env.py
similarity index 100%
rename from migrations/env.py
rename to src/python/mrmat_python_api_flask/migrations/env.py
diff --git a/migrations/script.py.mako b/src/python/mrmat_python_api_flask/migrations/script.py.mako
similarity index 100%
rename from migrations/script.py.mako
rename to src/python/mrmat_python_api_flask/migrations/script.py.mako
diff --git a/migrations/versions/2c4268119c7e_initial.py b/src/python/mrmat_python_api_flask/migrations/versions/2c4268119c7e_initial.py
similarity index 100%
rename from migrations/versions/2c4268119c7e_initial.py
rename to src/python/mrmat_python_api_flask/migrations/versions/2c4268119c7e_initial.py
diff --git a/mrmat_python_api_flask/templates/swagger-ui-redirect.html b/src/python/mrmat_python_api_flask/templates/swagger-ui-redirect.html
similarity index 100%
rename from mrmat_python_api_flask/templates/swagger-ui-redirect.html
rename to src/python/mrmat_python_api_flask/templates/swagger-ui-redirect.html
diff --git a/tests/conftest.py b/tests/conftest.py
index b4f2874..884b689 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -90,7 +90,12 @@ def app(self):
             'SECRET_KEY': secrets.token_hex(16)
         })
         with self._app.app_context():
-            upgrade(directory=os.path.join(os.path.dirname(__file__), '..', 'migrations'))
+            upgrade(directory=os.path.join(os.path.dirname(__file__),
+                                           '..',
+                                           'src',
+                                           'python',
+                                           'mrmat_python_api_flask',
+                                           'migrations'))
             db.create_all()
         yield self._app