diff --git a/.gitignore b/.gitignore
index 06ae7c7..8070a0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,12 +12,12 @@
 !/definitions/default/core/
 /definitions/default/core/*
 !/definitions/default/core/all/
+!/definitions/default/hosts/
+/definitions/default/hosts/*
+!/definitions/default/hosts/all/
 !/definitions/default/monitor/
 /definitions/default/monitor/*
 !/definitions/default/monitor/checks/
-!/definitions/default/script/
-/definitions/default/script/*
-!/definitions/default/script/all/
 
 # 2.) Ignore all content of 'states', except file README.md
 /states/*
diff --git a/core/ensureUsageOfDefinitions.sh b/core/ensureUsageOfDefinitions.sh
index 5372435..8be950b 100755
--- a/core/ensureUsageOfDefinitions.sh
+++ b/core/ensureUsageOfDefinitions.sh
@@ -58,7 +58,7 @@ function printSelectedDefinition() {
     _CORE_FILE_DEFAULT_ALL_HOSTS="${1:?"Missing CIS_ROOT"}definitions/default/core/all${3:?"Missing CURRENT_FULLFILE"}"
     _CORE_FILE_DEFINED_ALL_HOSTS="${_DEFINITIONS:?"Missing DEFINITIONS"}core/all${3:?"Missing CURRENT_FULLFILE"}"
     _CORE_FILE_DEFINED_THIS_HOST="${_DEFINITIONS:?"Missing DEFINITIONS"}core/$(hostname -s)${3:?"Missing CURRENT_FULLFILE"}"
-    _FILE_DEFAULT_ALL_HOSTS="${1:?"Missing CIS_ROOT"}definitions/default/script/all${3:?"Missing CURRENT_FULLFILE"}"
+    _FILE_DEFAULT_ALL_HOSTS="${1:?"Missing CIS_ROOT"}definitions/default/hosts/all${3:?"Missing CURRENT_FULLFILE"}"
     _FILE_DEFINED_ALL_HOSTS="${_DEFINITIONS:?"Missing DEFINITIONS"}hosts/all${3:?"Missing CURRENT_FULLFILE"}"
     _FILE_DEFINED_THIS_HOST="${_DEFINITIONS:?"Missing DEFINITIONS"}hosts/$(hostname -s)${3:?"Missing CURRENT_FULLFILE"}"
     readonly _DEFINITIONS _CORE_FILE_DEFAULT_ALL_HOSTS _CORE_FILE_DEFINED_ALL_HOSTS _CORE_FILE_DEFINED_THIS_HOST _FILE_DEFAULT_ALL_HOSTS _FILE_DEFINED_ALL_HOSTS _FILE_DEFINED_THIS_HOST
diff --git a/definitions/default/script/all/etc/sudoers.d/allow-composition-sync-send b/definitions/default/hosts/all/etc/sudoers.d/allow-composition-sync-send
similarity index 100%
rename from definitions/default/script/all/etc/sudoers.d/allow-composition-sync-send
rename to definitions/default/hosts/all/etc/sudoers.d/allow-composition-sync-send