diff --git a/dbt-redshift/src/dbt/dbt/__init__.py b/dbt-redshift/src/dbt/__init__.py
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/__init__.py
rename to dbt-redshift/src/dbt/__init__.py
diff --git a/dbt-redshift/src/dbt/dbt/adapters/redshift/__init__.py b/dbt-redshift/src/dbt/adapters/redshift/__init__.py
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/adapters/redshift/__init__.py
rename to dbt-redshift/src/dbt/adapters/redshift/__init__.py
diff --git a/dbt-redshift/src/dbt/dbt/adapters/redshift/__version__.py b/dbt-redshift/src/dbt/adapters/redshift/__version__.py
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/adapters/redshift/__version__.py
rename to dbt-redshift/src/dbt/adapters/redshift/__version__.py
diff --git a/dbt-redshift/src/dbt/dbt/adapters/redshift/connections.py b/dbt-redshift/src/dbt/adapters/redshift/connections.py
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/adapters/redshift/connections.py
rename to dbt-redshift/src/dbt/adapters/redshift/connections.py
diff --git a/dbt-redshift/src/dbt/dbt/adapters/redshift/impl.py b/dbt-redshift/src/dbt/adapters/redshift/impl.py
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/adapters/redshift/impl.py
rename to dbt-redshift/src/dbt/adapters/redshift/impl.py
diff --git a/dbt-redshift/src/dbt/dbt/adapters/redshift/relation.py b/dbt-redshift/src/dbt/adapters/redshift/relation.py
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/adapters/redshift/relation.py
rename to dbt-redshift/src/dbt/adapters/redshift/relation.py
diff --git a/dbt-redshift/src/dbt/dbt/adapters/redshift/relation_configs/__init__.py b/dbt-redshift/src/dbt/adapters/redshift/relation_configs/__init__.py
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/adapters/redshift/relation_configs/__init__.py
rename to dbt-redshift/src/dbt/adapters/redshift/relation_configs/__init__.py
diff --git a/dbt-redshift/src/dbt/dbt/adapters/redshift/relation_configs/base.py b/dbt-redshift/src/dbt/adapters/redshift/relation_configs/base.py
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/adapters/redshift/relation_configs/base.py
rename to dbt-redshift/src/dbt/adapters/redshift/relation_configs/base.py
diff --git a/dbt-redshift/src/dbt/dbt/adapters/redshift/relation_configs/dist.py b/dbt-redshift/src/dbt/adapters/redshift/relation_configs/dist.py
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/adapters/redshift/relation_configs/dist.py
rename to dbt-redshift/src/dbt/adapters/redshift/relation_configs/dist.py
diff --git a/dbt-redshift/src/dbt/dbt/adapters/redshift/relation_configs/materialized_view.py b/dbt-redshift/src/dbt/adapters/redshift/relation_configs/materialized_view.py
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/adapters/redshift/relation_configs/materialized_view.py
rename to dbt-redshift/src/dbt/adapters/redshift/relation_configs/materialized_view.py
diff --git a/dbt-redshift/src/dbt/dbt/adapters/redshift/relation_configs/policies.py b/dbt-redshift/src/dbt/adapters/redshift/relation_configs/policies.py
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/adapters/redshift/relation_configs/policies.py
rename to dbt-redshift/src/dbt/adapters/redshift/relation_configs/policies.py
diff --git a/dbt-redshift/src/dbt/dbt/adapters/redshift/relation_configs/sort.py b/dbt-redshift/src/dbt/adapters/redshift/relation_configs/sort.py
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/adapters/redshift/relation_configs/sort.py
rename to dbt-redshift/src/dbt/adapters/redshift/relation_configs/sort.py
diff --git a/dbt-redshift/src/dbt/dbt/adapters/redshift/utility.py b/dbt-redshift/src/dbt/adapters/redshift/utility.py
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/adapters/redshift/utility.py
rename to dbt-redshift/src/dbt/adapters/redshift/utility.py
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/__init__.py b/dbt-redshift/src/dbt/include/include/redshift/__init__.py
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/__init__.py
rename to dbt-redshift/src/dbt/include/include/redshift/__init__.py
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/dbt_project.yml b/dbt-redshift/src/dbt/include/include/redshift/dbt_project.yml
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/dbt_project.yml
rename to dbt-redshift/src/dbt/include/include/redshift/dbt_project.yml
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/adapters.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/adapters.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/adapters.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/adapters.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/adapters/apply_grants.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/adapters/apply_grants.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/adapters/apply_grants.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/adapters/apply_grants.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/adapters/unit_testing.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/adapters/unit_testing.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/adapters/unit_testing.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/adapters/unit_testing.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/catalog/by_relation.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/catalog/by_relation.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/catalog/by_relation.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/catalog/by_relation.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/catalog/by_schema.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/catalog/by_schema.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/catalog/by_schema.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/catalog/by_schema.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/catalog/catalog.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/catalog/catalog.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/catalog/catalog.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/catalog/catalog.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/materializations/incremental_merge.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/materializations/incremental_merge.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/materializations/incremental_merge.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/materializations/incremental_merge.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/materializations/materialized_view.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/materializations/materialized_view.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/materializations/materialized_view.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/materializations/materialized_view.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/materializations/seeds/helpers.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/materializations/seeds/helpers.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/materializations/seeds/helpers.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/materializations/seeds/helpers.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/materializations/snapshot_merge.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/materializations/snapshot_merge.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/materializations/snapshot_merge.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/materializations/snapshot_merge.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/materializations/table.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/materializations/table.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/materializations/table.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/materializations/table.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/materializations/view.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/materializations/view.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/materializations/view.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/materializations/view.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/metadata/relation_last_modified.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/metadata/relation_last_modified.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/metadata/relation_last_modified.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/metadata/relation_last_modified.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/relations.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/relations.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/relations.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/relations.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/materialized_view/alter.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/relations/materialized_view/alter.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/materialized_view/alter.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/relations/materialized_view/alter.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/materialized_view/create.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/relations/materialized_view/create.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/materialized_view/create.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/relations/materialized_view/create.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/materialized_view/describe.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/relations/materialized_view/describe.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/materialized_view/describe.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/relations/materialized_view/describe.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/materialized_view/drop.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/relations/materialized_view/drop.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/materialized_view/drop.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/relations/materialized_view/drop.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/materialized_view/refresh.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/relations/materialized_view/refresh.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/materialized_view/refresh.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/relations/materialized_view/refresh.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/table/drop.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/relations/table/drop.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/table/drop.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/relations/table/drop.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/table/rename.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/relations/table/rename.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/table/rename.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/relations/table/rename.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/view/drop.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/relations/view/drop.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/view/drop.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/relations/view/drop.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/view/rename.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/relations/view/rename.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/view/rename.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/relations/view/rename.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/view/replace.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/relations/view/replace.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/relations/view/replace.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/relations/view/replace.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/timestamps.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/timestamps.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/timestamps.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/timestamps.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/array_append.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/utils/array_append.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/array_append.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/utils/array_append.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/array_concat.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/utils/array_concat.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/array_concat.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/utils/array_concat.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/array_construct.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/utils/array_construct.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/array_construct.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/utils/array_construct.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/cast_bool_to_text.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/utils/cast_bool_to_text.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/cast_bool_to_text.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/utils/cast_bool_to_text.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/dateadd.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/utils/dateadd.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/dateadd.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/utils/dateadd.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/datediff.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/utils/datediff.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/datediff.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/utils/datediff.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/last_day.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/utils/last_day.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/last_day.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/utils/last_day.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/length.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/utils/length.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/length.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/utils/length.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/listagg.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/utils/listagg.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/listagg.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/utils/listagg.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/split_part.sql b/dbt-redshift/src/dbt/include/include/redshift/macros/utils/split_part.sql
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/macros/utils/split_part.sql
rename to dbt-redshift/src/dbt/include/include/redshift/macros/utils/split_part.sql
diff --git a/dbt-redshift/src/dbt/dbt/include/redshift/profile_template.yml b/dbt-redshift/src/dbt/include/include/redshift/profile_template.yml
similarity index 100%
rename from dbt-redshift/src/dbt/dbt/include/redshift/profile_template.yml
rename to dbt-redshift/src/dbt/include/include/redshift/profile_template.yml