diff --git a/README.md b/README.md
deleted file mode 100644
index 1a6632c..0000000
--- a/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Noveria Salt-State
-
-This repository is for the master-less salt-statetree for the noveria host, running Alpine Linux
-
-It manages the complete system using the saltproject.
-
-For further instructions, head to the official salt docs: https://docs.saltproject.io/en/latest/contents.html
diff --git a/apps/generate-motd/init.sls b/apps/generate-motd/init.sls
index c0fe473..b52acb5 100644
--- a/apps/generate-motd/init.sls
+++ b/apps/generate-motd/init.sls
@@ -1,7 +1,8 @@
-include:
-  - system.base
+{% from "map.jinja" import noveria with context %}
 
-{% from "map.jinja" import noveria %}
+include:
+  - directories
+  - system.base
 
 apps_generate-motd_git:
   git.latest:
@@ -10,7 +11,7 @@ apps_generate-motd_git:
     - user: root
     - force_reset: True
     - require:
-      - system_base_apps_dir
+      - directories_apps_dir
 
 apps_generate-motd_link:
   file.symlink:
@@ -20,5 +21,6 @@ apps_generate-motd_link:
     - group: root
     - mode: '0755'
     - require:
-      - system_base_bin_dir
       - apps_generate-motd_git
+      - directories_bin_dir
+      - directories_apps_dir
diff --git a/apps/noveriablcgen/init.sls b/apps/noveriablcgen/init.sls
index ff2cf66..3afa967 100644
--- a/apps/noveriablcgen/init.sls
+++ b/apps/noveriablcgen/init.sls
@@ -1,7 +1,8 @@
-include:
-  - system.base
+{% from "map.jinja" import noveria with context %}
 
-{% from "map.jinja" import noveria %}
+include:
+  - directories
+  - system.base
 
 apps_noveriablcgen_git:
   git.latest:
@@ -10,7 +11,7 @@ apps_noveriablcgen_git:
     - user: root
     - force_reset: True
     - require:
-      - system_base_apps_dir
+      - directories_apps_dir
 
 apps_noveriablcgen_link:
   file.symlink:
@@ -20,8 +21,9 @@ apps_noveriablcgen_link:
     - group: root
     - mode: '0755'
     - require:
-      - system_base_bin_dir
       - apps_noveriablcgen_git
+      - directories_bin_dir
+      - directories_apps_dir
 
 apps_noveriablcgen_config:
   file.managed:
@@ -40,3 +42,4 @@ apps_noveriablcgen_config:
     - group: root
     - require:
       - apps_noveriablcgen_git
+      - directories_etc_dir
diff --git a/directories.sls b/directories.sls
new file mode 100644
index 0000000..adeef94
--- /dev/null
+++ b/directories.sls
@@ -0,0 +1,39 @@
+{% from "map.jinja" import noveria with context %}
+
+directories_dir:
+  file.directory:
+    - name: {{ noveria.dir }}
+    - user: root
+    - group: root
+    - file_mode: '0644'
+    - dir_mode: '0755'
+
+directories_bin_dir:
+  file.directory:
+    - name: {{ noveria.bin_dir }}
+    - user: root
+    - group: root
+    - file_mode: '0644'
+    - dir_mode: '0755'
+    - require:
+      - directories_dir
+
+directories_etc_dir:
+  file.directory:
+    - name: {{ noveria.etc_dir }}
+    - user: root
+    - group: root
+    - file_mode: '0644'
+    - dir_mode: '0755'
+    - require:
+      - directories_dir
+
+directories_apps_dir:
+  file.directory:
+    - name: {{ noveria.app_dir }}
+    - user: root
+    - group: root
+    - file_mode: '0644'
+    - dir_mode: '0755'
+    - require:
+      - directories_dir
diff --git a/map.jinja b/map.jinja
index 170841e..bf24487 100644
--- a/map.jinja
+++ b/map.jinja
@@ -1,5 +1,6 @@
 {% set noveria = {
-  'bin_dir': '/usr/local/noveria/bin',
-  'app_dir': '/usr/local/noveria/apps',
-  'etc_dir': '/usr/local/noveria/etc'
-} %}
\ No newline at end of file
+  'dir': '/usr/local/noveria',
+  'bin_dir': '%s/bin' % dir,
+  'etc_dir': '%s/etc' % dir,
+  'app_dir': '%s/apps' % dir
+} %}
diff --git a/nginx/init.sls b/nginx/init.sls
new file mode 100644
index 0000000..5ab2baa
--- /dev/null
+++ b/nginx/init.sls
@@ -0,0 +1,8 @@
+{% from "{{ tpldir }}/map.jinja" import nginx with context %}
+
+nginx_pkg:
+  pkg.installed:
+    - pkgs:
+      - nginx
+      - certbot
+      - certbot-nginx
diff --git a/nginx/map.jinja b/nginx/map.jinja
new file mode 100644
index 0000000..4cddd85
--- /dev/null
+++ b/nginx/map.jinja
@@ -0,0 +1,3 @@
+{% set nginx = {
+  'dir': 
+}%}
diff --git a/podman/apps/pms-cli/init.sls b/podman/apps/pms-cli/init.sls
index a7d07e8..edfd4cd 100644
--- a/podman/apps/pms-cli/init.sls
+++ b/podman/apps/pms-cli/init.sls
@@ -1,7 +1,8 @@
-include:
-  - system.base
+{% from "map.jinja" import noveria with context %}
 
