diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 070bcec..f92b3b3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ name: Build
 env:
   MAJOR: 0
   MINOR: 0
-  PYTHON_VERSION: 3.10.1
+  PYTHON_VERSION: 3.11.0
 
 #
 # Establish when the workflow is run
@@ -44,7 +44,7 @@ jobs:
     - name: Calculate Build Context
       run: |
         MRMAT_VERSION="${MAJOR}.${MINOR}.${GITHUB_RUN_NUMBER}"
-        if [ "$GITHUB_EVENT_NAME" == 'pull_request_target' && GITHUB_BASE_REF == 'main']; then
+        if [ "$GITHUB_EVENT_NAME" == 'pull_request_target' -a "$GITHUB_BASE_REF" == 'main' ]; then
           MRMAT_IS_RELEASE=true
           echo "::warning ::Building release ${MRMAT_VERSION}"
           echo "MRMAT_IS_RELEASE=true" >> $GITHUB_ENV
@@ -69,12 +69,10 @@ jobs:
 
     - name: Build
       run: |
-        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
-        PYTHONPATH=${GITHUB_WORKSPACE} python -m build --wheel -n
+        pylint ${GITHUB_WORKSPACE}/src/python/mrmat_python_api_flask
+        PYTHONPATH=${GITHUB_WORKSPACE}/src/python python -m pytest
+        python -m build --wheel -n  
 
     - name: Upload test results
       uses: actions/upload-artifact@v2
diff --git a/.gitignore b/.gitignore
index ba552da..0557764 100644
--- a/.gitignore
+++ b/.gitignore
@@ -159,10 +159,6 @@ coverage.xml
 .pytest_cache/
 pytestdebug.log
 
-# Translations
-*.mo
-*.pot
-
 # Django stuff:
 *.log
 local_settings.py
@@ -245,6 +241,3 @@ dmypy.json
 .prof
 
 # End of https://www.toptal.com/developers/gitignore/api/jetbrains,python
-
-
-.coverage
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4ea37de..71f34c9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (mrmat-python-api-flask)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (mrmat-python-api-flask)" project-jdk-type="Python SDK" />
   <component name="VagrantProjectSettings">
     <option name="instanceFolder" value="" />
     <option name="provider" value="" />
diff --git a/.idea/mrmat-python-api-flask.iml b/.idea/mrmat-python-api-flask.iml
index 6334ba1..38dee3a 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" />
@@ -18,7 +18,7 @@
       <excludeFolder url="file://$MODULE_DIR$/instance" />
       <excludeFolder url="file://$MODULE_DIR$/tests/build" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.10 (mrmat-python-api-flask)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.11 (mrmat-python-api-flask)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyBDDFrameworkConfig">
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/.pylintrc b/.pylintrc
index d735031..89e53ac 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -146,6 +146,7 @@ disable=abstract-method,
         wrong-import-order,
         xrange-builtin,
         zip-builtin-not-iterating,
+        missing-module-docstring
 
 
 [REPORTS]
@@ -155,12 +156,6 @@ disable=abstract-method,
 # mypackage.mymodule.MyReporterClass.
 output-format=text
 
-# Put messages in a separate file for each module / package specified on the
-# command line instead of printing them on stdout. Reports (if any) will be
-# written in a file name "pylint_global.[txt|html]". This option is deprecated
-# and it will be removed in Pylint 2.0.
-files-output=no
-
 # Tells whether to display a full report or only the messages
 reports=no
 
