diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 8b0c670c14..58cad9016e 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -14,7 +14,7 @@ import { LoginComponent } from './accounts/login.component';
 import { RegisterComponent } from './accounts/register.component';
 import { TwoFactorComponent } from './accounts/two-factor.component';
 
-import { VaultComponent as OrganizationVaultComponent } from './organizations/vault.component';
+import { VaultComponent as OrganizationVaultComponent } from './organizations/vault/vault.component';
 
 import { AccountComponent } from './settings/account.component';
 import { CreateOrganizationComponent } from './settings/create-organization.component';
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 26105e3f64..8f98a9eafb 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -32,12 +32,12 @@ import { RegisterComponent } from './accounts/register.component';
 import { TwoFactorOptionsComponent } from './accounts/two-factor-options.component';
 import { TwoFactorComponent } from './accounts/two-factor.component';
 
-import { AddEditComponent as OrgAddEditComponent } from './organizations/add-edit.component';
-import { AttachmentsComponent as OrgAttachmentsComponent } from './organizations/attachments.component';
-import { CiphersComponent as OrgCiphersComponent } from './organizations/ciphers.component';
-import { CollectionsComponent as OrgCollectionsComponent } from './organizations/collections.component';
-import { GroupingsComponent as OrgGroupingsComponent } from './organizations/groupings.component';
-import { VaultComponent as OrgVaultComponent } from './organizations/vault.component';
+import { AddEditComponent as OrgAddEditComponent } from './organizations/vault/add-edit.component';
+import { AttachmentsComponent as OrgAttachmentsComponent } from './organizations/vault/attachments.component';
+import { CiphersComponent as OrgCiphersComponent } from './organizations/vault/ciphers.component';
+import { CollectionsComponent as OrgCollectionsComponent } from './organizations/vault/collections.component';
+import { GroupingsComponent as OrgGroupingsComponent } from './organizations/vault/groupings.component';
+import { VaultComponent as OrgVaultComponent } from './organizations/vault/vault.component';
 
 import { AccountComponent } from './settings/account.component';
 import { AdjustPaymentComponent } from './settings/adjust-payment.component';
diff --git a/src/app/organizations/add-edit.component.ts b/src/app/organizations/vault/add-edit.component.ts
similarity index 95%
rename from src/app/organizations/add-edit.component.ts
rename to src/app/organizations/vault/add-edit.component.ts
index 5f25274442..9a23bc9321 100644
--- a/src/app/organizations/add-edit.component.ts
+++ b/src/app/organizations/vault/add-edit.component.ts
@@ -22,11 +22,11 @@ import { Cipher } from 'jslib/models/domain/cipher';
 import { Organization } from 'jslib/models/domain/organization';
 import { CipherRequest } from 'jslib/models/request/cipherRequest';
 
