diff --git a/sql2008-logins.sql b/sql2008-startup/logins.sql
similarity index 100%
rename from sql2008-logins.sql
rename to sql2008-startup/logins.sql
diff --git a/ola/CommandExecute.sql b/sql2016-startup/ola/CommandExecute.sql
similarity index 100%
rename from ola/CommandExecute.sql
rename to sql2016-startup/ola/CommandExecute.sql
diff --git a/ola/CommandLog Cleanup.sql b/sql2016-startup/ola/CommandLog Cleanup.sql
similarity index 100%
rename from ola/CommandLog Cleanup.sql
rename to sql2016-startup/ola/CommandLog Cleanup.sql
diff --git a/ola/CommandLog.sql b/sql2016-startup/ola/CommandLog.sql
similarity index 100%
rename from ola/CommandLog.sql
rename to sql2016-startup/ola/CommandLog.sql
diff --git a/ola/DatabaseBackup - SYSTEM_DATABASES - FULL.sql b/sql2016-startup/ola/DatabaseBackup - SYSTEM_DATABASES - FULL.sql
similarity index 100%
rename from ola/DatabaseBackup - SYSTEM_DATABASES - FULL.sql
rename to sql2016-startup/ola/DatabaseBackup - SYSTEM_DATABASES - FULL.sql
diff --git a/ola/DatabaseBackup - USER_DATABASES - DIFF.sql b/sql2016-startup/ola/DatabaseBackup - USER_DATABASES - DIFF.sql
similarity index 100%
rename from ola/DatabaseBackup - USER_DATABASES - DIFF.sql
rename to sql2016-startup/ola/DatabaseBackup - USER_DATABASES - DIFF.sql
diff --git a/ola/DatabaseBackup - USER_DATABASES - FULL.sql b/sql2016-startup/ola/DatabaseBackup - USER_DATABASES - FULL.sql
similarity index 100%
rename from ola/DatabaseBackup - USER_DATABASES - FULL.sql
rename to sql2016-startup/ola/DatabaseBackup - USER_DATABASES - FULL.sql
diff --git a/ola/DatabaseBackup - USER_DATABASES - LOG.sql b/sql2016-startup/ola/DatabaseBackup - USER_DATABASES - LOG.sql
similarity index 100%
rename from ola/DatabaseBackup - USER_DATABASES - LOG.sql
rename to sql2016-startup/ola/DatabaseBackup - USER_DATABASES - LOG.sql
diff --git a/ola/DatabaseBackup.sql b/sql2016-startup/ola/DatabaseBackup.sql
similarity index 100%
rename from ola/DatabaseBackup.sql
rename to sql2016-startup/ola/DatabaseBackup.sql
diff --git a/ola/DatabaseIntegrityCheck - SYSTEM_DATABASES.sql b/sql2016-startup/ola/DatabaseIntegrityCheck - SYSTEM_DATABASES.sql
similarity index 100%
rename from ola/DatabaseIntegrityCheck - SYSTEM_DATABASES.sql
rename to sql2016-startup/ola/DatabaseIntegrityCheck - SYSTEM_DATABASES.sql
diff --git a/ola/DatabaseIntegrityCheck - USER_DATABASES.sql b/sql2016-startup/ola/DatabaseIntegrityCheck - USER_DATABASES.sql
similarity index 100%
rename from ola/DatabaseIntegrityCheck - USER_DATABASES.sql
rename to sql2016-startup/ola/DatabaseIntegrityCheck - USER_DATABASES.sql
diff --git a/ola/DatabaseIntegrityCheck.sql b/sql2016-startup/ola/DatabaseIntegrityCheck.sql
similarity index 100%
rename from ola/DatabaseIntegrityCheck.sql
rename to sql2016-startup/ola/DatabaseIntegrityCheck.sql
diff --git a/ola/IndexOptimize - USER_DATABASES.sql b/sql2016-startup/ola/IndexOptimize - USER_DATABASES.sql
similarity index 100%
rename from ola/IndexOptimize - USER_DATABASES.sql
rename to sql2016-startup/ola/IndexOptimize - USER_DATABASES.sql
diff --git a/ola/IndexOptimize.sql b/sql2016-startup/ola/IndexOptimize.sql
similarity index 100%
rename from ola/IndexOptimize.sql
rename to sql2016-startup/ola/IndexOptimize.sql
diff --git a/ola/Output File Cleanup.sql b/sql2016-startup/ola/Output File Cleanup.sql
similarity index 100%
rename from ola/Output File Cleanup.sql
rename to sql2016-startup/ola/Output File Cleanup.sql
diff --git a/ola/sp_delete_backuphistory.sql b/sql2016-startup/ola/sp_delete_backuphistory.sql
similarity index 100%
rename from ola/sp_delete_backuphistory.sql
rename to sql2016-startup/ola/sp_delete_backuphistory.sql
diff --git a/ola/sp_purge_jobhistory.sql b/sql2016-startup/ola/sp_purge_jobhistory.sql
similarity index 100%
rename from ola/sp_purge_jobhistory.sql
rename to sql2016-startup/ola/sp_purge_jobhistory.sql