diff --git a/NAMESPACE b/NAMESPACE
index 92dc0be..8a99886 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -1,5 +1,6 @@
 # Generated by roxygen2: do not edit by hand
 
+export(buildRelease)
 export(buildReleaseZip)
 export(createDdl)
 export(createForeignKeys)
diff --git a/R/buildRelease.R b/R/buildRelease.R
index 53d0bcc..15dae6b 100644
--- a/R/buildRelease.R
+++ b/R/buildRelease.R
@@ -19,25 +19,36 @@
 #' Writes DDL, ForeignKey, PrimaryKey and index SQL files for given cdmVersion
 #' and targetDialect to the 'ddl' folder in current working directory.
 #'
-#' @param cdmVersion The version of the CDM you are creating, e.g. 5.3, 5.4.
+#' @param cdmVersions The versions of the CDM you are creating, e.g. 5.3, 5.4.
 #'                   Defaults to all supported CDM versions.
-#' @param targetDialect The target dialect
-#'
-buildRelease <- function(cdmVersion = listSupportedVersions(),
-                         targetDialect = listSupportedDialects()){
-  for (cdmVersion in cdmVersion) {
-    for (targetDialect in targetDialect) {
+#' @param targetDialects A character vector of target dialects.
+#'                      Defaults to all supported dialects.
+#' @param outputfolder The base folder where the SQL files will be written.
+#'                     Subfolders will be created for each cdmVersion and targetDialect.
+#' @export
+buildRelease <- function(cdmVersions = listSupportedVersions(),
+                         targetDialects = listSupportedDialects(),
+                         outputfolder = file.path(getwd(), "inst", "ddl")){
+  basefolder <- outputfolder
+  for (cdmVersion in cdmVersions) {
+    for (targetDialect in targetDialects) {
+      outputfolder <- file.path(basefolder, cdmVersion, gsub(" ", "_", targetDialect))
+
       writeDdl(targetDialect = targetDialect,
-               cdmVersion = cdmVersion)
+               cdmVersion = cdmVersion,
+               outputfolder = outputfolder)
 
       writePrimaryKeys(targetDialect = targetDialect,
-                       cdmVersion = cdmVersion)
+                       cdmVersion = cdmVersion,
+                       outputfolder = outputfolder)
 
       writeForeignKeys(targetDialect = targetDialect,
-                       cdmVersion = cdmVersion)
+                       cdmVersion = cdmVersion,
+                       outputfolder = outputfolder)
 
       writeIndex(targetDialect = targetDialect,
-                 cdmVersion = cdmVersion)
+                 cdmVersion = cdmVersion,
+                 outputfolder = outputfolder)
     }
   }
 }
