diff --git a/.gitignore b/.gitignore
index 2c4c7ec..a884b44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@ site-config/*
 
 ## Ignore site configuration
 */docker-compose.override.yml
+
+## MAC OS
+.DS_Store
diff --git a/ccp/mtba-compose.yml b/ccp/modules/mtba-compose.yml
similarity index 100%
rename from ccp/mtba-compose.yml
rename to ccp/modules/mtba-compose.yml
diff --git a/ccp/modules/mtba-setup.sh b/ccp/modules/mtba-setup.sh
new file mode 100644
index 0000000..561e5be
--- /dev/null
+++ b/ccp/modules/mtba-setup.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+function mtbaSetup() {
+       # TODO: Check if ID-Management Module is activated!
+       if [ -n "$ENABLE_MTBA" ];then
+               log INFO "MTBA setup detected -- will start MTBA Service and CBioPortal."
+              if [ ! -n "$IDMANAGER_UPLOAD_APIKEY" ]; then
+                      log ERROR "Detected MTBA Module configuration but ID-Management Module seems not to be configured!"
+                      exit 1;
+              fi
+               OVERRIDE+=" -f ./$PROJECT/mtba-compose.yml"
+       fi
+}
\ No newline at end of file
diff --git a/ccp/nngm-compose.yml b/ccp/modules/nngm-compose.yml
similarity index 100%
rename from ccp/nngm-compose.yml
rename to ccp/modules/nngm-compose.yml
diff --git a/ccp/modules/nngm-setup.sh b/ccp/modules/nngm-setup.sh
new file mode 100644
index 0000000..3e31f59
--- /dev/null
+++ b/ccp/modules/nngm-setup.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+function nngmSetup() {
+	if [ -n "$NNGM_CTS_APIKEY" ]; then
+		log INFO "nNGM setup detected -- will start nNGM Connector."
+		OVERRIDE+=" -f ./$PROJECT/modules/nngm-compose.yml"
+	fi
+	}
diff --git a/ccp/nngm-setup.sh b/ccp/nngm-setup.sh
deleted file mode 100644
index f9f1e70..0000000
--- a/ccp/nngm-setup.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-function nngmSetup() {
-	if [ -n "$NNGM_CTS_APIKEY" ]; then
-		log INFO "nNGM setup detected -- will start nNGM Connector."
-		OVERRIDE+=" -f ./$PROJECT/nngm-compose.yml"
-	fi
-	}
-
-function mtbaSetup() {
-	# TODO: Check if ID-Management Module is activated!
-	if [ -n "$ENABLE_MTBA" ];then
-		log INFO "MTBA setup detected -- will start MTBA Service and CBioPortal."
-#		if [ ! -n "$IDMANAGER_UPLOAD_APIKEY" ]; then
-#			log ERROR "Detected MTBA Module configuration but ID-Management Module seems not to be configured!"
-#			exit 1;
-#		fi
-		OVERRIDE+=" -f ./$PROJECT/mtba-compose.yml"
-	fi
-}
diff --git a/ccp/vars b/ccp/vars
index 161b04e..0c80e8a 100644
--- a/ccp/vars
+++ b/ccp/vars
@@ -8,17 +8,13 @@ PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem
 
 BROKER_URL_FOR_PREREQ=$BROKER_URL
 
-# This will load id-management setup. Effective only if id-management configuration is defined.
-source $PROJECT/modules/id-management-setup.sh
-idManagementSetup
-# This will load nngm setup. Effective only if nngm configuration is defined.
-source $PROJECT/nngm-setup.sh
-nngmSetup
-
-mtbaSetup
 
 for module in $PROJECT/modules/*.sh
 do
     log DEBUG "sourcing $module"
     source $module
 done
+
+idManagementSetup
+nngmSetup
+mtbaSetup
\ No newline at end of file