diff --git a/TEMPLATE/_mapdata/init.sls b/TEMPLATE/_mapdata/init.sls
index 3529a8df..4868e61d 100644
--- a/TEMPLATE/_mapdata/init.sls
+++ b/TEMPLATE/_mapdata/init.sls
@@ -3,7 +3,7 @@
 ---
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split("/")[0] %}
-{%- from tplroot ~ "/map.jinja" import mapdata with context %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata with context %}
 
 {%- set _mapdata = {
       "values": mapdata,
diff --git a/TEMPLATE/config/clean.sls b/TEMPLATE/config/clean.sls
index 19b3f99f..34ba49d2 100644
--- a/TEMPLATE/config/clean.sls
+++ b/TEMPLATE/config/clean.sls
@@ -4,7 +4,7 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_service_clean = tplroot ~ '.service.clean' %}
-{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
 
 include:
   - {{ sls_service_clean }}
diff --git a/TEMPLATE/config/file.sls b/TEMPLATE/config/file.sls
index 661d8138..d0931de5 100644
--- a/TEMPLATE/config/file.sls
+++ b/TEMPLATE/config/file.sls
@@ -4,8 +4,8 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_package_install = tplroot ~ '.package.install' %}
-{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
-{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
+{%- from tplroot ~ "/libs/libtofs.jinja" import files_switch with context %}
 
 include:
   - {{ sls_package_install }}
diff --git a/TEMPLATE/libmapstack.jinja b/TEMPLATE/libs/libmapstack.jinja
similarity index 99%
rename from TEMPLATE/libmapstack.jinja
rename to TEMPLATE/libs/libmapstack.jinja
index 8f54ef37..dda9a096 100644
--- a/TEMPLATE/libmapstack.jinja
+++ b/TEMPLATE/libs/libmapstack.jinja
@@ -3,7 +3,7 @@
 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split("/")[0] %}
-{%- from tplroot ~ "/libmatchers.jinja" import parse_matchers, query_map with context %}
+{%- from tplroot ~ "/libs/libmatchers.jinja" import parse_matchers, query_map with context %}
 
 {%- set _default_config_dirs = [
       "parameters/",
diff --git a/TEMPLATE/libmatchers.jinja b/TEMPLATE/libs/libmatchers.jinja
similarity index 98%
rename from TEMPLATE/libmatchers.jinja
rename to TEMPLATE/libs/libmatchers.jinja
index 10ff8bd1..d03bb5ce 100644
--- a/TEMPLATE/libmatchers.jinja
+++ b/TEMPLATE/libs/libmatchers.jinja
@@ -3,7 +3,7 @@
 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split("/")[0] %}
-{%- from tplroot ~ "/libsaltcli.jinja" import cli with context %}
+{%- from tplroot ~ "/libs/libsaltcli.jinja" import cli with context %}
 
 {%- set query_map = {
       "C": "config.get",
diff --git a/TEMPLATE/libsaltcli.jinja b/TEMPLATE/libs/libsaltcli.jinja
similarity index 100%
rename from TEMPLATE/libsaltcli.jinja
rename to TEMPLATE/libs/libsaltcli.jinja
diff --git a/TEMPLATE/libtofs.jinja b/TEMPLATE/libs/libtofs.jinja
similarity index 100%
rename from TEMPLATE/libtofs.jinja
rename to TEMPLATE/libs/libtofs.jinja
diff --git a/TEMPLATE/map.jinja b/TEMPLATE/libs/map.jinja
similarity index 92%
rename from TEMPLATE/map.jinja
rename to TEMPLATE/libs/map.jinja
index cc25c18c..891ae045 100644
--- a/TEMPLATE/map.jinja
+++ b/TEMPLATE/libs/map.jinja
@@ -3,7 +3,7 @@
 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split("/")[0] %}
-{%- from tplroot ~ "/libmapstack.jinja" import mapstack with context %}
+{%- from tplroot ~ "/libs/libmapstack.jinja" import mapstack with context %}
 
 {#- Where to lookup parameters source files #}
 {%- set formula_param_dir = tplroot ~ "/parameters" %}
@@ -63,4 +63,4 @@
 
 {#- Per formula post-processing of `mapdata` if it exists #}
 {%- do salt["log.debug"]("map.jinja: post-processing of 'mapdata'") %}
-{%- include tplroot ~ "/post-map.jinja" ignore missing %}
+{%- include formula_param_dir ~ "/post-map.jinja" ignore missing %}
diff --git a/TEMPLATE/package/clean.sls b/TEMPLATE/package/clean.sls
index 883b37d8..88bd3a75 100644
--- a/TEMPLATE/package/clean.sls
+++ b/TEMPLATE/package/clean.sls
@@ -4,7 +4,7 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_config_clean = tplroot ~ '.config.clean' %}
-{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
 
 include:
   - {{ sls_config_clean }}
diff --git a/TEMPLATE/package/install.sls b/TEMPLATE/package/install.sls
index 631e1899..f2887cf1 100644
--- a/TEMPLATE/package/install.sls
+++ b/TEMPLATE/package/install.sls
@@ -3,7 +3,7 @@
 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
-{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
 
 TEMPLATE-package-install-pkg-installed:
   pkg.installed:
diff --git a/TEMPLATE/service/clean.sls b/TEMPLATE/service/clean.sls
index 56167034..59011f04 100644
--- a/TEMPLATE/service/clean.sls
+++ b/TEMPLATE/service/clean.sls
@@ -3,7 +3,7 @@
 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
-{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
 
 TEMPLATE-service-clean-service-dead:
   service.dead:
diff --git a/TEMPLATE/service/running.sls b/TEMPLATE/service/running.sls
index 9c9a6259..7caaacf8 100644
--- a/TEMPLATE/service/running.sls
+++ b/TEMPLATE/service/running.sls
@@ -4,7 +4,7 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_config_file = tplroot ~ '.config.file' %}
-{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
 
 include:
   - {{ sls_config_file }}
diff --git a/TEMPLATE/subcomponent/config/clean.sls b/TEMPLATE/subcomponent/config/clean.sls
index 7cbe308e..67a7b9f7 100644
--- a/TEMPLATE/subcomponent/config/clean.sls
+++ b/TEMPLATE/subcomponent/config/clean.sls
@@ -4,7 +4,7 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_service_clean = tplroot ~ '.service.clean' %}
-{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
 
 include:
   - {{ sls_service_clean }}
diff --git a/TEMPLATE/subcomponent/config/file.sls b/TEMPLATE/subcomponent/config/file.sls
index dc3404f6..fe60eb59 100644
--- a/TEMPLATE/subcomponent/config/file.sls
+++ b/TEMPLATE/subcomponent/config/file.sls
@@ -4,8 +4,8 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_config_file = tplroot ~ '.config.file' %}
-{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
-{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
+{%- from tplroot ~ "/libs/libtofs.jinja" import files_switch with context %}
 
 include:
   - {{ sls_config_file }}
diff --git a/commitlint.config.js b/commitlint.config.js
index fc3c51f4..ddfebe10 100644
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -8,6 +8,7 @@ module.exports = {
   ignores: [
     (commit) => commit.startsWith('chore(copier):'),
     (commit) => commit.startsWith('chore(deps):'),
+    (commit) => commit.startsWith('chore(release):'),
     (commit) => commit.startsWith('ci(pre-commit.ci):'),
     (commit) => commit.startsWith('[CI merge]')
   ]
diff --git a/docs/map.jinja.rst b/docs/map.jinja.rst
index bad8a918..d9111590 100644
--- a/docs/map.jinja.rst
+++ b/docs/map.jinja.rst
@@ -293,7 +293,7 @@ The ``map.jinja`` file aggregates configuration values from several sources:
 
 For the values loaded from YAML files, ``map.jinja`` will automatically try to load a Jinja2 template with the same name as the YAML file with the addition of the ``.jinja`` extension, for example ``foo/bar/quux.yaml.jinja``.
 
-After loading values from all sources, it will try to include the ``salt://{{ tplroot }}/post-map.jinja`` Jinja file if it exists which can post-process the ``mapdata`` variable.
+After loading values from all sources, it will try to include the ``salt://{{ tplroot }}/parameters/post-map.jinja`` Jinja file if it exists which can post-process the ``mapdata`` variable.
 
 Configuring ``map.jinja`` sources
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -458,7 +458,7 @@ Here is the best way to use it in an ``sls`` file:
 
     {#- Get the `tplroot` from `tpldir` #}
     {%- set tplroot = tpldir.split("/")[0] %}
-    {%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
+    {%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
 
     test-does-nothing-but-display-TEMPLATE-as-json:
       test.nop:
@@ -480,8 +480,8 @@ Here is an example based on `template-formula/TEMPLATE/config/file.sls`_:
     {#- Get the `tplroot` from `tpldir` #}
     {%- set tplroot = tpldir.split('/')[0] %}
     {%- set sls_package_install = tplroot ~ '.package.install' %}
-    {%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
-    {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
+    {%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
+    {%- from tplroot ~ "/libs/libtofs.jinja" import files_switch with context %}
 
     include:
       - {{ sls_package_install }}