diff --git a/data/osfamily/Debian.yaml b/data/os/Debian.yaml
similarity index 100%
rename from data/osfamily/Debian.yaml
rename to data/os/Debian.yaml
diff --git a/data/osfamily/Debian/8.yaml b/data/os/Debian/Debian/8.yaml
similarity index 100%
rename from data/osfamily/Debian/8.yaml
rename to data/os/Debian/Debian/8.yaml
diff --git a/data/osfamily/Debian/9.yaml b/data/os/Debian/Debian/9.yaml
similarity index 100%
rename from data/osfamily/Debian/9.yaml
rename to data/os/Debian/Debian/9.yaml
diff --git a/data/osfamily/RedHat.yaml b/data/os/RedHat.yaml
similarity index 100%
rename from data/osfamily/RedHat.yaml
rename to data/os/RedHat.yaml
diff --git a/data/osfamily/CentOS/7.yaml b/data/os/RedHat/CentOS/7.yaml
similarity index 100%
rename from data/osfamily/CentOS/7.yaml
rename to data/os/RedHat/CentOS/7.yaml
diff --git a/hiera.yaml b/hiera.yaml
index cd8a6c4..55f6786 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -5,6 +5,7 @@ hierarchy:
   - name: "Platform"
     backend: yaml
     paths:
-      - "osfamily/%{facts.os.name}/%{facts.os.release.major}"
-      - "osfamily/%{facts.os.family}"
+      - "os/%{facts.os.family}/%{facts.os.name}/%{facts.os.release.major}"
+      - "os/%{facts.os.family}/%{facts.os.name}"
+      - "os/%{facts.os.family}"
       - "common"