diff --git a/goss_ap31-prod.yaml b/goss/goss_ap31-prod.yaml
similarity index 100%
rename from goss_ap31-prod.yaml
rename to goss/goss_ap31-prod.yaml
diff --git a/goss_ap31-test.yaml b/goss/goss_ap31-test.yaml
similarity index 100%
rename from goss_ap31-test.yaml
rename to goss/goss_ap31-test.yaml
diff --git a/journald-rcv.sh b/journald/journald-rcv.sh
similarity index 100%
rename from journald-rcv.sh
rename to journald/journald-rcv.sh
diff --git a/journald-snd.sh b/journald/journald-snd.sh
similarity index 100%
rename from journald-snd.sh
rename to journald/journald-snd.sh
diff --git a/zabbix-install-client-prod.sh b/zabbix/zabbix-install-client-prod.sh
similarity index 100%
rename from zabbix-install-client-prod.sh
rename to zabbix/zabbix-install-client-prod.sh
diff --git a/zabbix-install-client-test.sh b/zabbix/zabbix-install-client-test.sh
similarity index 100%
rename from zabbix-install-client-test.sh
rename to zabbix/zabbix-install-client-test.sh
diff --git a/zabbix-install-server.sh b/zabbix/zabbix-install-server.sh
similarity index 100%
rename from zabbix-install-server.sh
rename to zabbix/zabbix-install-server.sh