@@ -279,12 +274,6 @@ ignore-long-lines=(?x)(
 # else.
 single-line-if-stmt=yes
 
-# List of optional constructs for which whitespace checking is disabled. `dict-
-# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
-# `trailing-comma` allows a space between comma and closing bracket: (a, ).
-# `empty-line` allows space-only lines.
-no-space-check=
-
 # Maximum number of lines in a module
 max-module-lines=99999
 
diff --git a/LICENSE b/LICENSE
index 24158cc..263a877 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 MrMatOrg
+Copyright (c) 2021 Mathieu Imfeld
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index 877ed7d..0000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# If and when we have templates or static content, graft it here
-#graft mrmat_python_api_flask/templates
-#graft mrmat_python_api_flask/static
-global-exclude *.pyc
diff --git a/README.md b/README.md
index e33ea1e..3891936 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # MrMat :: Python :: API :: Flask
 
-[![Build](https://github.com/MrMatOrg/mrmat-python-api-flask/actions/workflows/build.yml/badge.svg)](https://github.com/MrMatOrg/mrmat-python-api-flask/actions/workflows/build.yml)
+[![Build](https://github.com/MrMatAP/mrmat-python-api-flask/actions/workflows/build.yml/badge.svg)](https://github.com/MrMatAP/mrmat-python-api-flask/actions/workflows/build.yml)
 
 Boilerplate (and playground) for a code-first Python Flask API, with all the bells and whistles we've come to expect:
 
@@ -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.
@@ -355,4 +355,4 @@ following form. The DISCOVERY_URL must point to the URL where the IdP publishes
 }
 ```
 
->The client requires configuration with OIDC secrets and currently implements the Device code flow
+>The client requires configuration with OIDC secrets and currently implements the Device code flow 
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000..edfa253
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,13 @@
+# Security Policy
+
+## Supported Versions
+
+I'd be surprised if you'd want support for this. But be my guest raising an issue...
+
+| Version | Supported          |
+| ------- | ------------------ |
+| all     | :white_check_mark: |
+
+## Reporting a Vulnerability
+
+Raise an issue straight on this repository.
diff --git a/pyproject.toml b/pyproject.toml
index 7e01ab2..c7ad76f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,70 @@
 [build-system]
-requires = ['setuptools', 'wheel']
+requires = [
+    'setuptools>=42.0.0',
+    'wheel >= 0.36.0',
+    'pylint~=2.15.5',           # MIT
+    'pytest~=7.2.0',            # GPL-2.0-or-later
+    'pytest-cov~=4.0.0',        # MIT
+    'pyjwt~=2.6.0',             # MIT
+    'python-keycloak~=2.6.0'  # MIT
+]
 build-backend = 'setuptools.build_meta'
+
+[project]
+name = "mrmat-python-api-flask"
+description = "Boilerplate code for an API using Flask"
+urls = { "Sources" = "https://github.com/MrMatAP/mrmat-python-api-flask" }
+keywords = ["experimental"]
+readme = "README.md"
+license = { text = "MIT" }
+authors = [
+    { "name" = "Mathieu Imfeld", "email" = "imfeldma+9jqerw@gmail.com" }
+]
+maintainers = [
+    { "name" = "Mathieu Imfeld", "email" = "imfeldma+9jqerw@gmail.com" }
+]
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "License :: OSI Approved :: MIT",
+    "Programming Language :: Python :: 3.11"
+]
+requires-python = ">=3.10"
+dependencies = [
+    "rich~=12.6.0",
+    "Flask~=2.2.2",
+    "Flask-SQLAlchemy~=3.0.2",
+    "Flask-Migrate~=4.0.0",
+    "flask-smorest~=0.40.0",
+    "Flask-Marshmallow~=0.14.0",
+    "marshmallow-sqlalchemy~=0.28.1",
+    "psycopg2-binary~=2.9.5",
+    "Flask-OIDC~=1.4.0"
+]
+dynamic = ["version"]
+
+[tool.setuptools.dynamic]
+version = { attr = "ci.version "}
+
+[tool.setuptools.packages.find]
+where = ["src/python"]
+include = ["mrmat_python_api_flask*"]
+namespaces = true
+
+[tool.setuptools.package-data]
+"*" = ["*.mo", "migrations/*", "templates/*", "static/*"]
+
+[project.scripts]
+mrmat-python-api-flask = "mrmat_python_api_flask.cui:main"
+mrmat-python-api-flask-client = "mrmat_python_api_flask.client:main"
+
+# If you are debugging your tests using PyCharm then comment out the coverage options
+# in addopts
+[tool.pytest.ini_options]
+minversion = "6.0"
+addopts = "--cov=mrmat_python_api_flask --cov-report=term --cov-report=xml:build/coverage.xml --junit-xml=build/junit.xml"
+testpaths = ["tests"]
+junit_family = "xunit2"
+log_cli = 1
+log_cli_level = "INFO"
+log_cli_format = "%(asctime)s [%(levelname)8s] %(message)s (%(filename)s:%(lineno)s)"
+log_cli_date_format="%Y-%m-%d %H:%M:%S"
diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644
index f589022..0000000
--- a/pytest.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# If you are debugging your tests using PyCharm then comment out the coverage options
-# in addopts
-
-[pytest]
-testpaths = tests
-addopts = --cov=mrmat_python_api_flask --cov-report=term --cov-report=xml:build/coverage.xml --junit-xml=build/junit.xml
-junit_family = xunit2
-log_cli = 1
-log_cli_level = INFO
-log_cli_format = %(asctime)s [%(levelname)8s] %(message)s (%(filename)s:%(lineno)s)
-log_cli_date_format=%Y-%m-%d %H:%M:%S
diff --git a/requirements.txt b/requirements.txt
index d37b27b..93e5063 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,24 +5,27 @@
 
 # Build/Test requirements
 
-build~=0.7.0             # MIT
-wheel~=0.37.1            # MIT
-pylint~=2.12.2           # GPL-2.0-or-later
-pytest~=7.0.1            # MIT
-pytest-cov~=3.0.0        # MIT
-pyjwt~=2.3.0             # MIT
-python-keycloak~=0.27.0  # MIT
+setuptools>=42.0.0
+build>=0.9.0             # MIT
+wheel>=0.36.0            # MIT
+pylint~=2.15.5           # MIT
+pytest~=7.2.0            # GPL-2.0-or-later
+pytest-cov~=4.0.0        # MIT
+pyjwt~=2.6.0             # MIT
+python-keycloak~=2.6.0   # MIT
 
 # Runtime requirements
 
-rich~=11.2.0                    # MIT
-Flask~=2.0.3                    # BSD 3-Clause
-Flask-SQLAlchemy~=2.5.1         # BSD 3-Clause
-Flask-Migrate~=3.1.0            # MIT
-flask-smorest~=0.37.0           # MIT
+rich~=12.6.0                    # MIT
+Flask~=2.2.2                    # BSD 3-Clause
+Flask-SQLAlchemy~=3.0.2         # BSD 3-Clause
+Flask-Migrate~=4.0.0            # MIT
+flask-smorest~=0.40.0           # MIT
 Flask-Marshmallow~=0.14.0       # MIT
-marshmallow-sqlalchemy~=0.27.0  # MIT
-psycopg2-binary~=2.9.3          # LGPL with exceptions
+marshmallow-sqlalchemy~=0.28.1  # MIT
+psycopg2-binary~=2.9.5          # LGPL with exceptions
 Flask-OIDC~=1.4.0               # MIT
-requests_oauthlib~=1.3.1        # ISC
+
+# Do we need these?
+#requests_oauthlib~=1.3.1        # ISC
 itsdangerous<=2.0.1             # BSD 3-Clause      Must affix so JSONWebSignatureSerializer is known
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 7185e4a..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-[metadata]
-name = mrmat-python-api-flask
-version = attr: ci.version
-author = Mathieu Imfeld
-author_email = imfeldma+9jqerw@gmail.com
-maintainer = Mathieu Imfeld
-maintainer_email = imfeldma+9jqerw@gmail.com
-long_description = file: README.md
-license = MIT
-url = https://github.com/MrMatOrg/mrmat-python-api-flask
-classifiers =
-    Development Status :: 3 - Alpha
-    License :: OSI Approved :: MIT
-    Programming Language :: Python :: 3.9
-
-[options]
-packages = find:
-install_requires =
-    rich~=11.2.0
-    Flask~=2.0.3
-    Flask-SQLAlchemy~=2.5.1
-    Flask-Migrate~=3.1.0
-    flask-smorest~=0.37.0
-    Flask-Marshmallow~=0.14.0
-    marshmallow-sqlalchemy~=0.27.0
-    psycopg2-binary~=2.9.3
-    Flask-OIDC~=1.4.0
-    requests_oauthlib~=1.3.1
-    itsdangerous<=2.0.1
-
-[options.entry_points]
-console_scripts =
-    mrmat-python-api-flask = mrmat_python_api_flask.cui:main
-    mrmat-python-api-flask-client = mrmat_python_api_flask.client:main
-
-[options.packages.find]
-exclude =
-    ci
diff --git a/ci/__init__.py b/src/python/ci/__init__.py
similarity index 100%
rename from ci/__init__.py
rename to src/python/ci/__init__.py
diff --git a/mrmat_python_api_flask/__init__.py b/src/python/mrmat_python_api_flask/__init__.py
similarity index 81%
rename from mrmat_python_api_flask/__init__.py
rename to src/python/mrmat_python_api_flask/__init__.py
index 863e83c..50e0baf 100644
--- a/mrmat_python_api_flask/__init__.py
+++ b/src/python/mrmat_python_api_flask/__init__.py
@@ -25,6 +25,7 @@
 
 import sys
 import os
+import json
 import logging.config
 import secrets
 import importlib.metadata
@@ -37,57 +38,6 @@
 from flask_oidc import OpenIDConnect
 from flask_smorest import Api
 
-
-#
-# Establish consistent logging
-# The logger we obtain here is an operational logger, not the one logging requests. The former uses the matching
-# logger '__name__', the latter uses 'werkzeug'
-
-
-class RequestFormatter(logging.Formatter):
-    """
-    Formatter for requests
-    """
-    def format(self, record):
-        if has_request_context():
-            record.blueprint = request.blueprint
-            record.url = request.full_path
-            record.remote_addr = request.remote_addr
-            record.user_agent = request.user_agent
-        else:
-            record.url = None
-            record.remote_addr = None
-        return super().format(record)
-
-
-logging.config.dictConfig({
-    'version': 1,
-    'formatters': {
-        'default': {
-            'class': 'logging.Formatter',
-            'format': '%(asctime)s %(name)-22s %(levelname)-8s %(message)s'
-        }
-    },
-    'handlers': {
-        'console': {
-            'class': 'logging.StreamHandler',
-            'level': 'INFO',
-            'formatter': 'default'
-        }
-    },
-    'loggers': {
-        __name__: {
-            'level': 'INFO',
-            'handlers': ['console'],
-            'propagate': False
-        }
-    },
-    'root': {
-        'level': 'INFO',
-        'formatter': 'default',
-        'handlers': ['console']
-    }
-})
 log = logging.getLogger(__name__)
 
 #
@@ -99,11 +49,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()
@@ -146,7 +96,10 @@ def create_app(config_override=None, instance_path=None):
     app_config_file = os.path.expanduser(os.environ.get('APP_CONFIG', '~/etc/mrmat-python-api-flask.json'))
     if os.path.exists(app_config_file):
         log.info('Applying configuration from %s', app_config_file)
-        app.config.from_json(app_config_file)
+        with open(app_config_file, 'r', encoding='UTF-8') as c:
+            config = json.load(c)
+            app.config.from_object(config)
+            #app.config.from_json(app_config_file)
     if config_override is not None:
         for override in config_override:
             log.info('Overriding configuration for %s from the command line', override)
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 99%
rename from mrmat_python_api_flask/apis/resource/v1/api.py
rename to src/python/mrmat_python_api_flask/apis/resource/v1/api.py
index 5ef6ef7..35f231b 100644
--- a/mrmat_python_api_flask/apis/resource/v1/api.py
+++ b/src/python/mrmat_python_api_flask/apis/resource/v1/api.py
@@ -58,7 +58,7 @@ def get_all():
 
 @bp.route('/<i>', methods=['GET'])
 @bp.doc(summary='Get a single resource',
-        description='Return a single resource identified by its resource id.',
+        description='Return a single resource identified by its resource id',
         security=[{'openId': ['mpaf-read']}])
 @bp.response(200, schema=ResourceSchema)
 @oidc.accept_token(require_token=True, scopes_required=['mpaf-read'])
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 96%
rename from mrmat_python_api_flask/client.py
rename to src/python/mrmat_python_api_flask/client.py
index 4e34d40..859966c 100644
--- a/mrmat_python_api_flask/client.py
+++ b/src/python/mrmat_python_api_flask/client.py
@@ -50,7 +50,7 @@ def __init__(self, exit_code: int = 1, msg: str = 'Unknown Exception'):
 
 
 def oidc_discovery(config: Dict) -> Dict:
-    resp = requests.get(config['discovery_url'])
+    resp = requests.get(config['discovery_url'], timeout=60)
     if resp.status_code != 200:
         raise ClientException(exit_code=1, msg=f'Unexpected response {resp.status_code} from discovery endpoint')
     try:
@@ -64,7 +64,8 @@ def oidc_device_auth(config: Dict, discovery: Dict) -> Dict:
     resp = requests.post(url=discovery['device_authorization_endpoint'],
                          data={'client_id': config['client_id'],
                                'client_secret': config['client_secret'],
-                               'scope': ['openid', 'profile']})
+                               'scope': ['openid', 'profile']},
+                         timeout=60)
     if resp.status_code != 200:
         raise ClientException(exit_code=1, msg=f'Unexpected response {resp.status_code} from device endpoint')
     try:
@@ -82,7 +83,8 @@ def oidc_check_auth(config: Dict, discovery: Dict, device_auth: Dict):
                              data={'grant_type': 'urn:ietf:params:oauth:grant-type:device_code',
                                    'device_code': device_auth['device_code'],
                                    'client_id': config['client_id'],
-                                   'client_secret': config['client_secret']})  # client_secret only for keycloak
+                                   'client_secret': config['client_secret']},
+                             timeout=60)  # client_secret only for keycloak
         if resp.status_code == 400:
             body = resp.json()
             if body['error'] == 'authorization_pending':
@@ -213,7 +215,8 @@ def main(argv=None) -> int:
         # We're using requests directly here because requests_oauthlib doesn't support device code flow directly
 
         resp = requests.get(f'http://{args.host}:{args.port}/api/greeting/v3/',
-                            headers={'Authorization': f'Bearer {auth["id_token"]}'})
+                            headers={'Authorization': f'Bearer {auth["id_token"]}'},
+                            timeout=60)
         log.info('Status Code: %s', resp.status_code)
         log.info(resp.content)
 
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 99%
rename from migrations/env.py
rename to src/python/mrmat_python_api_flask/migrations/env.py
index aecfc76..ee59fb1 100644
--- a/migrations/env.py
+++ b/src/python/mrmat_python_api_flask/migrations/env.py
@@ -93,7 +93,6 @@ def process_revision_directives(context, revision, directives):
             connection=connection,
             target_metadata=target_metadata,
             process_revision_directives=process_revision_directives,
-            render_as_batch=True,
             **current_app.extensions['migrate'].configure_args
         )
 
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..c4eba45 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
 
@@ -266,7 +271,7 @@ def app(self,
                 'OIDC_CLIENT_SECRETS': auth['client_secrets_file']
             })
             with self._app.app_context():
-                upgrade(directory=os.path.join(os.path.dirname(__file__), '..', 'migrations'))
+                upgrade(directory=os.path.join(os.path.dirname(__file__), '..', 'var', 'migrations'))
                 db.create_all()
             yield self._app
 
diff --git a/var/docker/Dockerfile b/var/docker/Dockerfile
index 34c7ac0..3cd3a78 100644
--- a/var/docker/Dockerfile
+++ b/var/docker/Dockerfile
@@ -1,6 +1,6 @@
-FROM python:3.10.1-slim
+FROM python:3.10.5-slim
 
-ADD migrations /migrations
+USER 0:0
 COPY dist/mrmat_python_api_flask-*.whl /
 RUN \
     groupadd -g 1000 flask \
@@ -9,19 +9,17 @@ RUN \
     && chown -R 1000:1000 /app /app/instance
 
 USER 1000:1000
-
 ENV FLASK_APP=mrmat_python_api_flask
 RUN \
     python -mvenv /app/venv \
     && . /app/venv/bin/activate \
     && python -m pip install --no-cache-dir -U pip setuptools wheel \
     && pip install --no-cache-dir gunicorn \
-    && pip install --no-cache-dir /mrmat_python_api_flask-*.whl \
-    && flask db upgrade
+    && pip install --no-cache-dir /mrmat_python_api_flask-*.whl
 
 USER 0:0
 RUN \
-    rm -rf /mrmat_python_api_flask-*.whl /migrations
+    rm -rf /mrmat_python_api_flask-*.whl
 
 EXPOSE 8080
 USER 1000:1000