diff --git a/k8s/namespaces.yaml b/k8s/00-base/namespaces.yaml
similarity index 100%
rename from k8s/namespaces.yaml
rename to k8s/00-base/namespaces.yaml
diff --git a/k8s/secrets.in.yaml b/k8s/00-base/secrets.in.yaml
similarity index 100%
rename from k8s/secrets.in.yaml
rename to k8s/00-base/secrets.in.yaml
diff --git a/k8s/metallb-config.in.yaml b/k8s/01-ingress/metallb-config.in.yaml
similarity index 100%
rename from k8s/metallb-config.in.yaml
rename to k8s/01-ingress/metallb-config.in.yaml
diff --git a/k8s/metallb-crds.yaml b/k8s/01-ingress/metallb-crds.yaml
similarity index 100%
rename from k8s/metallb-crds.yaml
rename to k8s/01-ingress/metallb-crds.yaml
diff --git a/k8s/metallb-rbac.yaml b/k8s/01-ingress/metallb-rbac.yaml
similarity index 100%
rename from k8s/metallb-rbac.yaml
rename to k8s/01-ingress/metallb-rbac.yaml
diff --git a/k8s/metallb.yaml b/k8s/01-ingress/metallb.yaml
similarity index 100%
rename from k8s/metallb.yaml
rename to k8s/01-ingress/metallb.yaml
diff --git a/k8s/traefik-config.in.yaml b/k8s/01-ingress/traefik-config.in.yaml
similarity index 100%
rename from k8s/traefik-config.in.yaml
rename to k8s/01-ingress/traefik-config.in.yaml
diff --git a/k8s/traefik-crds.yaml b/k8s/01-ingress/traefik-crds.yaml
similarity index 100%
rename from k8s/traefik-crds.yaml
rename to k8s/01-ingress/traefik-crds.yaml
diff --git a/k8s/traefik-rbac.yaml b/k8s/01-ingress/traefik-rbac.yaml
similarity index 100%
rename from k8s/traefik-rbac.yaml
rename to k8s/01-ingress/traefik-rbac.yaml
diff --git a/k8s/traefik.yaml b/k8s/01-ingress/traefik.yaml
similarity index 100%
rename from k8s/traefik.yaml
rename to k8s/01-ingress/traefik.yaml
diff --git a/k8s/riju-docker-registry.yaml b/k8s/02-services/riju-docker-registry.yaml
similarity index 100%
rename from k8s/riju-docker-registry.yaml
rename to k8s/02-services/riju-docker-registry.yaml
diff --git a/k8s/riju-minio.yaml b/k8s/02-services/riju-minio.yaml
similarity index 100%
rename from k8s/riju-minio.yaml
rename to k8s/02-services/riju-minio.yaml
diff --git a/k8s/riju-proxy.yaml b/k8s/02-services/riju-proxy.yaml
similarity index 100%
rename from k8s/riju-proxy.yaml
rename to k8s/02-services/riju-proxy.yaml
diff --git a/k8s/riju-server.yaml b/k8s/02-services/riju-server.yaml
similarity index 100%
rename from k8s/riju-server.yaml
rename to k8s/02-services/riju-server.yaml