diff --git a/gb-infra/src/scripts/alm-ci.sh b/gb-infra/src/templates/opt/gbo/tenants/default/alm-ci/alm-ci.sh
similarity index 100%
rename from gb-infra/src/scripts/alm-ci.sh
rename to gb-infra/src/templates/opt/gbo/tenants/default/alm-ci/alm-ci.sh
diff --git a/gb-infra/src/scripts/alm.sh b/gb-infra/src/templates/opt/gbo/tenants/default/alm/alm.sh
similarity index 100%
rename from gb-infra/src/scripts/alm.sh
rename to gb-infra/src/templates/opt/gbo/tenants/default/alm/alm.sh
diff --git a/gb-infra/src/scripts/bot.sh b/gb-infra/src/templates/opt/gbo/tenants/default/bot/bot.sh
similarity index 100%
rename from gb-infra/src/scripts/bot.sh
rename to gb-infra/src/templates/opt/gbo/tenants/default/bot/bot.sh
diff --git a/gb-infra/src/scripts/directory.sh b/gb-infra/src/templates/opt/gbo/tenants/default/directory/directory.sh
similarity index 100%
rename from gb-infra/src/scripts/directory.sh
rename to gb-infra/src/templates/opt/gbo/tenants/default/directory/directory.sh
diff --git a/gb-infra/src/scripts/drive.sh b/gb-infra/src/templates/opt/gbo/tenants/default/drive/drive.sh
similarity index 100%
rename from gb-infra/src/scripts/drive.sh
rename to gb-infra/src/templates/opt/gbo/tenants/default/drive/drive.sh
diff --git a/gb-infra/src/scripts/email.sh b/gb-infra/src/templates/opt/gbo/tenants/default/email/email.sh
similarity index 100%
rename from gb-infra/src/scripts/email.sh
rename to gb-infra/src/templates/opt/gbo/tenants/default/email/email.sh
diff --git a/gb-infra/src/scripts/meeting.sh b/gb-infra/src/templates/opt/gbo/tenants/default/meeting/meeting.sh
similarity index 100%
rename from gb-infra/src/scripts/meeting.sh
rename to gb-infra/src/templates/opt/gbo/tenants/default/meeting/meeting.sh
diff --git a/gb-infra/src/scripts/proxy.sh b/gb-infra/src/templates/opt/gbo/tenants/default/proxy/proxy.sh
similarity index 100%
rename from gb-infra/src/scripts/proxy.sh
rename to gb-infra/src/templates/opt/gbo/tenants/default/proxy/proxy.sh
diff --git a/gb-infra/src/scripts/limits.sh b/gb-infra/src/templates/opt/gbo/tenants/default/shared/scripts/limits.sh
similarity index 100%
rename from gb-infra/src/scripts/limits.sh
rename to gb-infra/src/templates/opt/gbo/tenants/default/shared/scripts/limits.sh
diff --git a/gb-infra/src/scripts/tables.sh b/gb-infra/src/templates/opt/gbo/tenants/default/tables/tables.sh
similarity index 100%
rename from gb-infra/src/scripts/tables.sh
rename to gb-infra/src/templates/opt/gbo/tenants/default/tables/tables.sh
diff --git a/gb-infra/src/scripts/webmail.sh b/gb-infra/src/templates/opt/gbo/tenants/default/webmail/webmail.sh
similarity index 100%
rename from gb-infra/src/scripts/webmail.sh
rename to gb-infra/src/templates/opt/gbo/tenants/default/webmail/webmail.sh