-{% from "map.jinja" import noveria %}
+include:
+  - directories
+  - system.base
 
 podman_apps_pms-cli_git:
   git.latest:
@@ -10,7 +11,7 @@ podman_apps_pms-cli_git:
     - user: root
     - force_reset: True
     - require:
-      - system_base_apps_dir
+      - directories_apps_dir
 
 podman_apps_pms-cli_link:
   file.symlink:
@@ -20,8 +21,9 @@ podman_apps_pms-cli_link:
     - group: root
     - mode: '0755'
     - require:
-      - system_base_bin_dir
       - podman_apps_pms-cli_git
+      - directories_bin_dir
+      - directories_apps_dir
 
 podman_apps_pms-cli_config:
   file.managed:
@@ -36,3 +38,4 @@ podman_apps_pms-cli_config:
     - group: root
     - require:
       - podman_apps_pms-cli_git
+      - directories_etc_dir
diff --git a/podman/apps/poddoc/init.sls b/podman/apps/poddoc/init.sls
index ea25d8b..35dec51 100644
--- a/podman/apps/poddoc/init.sls
+++ b/podman/apps/poddoc/init.sls
@@ -1,7 +1,8 @@
-include:
-  - system.base
+{% from "map.jinja" import noveria with context %}
 
-{% from "map.jinja" import noveria %}
+include:
+  - directories
+  - system.base
 
 podman_apps_poddoc_git:
   git.latest:
@@ -10,7 +11,7 @@ podman_apps_poddoc_git:
     - user: root
     - force_reset: True
     - require:
-      - system_base_apps_dir
+      - directories_apps_dir
 
 podman_apps_poddoc_link:
   file.symlink:
@@ -20,8 +21,9 @@ podman_apps_poddoc_link:
     - group: root
     - mode: '0755'
     - require:
-      - system_base_bin_dir
       - podman_apps_poddoc_git
+      - directories_bin_dir
+      - directories_apps_dir
 
 podman_apps_poddoc_config:
   file.managed:
@@ -37,3 +39,4 @@ podman_apps_poddoc_config:
     - group: root
     - require:
       - podman_apps_poddoc_git
+      - directories_etc_dir
diff --git a/system/base.sls b/system/base.sls
index ff95e65..6e90d79 100644
--- a/system/base.sls
+++ b/system/base.sls
@@ -1,4 +1,7 @@
-{% from "map.jinja" import noveria %}
+{% from "map.jinja" import noveria with context %}
+
+include:
+  - directories
 
 system_base_pkgs:
   pkg.installed:
@@ -14,33 +17,6 @@ system_base_pkgs:
       - sudo
       - curl
 
-system_base_bin_dir:
-  file.directory:
-    - name: {{ noveria.bin_dir }}
-    - makedirs: True
-    - user: root
-    - group: root
-    - dir_mode: '0755'
-    - file_mode: '0644'
-
-system_base_apps_dir:
-  file.directory:
-    - name: {{ noveria.app_dir }}
-    - makedirs: True
-    - user: root
-    - group: root
-    - dir_mode: '0755'
-    - file_mode: '0644'
-
-system_base_etc_dir:
-  file.directory:
-    - name: {{ noveria.etc_dir }}
-    - makedirs: True
-    - user: root
-    - group: root
-    - dir_mode: '0755'
-    - file_mode: '0644'
-
 system_base_systemupdate:
   file.managed:
     - name: {{ noveria.app_dir }}/systemupdate
@@ -59,8 +35,8 @@ system_base_systemupdate_link:
     - group: root
     - mode: '0755'
     - require:
-      - system_base_bin_dir
       - system_base_systemupdate
+      - directories_bin_dir
 
 system_base_modules_service:
   service.running:
diff --git a/system/disks.sls b/system/disks.sls
index 3ea8370..14a6c0c 100644
--- a/system/disks.sls
+++ b/system/disks.sls
@@ -26,7 +26,7 @@ system_disks_fstab:
     - source: salt://{{ tpldir }}/files/disks_fstab.jinja
     - template: jinja
     - context:
-        TIMESTAMP: {{ salt['pillar.get']('timestamp') }}
+        TIMESTAMP: {{ salt['pillar.get']('system:timestamp') }}
         ROOT_UUID: {{ ROOT_UUID }}
         ESP_UUID: {{ ESP_UUID }}
     - user: root
diff --git a/system/shell.sls b/system/shell.sls
index 793356e..4069e2e 100644
--- a/system/shell.sls
+++ b/system/shell.sls
@@ -1,7 +1,8 @@
-include:
-  - system.base
+{% from "map.jinja" import noveria with context %}
 
-{% from "map.jinja" import noveria %}
+include:
+  - directories
+  - system.base
 
 system_shell_pkgs:
   pkg.installed:
diff --git a/top.sls b/top.sls
index f576aeb..e4c69e6 100644
--- a/top.sls
+++ b/top.sls
@@ -1,5 +1,7 @@
 base:
   '*':
+    - directories
+    - pillars
     - system
     - network
     - apps