diff --git a/bbmri/directory-sync.sh b/bbmri/directory-sync.sh
deleted file mode 100755
index 2eeef4a..0000000
--- a/bbmri/directory-sync.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-function dirSetup() {
-	if [ -n "$DS_DIRECTORY_USER_NAME" ]; then
-		log INFO "Directory sync setup detected -- will start directory sync service."
-		OVERRIDE+=" -f ./$PROJECT/directory-sync-compose.yml"
-	fi
-}
diff --git a/bbmri/directory-sync-compose.yml b/bbmri/modules/directory-sync-compose.yml
similarity index 100%
rename from bbmri/directory-sync-compose.yml
rename to bbmri/modules/directory-sync-compose.yml
diff --git a/bbmri/modules/directory-sync.sh b/bbmri/modules/directory-sync.sh
new file mode 100755
index 0000000..2765dfb
--- /dev/null
+++ b/bbmri/modules/directory-sync.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if [ -n "${DS_DIRECTORY_USER_NAME}" ]; then
+	log INFO "Directory sync setup detected -- will start directory sync service."
+	OVERRIDE+=" -f ./$PROJECT/modules/directory-sync-compose.yml"
+fi
diff --git a/bbmri/vars b/bbmri/vars
index 21aeaec..d86930c 100644
--- a/bbmri/vars
+++ b/bbmri/vars
@@ -11,7 +11,3 @@ do
     log DEBUG "sourcing $module"
     source $module
 done
-
-# This will load directory-sync setup.
-source $PROJECT/directory-sync.sh
-dirSetup