diff --git a/.gitmodules b/.gitmodules
index 31ee66bdef..35fff05b0c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
-[submodule "jslib"]
-	path = jslib
+[submodule "apps/cli/jslib"]
+	path = apps/cli/jslib
 	url = https://github.com/bitwarden/jslib.git
 	branch = master
diff --git a/.editorconfig b/apps/cli/.editorconfig
similarity index 100%
rename from .editorconfig
rename to apps/cli/.editorconfig
diff --git a/.eslintignore b/apps/cli/.eslintignore
similarity index 100%
rename from .eslintignore
rename to apps/cli/.eslintignore
diff --git a/.eslintrc.json b/apps/cli/.eslintrc.json
similarity index 100%
rename from .eslintrc.json
rename to apps/cli/.eslintrc.json
diff --git a/.git-blame-ignore-revs b/apps/cli/.git-blame-ignore-revs
similarity index 100%
rename from .git-blame-ignore-revs
rename to apps/cli/.git-blame-ignore-revs
diff --git a/.gitattributes b/apps/cli/.gitattributes
similarity index 100%
rename from .gitattributes
rename to apps/cli/.gitattributes
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/apps/cli/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE.md
rename to apps/cli/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/workflows/build.yml b/apps/cli/.github/workflows/build.yml
similarity index 100%
rename from .github/workflows/build.yml
rename to apps/cli/.github/workflows/build.yml
diff --git a/.github/workflows/enforce-labels.yml b/apps/cli/.github/workflows/enforce-labels.yml
similarity index 100%
rename from .github/workflows/enforce-labels.yml
rename to apps/cli/.github/workflows/enforce-labels.yml
diff --git a/.github/workflows/release.yml b/apps/cli/.github/workflows/release.yml
similarity index 100%
rename from .github/workflows/release.yml
rename to apps/cli/.github/workflows/release.yml
diff --git a/.github/workflows/version-bump.yml b/apps/cli/.github/workflows/version-bump.yml
similarity index 100%
rename from .github/workflows/version-bump.yml
rename to apps/cli/.github/workflows/version-bump.yml
diff --git a/.github/workflows/workflow-linter.yml b/apps/cli/.github/workflows/workflow-linter.yml
similarity index 100%
rename from .github/workflows/workflow-linter.yml
rename to apps/cli/.github/workflows/workflow-linter.yml
diff --git a/.gitignore b/apps/cli/.gitignore
similarity index 100%
rename from .gitignore
rename to apps/cli/.gitignore
diff --git a/.husky/.gitignore b/apps/cli/.husky/.gitignore
similarity index 100%
rename from .husky/.gitignore
rename to apps/cli/.husky/.gitignore
diff --git a/.husky/pre-commit b/apps/cli/.husky/pre-commit
old mode 100755
new mode 100644
similarity index 100%
rename from .husky/pre-commit
rename to apps/cli/.husky/pre-commit
diff --git a/.npmignore b/apps/cli/.npmignore
similarity index 100%
rename from .npmignore
rename to apps/cli/.npmignore
diff --git a/.prettierignore b/apps/cli/.prettierignore
similarity index 100%
rename from .prettierignore
rename to apps/cli/.prettierignore
diff --git a/.prettierrc.json b/apps/cli/.prettierrc.json
similarity index 100%
rename from .prettierrc.json
rename to apps/cli/.prettierrc.json
diff --git a/.vscode/launch.json b/apps/cli/.vscode/launch.json
similarity index 100%
rename from .vscode/launch.json
rename to apps/cli/.vscode/launch.json
diff --git a/.vscode/settings.json b/apps/cli/.vscode/settings.json
similarity index 100%
rename from .vscode/settings.json
rename to apps/cli/.vscode/settings.json
diff --git a/CONTRIBUTING.md b/apps/cli/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to apps/cli/CONTRIBUTING.md
diff --git a/ISSUE_TEMPLATE.md b/apps/cli/ISSUE_TEMPLATE.md
similarity index 100%
rename from ISSUE_TEMPLATE.md
rename to apps/cli/ISSUE_TEMPLATE.md
diff --git a/LICENSE.txt b/apps/cli/LICENSE.txt
similarity index 100%
rename from LICENSE.txt
rename to apps/cli/LICENSE.txt
diff --git a/README.md b/apps/cli/README.md
similarity index 100%
rename from README.md
rename to apps/cli/README.md
diff --git a/SECURITY.md b/apps/cli/SECURITY.md
similarity index 100%
rename from SECURITY.md
rename to apps/cli/SECURITY.md
diff --git a/config/config.js b/apps/cli/config/config.js
similarity index 100%
rename from config/config.js
rename to apps/cli/config/config.js
diff --git a/config/development.json b/apps/cli/config/development.json
similarity index 100%
rename from config/development.json
rename to apps/cli/config/development.json
diff --git a/config/production.json b/apps/cli/config/production.json
similarity index 100%
rename from config/production.json
rename to apps/cli/config/production.json
diff --git a/examples/git-credential-bw.sh b/apps/cli/examples/git-credential-bw.sh
old mode 100755
new mode 100644
similarity index 100%
rename from examples/git-credential-bw.sh
rename to apps/cli/examples/git-credential-bw.sh
diff --git a/jslib b/apps/cli/jslib
similarity index 100%
rename from jslib
rename to apps/cli/jslib
diff --git a/package-lock.json b/apps/cli/package-lock.json
similarity index 100%
rename from package-lock.json
rename to apps/cli/package-lock.json
diff --git a/package.json b/apps/cli/package.json
similarity index 100%
rename from package.json
rename to apps/cli/package.json
diff --git a/scripts/brew-update.ps1 b/apps/cli/scripts/brew-update.ps1
similarity index 100%
rename from scripts/brew-update.ps1
rename to apps/cli/scripts/brew-update.ps1
diff --git a/scripts/choco-pack.ps1 b/apps/cli/scripts/choco-pack.ps1
similarity index 100%
rename from scripts/choco-pack.ps1
rename to apps/cli/scripts/choco-pack.ps1
diff --git a/scripts/choco-update.ps1 b/apps/cli/scripts/choco-update.ps1
similarity index 100%
rename from scripts/choco-update.ps1
rename to apps/cli/scripts/choco-update.ps1
diff --git a/scripts/snap-build.ps1 b/apps/cli/scripts/snap-build.ps1
similarity index 100%
rename from scripts/snap-build.ps1
rename to apps/cli/scripts/snap-build.ps1
diff --git a/scripts/snap-update.ps1 b/apps/cli/scripts/snap-update.ps1
similarity index 100%
rename from scripts/snap-update.ps1
rename to apps/cli/scripts/snap-update.ps1
diff --git a/spec/bw.spec.ts b/apps/cli/spec/bw.spec.ts
similarity index 100%
rename from spec/bw.spec.ts
rename to apps/cli/spec/bw.spec.ts
diff --git a/spec/helpers.ts b/apps/cli/spec/helpers.ts
similarity index 100%
rename from spec/helpers.ts
rename to apps/cli/spec/helpers.ts
diff --git a/spec/support/jasmine.json b/apps/cli/spec/support/jasmine.json
similarity index 100%
rename from spec/support/jasmine.json
rename to apps/cli/spec/support/jasmine.json
diff --git a/spec/tsconfig.json b/apps/cli/spec/tsconfig.json
similarity index 100%
rename from spec/tsconfig.json
rename to apps/cli/spec/tsconfig.json
diff --git a/spec/utils.spec.ts b/apps/cli/spec/utils.spec.ts
similarity index 100%
rename from spec/utils.spec.ts
rename to apps/cli/spec/utils.spec.ts
diff --git a/src/bw.ts b/apps/cli/src/bw.ts
similarity index 100%
rename from src/bw.ts
rename to apps/cli/src/bw.ts
diff --git a/src/commands/completion.command.ts b/apps/cli/src/commands/completion.command.ts
similarity index 100%
rename from src/commands/completion.command.ts
rename to apps/cli/src/commands/completion.command.ts
diff --git a/src/commands/config.command.ts b/apps/cli/src/commands/config.command.ts
similarity index 100%
rename from src/commands/config.command.ts
rename to apps/cli/src/commands/config.command.ts
diff --git a/src/commands/confirm.command.ts b/apps/cli/src/commands/confirm.command.ts
similarity index 100%
rename from src/commands/confirm.command.ts
rename to apps/cli/src/commands/confirm.command.ts
diff --git a/src/commands/convertToKeyConnector.command.ts b/apps/cli/src/commands/convertToKeyConnector.command.ts
similarity index 100%
rename from src/commands/convertToKeyConnector.command.ts
rename to apps/cli/src/commands/convertToKeyConnector.command.ts
diff --git a/src/commands/create.command.ts b/apps/cli/src/commands/create.command.ts
similarity index 100%
rename from src/commands/create.command.ts
rename to apps/cli/src/commands/create.command.ts
diff --git a/src/commands/delete.command.ts b/apps/cli/src/commands/delete.command.ts
similarity index 100%
rename from src/commands/delete.command.ts
rename to apps/cli/src/commands/delete.command.ts
diff --git a/src/commands/download.command.ts b/apps/cli/src/commands/download.command.ts
similarity index 100%
rename from src/commands/download.command.ts
rename to apps/cli/src/commands/download.command.ts
diff --git a/src/commands/edit.command.ts b/apps/cli/src/commands/edit.command.ts
similarity index 100%
rename from src/commands/edit.command.ts
rename to apps/cli/src/commands/edit.command.ts
diff --git a/src/commands/encode.command.ts b/apps/cli/src/commands/encode.command.ts
similarity index 100%
rename from src/commands/encode.command.ts
rename to apps/cli/src/commands/encode.command.ts
diff --git a/src/commands/export.command.ts b/apps/cli/src/commands/export.command.ts
similarity index 100%
rename from src/commands/export.command.ts
rename to apps/cli/src/commands/export.command.ts
diff --git a/src/commands/generate.command.ts b/apps/cli/src/commands/generate.command.ts
similarity index 100%
rename from src/commands/generate.command.ts
rename to apps/cli/src/commands/generate.command.ts
diff --git a/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts
similarity index 100%
rename from src/commands/get.command.ts
rename to apps/cli/src/commands/get.command.ts
diff --git a/src/commands/import.command.ts b/apps/cli/src/commands/import.command.ts
similarity index 100%
rename from src/commands/import.command.ts
rename to apps/cli/src/commands/import.command.ts
diff --git a/src/commands/list.command.ts b/apps/cli/src/commands/list.command.ts
similarity index 100%
rename from src/commands/list.command.ts
rename to apps/cli/src/commands/list.command.ts
diff --git a/src/commands/lock.command.ts b/apps/cli/src/commands/lock.command.ts
similarity index 100%
rename from src/commands/lock.command.ts
rename to apps/cli/src/commands/lock.command.ts
diff --git a/src/commands/login.command.ts b/apps/cli/src/commands/login.command.ts
similarity index 100%
rename from src/commands/login.command.ts
rename to apps/cli/src/commands/login.command.ts
diff --git a/src/commands/restore.command.ts b/apps/cli/src/commands/restore.command.ts
similarity index 100%
rename from src/commands/restore.command.ts
rename to apps/cli/src/commands/restore.command.ts
diff --git a/src/commands/send/create.command.ts b/apps/cli/src/commands/send/create.command.ts
similarity index 100%
rename from src/commands/send/create.command.ts
rename to apps/cli/src/commands/send/create.command.ts
diff --git a/src/commands/send/delete.command.ts b/apps/cli/src/commands/send/delete.command.ts
similarity index 100%
rename from src/commands/send/delete.command.ts
rename to apps/cli/src/commands/send/delete.command.ts
diff --git a/src/commands/send/edit.command.ts b/apps/cli/src/commands/send/edit.command.ts
similarity index 100%
rename from src/commands/send/edit.command.ts
rename to apps/cli/src/commands/send/edit.command.ts
diff --git a/src/commands/send/get.command.ts b/apps/cli/src/commands/send/get.command.ts
similarity index 100%
rename from src/commands/send/get.command.ts
rename to apps/cli/src/commands/send/get.command.ts
diff --git a/src/commands/send/list.command.ts b/apps/cli/src/commands/send/list.command.ts
similarity index 100%
rename from src/commands/send/list.command.ts
rename to apps/cli/src/commands/send/list.command.ts
diff --git a/src/commands/send/receive.command.ts b/apps/cli/src/commands/send/receive.command.ts
similarity index 100%
rename from src/commands/send/receive.command.ts
rename to apps/cli/src/commands/send/receive.command.ts
diff --git a/src/commands/send/removePassword.command.ts b/apps/cli/src/commands/send/removePassword.command.ts
similarity index 100%
rename from src/commands/send/removePassword.command.ts
rename to apps/cli/src/commands/send/removePassword.command.ts
diff --git a/src/commands/serve.command.ts b/apps/cli/src/commands/serve.command.ts
similarity index 100%
rename from src/commands/serve.command.ts
rename to apps/cli/src/commands/serve.command.ts
diff --git a/src/commands/share.command.ts b/apps/cli/src/commands/share.command.ts
similarity index 100%
rename from src/commands/share.command.ts
rename to apps/cli/src/commands/share.command.ts
diff --git a/src/commands/status.command.ts b/apps/cli/src/commands/status.command.ts
similarity index 100%
rename from src/commands/status.command.ts
rename to apps/cli/src/commands/status.command.ts
diff --git a/src/commands/sync.command.ts b/apps/cli/src/commands/sync.command.ts
similarity index 100%
rename from src/commands/sync.command.ts
rename to apps/cli/src/commands/sync.command.ts
diff --git a/src/commands/unlock.command.ts b/apps/cli/src/commands/unlock.command.ts
similarity index 100%
rename from src/commands/unlock.command.ts
rename to apps/cli/src/commands/unlock.command.ts
diff --git a/src/flags.ts b/apps/cli/src/flags.ts
similarity index 100%
rename from src/flags.ts
rename to apps/cli/src/flags.ts
diff --git a/src/locales/en/messages.json b/apps/cli/src/locales/en/messages.json
similarity index 100%
rename from src/locales/en/messages.json
rename to apps/cli/src/locales/en/messages.json
diff --git a/src/models/request/organizationCollectionRequest.ts b/apps/cli/src/models/request/organizationCollectionRequest.ts
similarity index 100%
rename from src/models/request/organizationCollectionRequest.ts
rename to apps/cli/src/models/request/organizationCollectionRequest.ts
diff --git a/src/models/response/attachmentResponse.ts b/apps/cli/src/models/response/attachmentResponse.ts
similarity index 100%
rename from src/models/response/attachmentResponse.ts
rename to apps/cli/src/models/response/attachmentResponse.ts
diff --git a/src/models/response/cipherResponse.ts b/apps/cli/src/models/response/cipherResponse.ts
similarity index 100%
rename from src/models/response/cipherResponse.ts
rename to apps/cli/src/models/response/cipherResponse.ts
diff --git a/src/models/response/collectionResponse.ts b/apps/cli/src/models/response/collectionResponse.ts
similarity index 100%
rename from src/models/response/collectionResponse.ts
rename to apps/cli/src/models/response/collectionResponse.ts
diff --git a/src/models/response/folderResponse.ts b/apps/cli/src/models/response/folderResponse.ts
similarity index 100%
rename from src/models/response/folderResponse.ts
rename to apps/cli/src/models/response/folderResponse.ts
diff --git a/src/models/response/loginResponse.ts b/apps/cli/src/models/response/loginResponse.ts
similarity index 100%
rename from src/models/response/loginResponse.ts
rename to apps/cli/src/models/response/loginResponse.ts
diff --git a/src/models/response/organizationCollectionResponse.ts b/apps/cli/src/models/response/organizationCollectionResponse.ts
similarity index 100%
rename from src/models/response/organizationCollectionResponse.ts
rename to apps/cli/src/models/response/organizationCollectionResponse.ts
diff --git a/src/models/response/organizationResponse.ts b/apps/cli/src/models/response/organizationResponse.ts
similarity index 100%
rename from src/models/response/organizationResponse.ts
rename to apps/cli/src/models/response/organizationResponse.ts
diff --git a/src/models/response/organizationUserResponse.ts b/apps/cli/src/models/response/organizationUserResponse.ts
similarity index 100%
rename from src/models/response/organizationUserResponse.ts
rename to apps/cli/src/models/response/organizationUserResponse.ts
diff --git a/src/models/response/passwordHistoryResponse.ts b/apps/cli/src/models/response/passwordHistoryResponse.ts
similarity index 100%
rename from src/models/response/passwordHistoryResponse.ts
rename to apps/cli/src/models/response/passwordHistoryResponse.ts
diff --git a/src/models/response/sendAccessResponse.ts b/apps/cli/src/models/response/sendAccessResponse.ts
similarity index 100%
rename from src/models/response/sendAccessResponse.ts
rename to apps/cli/src/models/response/sendAccessResponse.ts
diff --git a/src/models/response/sendFileResponse.ts b/apps/cli/src/models/response/sendFileResponse.ts
similarity index 100%
rename from src/models/response/sendFileResponse.ts
rename to apps/cli/src/models/response/sendFileResponse.ts
diff --git a/src/models/response/sendResponse.ts b/apps/cli/src/models/response/sendResponse.ts
similarity index 100%
rename from src/models/response/sendResponse.ts
rename to apps/cli/src/models/response/sendResponse.ts
diff --git a/src/models/response/sendTextResponse.ts b/apps/cli/src/models/response/sendTextResponse.ts
similarity index 100%
rename from src/models/response/sendTextResponse.ts
rename to apps/cli/src/models/response/sendTextResponse.ts
diff --git a/src/models/response/templateResponse.ts b/apps/cli/src/models/response/templateResponse.ts
similarity index 100%
rename from src/models/response/templateResponse.ts
rename to apps/cli/src/models/response/templateResponse.ts
diff --git a/src/models/selectionReadOnly.ts b/apps/cli/src/models/selectionReadOnly.ts
similarity index 100%
rename from src/models/selectionReadOnly.ts
rename to apps/cli/src/models/selectionReadOnly.ts
diff --git a/src/program.ts b/apps/cli/src/program.ts
similarity index 100%
rename from src/program.ts
rename to apps/cli/src/program.ts
diff --git a/src/send.program.ts b/apps/cli/src/send.program.ts
similarity index 100%
rename from src/send.program.ts
rename to apps/cli/src/send.program.ts
diff --git a/src/services/i18n.service.ts b/apps/cli/src/services/i18n.service.ts
similarity index 100%
rename from src/services/i18n.service.ts
rename to apps/cli/src/services/i18n.service.ts
diff --git a/src/services/lowdbStorage.service.ts b/apps/cli/src/services/lowdbStorage.service.ts
similarity index 100%
rename from src/services/lowdbStorage.service.ts
rename to apps/cli/src/services/lowdbStorage.service.ts
diff --git a/src/services/nodeEnvSecureStorage.service.ts b/apps/cli/src/services/nodeEnvSecureStorage.service.ts
similarity index 100%
rename from src/services/nodeEnvSecureStorage.service.ts
rename to apps/cli/src/services/nodeEnvSecureStorage.service.ts
diff --git a/src/utils.ts b/apps/cli/src/utils.ts
similarity index 100%
rename from src/utils.ts
rename to apps/cli/src/utils.ts
diff --git a/src/vault.program.ts b/apps/cli/src/vault.program.ts
similarity index 100%
rename from src/vault.program.ts
rename to apps/cli/src/vault.program.ts
diff --git a/stores/chocolatey/bitwarden-cli.nuspec b/apps/cli/stores/chocolatey/bitwarden-cli.nuspec
similarity index 100%
rename from stores/chocolatey/bitwarden-cli.nuspec
rename to apps/cli/stores/chocolatey/bitwarden-cli.nuspec
diff --git a/stores/chocolatey/tools/VERIFICATION.txt b/apps/cli/stores/chocolatey/tools/VERIFICATION.txt
similarity index 100%
rename from stores/chocolatey/tools/VERIFICATION.txt
rename to apps/cli/stores/chocolatey/tools/VERIFICATION.txt
diff --git a/stores/snap/snapcraft.yaml b/apps/cli/stores/snap/snapcraft.yaml
similarity index 100%
rename from stores/snap/snapcraft.yaml
rename to apps/cli/stores/snap/snapcraft.yaml
diff --git a/tsconfig.json b/apps/cli/tsconfig.json
similarity index 100%
rename from tsconfig.json
rename to apps/cli/tsconfig.json
diff --git a/tslint.json b/apps/cli/tslint.json
similarity index 100%
rename from tslint.json
rename to apps/cli/tslint.json
diff --git a/webpack.config.js b/apps/cli/webpack.config.js
similarity index 100%
rename from webpack.config.js
rename to apps/cli/webpack.config.js