-import { AddEditComponent as BaseAddEditComponent } from '../vault/add-edit.component';
+import { AddEditComponent as BaseAddEditComponent } from '../../vault/add-edit.component';
 
 @Component({
     selector: 'app-org-vault-add-edit',
-    templateUrl: '../vault/add-edit.component.html',
+    templateUrl: '../../vault/add-edit.component.html',
 })
 export class AddEditComponent extends BaseAddEditComponent implements OnInit {
     organization: Organization;
diff --git a/src/app/organizations/attachments.component.ts b/src/app/organizations/vault/attachments.component.ts
similarity index 95%
rename from src/app/organizations/attachments.component.ts
rename to src/app/organizations/vault/attachments.component.ts
index 76e3c88224..de1021e2cc 100644
--- a/src/app/organizations/attachments.component.ts
+++ b/src/app/organizations/vault/attachments.component.ts
@@ -14,11 +14,11 @@ import { CipherData } from 'jslib/models/data/cipherData';
 import { Cipher } from 'jslib/models/domain/cipher';
 import { Organization } from 'jslib/models/domain/organization';
 
-import { AttachmentsComponent as BaseAttachmentsComponent } from '../vault/attachments.component';
+import { AttachmentsComponent as BaseAttachmentsComponent } from '../../vault/attachments.component';
 
 @Component({
     selector: 'app-org-vault-attachments',
-    templateUrl: '../vault/attachments.component.html',
+    templateUrl: '../../vault/attachments.component.html',
 })
 export class AttachmentsComponent extends BaseAttachmentsComponent {
     organization: Organization;
diff --git a/src/app/organizations/ciphers.component.ts b/src/app/organizations/vault/ciphers.component.ts
similarity index 94%
rename from src/app/organizations/ciphers.component.ts
rename to src/app/organizations/vault/ciphers.component.ts
index 690bd76ab1..30e6f12ddd 100644
--- a/src/app/organizations/ciphers.component.ts
+++ b/src/app/organizations/vault/ciphers.component.ts
@@ -13,11 +13,11 @@ import { Cipher } from 'jslib/models/domain/cipher';
 import { Organization } from 'jslib/models/domain/organization';
 import { CipherView } from 'jslib/models/view/cipherView';
 
-import { CiphersComponent as BaseCiphersComponent } from '../vault/ciphers.component';
+import { CiphersComponent as BaseCiphersComponent } from '../../vault/ciphers.component';
 
 @Component({
     selector: 'app-org-vault-ciphers',
-    templateUrl: '../vault/ciphers.component.html',
+    templateUrl: '../../vault/ciphers.component.html',
 })
 export class CiphersComponent extends BaseCiphersComponent {
     organization: Organization;
diff --git a/src/app/organizations/collections.component.ts b/src/app/organizations/vault/collections.component.ts
similarity index 95%
rename from src/app/organizations/collections.component.ts
rename to src/app/organizations/vault/collections.component.ts
index 8004b0defc..671c45acfc 100644
--- a/src/app/organizations/collections.component.ts
+++ b/src/app/organizations/vault/collections.component.ts
@@ -13,11 +13,11 @@ import { Cipher } from 'jslib/models/domain/cipher';
 import { Organization } from 'jslib/models/domain/organization';
 import { CipherCollectionsRequest } from 'jslib/models/request/cipherCollectionsRequest';
 
-import { CollectionsComponent as BaseCollectionsComponent } from '../vault/collections.component';
+import { CollectionsComponent as BaseCollectionsComponent } from '../../vault/collections.component';
 
 @Component({
     selector: 'app-org-vault-collections',
-    templateUrl: '../vault/collections.component.html',
+    templateUrl: '../../vault/collections.component.html',
 })
 export class CollectionsComponent extends BaseCollectionsComponent {
     organization: Organization;
diff --git a/src/app/organizations/groupings.component.ts b/src/app/organizations/vault/groupings.component.ts
similarity index 96%
rename from src/app/organizations/groupings.component.ts
rename to src/app/organizations/vault/groupings.component.ts
index e2c3732dc2..6b7a4937e5 100644
--- a/src/app/organizations/groupings.component.ts
+++ b/src/app/organizations/vault/groupings.component.ts
@@ -10,11 +10,11 @@ import { Collection } from 'jslib/models/domain/collection';
 import { Organization } from 'jslib/models/domain/organization';
 import { CollectionView } from 'jslib/models/view/collectionView';
 
-import { GroupingsComponent as BaseGroupingsComponent } from '../vault/groupings.component';
+import { GroupingsComponent as BaseGroupingsComponent } from '../../vault/groupings.component';
 
 @Component({
     selector: 'app-org-vault-groupings',
-    templateUrl: '../vault/groupings.component.html',
+    templateUrl: '../../vault/groupings.component.html',
 })
 export class GroupingsComponent extends BaseGroupingsComponent {
     organization: Organization;
diff --git a/src/app/organizations/vault.component.html b/src/app/organizations/vault/vault.component.html
similarity index 100%
rename from src/app/organizations/vault.component.html
rename to src/app/organizations/vault/vault.component.html
diff --git a/src/app/organizations/vault.component.ts b/src/app/organizations/vault/vault.component.ts
similarity index 99%
rename from src/app/organizations/vault.component.ts
rename to src/app/organizations/vault/vault.component.ts
index 4d32f46c0b..3d4ec131ff 100644
--- a/src/app/organizations/vault.component.ts
+++ b/src/app/organizations/vault/vault.component.ts
@@ -20,7 +20,7 @@ import { CipherView } from 'jslib/models/view/cipherView';
 
 import { CipherType } from 'jslib/enums/cipherType';
 
-import { ModalComponent } from '../modal.component';
+import { ModalComponent } from '../../modal.component';
 
 import { AddEditComponent } from './add-edit.component';
 import { AttachmentsComponent } from './attachments.component';