diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4839249..8dd2cc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,6 @@ add_subdirectory(interface)
 add_subdirectory(sys)
 add_subdirectory(lib)
 add_subdirectory(services)
-add_subdirectory(runlevel)
 add_subdirectory(programs)
 
 sysroot_add_program(NAME ${kernel_name} BIN_DIR /boot)
diff --git a/runlevel/CMakeLists.txt b/runlevel/CMakeLists.txt
deleted file mode 100644
index f9545fd..0000000
--- a/runlevel/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-file(GLOB runlevels *.runlevel)
-foreach (f ${runlevels})
-	get_filename_component(name ${f} NAME_WLE)
-	bsp_add_file(
-		ID runlevel-${name}
-		SRC_PATH ${f}
-		DEST_DIR /etc/herdd/runlevels)
-	sysroot_add_file(
-		ID runlevel-${name}
-		SRC_PATH ${f}
-		DEST_DIR /etc/herdd/runlevels)
-endforeach (f)
diff --git a/services/devmd/devmd.service b/services/devmd/devmd.service
index 0ccc85d..cde3097 100644
--- a/services/devmd/devmd.service
+++ b/services/devmd/devmd.service
@@ -1,6 +1,5 @@
 # vim ft=toml
 [unit]
-name = "devmd"
 description = "Device Management Service"
 
 [service]
diff --git a/services/nsd/nsd.service b/services/nsd/nsd.service
index 9836c63..c50bf4d 100644
--- a/services/nsd/nsd.service
+++ b/services/nsd/nsd.service
@@ -1,6 +1,5 @@
 # vim ft=toml
 [unit]
-name = "nsd"
 description = "Namespace Service"
 
 [service]
diff --git a/services/targets/CMakeLists.txt b/services/targets/CMakeLists.txt
new file mode 100644
index 0000000..e58367f
--- /dev/null
+++ b/services/targets/CMakeLists.txt
@@ -0,0 +1,13 @@
+file(GLOB targets *.target)
+
+foreach (f ${targets})
+	get_filename_component(name ${f} NAME_WLE)
+	bsp_add_file(
+		ID target-${name}
+		SRC_PATH ${f}
+		DEST_DIR /etc/herdd/targets)
+	sysroot_add_file(
+		ID target-${name}
+		SRC_PATH ${f}
+		DEST_DIR /etc/herdd/targets)
+endforeach (f)
diff --git a/runlevel/minimal.runlevel b/services/targets/minimal.target
similarity index 51%
rename from runlevel/minimal.runlevel
rename to services/targets/minimal.target
index f886508..e357581 100644
--- a/runlevel/minimal.runlevel
+++ b/services/targets/minimal.target
@@ -1,8 +1,9 @@
 # vim ft=toml
-[runlevel]
-name = "minimal"
+[unit]
 description = "Minimal"
+
+[target]
 requires = [
-	"nsd",
-	"devmd"
+	"nsd.service",
+	"devmd.service"
 ]
diff --git a/runlevel/single-user.runlevel b/services/targets/single-user.target
similarity index 53%
rename from runlevel/single-user.runlevel
rename to services/targets/single-user.target
index dfc26e6..2c60322 100644
--- a/runlevel/single-user.runlevel
+++ b/services/targets/single-user.target
@@ -1,8 +1,9 @@
 # vim ft=toml
-[runlevel]
-name = "single-user"
+[unit]
 description = "Single-User"
+
+[target]
 requires = [
-	"nsd",
-	"devmd"
+	"nsd.service",
+	"devmd.service"
 ]