diff --git a/vrp/README.md b/vrp/kctf/README.md similarity index 100% rename from vrp/README.md rename to vrp/kctf/README.md diff --git a/vrp/full-chain/challenge.yaml b/vrp/kctf/full-chain/challenge.yaml similarity index 100% rename from vrp/full-chain/challenge.yaml rename to vrp/kctf/full-chain/challenge.yaml diff --git a/vrp/full-chain/challenge/Dockerfile b/vrp/kctf/full-chain/challenge/Dockerfile similarity index 100% rename from vrp/full-chain/challenge/Dockerfile rename to vrp/kctf/full-chain/challenge/Dockerfile diff --git a/vrp/kctf/VERSION b/vrp/kctf/kctf/VERSION similarity index 100% rename from vrp/kctf/VERSION rename to vrp/kctf/kctf/VERSION diff --git a/vrp/kctf/activate b/vrp/kctf/kctf/activate similarity index 100% rename from vrp/kctf/activate rename to vrp/kctf/kctf/activate diff --git a/vrp/kctf/bin/kctf-challenge b/vrp/kctf/kctf/bin/kctf-challenge similarity index 100% rename from vrp/kctf/bin/kctf-challenge rename to vrp/kctf/kctf/bin/kctf-challenge diff --git a/vrp/kctf/bin/kctf-cluster b/vrp/kctf/kctf/bin/kctf-cluster similarity index 100% rename from vrp/kctf/bin/kctf-cluster rename to vrp/kctf/kctf/bin/kctf-cluster diff --git a/vrp/kctf/bin/kctf-completion b/vrp/kctf/kctf/bin/kctf-completion similarity index 100% rename from vrp/kctf/bin/kctf-completion rename to vrp/kctf/kctf/bin/kctf-completion diff --git a/vrp/kctf/bin/kctf-log b/vrp/kctf/kctf/bin/kctf-log similarity index 100% rename from vrp/kctf/bin/kctf-log rename to vrp/kctf/kctf/bin/kctf-log diff --git a/vrp/kctf/bin/kind b/vrp/kctf/kctf/bin/kind similarity index 100% rename from vrp/kctf/bin/kind rename to vrp/kctf/kctf/bin/kind diff --git a/vrp/kctf/bin/kubectl b/vrp/kctf/kctf/bin/kubectl similarity index 100% rename from vrp/kctf/bin/kubectl rename to vrp/kctf/kctf/bin/kubectl diff --git a/vrp/kctf/bin/yq b/vrp/kctf/kctf/bin/yq similarity index 100% rename from vrp/kctf/bin/yq rename to vrp/kctf/kctf/bin/yq diff --git a/vrp/kctf/challenge-templates/pwn/README.md b/vrp/kctf/kctf/challenge-templates/pwn/README.md similarity index 100% rename from vrp/kctf/challenge-templates/pwn/README.md rename to vrp/kctf/kctf/challenge-templates/pwn/README.md diff --git a/vrp/kctf/challenge-templates/pwn/challenge.yaml b/vrp/kctf/kctf/challenge-templates/pwn/challenge.yaml similarity index 100% rename from vrp/kctf/challenge-templates/pwn/challenge.yaml rename to vrp/kctf/kctf/challenge-templates/pwn/challenge.yaml diff --git a/vrp/kctf/challenge-templates/pwn/challenge/Dockerfile b/vrp/kctf/kctf/challenge-templates/pwn/challenge/Dockerfile similarity index 100% rename from vrp/kctf/challenge-templates/pwn/challenge/Dockerfile rename to vrp/kctf/kctf/challenge-templates/pwn/challenge/Dockerfile diff --git a/vrp/kctf/challenge-templates/pwn/challenge/Makefile b/vrp/kctf/kctf/challenge-templates/pwn/challenge/Makefile similarity index 100% rename from vrp/kctf/challenge-templates/pwn/challenge/Makefile rename to vrp/kctf/kctf/challenge-templates/pwn/challenge/Makefile diff --git a/vrp/kctf/challenge-templates/pwn/challenge/chal.c b/vrp/kctf/kctf/challenge-templates/pwn/challenge/chal.c similarity index 100% rename from vrp/kctf/challenge-templates/pwn/challenge/chal.c rename to vrp/kctf/kctf/challenge-templates/pwn/challenge/chal.c diff --git a/vrp/kctf/challenge-templates/pwn/challenge/flag b/vrp/kctf/kctf/challenge-templates/pwn/challenge/flag similarity index 100% rename from vrp/kctf/challenge-templates/pwn/challenge/flag rename to vrp/kctf/kctf/challenge-templates/pwn/challenge/flag diff --git a/vrp/kctf/challenge-templates/pwn/challenge/nsjail.cfg b/vrp/kctf/kctf/challenge-templates/pwn/challenge/nsjail.cfg similarity index 100% rename from vrp/kctf/challenge-templates/pwn/challenge/nsjail.cfg rename to vrp/kctf/kctf/challenge-templates/pwn/challenge/nsjail.cfg diff --git a/vrp/kctf/challenge-templates/pwn/healthcheck/Dockerfile b/vrp/kctf/kctf/challenge-templates/pwn/healthcheck/Dockerfile similarity index 100% rename from vrp/kctf/challenge-templates/pwn/healthcheck/Dockerfile rename to vrp/kctf/kctf/challenge-templates/pwn/healthcheck/Dockerfile diff --git a/vrp/kctf/challenge-templates/pwn/healthcheck/README.md b/vrp/kctf/kctf/challenge-templates/pwn/healthcheck/README.md similarity index 100% rename from vrp/kctf/challenge-templates/pwn/healthcheck/README.md rename to vrp/kctf/kctf/challenge-templates/pwn/healthcheck/README.md diff --git a/vrp/kctf/challenge-templates/pwn/healthcheck/healthcheck.py b/vrp/kctf/kctf/challenge-templates/pwn/healthcheck/healthcheck.py similarity index 100% rename from vrp/kctf/challenge-templates/pwn/healthcheck/healthcheck.py rename to vrp/kctf/kctf/challenge-templates/pwn/healthcheck/healthcheck.py diff --git a/vrp/kctf/challenge-templates/pwn/healthcheck/healthcheck_loop.sh b/vrp/kctf/kctf/challenge-templates/pwn/healthcheck/healthcheck_loop.sh similarity index 100% rename from vrp/kctf/challenge-templates/pwn/healthcheck/healthcheck_loop.sh rename to vrp/kctf/kctf/challenge-templates/pwn/healthcheck/healthcheck_loop.sh diff --git a/vrp/kctf/challenge-templates/pwn/healthcheck/healthz_webserver.py b/vrp/kctf/kctf/challenge-templates/pwn/healthcheck/healthz_webserver.py similarity index 100% rename from vrp/kctf/challenge-templates/pwn/healthcheck/healthz_webserver.py rename to vrp/kctf/kctf/challenge-templates/pwn/healthcheck/healthz_webserver.py diff --git a/vrp/kctf/challenge-templates/web/README.md b/vrp/kctf/kctf/challenge-templates/web/README.md similarity index 100% rename from vrp/kctf/challenge-templates/web/README.md rename to vrp/kctf/kctf/challenge-templates/web/README.md diff --git a/vrp/kctf/challenge-templates/web/challenge.yaml b/vrp/kctf/kctf/challenge-templates/web/challenge.yaml similarity index 100% rename from vrp/kctf/challenge-templates/web/challenge.yaml rename to vrp/kctf/kctf/challenge-templates/web/challenge.yaml diff --git a/vrp/kctf/challenge-templates/web/challenge/Dockerfile b/vrp/kctf/kctf/challenge-templates/web/challenge/Dockerfile similarity index 100% rename from vrp/kctf/challenge-templates/web/challenge/Dockerfile rename to vrp/kctf/kctf/challenge-templates/web/challenge/Dockerfile diff --git a/vrp/kctf/challenge-templates/web/challenge/apache2-kctf-nsjail.conf b/vrp/kctf/kctf/challenge-templates/web/challenge/apache2-kctf-nsjail.conf similarity index 100% rename from vrp/kctf/challenge-templates/web/challenge/apache2-kctf-nsjail.conf rename to vrp/kctf/kctf/challenge-templates/web/challenge/apache2-kctf-nsjail.conf diff --git a/vrp/kctf/challenge-templates/web/challenge/cgi-bin.nsjail.cfg b/vrp/kctf/kctf/challenge-templates/web/challenge/cgi-bin.nsjail.cfg similarity index 100% rename from vrp/kctf/challenge-templates/web/challenge/cgi-bin.nsjail.cfg rename to vrp/kctf/kctf/challenge-templates/web/challenge/cgi-bin.nsjail.cfg diff --git a/vrp/kctf/challenge-templates/web/challenge/cgi-bin/nsjail-php-cgi b/vrp/kctf/kctf/challenge-templates/web/challenge/cgi-bin/nsjail-php-cgi similarity index 100% rename from vrp/kctf/challenge-templates/web/challenge/cgi-bin/nsjail-php-cgi rename to vrp/kctf/kctf/challenge-templates/web/challenge/cgi-bin/nsjail-php-cgi diff --git a/vrp/kctf/challenge-templates/web/challenge/flag b/vrp/kctf/kctf/challenge-templates/web/challenge/flag similarity index 100% rename from vrp/kctf/challenge-templates/web/challenge/flag rename to vrp/kctf/kctf/challenge-templates/web/challenge/flag diff --git a/vrp/kctf/challenge-templates/web/challenge/web-apps/nodejs/app.js b/vrp/kctf/kctf/challenge-templates/web/challenge/web-apps/nodejs/app.js similarity index 100% rename from vrp/kctf/challenge-templates/web/challenge/web-apps/nodejs/app.js rename to vrp/kctf/kctf/challenge-templates/web/challenge/web-apps/nodejs/app.js diff --git a/vrp/kctf/challenge-templates/web/challenge/web-apps/php/index.php b/vrp/kctf/kctf/challenge-templates/web/challenge/web-apps/php/index.php similarity index 100% rename from vrp/kctf/challenge-templates/web/challenge/web-apps/php/index.php rename to vrp/kctf/kctf/challenge-templates/web/challenge/web-apps/php/index.php diff --git a/vrp/kctf/challenge-templates/web/challenge/web-servers.nsjail.cfg b/vrp/kctf/kctf/challenge-templates/web/challenge/web-servers.nsjail.cfg similarity index 100% rename from vrp/kctf/challenge-templates/web/challenge/web-servers.nsjail.cfg rename to vrp/kctf/kctf/challenge-templates/web/challenge/web-servers.nsjail.cfg diff --git a/vrp/kctf/challenge-templates/web/challenge/web-servers/nodejs.sh b/vrp/kctf/kctf/challenge-templates/web/challenge/web-servers/nodejs.sh similarity index 100% rename from vrp/kctf/challenge-templates/web/challenge/web-servers/nodejs.sh rename to vrp/kctf/kctf/challenge-templates/web/challenge/web-servers/nodejs.sh diff --git a/vrp/kctf/challenge-templates/web/healthcheck/Dockerfile b/vrp/kctf/kctf/challenge-templates/web/healthcheck/Dockerfile similarity index 100% rename from vrp/kctf/challenge-templates/web/healthcheck/Dockerfile rename to vrp/kctf/kctf/challenge-templates/web/healthcheck/Dockerfile diff --git a/vrp/kctf/challenge-templates/web/healthcheck/README.md b/vrp/kctf/kctf/challenge-templates/web/healthcheck/README.md similarity index 100% rename from vrp/kctf/challenge-templates/web/healthcheck/README.md rename to vrp/kctf/kctf/challenge-templates/web/healthcheck/README.md diff --git a/vrp/kctf/challenge-templates/web/healthcheck/healthcheck.py b/vrp/kctf/kctf/challenge-templates/web/healthcheck/healthcheck.py similarity index 100% rename from vrp/kctf/challenge-templates/web/healthcheck/healthcheck.py rename to vrp/kctf/kctf/challenge-templates/web/healthcheck/healthcheck.py diff --git a/vrp/kctf/challenge-templates/web/healthcheck/healthcheck_loop.sh b/vrp/kctf/kctf/challenge-templates/web/healthcheck/healthcheck_loop.sh similarity index 100% rename from vrp/kctf/challenge-templates/web/healthcheck/healthcheck_loop.sh rename to vrp/kctf/kctf/challenge-templates/web/healthcheck/healthcheck_loop.sh diff --git a/vrp/kctf/challenge-templates/web/healthcheck/healthz_webserver.py b/vrp/kctf/kctf/challenge-templates/web/healthcheck/healthz_webserver.py similarity index 100% rename from vrp/kctf/challenge-templates/web/healthcheck/healthz_webserver.py rename to vrp/kctf/kctf/challenge-templates/web/healthcheck/healthz_webserver.py diff --git a/vrp/kctf/challenge-templates/xss-bot/README.md b/vrp/kctf/kctf/challenge-templates/xss-bot/README.md similarity index 100% rename from vrp/kctf/challenge-templates/xss-bot/README.md rename to vrp/kctf/kctf/challenge-templates/xss-bot/README.md diff --git a/vrp/kctf/challenge-templates/xss-bot/challenge.yaml b/vrp/kctf/kctf/challenge-templates/xss-bot/challenge.yaml similarity index 100% rename from vrp/kctf/challenge-templates/xss-bot/challenge.yaml rename to vrp/kctf/kctf/challenge-templates/xss-bot/challenge.yaml diff --git a/vrp/kctf/challenge-templates/xss-bot/challenge/Dockerfile b/vrp/kctf/kctf/challenge-templates/xss-bot/challenge/Dockerfile similarity index 100% rename from vrp/kctf/challenge-templates/xss-bot/challenge/Dockerfile rename to vrp/kctf/kctf/challenge-templates/xss-bot/challenge/Dockerfile diff --git a/vrp/kctf/challenge-templates/xss-bot/challenge/bot.js b/vrp/kctf/kctf/challenge-templates/xss-bot/challenge/bot.js similarity index 100% rename from vrp/kctf/challenge-templates/xss-bot/challenge/bot.js rename to vrp/kctf/kctf/challenge-templates/xss-bot/challenge/bot.js diff --git a/vrp/kctf/challenge-templates/xss-bot/challenge/cookie b/vrp/kctf/kctf/challenge-templates/xss-bot/challenge/cookie similarity index 100% rename from vrp/kctf/challenge-templates/xss-bot/challenge/cookie rename to vrp/kctf/kctf/challenge-templates/xss-bot/challenge/cookie diff --git a/vrp/kctf/challenge-templates/xss-bot/healthcheck/Dockerfile b/vrp/kctf/kctf/challenge-templates/xss-bot/healthcheck/Dockerfile similarity index 100% rename from vrp/kctf/challenge-templates/xss-bot/healthcheck/Dockerfile rename to vrp/kctf/kctf/challenge-templates/xss-bot/healthcheck/Dockerfile diff --git a/vrp/kctf/challenge-templates/xss-bot/healthcheck/README.md b/vrp/kctf/kctf/challenge-templates/xss-bot/healthcheck/README.md similarity index 100% rename from vrp/kctf/challenge-templates/xss-bot/healthcheck/README.md rename to vrp/kctf/kctf/challenge-templates/xss-bot/healthcheck/README.md diff --git a/vrp/kctf/challenge-templates/xss-bot/healthcheck/healthcheck.py b/vrp/kctf/kctf/challenge-templates/xss-bot/healthcheck/healthcheck.py similarity index 100% rename from vrp/kctf/challenge-templates/xss-bot/healthcheck/healthcheck.py rename to vrp/kctf/kctf/challenge-templates/xss-bot/healthcheck/healthcheck.py diff --git a/vrp/kctf/challenge-templates/xss-bot/healthcheck/healthcheck_loop.sh b/vrp/kctf/kctf/challenge-templates/xss-bot/healthcheck/healthcheck_loop.sh similarity index 100% rename from vrp/kctf/challenge-templates/xss-bot/healthcheck/healthcheck_loop.sh rename to vrp/kctf/kctf/challenge-templates/xss-bot/healthcheck/healthcheck_loop.sh diff --git a/vrp/kctf/challenge-templates/xss-bot/healthcheck/healthz_webserver.py b/vrp/kctf/kctf/challenge-templates/xss-bot/healthcheck/healthz_webserver.py similarity index 100% rename from vrp/kctf/challenge-templates/xss-bot/healthcheck/healthz_webserver.py rename to vrp/kctf/kctf/challenge-templates/xss-bot/healthcheck/healthz_webserver.py diff --git a/vrp/kctf/config/.lastconfig b/vrp/kctf/kctf/config/.lastconfig similarity index 100% rename from vrp/kctf/config/.lastconfig rename to vrp/kctf/kctf/config/.lastconfig diff --git a/vrp/kctf/config/kctf-cluster b/vrp/kctf/kctf/config/kctf-cluster similarity index 100% rename from vrp/kctf/config/kctf-cluster rename to vrp/kctf/kctf/config/kctf-cluster diff --git a/vrp/kctf/config/kctf-cluster-newer b/vrp/kctf/kctf/config/kctf-cluster-newer similarity index 100% rename from vrp/kctf/config/kctf-cluster-newer rename to vrp/kctf/kctf/config/kctf-cluster-newer diff --git a/vrp/kctf/resources/kctf-operator-controller-manager-metrics-service_v1_service.yaml b/vrp/kctf/kctf/resources/kctf-operator-controller-manager-metrics-service_v1_service.yaml similarity index 100% rename from vrp/kctf/resources/kctf-operator-controller-manager-metrics-service_v1_service.yaml rename to vrp/kctf/kctf/resources/kctf-operator-controller-manager-metrics-service_v1_service.yaml diff --git a/vrp/kctf/resources/kctf-operator-manager-config_v1_configmap.yaml b/vrp/kctf/kctf/resources/kctf-operator-manager-config_v1_configmap.yaml similarity index 100% rename from vrp/kctf/resources/kctf-operator-manager-config_v1_configmap.yaml rename to vrp/kctf/kctf/resources/kctf-operator-manager-config_v1_configmap.yaml diff --git a/vrp/kctf/resources/kctf-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml b/vrp/kctf/kctf/resources/kctf-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml similarity index 100% rename from vrp/kctf/resources/kctf-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml rename to vrp/kctf/kctf/resources/kctf-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml diff --git a/vrp/kctf/resources/kctf-operator.clusterserviceversion.yaml b/vrp/kctf/kctf/resources/kctf-operator.clusterserviceversion.yaml similarity index 100% rename from vrp/kctf/resources/kctf-operator.clusterserviceversion.yaml rename to vrp/kctf/kctf/resources/kctf-operator.clusterserviceversion.yaml diff --git a/vrp/kctf/resources/kctf.dev_challenges.yaml b/vrp/kctf/kctf/resources/kctf.dev_challenges.yaml similarity index 100% rename from vrp/kctf/resources/kctf.dev_challenges.yaml rename to vrp/kctf/kctf/resources/kctf.dev_challenges.yaml diff --git a/vrp/kctf/resources/operator.yaml b/vrp/kctf/kctf/resources/operator.yaml similarity index 100% rename from vrp/kctf/resources/operator.yaml rename to vrp/kctf/kctf/resources/operator.yaml diff --git a/vrp/level1/challenge.yaml b/vrp/kctf/level1/challenge.yaml similarity index 100% rename from vrp/level1/challenge.yaml rename to vrp/kctf/level1/challenge.yaml diff --git a/vrp/level1/challenge/Dockerfile b/vrp/kctf/level1/challenge/Dockerfile similarity index 100% rename from vrp/level1/challenge/Dockerfile rename to vrp/kctf/level1/challenge/Dockerfile diff --git a/vrp/level1/challenge/chal b/vrp/kctf/level1/challenge/chal similarity index 100% rename from vrp/level1/challenge/chal rename to vrp/kctf/level1/challenge/chal diff --git a/vrp/level1/challenge/nsjail.cfg b/vrp/kctf/level1/challenge/nsjail.cfg similarity index 100% rename from vrp/level1/challenge/nsjail.cfg rename to vrp/kctf/level1/challenge/nsjail.cfg diff --git a/vrp/level1/healthcheck/Dockerfile b/vrp/kctf/level1/healthcheck/Dockerfile similarity index 100% rename from vrp/level1/healthcheck/Dockerfile rename to vrp/kctf/level1/healthcheck/Dockerfile diff --git a/vrp/level1/healthcheck/doit.py b/vrp/kctf/level1/healthcheck/doit.py similarity index 100% rename from vrp/level1/healthcheck/doit.py rename to vrp/kctf/level1/healthcheck/doit.py diff --git a/vrp/level1/healthcheck/env b/vrp/kctf/level1/healthcheck/env similarity index 100% rename from vrp/level1/healthcheck/env rename to vrp/kctf/level1/healthcheck/env diff --git a/vrp/level1/healthcheck/healthz.py b/vrp/kctf/level1/healthcheck/healthz.py similarity index 100% rename from vrp/level1/healthcheck/healthz.py rename to vrp/kctf/level1/healthcheck/healthz.py diff --git a/vrp/level1/healthcheck/run.sh b/vrp/kctf/level1/healthcheck/run.sh similarity index 100% rename from vrp/level1/healthcheck/run.sh rename to vrp/kctf/level1/healthcheck/run.sh diff --git a/vrp/level1/transaction.yaml b/vrp/kctf/level1/transaction.yaml similarity index 100% rename from vrp/level1/transaction.yaml rename to vrp/kctf/level1/transaction.yaml