diff --git a/server/zone.sls b/metadata/service/server/single.yml
similarity index 100%
copy from server/zone.sls
copy to metadata/service/server/single.yml
diff --git a/files/pdns.conf b/powerdns/files/pdns.conf
similarity index 100%
rename from files/pdns.conf
rename to powerdns/files/pdns.conf
diff --git a/files/pdns.local.gmysql.conf b/powerdns/files/pdns.local.gmysql.conf
similarity index 100%
rename from files/pdns.local.gmysql.conf
rename to powerdns/files/pdns.local.gmysql.conf
diff --git a/files/powerdns.conf b/powerdns/files/powerdns.conf
similarity index 100%
rename from files/powerdns.conf
rename to powerdns/files/powerdns.conf
diff --git a/init.sls b/powerdns/init.sls
similarity index 100%
rename from init.sls
rename to powerdns/init.sls
diff --git a/map.jinja b/powerdns/map.jinja
similarity index 100%
rename from map.jinja
rename to powerdns/map.jinja
diff --git a/server/init.sls b/powerdns/server/init.sls
similarity index 100%
rename from server/init.sls
rename to powerdns/server/init.sls
diff --git a/server/service.sls b/powerdns/server/service.sls
similarity index 100%
rename from server/service.sls
rename to powerdns/server/service.sls
diff --git a/server/zone.sls b/powerdns/server/zone.sls
similarity index 100%
rename from server/zone.sls
rename to powerdns/server/zone.sls