@@ -62,7 +73,7 @@ buildRelease <- function(cdmVersion = listSupportedVersions(),
 #'
 buildReleaseZip <- function(cdmVersion,
                             targetDialect = listSupportedDialects(),
-                            outputfolder = "output"){
+                            outputfolder = file.path(getwd(), "inst", "ddl")){
   # argument checks
   stopifnot(is.character(cdmVersion), length(cdmVersion) == 1, cdmVersion %in% listSupportedVersions())
 
@@ -72,8 +83,8 @@ buildReleaseZip <- function(cdmVersion,
 
   files <- c()
   for (dialect in targetDialect) {
-    buildRelease(cdmVersion, dialect)
-    files <- c(files, list.files(file.path('ddl', cdmVersion, gsub(" ", "_", dialect)),
+    buildRelease(cdmVersion, dialect, outputfolder = outputfolder)
+    files <- c(files, list.files(file.path(outputfolder, cdmVersion, gsub(" ", "_", dialect)),
                                  pattern = ".*\\.sql$",
                                  full.names = TRUE))
   }
diff --git a/R/executeDdl.R b/R/executeDdl.R
index ed5e010..3c1d3ff 100644
--- a/R/executeDdl.R
+++ b/R/executeDdl.R
@@ -42,16 +42,16 @@ executeDdl <- function(connectionDetails,
                        executeForeignKey = TRUE,
                        ...) {
 
-  outputpath <- tempdir(check = TRUE)
+  outputfolder <- tempdir(check = TRUE)
 
 
   if(executeDdl) {
     filename <- writeDdl(targetDialect = connectionDetails$dbms,
                          cdmVersion = cdmVersion,
                          cdmDatabaseSchema = cdmDatabaseSchema,
-                         outputpath = outputpath)
+                         outputfolder = outputfolder)
 
-    sql <- readr::read_file(file.path(outputpath, filename))
+    sql <- readr::read_file(file.path(outputfolder, filename))
   } else {
     sql <- ""
   }
@@ -60,18 +60,18 @@ executeDdl <- function(connectionDetails,
     filename <- writePrimaryKeys(targetDialect = connectionDetails$dbms,
                                  cdmVersion = cdmVersion,
                                  cdmDatabaseSchema = cdmDatabaseSchema,
-                                 outputpath = outputpath)
+                                 outputfolder = outputfolder)
 
-    sql <- paste(sql, readr::read_file(file.path(outputpath, filename)), sep = "\n")
+    sql <- paste(sql, readr::read_file(file.path(outputfolder, filename)), sep = "\n")
   }
 
   if(executeForeignKey) {
     filename <- writeForeignKeys(targetDialect = connectionDetails$dbms,
                                  cdmVersion = cdmVersion,
                                  cdmDatabaseSchema = cdmDatabaseSchema,
-                                 outputpath = outputpath)
+                                 outputfolder = outputfolder)
 
-    sql <- paste(sql, readr::read_file(file.path(outputpath, filename)), sep = "\n")
+    sql <- paste(sql, readr::read_file(file.path(outputfolder, filename)), sep = "\n")
   }
 
   con <- DatabaseConnector::connect(connectionDetails = connectionDetails)
diff --git a/R/writeDDL.R b/R/writeDDL.R
index 6b89082..9df7235 100644
--- a/R/writeDDL.R
+++ b/R/writeDDL.R
@@ -22,95 +22,95 @@
 #'
 #' @param targetDialect  The dialect of the target database. Choices are "oracle", "postgresql", "pdw", "redshift", "impala", "netezza", "bigquery", "sql server"
 #' @param cdmVersion The version of the CDM you are creating, e.g. 5.3, 5.4
-#' @param outputpath The directory or folder where the SQL file should be saved.
+#' @param outputfolder The directory or folder where the SQL file should be saved.
 #' @param cdmDatabaseSchema The schema of the CDM instance where the DDL will be run. For example, this would be "ohdsi.dbo" when testing on sql server.
 #'                          Defaults to "@cdmDatabaseSchema"
 #'
 #' @export
-writeDdl <- function(targetDialect, cdmVersion, outputpath, cdmDatabaseSchema = "@cdmDatabaseSchema") {
+writeDdl <- function(targetDialect, cdmVersion, outputfolder, cdmDatabaseSchema = "@cdmDatabaseSchema") {
 
   # argument checks
   stopifnot(targetDialect %in% c("oracle", "postgresql", "pdw", "redshift", "impala", "netezza", "bigquery", "sql server"))
   stopifnot(cdmVersion %in% listSupportedVersions())
   stopifnot(is.character(cdmDatabaseSchema))
 
-  if(missing(outputpath)) {
-    outputpath <- file.path("ddl", cdmVersion, gsub(" ", "_", targetDialect))
+  if(missing(outputfolder)) {
+    outputfolder <- file.path("ddl", cdmVersion, gsub(" ", "_", targetDialect))
   }
 
-  if(!dir.exists(outputpath)) dir.create(outputpath, showWarnings = FALSE, recursive = TRUE)
+  if(!dir.exists(outputfolder)) dir.create(outputfolder, showWarnings = FALSE, recursive = TRUE)
 
   sql <- createDdl(cdmVersion)
   sql <- SqlRender::render(sql = sql, cdmDatabaseSchema = cdmDatabaseSchema, targetDialect = targetDialect)
   sql <- SqlRender::translate(sql, targetDialect = targetDialect)
 
   filename <- paste("OMOPCDM", gsub(" ", "_", targetDialect), cdmVersion, "ddl.sql", sep = "_")
-  SqlRender::writeSql(sql = sql, targetFile = file.path(outputpath, filename))
+  SqlRender::writeSql(sql = sql, targetFile = file.path(outputfolder, filename))
   invisible(filename)
 }
 
 #' @describeIn writeDdl writePrimaryKeys Write the SQL code that creates the primary keys to a file.
 #' @export
-writePrimaryKeys <- function(targetDialect, cdmVersion, outputpath, cdmDatabaseSchema = "@cdmDatabaseSchema") {
+writePrimaryKeys <- function(targetDialect, cdmVersion, outputfolder, cdmDatabaseSchema = "@cdmDatabaseSchema") {
 
   # argument checks
   stopifnot(targetDialect %in% c("oracle", "postgresql", "pdw", "redshift", "impala", "netezza", "bigquery", "sql server"))
   stopifnot(cdmVersion %in% listSupportedVersions())
   stopifnot(is.character(cdmDatabaseSchema))
 
-  if(missing(outputpath)) {
-    outputpath <- file.path("ddl", cdmVersion, gsub(" ", "_", targetDialect))
+  if(missing(outputfolder)) {
+    outputfolder <- file.path("ddl", cdmVersion, gsub(" ", "_", targetDialect))
   }
 
-  if(!dir.exists(outputpath)) dir.create(outputpath, showWarnings = FALSE, recursive = TRUE)
+  if(!dir.exists(outputfolder)) dir.create(outputfolder, showWarnings = FALSE, recursive = TRUE)
 
   sql <- createPrimaryKeys(cdmVersion)
   sql <- SqlRender::render(sql = sql, cdmDatabaseSchema = cdmDatabaseSchema, targetDialect = targetDialect)
   sql <- SqlRender::translate(sql, targetDialect = targetDialect)
 
   filename <- paste("OMOPCDM", gsub(" ", "_", targetDialect), cdmVersion, "primary", "keys.sql", sep = "_")
-  SqlRender::writeSql(sql = sql, targetFile = file.path(outputpath, filename))
+  SqlRender::writeSql(sql = sql, targetFile = file.path(outputfolder, filename))
   invisible(filename)
 }
 
 #' @describeIn writeDdl writeForeignKeys Write the SQL code that creates the foreign keys to a file.
 #' @export
-writeForeignKeys <- function(targetDialect, cdmVersion, outputpath, cdmDatabaseSchema = "@cdmDatabaseSchema") {
+writeForeignKeys <- function(targetDialect, cdmVersion, outputfolder, cdmDatabaseSchema = "@cdmDatabaseSchema") {
 
   # argument checks
   stopifnot(targetDialect %in% c("oracle", "postgresql", "pdw", "redshift", "impala", "netezza", "bigquery", "sql server"))
   stopifnot(cdmVersion %in% listSupportedVersions())
   stopifnot(is.character(cdmDatabaseSchema))
 
-  if(missing(outputpath)) {
-    outputpath <- file.path("ddl", cdmVersion, gsub(" ", "_", targetDialect))
+  if(missing(outputfolder)) {
+    outputfolder <- file.path("ddl", cdmVersion, gsub(" ", "_", targetDialect))
   }
 
-  if(!dir.exists(outputpath)) dir.create(outputpath, showWarnings = FALSE, recursive = TRUE)
+  if(!dir.exists(outputfolder)) dir.create(outputfolder, showWarnings = FALSE, recursive = TRUE)
 
   sql <- createForeignKeys(cdmVersion)
   sql <- SqlRender::render(sql = sql, cdmDatabaseSchema = cdmDatabaseSchema, targetDialect = targetDialect)
   sql <- SqlRender::translate(sql, targetDialect = targetDialect)
 
   filename <- paste("OMOPCDM", gsub(" ", "_", targetDialect), cdmVersion, "constraints.sql", sep = "_")
-  SqlRender::writeSql(sql = sql, targetFile = file.path(outputpath, filename))
+  SqlRender::writeSql(sql = sql, targetFile = file.path(outputfolder, filename))
   invisible(filename)
 }
 
 #' @describeIn writeDdl writeIndex Write the rendered and translated sql that creates recommended indexes to a file.
 #' @export
-writeIndex <- function(targetDialect, cdmVersion, outputpath, cdmDatabaseSchema  = "@cdmDatabaseSchema") {
+writeIndex <- function(targetDialect, cdmVersion, outputfolder, cdmDatabaseSchema  = "@cdmDatabaseSchema") {
 
   # argument checks
   stopifnot(targetDialect %in% c("oracle", "postgresql", "pdw", "redshift", "impala", "netezza", "bigquery", "sql server"))
   stopifnot(cdmVersion %in% listSupportedVersions())
   stopifnot(is.character(cdmDatabaseSchema))
 
-  if(missing(outputpath)) {
-    outputpath <- file.path("ddl", cdmVersion, gsub(" ", "_", targetDialect))
+  if(missing(outputfolder)) {
+    outputfolder <- file.path("ddl", cdmVersion, gsub(" ", "_", targetDialect))
   }
 
-  if(!dir.exists(outputpath)) dir.create(outputpath, showWarnings = FALSE, recursive = TRUE)
+  if(!dir.exists(outputfolder)) dir.create(outputfolder, showWarnings = FALSE, recursive = TRUE)
 
   sqlFilename <- paste0("OMOP_CDM_indices_v", cdmVersion, ".sql")
   sql <- readr::read_file(system.file(file.path("sql", "sql_server", sqlFilename), package = "CommonDataModel"))
@@ -118,6 +118,6 @@ writeIndex <- function(targetDialect, cdmVersion, outputpath, cdmDatabaseSchema
   sql <- SqlRender::translate(sql, targetDialect = targetDialect)
 
   filename <- paste("OMOPCDM", gsub(" ", "_", targetDialect), cdmVersion, "indices.sql", sep = "_")
-  SqlRender::writeSql(sql = sql, targetFile = file.path(outputpath, filename))
+  SqlRender::writeSql(sql = sql, targetFile = file.path(outputfolder, filename))
   invisible(filename)
 }
diff --git a/ddl/5.3/bigquery/OMOPCDM_bigquery_5.3_constraints.sql b/inst/ddl/5.3/bigquery/OMOPCDM_bigquery_5.3_constraints.sql
similarity index 100%
rename from ddl/5.3/bigquery/OMOPCDM_bigquery_5.3_constraints.sql
rename to inst/ddl/5.3/bigquery/OMOPCDM_bigquery_5.3_constraints.sql
diff --git a/ddl/5.3/bigquery/OMOPCDM_bigquery_5.3_ddl.sql b/inst/ddl/5.3/bigquery/OMOPCDM_bigquery_5.3_ddl.sql
similarity index 100%
rename from ddl/5.3/bigquery/OMOPCDM_bigquery_5.3_ddl.sql
rename to inst/ddl/5.3/bigquery/OMOPCDM_bigquery_5.3_ddl.sql
diff --git a/ddl/5.3/bigquery/OMOPCDM_bigquery_5.3_indices.sql b/inst/ddl/5.3/bigquery/OMOPCDM_bigquery_5.3_indices.sql
similarity index 100%
rename from ddl/5.3/bigquery/OMOPCDM_bigquery_5.3_indices.sql
rename to inst/ddl/5.3/bigquery/OMOPCDM_bigquery_5.3_indices.sql
diff --git a/ddl/5.3/bigquery/OMOPCDM_bigquery_5.3_primary_keys.sql b/inst/ddl/5.3/bigquery/OMOPCDM_bigquery_5.3_primary_keys.sql
similarity index 100%
rename from ddl/5.3/bigquery/OMOPCDM_bigquery_5.3_primary_keys.sql
rename to inst/ddl/5.3/bigquery/OMOPCDM_bigquery_5.3_primary_keys.sql
diff --git a/ddl/5.3/impala/OMOPCDM_impala_5.3_constraints.sql b/inst/ddl/5.3/impala/OMOPCDM_impala_5.3_constraints.sql
similarity index 100%
rename from ddl/5.3/impala/OMOPCDM_impala_5.3_constraints.sql
rename to inst/ddl/5.3/impala/OMOPCDM_impala_5.3_constraints.sql
diff --git a/ddl/5.3/impala/OMOPCDM_impala_5.3_ddl.sql b/inst/ddl/5.3/impala/OMOPCDM_impala_5.3_ddl.sql
similarity index 100%
rename from ddl/5.3/impala/OMOPCDM_impala_5.3_ddl.sql
rename to inst/ddl/5.3/impala/OMOPCDM_impala_5.3_ddl.sql
diff --git a/ddl/5.3/impala/OMOPCDM_impala_5.3_indices.sql b/inst/ddl/5.3/impala/OMOPCDM_impala_5.3_indices.sql
similarity index 100%
rename from ddl/5.3/impala/OMOPCDM_impala_5.3_indices.sql
rename to inst/ddl/5.3/impala/OMOPCDM_impala_5.3_indices.sql
diff --git a/ddl/5.3/impala/OMOPCDM_impala_5.3_primary_keys.sql b/inst/ddl/5.3/impala/OMOPCDM_impala_5.3_primary_keys.sql
similarity index 100%
rename from ddl/5.3/impala/OMOPCDM_impala_5.3_primary_keys.sql
rename to inst/ddl/5.3/impala/OMOPCDM_impala_5.3_primary_keys.sql
diff --git a/ddl/5.3/netezza/OMOPCDM_netezza_5.3_constraints.sql b/inst/ddl/5.3/netezza/OMOPCDM_netezza_5.3_constraints.sql
similarity index 100%
rename from ddl/5.3/netezza/OMOPCDM_netezza_5.3_constraints.sql
rename to inst/ddl/5.3/netezza/OMOPCDM_netezza_5.3_constraints.sql
diff --git a/ddl/5.3/netezza/OMOPCDM_netezza_5.3_ddl.sql b/inst/ddl/5.3/netezza/OMOPCDM_netezza_5.3_ddl.sql
similarity index 100%
rename from ddl/5.3/netezza/OMOPCDM_netezza_5.3_ddl.sql
rename to inst/ddl/5.3/netezza/OMOPCDM_netezza_5.3_ddl.sql
diff --git a/ddl/5.3/netezza/OMOPCDM_netezza_5.3_indices.sql b/inst/ddl/5.3/netezza/OMOPCDM_netezza_5.3_indices.sql
similarity index 100%
rename from ddl/5.3/netezza/OMOPCDM_netezza_5.3_indices.sql
rename to inst/ddl/5.3/netezza/OMOPCDM_netezza_5.3_indices.sql
diff --git a/ddl/5.3/netezza/OMOPCDM_netezza_5.3_primary_keys.sql b/inst/ddl/5.3/netezza/OMOPCDM_netezza_5.3_primary_keys.sql
similarity index 100%
rename from ddl/5.3/netezza/OMOPCDM_netezza_5.3_primary_keys.sql
rename to inst/ddl/5.3/netezza/OMOPCDM_netezza_5.3_primary_keys.sql
diff --git a/ddl/5.3/oracle/OMOPCDM_oracle_5.3_constraints.sql b/inst/ddl/5.3/oracle/OMOPCDM_oracle_5.3_constraints.sql
similarity index 100%
rename from ddl/5.3/oracle/OMOPCDM_oracle_5.3_constraints.sql
rename to inst/ddl/5.3/oracle/OMOPCDM_oracle_5.3_constraints.sql
diff --git a/ddl/5.3/oracle/OMOPCDM_oracle_5.3_ddl.sql b/inst/ddl/5.3/oracle/OMOPCDM_oracle_5.3_ddl.sql
similarity index 100%
rename from ddl/5.3/oracle/OMOPCDM_oracle_5.3_ddl.sql
rename to inst/ddl/5.3/oracle/OMOPCDM_oracle_5.3_ddl.sql
diff --git a/ddl/5.3/oracle/OMOPCDM_oracle_5.3_indices.sql b/inst/ddl/5.3/oracle/OMOPCDM_oracle_5.3_indices.sql
similarity index 100%
rename from ddl/5.3/oracle/OMOPCDM_oracle_5.3_indices.sql
rename to inst/ddl/5.3/oracle/OMOPCDM_oracle_5.3_indices.sql
diff --git a/ddl/5.3/oracle/OMOPCDM_oracle_5.3_primary_keys.sql b/inst/ddl/5.3/oracle/OMOPCDM_oracle_5.3_primary_keys.sql
similarity index 100%
rename from ddl/5.3/oracle/OMOPCDM_oracle_5.3_primary_keys.sql
rename to inst/ddl/5.3/oracle/OMOPCDM_oracle_5.3_primary_keys.sql
diff --git a/ddl/5.3/pdw/OMOPCDM_pdw_5.3_constraints.sql b/inst/ddl/5.3/pdw/OMOPCDM_pdw_5.3_constraints.sql
similarity index 100%
rename from ddl/5.3/pdw/OMOPCDM_pdw_5.3_constraints.sql
rename to inst/ddl/5.3/pdw/OMOPCDM_pdw_5.3_constraints.sql
diff --git a/ddl/5.3/pdw/OMOPCDM_pdw_5.3_ddl.sql b/inst/ddl/5.3/pdw/OMOPCDM_pdw_5.3_ddl.sql
similarity index 100%
rename from ddl/5.3/pdw/OMOPCDM_pdw_5.3_ddl.sql
rename to inst/ddl/5.3/pdw/OMOPCDM_pdw_5.3_ddl.sql
diff --git a/ddl/5.3/pdw/OMOPCDM_pdw_5.3_indices.sql b/inst/ddl/5.3/pdw/OMOPCDM_pdw_5.3_indices.sql
similarity index 100%
rename from ddl/5.3/pdw/OMOPCDM_pdw_5.3_indices.sql
rename to inst/ddl/5.3/pdw/OMOPCDM_pdw_5.3_indices.sql
diff --git a/ddl/5.3/pdw/OMOPCDM_pdw_5.3_primary_keys.sql b/inst/ddl/5.3/pdw/OMOPCDM_pdw_5.3_primary_keys.sql
similarity index 100%
rename from ddl/5.3/pdw/OMOPCDM_pdw_5.3_primary_keys.sql
rename to inst/ddl/5.3/pdw/OMOPCDM_pdw_5.3_primary_keys.sql
diff --git a/ddl/5.3/postgresql/OMOPCDM_postgresql_5.3_constraints.sql b/inst/ddl/5.3/postgresql/OMOPCDM_postgresql_5.3_constraints.sql
similarity index 100%
rename from ddl/5.3/postgresql/OMOPCDM_postgresql_5.3_constraints.sql
rename to inst/ddl/5.3/postgresql/OMOPCDM_postgresql_5.3_constraints.sql
diff --git a/ddl/5.3/postgresql/OMOPCDM_postgresql_5.3_ddl.sql b/inst/ddl/5.3/postgresql/OMOPCDM_postgresql_5.3_ddl.sql
similarity index 100%
rename from ddl/5.3/postgresql/OMOPCDM_postgresql_5.3_ddl.sql
rename to inst/ddl/5.3/postgresql/OMOPCDM_postgresql_5.3_ddl.sql
diff --git a/ddl/5.3/postgresql/OMOPCDM_postgresql_5.3_indices.sql b/inst/ddl/5.3/postgresql/OMOPCDM_postgresql_5.3_indices.sql
similarity index 100%
rename from ddl/5.3/postgresql/OMOPCDM_postgresql_5.3_indices.sql
rename to inst/ddl/5.3/postgresql/OMOPCDM_postgresql_5.3_indices.sql
diff --git a/ddl/5.3/postgresql/OMOPCDM_postgresql_5.3_primary_keys.sql b/inst/ddl/5.3/postgresql/OMOPCDM_postgresql_5.3_primary_keys.sql
similarity index 100%
rename from ddl/5.3/postgresql/OMOPCDM_postgresql_5.3_primary_keys.sql
rename to inst/ddl/5.3/postgresql/OMOPCDM_postgresql_5.3_primary_keys.sql
diff --git a/ddl/5.3/redshift/OMOPCDM_redshift_5.3_constraints.sql b/inst/ddl/5.3/redshift/OMOPCDM_redshift_5.3_constraints.sql
similarity index 100%
rename from ddl/5.3/redshift/OMOPCDM_redshift_5.3_constraints.sql
rename to inst/ddl/5.3/redshift/OMOPCDM_redshift_5.3_constraints.sql
diff --git a/ddl/5.3/redshift/OMOPCDM_redshift_5.3_ddl.sql b/inst/ddl/5.3/redshift/OMOPCDM_redshift_5.3_ddl.sql
similarity index 100%
rename from ddl/5.3/redshift/OMOPCDM_redshift_5.3_ddl.sql
rename to inst/ddl/5.3/redshift/OMOPCDM_redshift_5.3_ddl.sql
diff --git a/ddl/5.3/redshift/OMOPCDM_redshift_5.3_indices.sql b/inst/ddl/5.3/redshift/OMOPCDM_redshift_5.3_indices.sql
similarity index 100%
rename from ddl/5.3/redshift/OMOPCDM_redshift_5.3_indices.sql
rename to inst/ddl/5.3/redshift/OMOPCDM_redshift_5.3_indices.sql
diff --git a/ddl/5.3/redshift/OMOPCDM_redshift_5.3_primary_keys.sql b/inst/ddl/5.3/redshift/OMOPCDM_redshift_5.3_primary_keys.sql
similarity index 100%
rename from ddl/5.3/redshift/OMOPCDM_redshift_5.3_primary_keys.sql
rename to inst/ddl/5.3/redshift/OMOPCDM_redshift_5.3_primary_keys.sql
diff --git a/ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_constraints.sql b/inst/ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_constraints.sql
similarity index 100%
rename from ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_constraints.sql
rename to inst/ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_constraints.sql
diff --git a/ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_ddl.sql b/inst/ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_ddl.sql
similarity index 100%
rename from ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_ddl.sql
rename to inst/ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_ddl.sql
diff --git a/ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_indices.sql b/inst/ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_indices.sql
similarity index 100%
rename from ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_indices.sql
rename to inst/ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_indices.sql
diff --git a/ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_primary_keys.sql b/inst/ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_primary_keys.sql
similarity index 100%
rename from ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_primary_keys.sql
rename to inst/ddl/5.3/sql_server/OMOPCDM_sql_server_5.3_primary_keys.sql
diff --git a/ddl/5.4/bigquery/OMOPCDM_bigquery_5.4_constraints.sql b/inst/ddl/5.4/bigquery/OMOPCDM_bigquery_5.4_constraints.sql
similarity index 100%
rename from ddl/5.4/bigquery/OMOPCDM_bigquery_5.4_constraints.sql
rename to inst/ddl/5.4/bigquery/OMOPCDM_bigquery_5.4_constraints.sql
diff --git a/ddl/5.4/bigquery/OMOPCDM_bigquery_5.4_ddl.sql b/inst/ddl/5.4/bigquery/OMOPCDM_bigquery_5.4_ddl.sql
similarity index 100%
rename from ddl/5.4/bigquery/OMOPCDM_bigquery_5.4_ddl.sql
rename to inst/ddl/5.4/bigquery/OMOPCDM_bigquery_5.4_ddl.sql
diff --git a/ddl/5.4/bigquery/OMOPCDM_bigquery_5.4_indices.sql b/inst/ddl/5.4/bigquery/OMOPCDM_bigquery_5.4_indices.sql
similarity index 100%
rename from ddl/5.4/bigquery/OMOPCDM_bigquery_5.4_indices.sql
rename to inst/ddl/5.4/bigquery/OMOPCDM_bigquery_5.4_indices.sql
diff --git a/ddl/5.4/bigquery/OMOPCDM_bigquery_5.4_primary_keys.sql b/inst/ddl/5.4/bigquery/OMOPCDM_bigquery_5.4_primary_keys.sql
similarity index 100%
rename from ddl/5.4/bigquery/OMOPCDM_bigquery_5.4_primary_keys.sql
rename to inst/ddl/5.4/bigquery/OMOPCDM_bigquery_5.4_primary_keys.sql
diff --git a/ddl/5.4/impala/OMOPCDM_impala_5.4_constraints.sql b/inst/ddl/5.4/impala/OMOPCDM_impala_5.4_constraints.sql
similarity index 100%
rename from ddl/5.4/impala/OMOPCDM_impala_5.4_constraints.sql
rename to inst/ddl/5.4/impala/OMOPCDM_impala_5.4_constraints.sql
diff --git a/ddl/5.4/impala/OMOPCDM_impala_5.4_ddl.sql b/inst/ddl/5.4/impala/OMOPCDM_impala_5.4_ddl.sql
similarity index 100%
rename from ddl/5.4/impala/OMOPCDM_impala_5.4_ddl.sql
rename to inst/ddl/5.4/impala/OMOPCDM_impala_5.4_ddl.sql
diff --git a/ddl/5.4/impala/OMOPCDM_impala_5.4_indices.sql b/inst/ddl/5.4/impala/OMOPCDM_impala_5.4_indices.sql
similarity index 100%
rename from ddl/5.4/impala/OMOPCDM_impala_5.4_indices.sql
rename to inst/ddl/5.4/impala/OMOPCDM_impala_5.4_indices.sql
diff --git a/ddl/5.4/impala/OMOPCDM_impala_5.4_primary_keys.sql b/inst/ddl/5.4/impala/OMOPCDM_impala_5.4_primary_keys.sql
similarity index 100%
rename from ddl/5.4/impala/OMOPCDM_impala_5.4_primary_keys.sql
rename to inst/ddl/5.4/impala/OMOPCDM_impala_5.4_primary_keys.sql
diff --git a/ddl/5.4/netezza/OMOPCDM_netezza_5.4_constraints.sql b/inst/ddl/5.4/netezza/OMOPCDM_netezza_5.4_constraints.sql
similarity index 100%
rename from ddl/5.4/netezza/OMOPCDM_netezza_5.4_constraints.sql
rename to inst/ddl/5.4/netezza/OMOPCDM_netezza_5.4_constraints.sql
diff --git a/ddl/5.4/netezza/OMOPCDM_netezza_5.4_ddl.sql b/inst/ddl/5.4/netezza/OMOPCDM_netezza_5.4_ddl.sql
similarity index 100%
rename from ddl/5.4/netezza/OMOPCDM_netezza_5.4_ddl.sql
rename to inst/ddl/5.4/netezza/OMOPCDM_netezza_5.4_ddl.sql
diff --git a/ddl/5.4/netezza/OMOPCDM_netezza_5.4_indices.sql b/inst/ddl/5.4/netezza/OMOPCDM_netezza_5.4_indices.sql
similarity index 100%
rename from ddl/5.4/netezza/OMOPCDM_netezza_5.4_indices.sql
rename to inst/ddl/5.4/netezza/OMOPCDM_netezza_5.4_indices.sql
diff --git a/ddl/5.4/netezza/OMOPCDM_netezza_5.4_primary_keys.sql b/inst/ddl/5.4/netezza/OMOPCDM_netezza_5.4_primary_keys.sql
similarity index 100%
rename from ddl/5.4/netezza/OMOPCDM_netezza_5.4_primary_keys.sql
rename to inst/ddl/5.4/netezza/OMOPCDM_netezza_5.4_primary_keys.sql
diff --git a/ddl/5.4/oracle/OMOPCDM_oracle_5.4_constraints.sql b/inst/ddl/5.4/oracle/OMOPCDM_oracle_5.4_constraints.sql
similarity index 100%
rename from ddl/5.4/oracle/OMOPCDM_oracle_5.4_constraints.sql
rename to inst/ddl/5.4/oracle/OMOPCDM_oracle_5.4_constraints.sql
diff --git a/ddl/5.4/oracle/OMOPCDM_oracle_5.4_ddl.sql b/inst/ddl/5.4/oracle/OMOPCDM_oracle_5.4_ddl.sql
similarity index 100%
rename from ddl/5.4/oracle/OMOPCDM_oracle_5.4_ddl.sql
rename to inst/ddl/5.4/oracle/OMOPCDM_oracle_5.4_ddl.sql
diff --git a/ddl/5.4/oracle/OMOPCDM_oracle_5.4_indices.sql b/inst/ddl/5.4/oracle/OMOPCDM_oracle_5.4_indices.sql
similarity index 100%
rename from ddl/5.4/oracle/OMOPCDM_oracle_5.4_indices.sql
rename to inst/ddl/5.4/oracle/OMOPCDM_oracle_5.4_indices.sql
diff --git a/ddl/5.4/oracle/OMOPCDM_oracle_5.4_primary_keys.sql b/inst/ddl/5.4/oracle/OMOPCDM_oracle_5.4_primary_keys.sql
similarity index 100%
rename from ddl/5.4/oracle/OMOPCDM_oracle_5.4_primary_keys.sql
rename to inst/ddl/5.4/oracle/OMOPCDM_oracle_5.4_primary_keys.sql
diff --git a/ddl/5.4/pdw/OMOPCDM_pdw_5.4_constraints.sql b/inst/ddl/5.4/pdw/OMOPCDM_pdw_5.4_constraints.sql
similarity index 100%
rename from ddl/5.4/pdw/OMOPCDM_pdw_5.4_constraints.sql
rename to inst/ddl/5.4/pdw/OMOPCDM_pdw_5.4_constraints.sql
diff --git a/ddl/5.4/pdw/OMOPCDM_pdw_5.4_ddl.sql b/inst/ddl/5.4/pdw/OMOPCDM_pdw_5.4_ddl.sql
similarity index 100%
rename from ddl/5.4/pdw/OMOPCDM_pdw_5.4_ddl.sql
rename to inst/ddl/5.4/pdw/OMOPCDM_pdw_5.4_ddl.sql
diff --git a/ddl/5.4/pdw/OMOPCDM_pdw_5.4_indices.sql b/inst/ddl/5.4/pdw/OMOPCDM_pdw_5.4_indices.sql
similarity index 100%
rename from ddl/5.4/pdw/OMOPCDM_pdw_5.4_indices.sql
rename to inst/ddl/5.4/pdw/OMOPCDM_pdw_5.4_indices.sql
diff --git a/ddl/5.4/pdw/OMOPCDM_pdw_5.4_primary_keys.sql b/inst/ddl/5.4/pdw/OMOPCDM_pdw_5.4_primary_keys.sql
similarity index 100%
rename from ddl/5.4/pdw/OMOPCDM_pdw_5.4_primary_keys.sql
rename to inst/ddl/5.4/pdw/OMOPCDM_pdw_5.4_primary_keys.sql
diff --git a/ddl/5.4/postgresql/OMOPCDM_postgresql_5.4_constraints.sql b/inst/ddl/5.4/postgresql/OMOPCDM_postgresql_5.4_constraints.sql
similarity index 100%
rename from ddl/5.4/postgresql/OMOPCDM_postgresql_5.4_constraints.sql
rename to inst/ddl/5.4/postgresql/OMOPCDM_postgresql_5.4_constraints.sql
diff --git a/ddl/5.4/postgresql/OMOPCDM_postgresql_5.4_ddl.sql b/inst/ddl/5.4/postgresql/OMOPCDM_postgresql_5.4_ddl.sql
similarity index 100%
rename from ddl/5.4/postgresql/OMOPCDM_postgresql_5.4_ddl.sql
rename to inst/ddl/5.4/postgresql/OMOPCDM_postgresql_5.4_ddl.sql
diff --git a/ddl/5.4/postgresql/OMOPCDM_postgresql_5.4_indices.sql b/inst/ddl/5.4/postgresql/OMOPCDM_postgresql_5.4_indices.sql
similarity index 100%
rename from ddl/5.4/postgresql/OMOPCDM_postgresql_5.4_indices.sql
rename to inst/ddl/5.4/postgresql/OMOPCDM_postgresql_5.4_indices.sql
diff --git a/ddl/5.4/postgresql/OMOPCDM_postgresql_5.4_primary_keys.sql b/inst/ddl/5.4/postgresql/OMOPCDM_postgresql_5.4_primary_keys.sql
similarity index 100%
rename from ddl/5.4/postgresql/OMOPCDM_postgresql_5.4_primary_keys.sql
rename to inst/ddl/5.4/postgresql/OMOPCDM_postgresql_5.4_primary_keys.sql
diff --git a/ddl/5.4/redshift/OMOPCDM_redshift_5.4_constraints.sql b/inst/ddl/5.4/redshift/OMOPCDM_redshift_5.4_constraints.sql
similarity index 100%
rename from ddl/5.4/redshift/OMOPCDM_redshift_5.4_constraints.sql
rename to inst/ddl/5.4/redshift/OMOPCDM_redshift_5.4_constraints.sql
diff --git a/ddl/5.4/redshift/OMOPCDM_redshift_5.4_ddl.sql b/inst/ddl/5.4/redshift/OMOPCDM_redshift_5.4_ddl.sql
similarity index 100%
rename from ddl/5.4/redshift/OMOPCDM_redshift_5.4_ddl.sql
rename to inst/ddl/5.4/redshift/OMOPCDM_redshift_5.4_ddl.sql
diff --git a/ddl/5.4/redshift/OMOPCDM_redshift_5.4_indices.sql b/inst/ddl/5.4/redshift/OMOPCDM_redshift_5.4_indices.sql
similarity index 100%
rename from ddl/5.4/redshift/OMOPCDM_redshift_5.4_indices.sql
rename to inst/ddl/5.4/redshift/OMOPCDM_redshift_5.4_indices.sql
diff --git a/ddl/5.4/redshift/OMOPCDM_redshift_5.4_primary_keys.sql b/inst/ddl/5.4/redshift/OMOPCDM_redshift_5.4_primary_keys.sql
similarity index 100%
rename from ddl/5.4/redshift/OMOPCDM_redshift_5.4_primary_keys.sql
rename to inst/ddl/5.4/redshift/OMOPCDM_redshift_5.4_primary_keys.sql
diff --git a/ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_constraints.sql b/inst/ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_constraints.sql
similarity index 100%
rename from ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_constraints.sql
rename to inst/ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_constraints.sql
diff --git a/ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_ddl.sql b/inst/ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_ddl.sql
similarity index 100%
rename from ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_ddl.sql
rename to inst/ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_ddl.sql
diff --git a/ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_indices.sql b/inst/ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_indices.sql
similarity index 100%
rename from ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_indices.sql
rename to inst/ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_indices.sql
diff --git a/ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_primary_keys.sql b/inst/ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_primary_keys.sql
similarity index 100%
rename from ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_primary_keys.sql
rename to inst/ddl/5.4/sql_server/OMOPCDM_sql_server_5.4_primary_keys.sql
diff --git a/man/buildRelease.Rd b/man/buildRelease.Rd
index e07fec0..17c23b6 100644
--- a/man/buildRelease.Rd
+++ b/man/buildRelease.Rd
@@ -5,15 +5,20 @@
 \title{Create OMOP CDM SQL files}
 \usage{
 buildRelease(
-  cdmVersion = listSupportedVersions(),
-  targetDialect = listSupportedDialects()
+  cdmVersions = listSupportedVersions(),
+  targetDialects = listSupportedDialects(),
+  outputfolder = file.path(getwd(), "inst", "ddl")
 )
 }
 \arguments{
-\item{cdmVersion}{The version of the CDM you are creating, e.g. 5.3, 5.4.
+\item{cdmVersions}{The versions of the CDM you are creating, e.g. 5.3, 5.4.
 Defaults to all supported CDM versions.}
 
-\item{targetDialect}{The target dialect}
+\item{targetDialects}{A character vector of target dialects.
+Defaults to all supported dialects.}
+
+\item{outputfolder}{The base folder where the SQL files will be written.
+Subfolders will be created for each cdmVersion and targetDialect.}
 }
 \description{
 Writes DDL, ForeignKey, PrimaryKey and index SQL files for given cdmVersion
diff --git a/man/buildReleaseZip.Rd b/man/buildReleaseZip.Rd
index 95e6f55..b952b58 100644
--- a/man/buildReleaseZip.Rd
+++ b/man/buildReleaseZip.Rd
@@ -7,7 +7,7 @@
 buildReleaseZip(
   cdmVersion,
   targetDialect = listSupportedDialects(),
-  outputfolder = "output"
+  outputfolder = file.path(getwd(), "inst", "ddl")
 )
 }
 \arguments{
diff --git a/man/writeDdl.Rd b/man/writeDdl.Rd
index c245499..b5b94da 100644
--- a/man/writeDdl.Rd
+++ b/man/writeDdl.Rd
@@ -10,28 +10,28 @@
 writeDdl(
   targetDialect,
   cdmVersion,
-  outputpath,
+  outputfolder,
   cdmDatabaseSchema = "@cdmDatabaseSchema"
 )
 
 writePrimaryKeys(
   targetDialect,
   cdmVersion,
-  outputpath,
+  outputfolder,
   cdmDatabaseSchema = "@cdmDatabaseSchema"
 )
 
 writeForeignKeys(
   targetDialect,
   cdmVersion,
-  outputpath,
+  outputfolder,
   cdmDatabaseSchema = "@cdmDatabaseSchema"
 )
 
 writeIndex(
   targetDialect,
   cdmVersion,
-  outputpath,
+  outputfolder,
   cdmDatabaseSchema = "@cdmDatabaseSchema"
 )
 }
@@ -40,7 +40,7 @@ writeIndex(
 
 \item{cdmVersion}{The version of the CDM you are creating, e.g. 5.3, 5.4}
 
-\item{outputpath}{The directory or folder where the SQL file should be saved.}
+\item{outputfolder}{The directory or folder where the SQL file should be saved.}
 
 \item{cdmDatabaseSchema}{The schema of the CDM instance where the DDL will be run. For example, this would be "ohdsi.dbo" when testing on sql server.
 Defaults to "@cdmDatabaseSchema"}
diff --git a/tests/testthat/test-buildRelease.R b/tests/testthat/test-buildRelease.R
new file mode 100644
index 0000000..55dfbc7
--- /dev/null
+++ b/tests/testthat/test-buildRelease.R
@@ -0,0 +1,30 @@
+test_that("buildRelease() output matches current ddl folder", {
+
+  tempfolder <- tempdir(check = TRUE)
+  generatedBaseFolder <- file.path(tempdir(check = TRUE), "ddl")
+  currentBaseFolder <- system.file("ddl", package = "CommonDataModel", mustWork = TRUE)
+
+  # build all of the releases in a temp folder
+  buildRelease(outputfolder = generatedBaseFolder)
+
+  # compare to the files in the current ddl folder of the package
+  generatedDirectories <- list.dirs(generatedBaseFolder, full.names = F)
+  currentDirectories <- list.dirs(currentBaseFolder, full.names = F)
+  expect_gt(length(currentDirectories), 1)
+  expect_setequal(generatedDirectories, currentDirectories)
+
+  # compare filenames
+  generatedFilenames <- list.files(generatedBaseFolder, recursive = TRUE)
+  currentFilenames <- list.files(generatedBaseFolder, recursive = TRUE)
+  expect_gt(length(currentFilenames), 1)
+  expect_setequal(generatedFilenames, currentFilenames)
+
+  # compare file contents using md5 hash
+  generatedChecksums <- tools::md5sum(file.path(generatedBaseFolder, generatedFilenames))
+  currentChecksums <- tools::md5sum(file.path(currentBaseFolder, currentFilenames))
+  names(generatedChecksums) <- NULL
+  names(currentChecksums) <- NULL
+  expect_gt(length(currentChecksums), 1)
+  expect_setequal(generatedChecksums, currentChecksums)
+
+})
diff --git a/tests/testthat/test-writeDdl.R b/tests/testthat/test-writeDdl.R
index 1c95f2b..91c8604 100644
--- a/tests/testthat/test-writeDdl.R
+++ b/tests/testthat/test-writeDdl.R
@@ -1,10 +1,10 @@
 test_that("writeDdl works", {
 
-  outputpath <- tempdir(TRUE)
-  filename <- writeDdl(targetDialect = "postgresql", cdmVersion = "5.4", outputpath = outputpath)
+  outputfolder <- tempdir(TRUE)
+  filename <- writeDdl(targetDialect = "postgresql", cdmVersion = "5.4", outputfolder = outputfolder)
 
-  expect_true(file.exists(file.path(outputpath, filename)))
-  sql <- readr::read_file(file.path(outputpath, filename))
+  expect_true(file.exists(file.path(outputfolder, filename)))
+  sql <- readr::read_file(file.path(outputfolder, filename))
 
   expect_type(sql, "character")
   expect_gt(nchar(sql), 10)
@@ -13,11 +13,11 @@ test_that("writeDdl works", {
 
 test_that("writePrimaryKeys works", {
 
-  outputpath <- tempdir(TRUE)
-  filename <- writePrimaryKeys(targetDialect = "postgresql", cdmVersion = "5.4", outputpath = outputpath)
+  outputfolder <- tempdir(TRUE)
+  filename <- writePrimaryKeys(targetDialect = "postgresql", cdmVersion = "5.4", outputfolder = outputfolder)
 
-  expect_true(file.exists(file.path(outputpath, filename)))
-  sql <- readr::read_file(file.path(outputpath, filename))
+  expect_true(file.exists(file.path(outputfolder, filename)))
+  sql <- readr::read_file(file.path(outputfolder, filename))
 
   expect_type(sql, "character")
   expect_gt(nchar(sql), 10)
@@ -26,11 +26,11 @@ test_that("writePrimaryKeys works", {
 
 test_that("writeForeignKeys works", {
 
-  outputpath <- tempdir(TRUE)
-  filename <- writeForeignKeys(targetDialect = "postgresql", cdmVersion = "5.4", outputpath = outputpath)
+  outputfolder <- tempdir(TRUE)
+  filename <- writeForeignKeys(targetDialect = "postgresql", cdmVersion = "5.4", outputfolder = outputfolder)
 
-  expect_true(file.exists(file.path(outputpath, filename)))
-  sql <- readr::read_file(file.path(outputpath, filename))
+  expect_true(file.exists(file.path(outputfolder, filename)))
+  sql <- readr::read_file(file.path(outputfolder, filename))
 
   expect_type(sql, "character")
   expect_gt(nchar(sql), 10)
@@ -39,11 +39,11 @@ test_that("writeForeignKeys works", {
 
 test_that("writeIndex works", {
 
-  outputpath <- tempdir(TRUE)
-  filename <- writeIndex(targetDialect = "postgresql", cdmVersion = "5.4", outputpath = outputpath)
+  outputfolder <- tempdir(TRUE)
+  filename <- writeIndex(targetDialect = "postgresql", cdmVersion = "5.4", outputfolder = outputfolder)
 
-  expect_true(file.exists(file.path(outputpath, filename)))
-  sql <- readr::read_file(file.path(outputpath, filename))
+  expect_true(file.exists(file.path(outputfolder, filename)))
+  sql <- readr::read_file(file.path(outputfolder, filename))
 
   expect_type(sql, "character")
   expect_gt(nchar(sql), 10)