diff --git a/packages/buster-cli/.gitignore b/cli/.gitignore
similarity index 100%
rename from packages/buster-cli/.gitignore
rename to cli/.gitignore
diff --git a/packages/buster-cli/Cargo.toml b/cli/Cargo.toml
similarity index 100%
rename from packages/buster-cli/Cargo.toml
rename to cli/Cargo.toml
diff --git a/packages/buster-cli/README.md b/cli/README.md
similarity index 100%
rename from packages/buster-cli/README.md
rename to cli/README.md
diff --git a/packages/buster-cli/buster_project.yml b/cli/buster_project.yml
similarity index 100%
rename from packages/buster-cli/buster_project.yml
rename to cli/buster_project.yml
diff --git a/packages/buster-cli/src/assets/mod.rs b/cli/src/assets/mod.rs
similarity index 100%
rename from packages/buster-cli/src/assets/mod.rs
rename to cli/src/assets/mod.rs
diff --git a/packages/buster-cli/src/assets/templates/buster_model.yml b/cli/src/assets/templates/buster_model.yml
similarity index 100%
rename from packages/buster-cli/src/assets/templates/buster_model.yml
rename to cli/src/assets/templates/buster_model.yml
diff --git a/packages/buster-cli/src/assets/templates/buster_project.yml b/cli/src/assets/templates/buster_project.yml
similarity index 100%
rename from packages/buster-cli/src/assets/templates/buster_project.yml
rename to cli/src/assets/templates/buster_project.yml
diff --git a/packages/buster-cli/src/assets/templates/dbt_model.yml b/cli/src/assets/templates/dbt_model.yml
similarity index 100%
rename from packages/buster-cli/src/assets/templates/dbt_model.yml
rename to cli/src/assets/templates/dbt_model.yml
diff --git a/packages/buster-cli/src/assets/templates/dbt_project.yml b/cli/src/assets/templates/dbt_project.yml
similarity index 100%
rename from packages/buster-cli/src/assets/templates/dbt_project.yml
rename to cli/src/assets/templates/dbt_project.yml
diff --git a/packages/buster-cli/src/commands/auth.rs b/cli/src/commands/auth.rs
similarity index 100%
rename from packages/buster-cli/src/commands/auth.rs
rename to cli/src/commands/auth.rs
diff --git a/packages/buster-cli/src/commands/deploy.rs b/cli/src/commands/deploy.rs
similarity index 100%
rename from packages/buster-cli/src/commands/deploy.rs
rename to cli/src/commands/deploy.rs
diff --git a/packages/buster-cli/src/commands/generate.rs b/cli/src/commands/generate.rs
similarity index 100%
rename from packages/buster-cli/src/commands/generate.rs
rename to cli/src/commands/generate.rs
diff --git a/packages/buster-cli/src/commands/import.rs b/cli/src/commands/import.rs
similarity index 100%
rename from packages/buster-cli/src/commands/import.rs
rename to cli/src/commands/import.rs
diff --git a/packages/buster-cli/src/commands/init.rs b/cli/src/commands/init.rs
similarity index 100%
rename from packages/buster-cli/src/commands/init.rs
rename to cli/src/commands/init.rs
diff --git a/packages/buster-cli/src/commands/mod.rs b/cli/src/commands/mod.rs
similarity index 100%
rename from packages/buster-cli/src/commands/mod.rs
rename to cli/src/commands/mod.rs
diff --git a/packages/buster-cli/src/error.rs b/cli/src/error.rs
similarity index 100%
rename from packages/buster-cli/src/error.rs
rename to cli/src/error.rs
diff --git a/packages/buster-cli/src/main.rs b/cli/src/main.rs
similarity index 100%
rename from packages/buster-cli/src/main.rs
rename to cli/src/main.rs
diff --git a/packages/buster-cli/src/types/mod.rs b/cli/src/types/mod.rs
similarity index 100%
rename from packages/buster-cli/src/types/mod.rs
rename to cli/src/types/mod.rs
diff --git a/packages/buster-cli/src/utils/buster/api.rs b/cli/src/utils/buster/api.rs
similarity index 100%
rename from packages/buster-cli/src/utils/buster/api.rs
rename to cli/src/utils/buster/api.rs
diff --git a/packages/buster-cli/src/utils/buster/mod.rs b/cli/src/utils/buster/mod.rs
similarity index 100%
rename from packages/buster-cli/src/utils/buster/mod.rs
rename to cli/src/utils/buster/mod.rs
diff --git a/packages/buster-cli/src/utils/buster/types.rs b/cli/src/utils/buster/types.rs
similarity index 100%
rename from packages/buster-cli/src/utils/buster/types.rs
rename to cli/src/utils/buster/types.rs
diff --git a/packages/buster-cli/src/utils/dbt/command.rs b/cli/src/utils/dbt/command.rs
similarity index 100%
rename from packages/buster-cli/src/utils/dbt/command.rs
rename to cli/src/utils/dbt/command.rs
diff --git a/packages/buster-cli/src/utils/dbt/mod.rs b/cli/src/utils/dbt/mod.rs
similarity index 100%
rename from packages/buster-cli/src/utils/dbt/mod.rs
rename to cli/src/utils/dbt/mod.rs
diff --git a/packages/buster-cli/src/utils/file/buster_credentials.rs b/cli/src/utils/file/buster_credentials.rs
similarity index 100%
rename from packages/buster-cli/src/utils/file/buster_credentials.rs
rename to cli/src/utils/file/buster_credentials.rs
diff --git a/packages/buster-cli/src/utils/file/mod.rs b/cli/src/utils/file/mod.rs
similarity index 100%
rename from packages/buster-cli/src/utils/file/mod.rs
rename to cli/src/utils/file/mod.rs
diff --git a/packages/buster-cli/src/utils/file/model_files.rs b/cli/src/utils/file/model_files.rs
similarity index 100%
rename from packages/buster-cli/src/utils/file/model_files.rs
rename to cli/src/utils/file/model_files.rs
diff --git a/packages/buster-cli/src/utils/file/profiles.rs b/cli/src/utils/file/profiles.rs
similarity index 100%
rename from packages/buster-cli/src/utils/file/profiles.rs
rename to cli/src/utils/file/profiles.rs
diff --git a/packages/buster-cli/src/utils/file/project_files.rs b/cli/src/utils/file/project_files.rs
similarity index 100%
rename from packages/buster-cli/src/utils/file/project_files.rs
rename to cli/src/utils/file/project_files.rs
diff --git a/packages/buster-cli/src/utils/formatting/mod.rs b/cli/src/utils/formatting/mod.rs
similarity index 100%
rename from packages/buster-cli/src/utils/formatting/mod.rs
rename to cli/src/utils/formatting/mod.rs
diff --git a/packages/buster-cli/src/utils/formatting/text.rs b/cli/src/utils/formatting/text.rs
similarity index 100%
rename from packages/buster-cli/src/utils/formatting/text.rs
rename to cli/src/utils/formatting/text.rs
diff --git a/packages/buster-cli/src/utils/mod.rs b/cli/src/utils/mod.rs
similarity index 100%
rename from packages/buster-cli/src/utils/mod.rs
rename to cli/src/utils/mod.rs
diff --git a/packages/buster-cli/tests/cli_tests.rs b/cli/tests/cli_tests.rs
similarity index 100%
rename from packages/buster-cli/tests/cli_tests.rs
rename to cli/tests/cli_tests.rs
diff --git a/packages/buster-cli/tests/command_tests.rs b/cli/tests/command_tests.rs
similarity index 100%
rename from packages/buster-cli/tests/command_tests.rs
rename to cli/tests/command_tests.rs