diff --git a/group_vars/location_sama27/general.yml b/group_vars/location_sama27/general.yml
deleted file mode 100644
index 1fa4341cb..000000000
--- a/group_vars/location_sama27/general.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-contact_nickname: 'robertfoss'
-contacts:
-  - 'me@robertfoss.se'
diff --git a/group_vars/location_sama27/owm.yml b/group_vars/location_sama27/owm.yml
deleted file mode 100644
index 171fcf0c1..000000000
--- a/group_vars/location_sama27/owm.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-location_nice: Sama27
-latitude: 52.5188543341914
-longitude: 13.46564804132173
diff --git a/group_vars/location_sama27/snmp.yml b/group_vars/location_sama27/snmp.yml
deleted file mode 100644
index 93beae210..000000000
--- a/group_vars/location_sama27/snmp.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-snmp_devices:
-  - hostname: sama27-sama
-    address: 10.31.161.2
-    snmp_profile: airos_8
diff --git a/host_vars/sama27-core/base.yml b/host_vars/sama27-core/base.yml
deleted file mode 100644
index 5f513fcad..000000000
--- a/host_vars/sama27-core/base.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-
-location: sama27
-role: corerouter
-model: "tplink_archer-c7-v2"
-
-wireless_profile: freifunk_default
diff --git a/group_vars/location_sama27/networks.yml b/locations/sama27.yml
similarity index 61%
rename from group_vars/location_sama27/networks.yml
rename to locations/sama27.yml
index dcf7e3275..5c718489d 100644
--- a/group_vars/location_sama27/networks.yml
+++ b/locations/sama27.yml
@@ -1,4 +1,23 @@
 ---
+location: sama27
+location_nice: Sama27
+latitude: 52.5188543341914
+longitude: 13.46564804132173
+contact_nickname: 'robertfoss'
+contacts:
+  - 'me@robertfoss.se'
+
+hosts:
+  - hostname: sama27-core
+    role: corerouter
+    model: "tplink_archer-c7-v2"
+    wireless_profile: freifunk_default
+
+snmp_devices:
+  - hostname: sama27-sama
+    address: 10.31.161.2
+    snmp_profile: airos_8
+
 
 # IPv4 10.31.161.0/27
 # IPv6 2001:bf7:830:ab00::/56