Remove Organization prefix, remove unneeded imports

src/app/organizations/organizations-routing.module.ts

@@ -14,9 +14,9 @@ import { PeopleComponent } from "./manage/people.component";
 import { PoliciesComponent } from "./manage/policies.component";
 import { NavigationPermissionsService } from "./services/navigation-permissions.service";
 import { AccountComponent } from "./settings/account.component";
-import { OrganizationBillingComponent } from "./settings/organization-billing.component";
-import { OrganizationSubscriptionComponent } from "./settings/organization-subscription.component";
+import { BillingComponent } from "./settings/billing.component";
 import { SettingsComponent } from "./settings/settings.component";
+import { SubscriptionComponent } from "./settings/subscription.component";
 import { TwoFactorSetupComponent } from "./settings/two-factor-setup.component";
 import { ExportComponent } from "./tools/export.component";
 import { ExposedPasswordsReportComponent } from "./tools/exposed-passwords-report.component";
@@ -200,13 +200,13 @@ const routes: Routes = [
           },
           {
             path: "billing",
-            component: OrganizationBillingComponent,
+            component: BillingComponent,
             canActivate: [PermissionsGuard],
             data: { titleId: "billing", permissions: [Permissions.ManageBilling] },
           },
           {
             path: "subscription",
-            component: OrganizationSubscriptionComponent,
+            component: SubscriptionComponent,
             data: { titleId: "subscription" },
           },
         ],

src/app/organizations/organizations.module.ts

@@ -2,9 +2,6 @@ import { NgModule } from "@angular/core";
 
 import { PipesModule } from "../modules/pipes/pipes.module";
 import { SharedModule } from "../modules/shared.module";
-import { VaultFilterModule } from "../modules/vault-filter/vault-filter.module";
-import { OrganizationBadgeModule } from "../modules/vault/modules/organization-badge/organization-badge.module";
-
 
 import { OrganizationLayoutComponent } from "./layouts/organization-layout.component";
 import { OrganizationSwitcherComponent } from "./layouts/organization-switcher.component";
@@ -36,16 +33,16 @@ import { ResetPasswordPolicyComponent } from "./policies/reset-password.componen
 import { SendOptionsPolicyComponent } from "./policies/send-options.component";
 import { SingleOrgPolicyComponent } from "./policies/single-org.component";
 import { TwoFactorAuthenticationPolicyComponent } from "./policies/two-factor-authentication.component";
-import { AccountComponent as OrgAccountComponent } from "./settings/account.component";
+import { AccountComponent } from "./settings/account.component";
 import { AdjustSubscription } from "./settings/adjust-subscription.component";
 import { BillingSyncApiKeyComponent } from "./settings/billing-sync-api-key.component";
+import { BillingComponent } from "./settings/billing.component";
 import { ChangePlanComponent } from "./settings/change-plan.component";
 import { DeleteOrganizationComponent } from "./settings/delete-organization.component";
 import { DownloadLicenseComponent } from "./settings/download-license.component";
 import { ImageSubscriptionHiddenComponent } from "./settings/image-subscription-hidden.component";
-import { OrganizationBillingComponent } from "./settings/organization-billing.component";
-import { OrganizationSubscriptionComponent } from "./settings/organization-subscription.component";
 import { SettingsComponent } from "./settings/settings.component";
+import { SubscriptionComponent } from "./settings/subscription.component";
 import { TwoFactorSetupComponent } from "./settings/two-factor-setup.component";
 import { AcceptFamilySponsorshipComponent } from "./sponsorships/accept-family-sponsorship.component";
 import { FamiliesForEnterpriseSetupComponent } from "./sponsorships/families-for-enterprise-setup.component";
@@ -59,16 +56,12 @@ import { UnsecuredWebsitesReportComponent } from "./tools/unsecured-websites-rep
 import { WeakPasswordsReportComponent } from "./tools/weak-passwords-report.component";
 
 @NgModule({
-  imports: [
-    OrganizationsRoutingModule,
-    SharedModule,
-    VaultFilterModule,
-    OrganizationBadgeModule,
-    PipesModule,
-  ],
+  imports: [OrganizationsRoutingModule, SharedModule, PipesModule],
   declarations: [
     AcceptFamilySponsorshipComponent,
+    AccountComponent,
     AdjustSubscription,
+    BillingComponent,
     BillingSyncApiKeyComponent,
     BulkConfirmComponent,
     BulkRemoveComponent,
@@ -92,10 +85,7 @@ import { WeakPasswordsReportComponent } from "./tools/weak-passwords-report.comp
     ManageCollectionsComponent,
     ManageComponent,
     MasterPasswordPolicyComponent,
-    OrgAccountComponent,
-    OrganizationBillingComponent,
     OrganizationLayoutComponent,
-    OrganizationSubscriptionComponent,
     OrganizationSwitcherComponent,
     PasswordGeneratorPolicyComponent,
     PeopleComponent,
@@ -109,6 +99,7 @@ import { WeakPasswordsReportComponent } from "./tools/weak-passwords-report.comp
     SendOptionsPolicyComponent,
     SettingsComponent,
     SingleOrgPolicyComponent,
+    SubscriptionComponent,
     ToolsComponent,
     TwoFactorAuthenticationPolicyComponent,
     TwoFactorSetupComponent,

src/app/organizations/settings/billing.component.ts

@@ -12,9 +12,9 @@ import { BillingResponse } from "jslib-common/models/response/billingResponse";
 
 @Component({
   selector: "app-org-billing",
-  templateUrl: "./organization-billing.component.html",
+  templateUrl: "./billing.component.html",
 })
-export class OrganizationBillingComponent implements OnInit {
+export class BillingComponent implements OnInit {
   loading = false;
   firstLoaded = false;
   showAdjustPayment = false;

src/app/organizations/settings/subscription.component.ts

@@ -23,9 +23,9 @@ import { BillingSyncApiKeyComponent } from "./billing-sync-api-key.component";
 
 @Component({
   selector: "app-org-subscription",
-  templateUrl: "organization-subscription.component.html",
+  templateUrl: "subscription.component.html",
 })
-export class OrganizationSubscriptionComponent implements OnInit {
+export class SubscriptionComponent implements OnInit {
   @ViewChild("setupBillingSyncTemplate", { read: ViewContainerRef, static: true })
   setupBillingSyncModalRef: ViewContainerRef;