diff --git a/monitoring/nagios3/custom-commands.cfg b/monitoring/nagios3/configs/custom-commands.cfg
similarity index 100%
rename from monitoring/nagios3/custom-commands.cfg
rename to monitoring/nagios3/configs/custom-commands.cfg
diff --git a/monitoring/nagios3/custom-services.cfg b/monitoring/nagios3/configs/custom-services.cfg
similarity index 100%
rename from monitoring/nagios3/custom-services.cfg
rename to monitoring/nagios3/configs/custom-services.cfg
diff --git a/monitoring/nagios3/objects/ap/ap-bulgaria-1-ac.cfg b/monitoring/nagios3/configs/objects/ap/ap-bulgaria-1-ac.cfg
similarity index 100%
rename from monitoring/nagios3/objects/ap/ap-bulgaria-1-ac.cfg
rename to monitoring/nagios3/configs/objects/ap/ap-bulgaria-1-ac.cfg
diff --git a/monitoring/nagios3/objects/ap/ap-bulgaria-2-ac.cfg b/monitoring/nagios3/configs/objects/ap/ap-bulgaria-2-ac.cfg
similarity index 100%
rename from monitoring/nagios3/objects/ap/ap-bulgaria-2-ac.cfg
rename to monitoring/nagios3/configs/objects/ap/ap-bulgaria-2-ac.cfg
diff --git a/monitoring/nagios3/objects/ap/ap-bulgaria-3-ac.cfg b/monitoring/nagios3/configs/objects/ap/ap-bulgaria-3-ac.cfg
similarity index 100%
rename from monitoring/nagios3/objects/ap/ap-bulgaria-3-ac.cfg
rename to monitoring/nagios3/configs/objects/ap/ap-bulgaria-3-ac.cfg
diff --git a/monitoring/nagios3/objects/ap/ap-bulgaria-4-legacy.cfg b/monitoring/nagios3/configs/objects/ap/ap-bulgaria-4-legacy.cfg
similarity index 100%
rename from monitoring/nagios3/objects/ap/ap-bulgaria-4-legacy.cfg
rename to monitoring/nagios3/configs/objects/ap/ap-bulgaria-4-legacy.cfg
diff --git a/monitoring/nagios3/objects/ap/ap-chamber-1-ac.cfg b/monitoring/nagios3/configs/objects/ap/ap-chamber-1-ac.cfg
similarity index 100%
rename from monitoring/nagios3/objects/ap/ap-chamber-1-ac.cfg
rename to monitoring/nagios3/configs/objects/ap/ap-chamber-1-ac.cfg
diff --git a/monitoring/nagios3/objects/ap/ap-chamber-2-ac.cfg b/monitoring/nagios3/configs/objects/ap/ap-chamber-2-ac.cfg
similarity index 100%
rename from monitoring/nagios3/objects/ap/ap-chamber-2-ac.cfg
rename to monitoring/nagios3/configs/objects/ap/ap-chamber-2-ac.cfg
diff --git a/monitoring/nagios3/objects/ap/ap-lobby1-1-an.cfg b/monitoring/nagios3/configs/objects/ap/ap-lobby1-1-an.cfg
similarity index 100%
rename from monitoring/nagios3/objects/ap/ap-lobby1-1-an.cfg
rename to monitoring/nagios3/configs/objects/ap/ap-lobby1-1-an.cfg
diff --git a/monitoring/nagios3/objects/ap/ap-lobby1-3-an.cfg b/monitoring/nagios3/configs/objects/ap/ap-lobby1-3-an.cfg
similarity index 100%
rename from monitoring/nagios3/objects/ap/ap-lobby1-3-an.cfg
rename to monitoring/nagios3/configs/objects/ap/ap-lobby1-3-an.cfg
diff --git a/monitoring/nagios3/objects/ap/ap-lobby2-1-an.cfg b/monitoring/nagios3/configs/objects/ap/ap-lobby2-1-an.cfg
similarity index 100%
rename from monitoring/nagios3/objects/ap/ap-lobby2-1-an.cfg
rename to monitoring/nagios3/configs/objects/ap/ap-lobby2-1-an.cfg
diff --git a/monitoring/nagios3/objects/ap/ap-marble-1-ac.cfg b/monitoring/nagios3/configs/objects/ap/ap-marble-1-ac.cfg
similarity index 100%
rename from monitoring/nagios3/objects/ap/ap-marble-1-ac.cfg
rename to monitoring/nagios3/configs/objects/ap/ap-marble-1-ac.cfg
diff --git a/monitoring/nagios3/objects/ap/ap-music-1-ac.cfg b/monitoring/nagios3/configs/objects/ap/ap-music-1-ac.cfg
similarity index 100%
rename from monitoring/nagios3/objects/ap/ap-music-1-ac.cfg
rename to monitoring/nagios3/configs/objects/ap/ap-music-1-ac.cfg
diff --git a/monitoring/nagios3/objects/switch/01-core-coresw.cfg b/monitoring/nagios3/configs/objects/switch/01-core-coresw.cfg
similarity index 100%
rename from monitoring/nagios3/objects/switch/01-core-coresw.cfg
rename to monitoring/nagios3/configs/objects/switch/01-core-coresw.cfg
diff --git a/monitoring/nagios3/objects/switch/02-core-nocsw.cfg b/monitoring/nagios3/configs/objects/switch/02-core-nocsw.cfg
similarity index 100%
rename from monitoring/nagios3/objects/switch/02-core-nocsw.cfg
rename to monitoring/nagios3/configs/objects/switch/02-core-nocsw.cfg
diff --git a/monitoring/nagios3/objects/switch/03-core-teamsw.cfg b/monitoring/nagios3/configs/objects/switch/03-core-teamsw.cfg
similarity index 100%
rename from monitoring/nagios3/objects/switch/03-core-teamsw.cfg
rename to monitoring/nagios3/configs/objects/switch/03-core-teamsw.cfg
diff --git a/monitoring/nagios3/objects/switch/04-core-wssw.cfg b/monitoring/nagios3/configs/objects/switch/04-core-wssw.cfg
similarity index 100%
rename from monitoring/nagios3/objects/switch/04-core-wssw.cfg
rename to monitoring/nagios3/configs/objects/switch/04-core-wssw.cfg
diff --git a/monitoring/nagios3/objects/switch/05-core-receptionsw.cfg b/monitoring/nagios3/configs/objects/switch/05-core-receptionsw.cfg
similarity index 100%
rename from monitoring/nagios3/objects/switch/05-core-receptionsw.cfg
rename to monitoring/nagios3/configs/objects/switch/05-core-receptionsw.cfg
diff --git a/monitoring/nagios3/objects/switch/06-core-camsw.cfg b/monitoring/nagios3/configs/objects/switch/06-core-camsw.cfg
similarity index 100%
rename from monitoring/nagios3/objects/switch/06-core-camsw.cfg
rename to monitoring/nagios3/configs/objects/switch/06-core-camsw.cfg
diff --git a/monitoring/nagios3/objects/switch/07-core-f2sw.cfg b/monitoring/nagios3/configs/objects/switch/07-core-f2sw.cfg
similarity index 100%
rename from monitoring/nagios3/objects/switch/07-core-f2sw.cfg
rename to monitoring/nagios3/configs/objects/switch/07-core-f2sw.cfg
diff --git a/monitoring/nagios3/objects/switch/08-core-mussw.cfg b/monitoring/nagios3/configs/objects/switch/08-core-mussw.cfg
similarity index 100%
rename from monitoring/nagios3/objects/switch/08-core-mussw.cfg
rename to monitoring/nagios3/configs/objects/switch/08-core-mussw.cfg