diff --git a/environment.conf b/environment.conf
index 2a7a21c..4569646 100644
--- a/environment.conf
+++ b/environment.conf
@@ -1,2 +1,2 @@
-manifest = site.pp
+manifest = manifests/site.pp
 modulepath = external_modules:site
diff --git a/hiera.yaml b/hiera.yaml
new file mode 100644
index 0000000..c5cad1d
--- /dev/null
+++ b/hiera.yaml
@@ -0,0 +1,8 @@
+---
+version: 5
+defaults:
+  datadir: "hieradata"
+  data_hash: "yaml_data"
+hierarchy:
+  - path: "nodes/%{trusted.certname}.yaml"    # Node-specific data, overrides other levels.
+  - path: "common.yaml"                       # Common data shared across nodes.
diff --git a/site.pp b/manifests/site.pp
similarity index 100%
rename from site.pp
rename to manifests/site.pp