diff --git a/containers/comprehensive-rust.container b/containers/comprehensive-rust/comprehensive-rust.container
similarity index 100%
rename from containers/comprehensive-rust.container
rename to containers/comprehensive-rust/comprehensive-rust.container
diff --git a/containers/comprehensive-rust.fish b/containers/comprehensive-rust/comprehensive-rust.fish
similarity index 100%
rename from containers/comprehensive-rust.fish
rename to containers/comprehensive-rust/comprehensive-rust.fish
diff --git a/containers/dev-tools.container b/containers/dev-tools/dev-tools.container
similarity index 100%
rename from containers/dev-tools.container
rename to containers/dev-tools/dev-tools.container
diff --git a/containers/dev-tools.fish b/containers/dev-tools/dev-tools.fish
similarity index 100%
rename from containers/dev-tools.fish
rename to containers/dev-tools/dev-tools.fish
diff --git a/containers/forgejo.container b/containers/forgejo/forgejo.container
similarity index 100%
rename from containers/forgejo.container
rename to containers/forgejo/forgejo.container
diff --git a/containers/hedgedoc-db.container b/containers/hedgedoc/hedgedoc-db.container
similarity index 100%
rename from containers/hedgedoc-db.container
rename to containers/hedgedoc/hedgedoc-db.container
diff --git a/containers/hedgedoc.container b/containers/hedgedoc/hedgedoc.container
similarity index 100%
rename from containers/hedgedoc.container
rename to containers/hedgedoc/hedgedoc.container
diff --git a/containers/hedgedoc.network b/containers/hedgedoc/hedgedoc.network
similarity index 100%
rename from containers/hedgedoc.network
rename to containers/hedgedoc/hedgedoc.network
diff --git a/containers/how-2-julia.container b/containers/how-2-julia/how-2-julia.container
similarity index 100%
rename from containers/how-2-julia.container
rename to containers/how-2-julia/how-2-julia.container
diff --git a/containers/ihatemoney.container b/containers/ihatemoney/ihatemoney.container
similarity index 100%
rename from containers/ihatemoney.container
rename to containers/ihatemoney/ihatemoney.container
diff --git a/containers/internet-login.container b/containers/internet-login/internet-login.container
similarity index 100%
rename from containers/internet-login.container
rename to containers/internet-login/internet-login.container
diff --git a/containers/internet-login.fish b/containers/internet-login/internet-login.fish
similarity index 100%
rename from containers/internet-login.fish
rename to containers/internet-login/internet-login.fish
diff --git a/containers/juna-li-com.container b/containers/juna-li-com/juna-li-com.container
similarity index 100%
rename from containers/juna-li-com.container
rename to containers/juna-li-com/juna-li-com.container
diff --git a/containers/juna-li-com.fish b/containers/juna-li-com/juna-li-com.fish
similarity index 100%
rename from containers/juna-li-com.fish
rename to containers/juna-li-com/juna-li-com.fish
diff --git a/containers/lldap.container b/containers/lldap/lldap.container
similarity index 100%
rename from containers/lldap.container
rename to containers/lldap/lldap.container
diff --git a/containers/mo8it-com.container b/containers/mo8it-com/mo8it-com.container
similarity index 100%
rename from containers/mo8it-com.container
rename to containers/mo8it-com/mo8it-com.container
diff --git a/containers/mo8it-com.fish b/containers/mo8it-com/mo8it-com.fish
similarity index 100%
rename from containers/mo8it-com.fish
rename to containers/mo8it-com/mo8it-com.fish
diff --git a/containers/nextcloud-db.container b/containers/nextcloud/nextcloud-db.container
similarity index 100%
rename from containers/nextcloud-db.container
rename to containers/nextcloud/nextcloud-db.container
diff --git a/containers/nextcloud.container b/containers/nextcloud/nextcloud.container
similarity index 100%
rename from containers/nextcloud.container
rename to containers/nextcloud/nextcloud.container
diff --git a/containers/nextcloud.network b/containers/nextcloud/nextcloud.network
similarity index 100%
rename from containers/nextcloud.network
rename to containers/nextcloud/nextcloud.network
diff --git a/containers/oxitraffic-corrode-dev-db.container b/containers/oxitraffic-corrode-dev/oxitraffic-corrode-dev-db.container
similarity index 100%
rename from containers/oxitraffic-corrode-dev-db.container
rename to containers/oxitraffic-corrode-dev/oxitraffic-corrode-dev-db.container
diff --git a/containers/oxitraffic-corrode-dev.container b/containers/oxitraffic-corrode-dev/oxitraffic-corrode-dev.container
similarity index 100%
rename from containers/oxitraffic-corrode-dev.container
rename to containers/oxitraffic-corrode-dev/oxitraffic-corrode-dev.container
diff --git a/containers/oxitraffic-corrode-dev.network b/containers/oxitraffic-corrode-dev/oxitraffic-corrode-dev.network
similarity index 100%
rename from containers/oxitraffic-corrode-dev.network
rename to containers/oxitraffic-corrode-dev/oxitraffic-corrode-dev.network
diff --git a/containers/oxitraffic-db.container b/containers/oxitraffic/oxitraffic-db.container
similarity index 100%
rename from containers/oxitraffic-db.container
rename to containers/oxitraffic/oxitraffic-db.container
diff --git a/containers/oxitraffic.container b/containers/oxitraffic/oxitraffic.container
similarity index 100%
rename from containers/oxitraffic.container
rename to containers/oxitraffic/oxitraffic.container
diff --git a/containers/oxitraffic.network b/containers/oxitraffic/oxitraffic.network
similarity index 100%
rename from containers/oxitraffic.network
rename to containers/oxitraffic/oxitraffic.network
diff --git a/containers/traefik.container b/containers/traefik/traefik.container
similarity index 100%
rename from containers/traefik.container
rename to containers/traefik/traefik.container
diff --git a/containers/traefik.network b/containers/traefik/traefik.network
similarity index 100%
rename from containers/traefik.network
rename to containers/traefik/traefik.network
diff --git a/containers/yinghong-massage-oxiform.container b/containers/yinghong-massage/yinghong-massage-oxiform.container
similarity index 100%
rename from containers/yinghong-massage-oxiform.container
rename to containers/yinghong-massage/yinghong-massage-oxiform.container
diff --git a/containers/yinghong-massage-oxiform.fish b/containers/yinghong-massage/yinghong-massage-oxiform.fish
similarity index 100%
rename from containers/yinghong-massage-oxiform.fish
rename to containers/yinghong-massage/yinghong-massage-oxiform.fish
diff --git a/containers/yinghong-massage.container b/containers/yinghong-massage/yinghong-massage.container
similarity index 100%
rename from containers/yinghong-massage.container
rename to containers/yinghong-massage/yinghong-massage.container
diff --git a/containers/yinghong-massage.fish b/containers/yinghong-massage/yinghong-massage.fish
similarity index 100%
rename from containers/yinghong-massage.fish
rename to containers/yinghong-massage/yinghong-massage.fish