diff --git a/profiles/default/linux/amd64/13.0/backbone/desktop/parent b/profiles/default/linux/amd64/13.0/backbone/desktop/parent
deleted file mode 100644
index f3229c5b..00000000
--- a/profiles/default/linux/amd64/13.0/backbone/desktop/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/amd64/13.0/backbone/make.defaults b/profiles/default/linux/amd64/13.0/backbone/make.defaults
deleted file mode 100644
index aecf5a11..00000000
--- a/profiles/default/linux/amd64/13.0/backbone/make.defaults
+++ /dev/null
@@ -1 +0,0 @@
-CUSTOM_PROFILE="yes"
diff --git a/profiles/default/linux/amd64/13.0/backbone/desktop/eapi b/profiles/desktop/eapi
similarity index 100%
rename from profiles/default/linux/amd64/13.0/backbone/desktop/eapi
rename to profiles/desktop/eapi
diff --git a/profiles/default/linux/amd64/13.0/backbone/desktop/make.defaults b/profiles/desktop/make.defaults
similarity index 98%
rename from profiles/default/linux/amd64/13.0/backbone/desktop/make.defaults
rename to profiles/desktop/make.defaults
index d10bd1f0..359a4bd8 100644
--- a/profiles/default/linux/amd64/13.0/backbone/desktop/make.defaults
+++ b/profiles/desktop/make.defaults
@@ -1,3 +1,5 @@
+CUSTOM_PROFILE="yes"
+
 CFLAGS="-O2 -pipe -march=native"
 CXXFLAGS="${CFLAGS}"
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
diff --git a/profiles/default/linux/amd64/13.0/backbone/desktop/package.accept_keywords b/profiles/desktop/package.accept_keywords
similarity index 100%
rename from profiles/default/linux/amd64/13.0/backbone/desktop/package.accept_keywords
rename to profiles/desktop/package.accept_keywords
diff --git a/profiles/default/linux/amd64/13.0/backbone/desktop/package.keywords b/profiles/desktop/package.keywords
similarity index 100%
rename from profiles/default/linux/amd64/13.0/backbone/desktop/package.keywords
rename to profiles/desktop/package.keywords
diff --git a/profiles/default/linux/amd64/13.0/backbone/desktop/package.mask b/profiles/desktop/package.mask
similarity index 100%
rename from profiles/default/linux/amd64/13.0/backbone/desktop/package.mask
rename to profiles/desktop/package.mask
diff --git a/profiles/default/linux/amd64/13.0/backbone/desktop/package.unmask b/profiles/desktop/package.unmask
similarity index 100%
rename from profiles/default/linux/amd64/13.0/backbone/desktop/package.unmask
rename to profiles/desktop/package.unmask
diff --git a/profiles/default/linux/amd64/13.0/backbone/desktop/package.use b/profiles/desktop/package.use
similarity index 100%
rename from profiles/default/linux/amd64/13.0/backbone/desktop/package.use
rename to profiles/desktop/package.use
diff --git a/profiles/extreme/parent b/profiles/extreme/parent
new file mode 100644
index 00000000..5b26f1c3
--- /dev/null
+++ b/profiles/extreme/parent
@@ -0,0 +1 @@
+../desktop
diff --git a/profiles/default/linux/amd64/13.0/backbone/desktop/profile.bashrc b/profiles/extreme/profile.bashrc
similarity index 100%
rename from profiles/default/linux/amd64/13.0/backbone/desktop/profile.bashrc
rename to profiles/extreme/profile.bashrc
diff --git a/profiles/hardened/linux/amd64/backbone/eapi b/profiles/hardened/linux/amd64/backbone/eapi
deleted file mode 100644
index 0cfbf088..00000000
--- a/profiles/hardened/linux/amd64/backbone/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/hardened/linux/amd64/backbone/make.defaults b/profiles/hardened/linux/amd64/backbone/make.defaults
deleted file mode 100644
index aecf5a11..00000000
--- a/profiles/hardened/linux/amd64/backbone/make.defaults
+++ /dev/null
@@ -1 +0,0 @@
-CUSTOM_PROFILE="yes"
diff --git a/profiles/hardened/linux/amd64/backbone/no-multilib/eapi b/profiles/hardened/linux/amd64/backbone/no-multilib/eapi
deleted file mode 100644
index 0cfbf088..00000000
--- a/profiles/hardened/linux/amd64/backbone/no-multilib/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/profiles/hardened/linux/amd64/backbone/no-multilib/parent b/profiles/hardened/linux/amd64/backbone/no-multilib/parent
deleted file mode 100644
index f3229c5b..00000000
--- a/profiles/hardened/linux/amd64/backbone/no-multilib/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/amd64/13.0/backbone/eapi b/profiles/server/eapi
similarity index 100%
rename from profiles/default/linux/amd64/13.0/backbone/eapi
rename to profiles/server/eapi
diff --git a/profiles/hardened/linux/amd64/backbone/no-multilib/make.defaults b/profiles/server/make.defaults
similarity index 98%
rename from profiles/hardened/linux/amd64/backbone/no-multilib/make.defaults
rename to profiles/server/make.defaults
index afa73ea4..73147472 100644
--- a/profiles/hardened/linux/amd64/backbone/no-multilib/make.defaults
+++ b/profiles/server/make.defaults
@@ -1,3 +1,5 @@
+CUSTOM_PROFILE="yes"
+
 CFLAGS="-O2 -pipe -march=native"
 CXXFLAGS="${CFLAGS}"
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
diff --git a/profiles/hardened/linux/amd64/backbone/no-multilib/package.accept_keywords b/profiles/server/package.accept_keywords
similarity index 100%
rename from profiles/hardened/linux/amd64/backbone/no-multilib/package.accept_keywords
rename to profiles/server/package.accept_keywords
diff --git a/profiles/hardened/linux/amd64/backbone/no-multilib/package.keywords b/profiles/server/package.keywords
similarity index 100%
rename from profiles/hardened/linux/amd64/backbone/no-multilib/package.keywords
rename to profiles/server/package.keywords
diff --git a/profiles/hardened/linux/amd64/backbone/no-multilib/package.mask b/profiles/server/package.mask
similarity index 100%
rename from profiles/hardened/linux/amd64/backbone/no-multilib/package.mask
rename to profiles/server/package.mask
diff --git a/profiles/hardened/linux/amd64/backbone/no-multilib/package.unmask b/profiles/server/package.unmask
similarity index 100%
rename from profiles/hardened/linux/amd64/backbone/no-multilib/package.unmask
rename to profiles/server/package.unmask
diff --git a/profiles/hardened/linux/amd64/backbone/no-multilib/package.use b/profiles/server/package.use
similarity index 100%
rename from profiles/hardened/linux/amd64/backbone/no-multilib/package.use
rename to profiles/server/package.use
diff --git a/profiles/hardened/linux/amd64/backbone/no-multilib/package.use.mask b/profiles/server/package.use.mask
similarity index 100%
rename from profiles/hardened/linux/amd64/backbone/no-multilib/package.use.mask
rename to profiles/server/package.use.mask