diff --git a/server/xa000-0/nginx/gitea.conf b/xa000-0/nginx/gitea.conf
similarity index 100%
rename from server/xa000-0/nginx/gitea.conf
rename to xa000-0/nginx/gitea.conf
diff --git a/server/xa000-0/ssh/sshd_config b/xa000-0/ssh/sshd_config
similarity index 100%
rename from server/xa000-0/ssh/sshd_config
rename to xa000-0/ssh/sshd_config
diff --git a/server/xb000-0/ejabberd/ejabberd.yml b/xb000-0/ejabberd/ejabberd.yml
similarity index 100%
rename from server/xb000-0/ejabberd/ejabberd.yml
rename to xb000-0/ejabberd/ejabberd.yml
diff --git a/server/xb000-0/nginx/gitea.conf b/xb000-0/nginx/gitea.conf
similarity index 100%
rename from server/xb000-0/nginx/gitea.conf
rename to xb000-0/nginx/gitea.conf
diff --git a/server/xb000-0/nginx/redirect-git.conf b/xb000-0/nginx/redirect-git.conf
similarity index 100%
rename from server/xb000-0/nginx/redirect-git.conf
rename to xb000-0/nginx/redirect-git.conf
diff --git a/server/xb000-0/nginx/website.conf b/xb000-0/nginx/website.conf
similarity index 100%
rename from server/xb000-0/nginx/website.conf
rename to xb000-0/nginx/website.conf
diff --git a/server/xb000-0/portage/env/basic.conf b/xb000-0/portage/env/basic.conf
similarity index 100%
rename from server/xb000-0/portage/env/basic.conf
rename to xb000-0/portage/env/basic.conf
diff --git a/server/xb000-0/portage/env/gcc-basic.conf b/xb000-0/portage/env/gcc-basic.conf
similarity index 100%
rename from server/xb000-0/portage/env/gcc-basic.conf
rename to xb000-0/portage/env/gcc-basic.conf
diff --git a/server/xb000-0/portage/env/gcc-nolto.conf b/xb000-0/portage/env/gcc-nolto.conf
similarity index 100%
rename from server/xb000-0/portage/env/gcc-nolto.conf
rename to xb000-0/portage/env/gcc-nolto.conf
diff --git a/server/xb000-0/portage/env/gcc.conf b/xb000-0/portage/env/gcc.conf
similarity index 100%
rename from server/xb000-0/portage/env/gcc.conf
rename to xb000-0/portage/env/gcc.conf
diff --git a/server/xb000-0/portage/env/nolto.conf b/xb000-0/portage/env/nolto.conf
similarity index 100%
rename from server/xb000-0/portage/env/nolto.conf
rename to xb000-0/portage/env/nolto.conf
diff --git a/server/xb000-0/portage/env/notmpfs.conf b/xb000-0/portage/env/notmpfs.conf
similarity index 100%
rename from server/xb000-0/portage/env/notmpfs.conf
rename to xb000-0/portage/env/notmpfs.conf
diff --git a/server/xb000-0/portage/make.conf b/xb000-0/portage/make.conf
similarity index 100%
rename from server/xb000-0/portage/make.conf
rename to xb000-0/portage/make.conf
diff --git a/server/xb000-0/ssh/sshd_config b/xb000-0/ssh/sshd_config
similarity index 100%
rename from server/xb000-0/ssh/sshd_config
rename to xb000-0/ssh/sshd_config