diff --git a/angular.json b/angular.json
index 4b99c82ed..51ff0bd44 100644
--- a/angular.json
+++ b/angular.json
@@ -44,7 +44,7 @@
               }
             ],
             "styles": [
-              "src/assets/styles/styles.scss",
+              "src/styles/styles.scss",
               "node_modules/primeflex/primeflex.css",
               "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
               "node_modules/ngx-markdown-editor/assets/highlight.js/agate.min.css"
diff --git a/jest.config.js b/jest.config.js
index 3d6b6f358..bac82ca2e 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -8,7 +8,7 @@ module.exports = {
     '^@osf/(.*)$': '<rootDir>/src/app/$1',
     '^@core/(.*)$': '<rootDir>/src/app/core/$1',
     '^@shared/(.*)$': '<rootDir>/src/app/shared/$1',
-    '^@styles/(.*)$': '<rootDir>/assets/styles/$1',
+    '^@styles/(.*)$': '<rootDir>/src/styles/$1',
     '^@testing/(.*)$': '<rootDir>/src/testing/$1',
     '^src/environments/environment$': '<rootDir>/src/environments/environment.ts',
   },
diff --git a/src/app/core/components/breadcrumb/breadcrumb.component.scss b/src/app/core/components/breadcrumb/breadcrumb.component.scss
index 5df4a7926..a43a08f1a 100644
--- a/src/app/core/components/breadcrumb/breadcrumb.component.scss
+++ b/src/app/core/components/breadcrumb/breadcrumb.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 .breadcrumbs {
   color: var(--header-color, var.$dark-blue-1);
diff --git a/src/app/core/components/footer/footer.component.scss b/src/app/core/components/footer/footer.component.scss
index d5aab8005..a58c8093c 100644
--- a/src/app/core/components/footer/footer.component.scss
+++ b/src/app/core/components/footer/footer.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .footer-nav,
 .footer-secondary-nav {
diff --git a/src/app/core/components/forbidden-page/forbidden-page.component.scss b/src/app/core/components/forbidden-page/forbidden-page.component.scss
index ea23a76d4..2352579f3 100644
--- a/src/app/core/components/forbidden-page/forbidden-page.component.scss
+++ b/src/app/core/components/forbidden-page/forbidden-page.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-center;
diff --git a/src/app/core/components/header/header.component.scss b/src/app/core/components/header/header.component.scss
index b3cc1af0f..9f426eac4 100644
--- a/src/app/core/components/header/header.component.scss
+++ b/src/app/core/components/header/header.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .header {
   position: absolute;
diff --git a/src/app/core/components/page-not-found/page-not-found.component.scss b/src/app/core/components/page-not-found/page-not-found.component.scss
index ea23a76d4..2352579f3 100644
--- a/src/app/core/components/page-not-found/page-not-found.component.scss
+++ b/src/app/core/components/page-not-found/page-not-found.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-center;
diff --git a/src/app/core/components/request-access/request-access.component.scss b/src/app/core/components/request-access/request-access.component.scss
index c27d0d43b..e115a93dd 100644
--- a/src/app/core/components/request-access/request-access.component.scss
+++ b/src/app/core/components/request-access/request-access.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-center;
diff --git a/src/app/core/components/root/root.component.scss b/src/app/core/components/root/root.component.scss
index beee5455a..7d6df6575 100644
--- a/src/app/core/components/root/root.component.scss
+++ b/src/app/core/components/root/root.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/mixins" as mix;
-@use "assets/styles/variables" as var;
+@use "styles/mixins" as mix;
+@use "styles/variables" as var;
 
 :host {
   display: flex;
diff --git a/src/app/core/components/topnav/topnav.component.scss b/src/app/core/components/topnav/topnav.component.scss
index 595ed25eb..405ed4fea 100644
--- a/src/app/core/components/topnav/topnav.component.scss
+++ b/src/app/core/components/topnav/topnav.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   z-index: 1103;
diff --git a/src/app/core/store/user/user.state.ts b/src/app/core/store/user/user.state.ts
index 7705acd10..1067d11ef 100644
--- a/src/app/core/store/user/user.state.ts
+++ b/src/app/core/store/user/user.state.ts
@@ -5,8 +5,8 @@ import { tap } from 'rxjs';
 
 import { inject, Injectable } from '@angular/core';
 
-import { removeNullable } from '@osf/shared/constants';
 import { ProfileSettingsKey } from '@osf/shared/enums';
+import { removeNullable } from '@osf/shared/helpers';
 import { UserMapper } from '@osf/shared/mappers';
 import { Social } from '@osf/shared/models';
 
diff --git a/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.scss b/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.scss
index f39417f43..24526d1ae 100644
--- a/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.scss
+++ b/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 .width-25 {
   width: calc(25% - 1.5rem);
diff --git a/src/app/features/auth/pages/forgot-password/forgot-password.component.scss b/src/app/features/auth/pages/forgot-password/forgot-password.component.scss
index d4d4dac88..bf9a6a7ac 100644
--- a/src/app/features/auth/pages/forgot-password/forgot-password.component.scss
+++ b/src/app/features/auth/pages/forgot-password/forgot-password.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-center;
diff --git a/src/app/features/auth/pages/reset-password/reset-password.component.scss b/src/app/features/auth/pages/reset-password/reset-password.component.scss
index b231ba8b2..a9726d983 100644
--- a/src/app/features/auth/pages/reset-password/reset-password.component.scss
+++ b/src/app/features/auth/pages/reset-password/reset-password.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-center;
diff --git a/src/app/features/collections/components/add-to-collection/add-to-collection.component.scss b/src/app/features/collections/components/add-to-collection/add-to-collection.component.scss
index 4aca50a66..5e3f26fd1 100644
--- a/src/app/features/collections/components/add-to-collection/add-to-collection.component.scss
+++ b/src/app/features/collections/components/add-to-collection/add-to-collection.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   --collection-bg-color: #013b5c;
diff --git a/src/app/features/collections/components/collections-discover/collections-discover.component.scss b/src/app/features/collections/components/collections-discover/collections-discover.component.scss
index e9dab5325..949099876 100644
--- a/src/app/features/collections/components/collections-discover/collections-discover.component.scss
+++ b/src/app/features/collections/components/collections-discover/collections-discover.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-column;
diff --git a/src/app/features/collections/components/collections-filters/collections-filters.component.scss b/src/app/features/collections/components/collections-filters/collections-filters.component.scss
index 26925ce05..87860ca0c 100644
--- a/src/app/features/collections/components/collections-filters/collections-filters.component.scss
+++ b/src/app/features/collections/components/collections-filters/collections-filters.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/variables" as var;
-@use "assets/styles/mixins" as mix;
+@use "styles/variables" as var;
+@use "styles/mixins" as mix;
 
 .filters {
   border: 1px solid var.$grey-2;
diff --git a/src/app/features/collections/components/collections-help-dialog/collections-help-dialog.component.scss b/src/app/features/collections/components/collections-help-dialog/collections-help-dialog.component.scss
index fd23f1af8..c394c1464 100644
--- a/src/app/features/collections/components/collections-help-dialog/collections-help-dialog.component.scss
+++ b/src/app/features/collections/components/collections-help-dialog/collections-help-dialog.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 .dialog-content {
   border-top: 1px solid var.$grey-2;
diff --git a/src/app/features/collections/components/collections-main-content/collections-main-content.component.scss b/src/app/features/collections/components/collections-main-content/collections-main-content.component.scss
index 4a1a10512..ba7865aa7 100644
--- a/src/app/features/collections/components/collections-main-content/collections-main-content.component.scss
+++ b/src/app/features/collections/components/collections-main-content/collections-main-content.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/variables" as var;
-@use "assets/styles/mixins" as mix;
+@use "styles/variables" as var;
+@use "styles/mixins" as mix;
 
 .sort-card {
   @include mix.flex-center;
diff --git a/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.scss b/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.scss
index 858297a8a..0cbf44ef4 100644
--- a/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.scss
+++ b/src/app/features/collections/components/collections-search-result-card/collections-search-result-card.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/variables" as var;
-@use "assets/styles/mixins" as mix;
+@use "styles/variables" as var;
+@use "styles/mixins" as mix;
 
 :host {
   width: 100%;
diff --git a/src/app/features/files/components/move-file-dialog/move-file-dialog.component.scss b/src/app/features/files/components/move-file-dialog/move-file-dialog.component.scss
index 3917e8918..c63d56e96 100644
--- a/src/app/features/files/components/move-file-dialog/move-file-dialog.component.scss
+++ b/src/app/features/files/components/move-file-dialog/move-file-dialog.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/variables" as var;
-@use "assets/styles/mixins" as mix;
+@use "styles/variables" as var;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-column;
diff --git a/src/app/features/files/pages/files/files.component.scss b/src/app/features/files/pages/files/files.component.scss
index d513bbd19..59649a57b 100644
--- a/src/app/features/files/pages/files/files.component.scss
+++ b/src/app/features/files/pages/files/files.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/variables" as var;
-@use "assets/styles/mixins" as mix;
+@use "styles/variables" as var;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-column;
diff --git a/src/app/features/institutions/institutions.routes.ts b/src/app/features/institutions/institutions.routes.ts
index 75659c00e..bfc2ec5d8 100644
--- a/src/app/features/institutions/institutions.routes.ts
+++ b/src/app/features/institutions/institutions.routes.ts
@@ -2,10 +2,10 @@ import { provideStates } from '@ngxs/store';
 
 import { Routes } from '@angular/router';
 
-import { authGuard } from '@osf/core/guards';
-import { InstitutionsComponent } from '@osf/features/institutions/institutions.component';
-import { InstitutionsSearchState } from '@shared/stores';
+import { authGuard } from '@core/guards';
+import { InstitutionsSearchState } from '@osf/shared/stores';
 
+import { InstitutionsComponent } from './institutions.component';
 import { InstitutionsListComponent, InstitutionsSearchComponent } from './pages';
 
 export const routes: Routes = [
diff --git a/src/app/features/institutions/pages/institutions-list/institutions-list.component.html b/src/app/features/institutions/pages/institutions-list/institutions-list.component.html
index ee230607c..8e6ce79b2 100644
--- a/src/app/features/institutions/pages/institutions-list/institutions-list.component.html
+++ b/src/app/features/institutions/pages/institutions-list/institutions-list.component.html
@@ -6,14 +6,14 @@
     [icon]="'custom-icon-institutions-dark'"
   />
 
-  @if (institutionsLoading()) {
-    <div class="flex-1 mt-4 bg-white md:mt-8 lg:pt-5">
-      <osf-loading-spinner />
-    </div>
-  } @else {
-    <div class="flex-column flex flex-1 w-full bg-white p-5">
-      <osf-search-input [control]="searchControl" [placeholder]="'institutions.searchInstitutions' | translate" />
+  <div class="flex-column flex flex-1 w-full bg-white p-5">
+    <osf-search-input [control]="searchControl" [placeholder]="'institutions.searchInstitutions' | translate" />
 
+    @if (institutionsLoading()) {
+      <div class="flex-1 mt-4 bg-white md:mt-8 lg:pt-5">
+        <osf-loading-spinner />
+      </div>
+    } @else {
       <div class="py-5 flex flex-column gap-3">
         @for (institution of institutions(); track $index) {
           <a class="dark-blue-link" [routerLink]="[institution.id]">
@@ -36,13 +36,13 @@ <h2>{{ institution.name }}</h2>
         }
       </div>
 
-      @if (totalInstitutionsCount() > 10) {
+      @if (totalInstitutionsCount() > currentPageSize()) {
         <osf-custom-paginator
           [first]="first()"
           [totalCount]="totalInstitutionsCount()"
           (pageChanged)="onPageChange($event)"
         ></osf-custom-paginator>
       }
-    </div>
-  }
+    }
+  </div>
 </section>
diff --git a/src/app/features/institutions/pages/institutions-list/institutions-list.component.ts b/src/app/features/institutions/pages/institutions-list/institutions-list.component.ts
index 07ea9fbc9..4c9b1516c 100644
--- a/src/app/features/institutions/pages/institutions-list/institutions-list.component.ts
+++ b/src/app/features/institutions/pages/institutions-list/institutions-list.component.ts
@@ -26,11 +26,11 @@ import {
   LoadingSpinnerComponent,
   SearchInputComponent,
   SubHeaderComponent,
-} from '@shared/components';
-import { TABLE_PARAMS } from '@shared/constants';
-import { parseQueryFilterParams } from '@shared/helpers';
-import { QueryParams } from '@shared/models';
-import { FetchInstitutions, InstitutionsSelectors } from '@shared/stores/institutions';
+} from '@osf/shared/components';
+import { TABLE_PARAMS } from '@osf/shared/constants';
+import { parseQueryFilterParams } from '@osf/shared/helpers';
+import { QueryParams } from '@osf/shared/models';
+import { FetchInstitutions, InstitutionsSelectors } from '@osf/shared/stores/institutions';
 
 @Component({
   selector: 'osf-institutions-list',
diff --git a/src/app/features/metadata/dialogs/resource-tooltip-info/resource-tooltip-info.component.html b/src/app/features/metadata/dialogs/resource-tooltip-info/resource-tooltip-info.component.html
index 0385eb5dd..0612e8f5a 100644
--- a/src/app/features/metadata/dialogs/resource-tooltip-info/resource-tooltip-info.component.html
+++ b/src/app/features/metadata/dialogs/resource-tooltip-info/resource-tooltip-info.component.html
@@ -8,12 +8,12 @@
   <p>
     {{ 'project.metadata.resourceInformation.tooltipDialog.dataTypeLink' | translate }}
     <a href="https://support.datacite.org/v1.3/docs/what-are-the-resource-types-for-datacite-dois" target="_blank">
-      {{ 'project.metadata.resourceInformation.tooltipDialog.dataTypeLink' | translate }}. </a
-    >
+      {{ 'project.metadata.resourceInformation.tooltipDialog.dataTypeLink' | translate }}.
+    </a>
     {{ 'project.metadata.resourceInformation.tooltipDialog.endText' | translate }}
     <a href="https://help.osf.io/article/570-resource-types-in-osf" target="_blank">
-      {{ 'project.metadata.resourceInformation.tooltipDialog.helpLink' | translate }}. </a
-    >
+      {{ 'project.metadata.resourceInformation.tooltipDialog.helpLink' | translate }}.
+    </a>
   </p>
 </main>
 
diff --git a/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.scss b/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.scss
index b4205d981..59134fadc 100644
--- a/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.scss
+++ b/src/app/features/moderation/components/add-moderator-dialog/add-moderator-dialog.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/variables" as var;
-@use "assets/styles/mixins" as mix;
+@use "styles/variables" as var;
+@use "styles/mixins" as mix;
 
 .label {
   color: var.$dark-blue-1;
diff --git a/src/app/features/my-profile/components/my-profile-filter-chips/my-profile-filter-chips.component.scss b/src/app/features/my-profile/components/my-profile-filter-chips/my-profile-filter-chips.component.scss
index 1d02e27aa..9e54ad2ad 100644
--- a/src/app/features/my-profile/components/my-profile-filter-chips/my-profile-filter-chips.component.scss
+++ b/src/app/features/my-profile/components/my-profile-filter-chips/my-profile-filter-chips.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 :host {
   display: flex;
diff --git a/src/app/features/my-profile/components/my-profile-search/my-profile-search.component.scss b/src/app/features/my-profile/components/my-profile-search/my-profile-search.component.scss
index 8f2a65cb5..4a8e8f8cf 100644
--- a/src/app/features/my-profile/components/my-profile-search/my-profile-search.component.scss
+++ b/src/app/features/my-profile/components/my-profile-search/my-profile-search.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .search-container {
   position: relative;
diff --git a/src/app/features/my-projects/my-projects.component.scss b/src/app/features/my-projects/my-projects.component.scss
index e9dab5325..949099876 100644
--- a/src/app/features/my-projects/my-projects.component.scss
+++ b/src/app/features/my-projects/my-projects.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-column;
diff --git a/src/app/features/preprints/components/filters/preprints-filter-chips/preprints-filter-chips.component.scss b/src/app/features/preprints/components/filters/preprints-filter-chips/preprints-filter-chips.component.scss
index 9ff3d3c87..7de53cd68 100644
--- a/src/app/features/preprints/components/filters/preprints-filter-chips/preprints-filter-chips.component.scss
+++ b/src/app/features/preprints/components/filters/preprints-filter-chips/preprints-filter-chips.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/mixins" as mix;
-@use "assets/styles/variables" as var;
+@use "styles/mixins" as mix;
+@use "styles/variables" as var;
 
 :host {
   display: flex;
diff --git a/src/app/features/preprints/components/filters/preprints-resources-filters/preprints-resources-filters.component.scss b/src/app/features/preprints/components/filters/preprints-resources-filters/preprints-resources-filters.component.scss
index 1dd7a98c8..588254ea0 100644
--- a/src/app/features/preprints/components/filters/preprints-resources-filters/preprints-resources-filters.component.scss
+++ b/src/app/features/preprints/components/filters/preprints-resources-filters/preprints-resources-filters.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/variables" as var;
-@use "assets/styles/mixins" as mix;
+@use "styles/variables" as var;
+@use "styles/mixins" as mix;
 
 :host {
   width: 30%;
diff --git a/src/app/features/preprints/components/filters/preprints-resources/preprints-resources.component.scss b/src/app/features/preprints/components/filters/preprints-resources/preprints-resources.component.scss
index 56362826c..cc0eea369 100644
--- a/src/app/features/preprints/components/filters/preprints-resources/preprints-resources.component.scss
+++ b/src/app/features/preprints/components/filters/preprints-resources/preprints-resources.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/variables" as var;
-@use "assets/styles/mixins" as mix;
+@use "styles/variables" as var;
+@use "styles/mixins" as mix;
 
 h4 {
   color: var.$pr-blue-1;
diff --git a/src/app/features/preprints/components/preprint-details/share-and-downlaod/share-and-download.component.scss b/src/app/features/preprints/components/preprint-details/share-and-downlaod/share-and-download.component.scss
index 6c6740f9f..e4223887b 100644
--- a/src/app/features/preprints/components/preprint-details/share-and-downlaod/share-and-download.component.scss
+++ b/src/app/features/preprints/components/preprint-details/share-and-downlaod/share-and-download.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/mixins" as mix;
-@use "assets/styles/variables" as var;
+@use "styles/mixins" as mix;
+@use "styles/variables" as var;
 
 .social-link {
   background-color: var(--pr-blue-1);
diff --git a/src/app/features/preprints/components/preprint-provider-hero/preprint-provider-hero.component.scss b/src/app/features/preprints/components/preprint-provider-hero/preprint-provider-hero.component.scss
index 454fd2d77..86cfbe725 100644
--- a/src/app/features/preprints/components/preprint-provider-hero/preprint-provider-hero.component.scss
+++ b/src/app/features/preprints/components/preprint-provider-hero/preprint-provider-hero.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .search-input-container {
   position: relative;
diff --git a/src/app/features/preprints/components/preprint-services/preprint-services.component.scss b/src/app/features/preprints/components/preprint-services/preprint-services.component.scss
index c13d7bb7f..c980eeca9 100644
--- a/src/app/features/preprints/components/preprint-services/preprint-services.component.scss
+++ b/src/app/features/preprints/components/preprint-services/preprint-services.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .services-background-image {
   background: url("/assets/images/preprints/preprints-services-background.png") center;
diff --git a/src/app/features/preprints/components/preprints-help-dialog/preprints-help-dialog.component.scss b/src/app/features/preprints/components/preprints-help-dialog/preprints-help-dialog.component.scss
index fd23f1af8..c394c1464 100644
--- a/src/app/features/preprints/components/preprints-help-dialog/preprints-help-dialog.component.scss
+++ b/src/app/features/preprints/components/preprints-help-dialog/preprints-help-dialog.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 .dialog-content {
   border-top: 1px solid var.$grey-2;
diff --git a/src/app/features/preprints/components/stepper/author-assertion-step/author-assertions-step.component.scss b/src/app/features/preprints/components/stepper/author-assertion-step/author-assertions-step.component.scss
index 243cc50eb..1c574fd69 100644
--- a/src/app/features/preprints/components/stepper/author-assertion-step/author-assertions-step.component.scss
+++ b/src/app/features/preprints/components/stepper/author-assertion-step/author-assertions-step.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 .card {
   @media (max-width: var.$breakpoint-sm) {
diff --git a/src/app/features/preprints/components/stepper/file-step/file-step.component.scss b/src/app/features/preprints/components/stepper/file-step/file-step.component.scss
index 9ee46185f..715cc4824 100644
--- a/src/app/features/preprints/components/stepper/file-step/file-step.component.scss
+++ b/src/app/features/preprints/components/stepper/file-step/file-step.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/mixins" as mix;
-@use "assets/styles/variables" as var;
+@use "styles/mixins" as mix;
+@use "styles/variables" as var;
 
 .file-source-button {
   --p-button-secondary-border-color: var(--grey-2);
diff --git a/src/app/features/preprints/components/stepper/metadata-step/metadata-step.component.scss b/src/app/features/preprints/components/stepper/metadata-step/metadata-step.component.scss
index 243cc50eb..1c574fd69 100644
--- a/src/app/features/preprints/components/stepper/metadata-step/metadata-step.component.scss
+++ b/src/app/features/preprints/components/stepper/metadata-step/metadata-step.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 .card {
   @media (max-width: var.$breakpoint-sm) {
diff --git a/src/app/features/preprints/components/stepper/review-step/review-step.component.scss b/src/app/features/preprints/components/stepper/review-step/review-step.component.scss
index 243cc50eb..1c574fd69 100644
--- a/src/app/features/preprints/components/stepper/review-step/review-step.component.scss
+++ b/src/app/features/preprints/components/stepper/review-step/review-step.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 .card {
   @media (max-width: var.$breakpoint-sm) {
diff --git a/src/app/features/preprints/components/stepper/supplements-step/supplements-step.component.scss b/src/app/features/preprints/components/stepper/supplements-step/supplements-step.component.scss
index 16b791219..6198bda84 100644
--- a/src/app/features/preprints/components/stepper/supplements-step/supplements-step.component.scss
+++ b/src/app/features/preprints/components/stepper/supplements-step/supplements-step.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .supplement-option-button {
   --p-button-secondary-border-color: var(--grey-2);
diff --git a/src/app/features/preprints/components/stepper/title-and-abstract-step/title-and-abstract-step.component.scss b/src/app/features/preprints/components/stepper/title-and-abstract-step/title-and-abstract-step.component.scss
index 243cc50eb..1c574fd69 100644
--- a/src/app/features/preprints/components/stepper/title-and-abstract-step/title-and-abstract-step.component.scss
+++ b/src/app/features/preprints/components/stepper/title-and-abstract-step/title-and-abstract-step.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 .card {
   @media (max-width: var.$breakpoint-sm) {
diff --git a/src/app/features/preprints/pages/select-preprint-service/select-preprint-service.component.scss b/src/app/features/preprints/pages/select-preprint-service/select-preprint-service.component.scss
index 71b0cc2e1..7222b8552 100644
--- a/src/app/features/preprints/pages/select-preprint-service/select-preprint-service.component.scss
+++ b/src/app/features/preprints/pages/select-preprint-service/select-preprint-service.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .grid-item {
   width: mix.rem(260px);
diff --git a/src/app/features/preprints/preprints.component.scss b/src/app/features/preprints/preprints.component.scss
index bf9f05029..8203308a0 100644
--- a/src/app/features/preprints/preprints.component.scss
+++ b/src/app/features/preprints/preprints.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .desktop {
   @include mix.flex-column;
diff --git a/src/app/features/project/addons/addons.component.scss b/src/app/features/project/addons/addons.component.scss
index e9dab5325..949099876 100644
--- a/src/app/features/project/addons/addons.component.scss
+++ b/src/app/features/project/addons/addons.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-column;
diff --git a/src/app/features/project/addons/components/configure-addon/configure-addon.component.scss b/src/app/features/project/addons/components/configure-addon/configure-addon.component.scss
index e9dab5325..949099876 100644
--- a/src/app/features/project/addons/components/configure-addon/configure-addon.component.scss
+++ b/src/app/features/project/addons/components/configure-addon/configure-addon.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-column;
diff --git a/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.scss b/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.scss
index 445e2f9a2..1657b09ed 100644
--- a/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.scss
+++ b/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   flex: 1;
diff --git a/src/app/features/project/analytics/analytics.component.scss b/src/app/features/project/analytics/analytics.component.scss
index 0261d9d22..1714d4e84 100644
--- a/src/app/features/project/analytics/analytics.component.scss
+++ b/src/app/features/project/analytics/analytics.component.scss
@@ -1,10 +1,11 @@
-.date-range-label {
-  color: var(--dark-blue-1);
+:host {
+  display: flex;
+  flex-direction: column;
 }
 
 .chart {
   border: 1px solid var(--grey-2);
-  border-radius: 12px;
+  border-radius: 0.75rem;
   padding: 1rem;
   max-width: 100%;
   height: 460px;
diff --git a/src/app/features/project/analytics/components/analytics-kpi/analytics-kpi.component.scss b/src/app/features/project/analytics/components/analytics-kpi/analytics-kpi.component.scss
index be0bf34cc..dbc102c64 100644
--- a/src/app/features/project/analytics/components/analytics-kpi/analytics-kpi.component.scss
+++ b/src/app/features/project/analytics/components/analytics-kpi/analytics-kpi.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/variables" as var;
-@use "assets/styles/mixins" as mix;
+@use "styles/variables" as var;
+@use "styles/mixins" as mix;
 
 :host {
   width: 100%;
diff --git a/src/app/features/project/analytics/components/view-duplicates/view-duplicates.component.scss b/src/app/features/project/analytics/components/view-duplicates/view-duplicates.component.scss
index 79f7bf627..878a3d10c 100644
--- a/src/app/features/project/analytics/components/view-duplicates/view-duplicates.component.scss
+++ b/src/app/features/project/analytics/components/view-duplicates/view-duplicates.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/variables" as var;
-@use "assets/styles/mixins" as mix;
+@use "styles/variables" as var;
+@use "styles/mixins" as mix;
 
 :host {
   display: flex;
diff --git a/src/app/features/project/contributors/contributors.component.scss b/src/app/features/project/contributors/contributors.component.scss
index b262d0a74..9cdaa7642 100644
--- a/src/app/features/project/contributors/contributors.component.scss
+++ b/src/app/features/project/contributors/contributors.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .contributors {
   background-color: var(--white);
diff --git a/src/app/features/project/overview/components/overview-components/overview-components.component.scss b/src/app/features/project/overview/components/overview-components/overview-components.component.scss
index 4166ac8b5..1b65f7af8 100644
--- a/src/app/features/project/overview/components/overview-components/overview-components.component.scss
+++ b/src/app/features/project/overview/components/overview-components/overview-components.component.scss
@@ -1,4 +1,4 @@
-@use "/assets/styles/mixins" as mix;
+@use "/styles/mixins" as mix;
 
 .component {
   border: 1px solid var(--grey-2);
diff --git a/src/app/features/project/overview/components/overview-wiki/overview-wiki.component.scss b/src/app/features/project/overview/components/overview-wiki/overview-wiki.component.scss
index 365d2c9ba..923a68fca 100644
--- a/src/app/features/project/overview/components/overview-wiki/overview-wiki.component.scss
+++ b/src/app/features/project/overview/components/overview-wiki/overview-wiki.component.scss
@@ -1,4 +1,4 @@
-@use "/assets/styles/mixins" as mix;
+@use "/styles/mixins" as mix;
 
 .wiki {
   border: 1px solid var(--grey-2);
diff --git a/src/app/features/project/overview/components/recent-activity/recent-activity.component.scss b/src/app/features/project/overview/components/recent-activity/recent-activity.component.scss
index ba6bbf1f6..9256d6890 100644
--- a/src/app/features/project/overview/components/recent-activity/recent-activity.component.scss
+++ b/src/app/features/project/overview/components/recent-activity/recent-activity.component.scss
@@ -1,4 +1,4 @@
-@use "/assets/styles/mixins" as mix;
+@use "/styles/mixins" as mix;
 
 .activities {
   border: 1px solid var(--grey-2);
diff --git a/src/app/features/project/overview/components/toggle-publicity-dialog/toggle-publicity-dialog.component.scss b/src/app/features/project/overview/components/toggle-publicity-dialog/toggle-publicity-dialog.component.scss
index 5b85a6cd8..b4a2f35ee 100644
--- a/src/app/features/project/overview/components/toggle-publicity-dialog/toggle-publicity-dialog.component.scss
+++ b/src/app/features/project/overview/components/toggle-publicity-dialog/toggle-publicity-dialog.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .dialog-container {
   line-height: mix.rem(24px);
diff --git a/src/app/features/project/overview/models/project-overview.models.ts b/src/app/features/project/overview/models/project-overview.models.ts
index 2ac24c7fa..eee1224ef 100644
--- a/src/app/features/project/overview/models/project-overview.models.ts
+++ b/src/app/features/project/overview/models/project-overview.models.ts
@@ -1,10 +1,12 @@
 import { UserPermissions } from '@osf/shared/enums';
 import {
   Identifier,
+  IdTypeModel,
   Institution,
   InstitutionsJsonApiResponse,
   JsonApiResponseWithMeta,
   License,
+  LicensesOption,
   MetaAnonymousJsonApi,
 } from '@osf/shared/models';
 
@@ -32,10 +34,7 @@ export interface ProjectOverview {
   isCollection: boolean;
   tags: string[];
   accessRequestsEnabled: boolean;
-  nodeLicense?: {
-    copyrightHolders: string[];
-    year: string;
-  };
+  nodeLicense?: LicensesOption;
   license?: License;
   doi?: string;
   publicationDoi?: string;
@@ -56,10 +55,7 @@ export interface ProjectOverview {
   subjects: ProjectOverviewSubject[];
   contributors: ProjectOverviewContributor[];
   customCitation: string | null;
-  region?: {
-    id: string;
-    type: string;
-  };
+  region?: IdTypeModel;
   affiliatedInstitutions?: Institution[];
   forksCount: number;
   viewOnlyLinksCount: number;
diff --git a/src/app/features/project/registrations/registrations.component.scss b/src/app/features/project/registrations/registrations.component.scss
index e9dab5325..949099876 100644
--- a/src/app/features/project/registrations/registrations.component.scss
+++ b/src/app/features/project/registrations/registrations.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-column;
diff --git a/src/app/features/project/settings/settings.component.scss b/src/app/features/project/settings/settings.component.scss
index ce0ba1e54..7b8f7582e 100644
--- a/src/app/features/project/settings/settings.component.scss
+++ b/src/app/features/project/settings/settings.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-column;
diff --git a/src/app/features/registries/components/registry-services/registry-services.component.scss b/src/app/features/registries/components/registry-services/registry-services.component.scss
index be27f3dd0..0f6349712 100644
--- a/src/app/features/registries/components/registry-services/registry-services.component.scss
+++ b/src/app/features/registries/components/registry-services/registry-services.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .services-background-image {
   background: url("/assets/images/preprints/preprints-services-background.png") center;
diff --git a/src/app/features/registries/pages/registries-landing/registries-landing.component.scss b/src/app/features/registries/pages/registries-landing/registries-landing.component.scss
index 39af4152d..4f4c2e9be 100644
--- a/src/app/features/registries/pages/registries-landing/registries-landing.component.scss
+++ b/src/app/features/registries/pages/registries-landing/registries-landing.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 .subheader {
   color: var.$dark-blue-1;
diff --git a/src/app/features/registry/components/registry-revisions/registry-revisions.component.scss b/src/app/features/registry/components/registry-revisions/registry-revisions.component.scss
index 24e8f025d..aabf5a87d 100644
--- a/src/app/features/registry/components/registry-revisions/registry-revisions.component.scss
+++ b/src/app/features/registry/components/registry-revisions/registry-revisions.component.scss
@@ -1,5 +1,5 @@
-@use "/assets/styles/variables" as var;
-@use "assets/styles/mixins" as mix;
+@use "/styles/variables" as var;
+@use "styles/mixins" as mix;
 
 .accordion-border {
   border: 1px solid var.$grey-2;
diff --git a/src/app/features/registry/components/registry-statuses/registry-statuses.component.scss b/src/app/features/registry/components/registry-statuses/registry-statuses.component.scss
index 8af844a39..51e2630d2 100644
--- a/src/app/features/registry/components/registry-statuses/registry-statuses.component.scss
+++ b/src/app/features/registry/components/registry-statuses/registry-statuses.component.scss
@@ -1,5 +1,5 @@
-@use "/assets/styles/variables" as var;
-@use "assets/styles/mixins" as mix;
+@use "/styles/variables" as var;
+@use "styles/mixins" as mix;
 
 .accordion-border {
   border: 1px solid var.$grey-2;
diff --git a/src/app/features/registry/models/registry-overview.models.ts b/src/app/features/registry/models/registry-overview.models.ts
index ddad69854..1785d38c8 100644
--- a/src/app/features/registry/models/registry-overview.models.ts
+++ b/src/app/features/registry/models/registry-overview.models.ts
@@ -1,7 +1,14 @@
 import { ProjectOverviewContributor } from '@osf/features/project/overview/models';
 import { RegistrationQuestions, RegistrySubject } from '@osf/features/registry/models';
+import {
+  IdTypeModel,
+  License,
+  LicensesOption,
+  MetaAnonymousJsonApi,
+  ProviderModel,
+  SchemaResponse,
+} from '@osf/shared/models';
 import { RegistrationReviewStates, RegistryStatus, RevisionReviewStates } from '@shared/enums';
-import { License, MetaAnonymousJsonApi, ProviderModel, SchemaResponse } from '@shared/models';
 
 export interface RegistryOverview {
   id: string;
@@ -22,10 +29,7 @@ export interface RegistryOverview {
   category: string;
   isFork: boolean;
   accessRequestsEnabled: boolean;
-  nodeLicense?: {
-    copyrightHolders: string[];
-    year: string;
-  };
+  nodeLicense?: LicensesOption;
   license?: License;
   licenseUrl?: string;
   identifiers?: {
@@ -40,10 +44,7 @@ export interface RegistryOverview {
   currentUserIsContributor: boolean;
   currentUserIsContributorOrGroupMember: boolean;
   wikiEnabled: boolean;
-  region?: {
-    id: string;
-    type: string;
-  };
+  region?: IdTypeModel;
   subjects?: RegistrySubject[];
   customCitation: string;
   hasData: boolean;
diff --git a/src/app/features/registry/pages/registry-overview/registry-overview.component.scss b/src/app/features/registry/pages/registry-overview/registry-overview.component.scss
index 4e9823623..d4b8c0861 100644
--- a/src/app/features/registry/pages/registry-overview/registry-overview.component.scss
+++ b/src/app/features/registry/pages/registry-overview/registry-overview.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .left-section {
   flex: 3;
diff --git a/src/app/features/registry/pages/registry-resources/registry-resources.component.scss b/src/app/features/registry/pages/registry-resources/registry-resources.component.scss
index 5d7068592..34a3c6ca3 100644
--- a/src/app/features/registry/pages/registry-resources/registry-resources.component.scss
+++ b/src/app/features/registry/pages/registry-resources/registry-resources.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .resource-block {
   display: flex;
diff --git a/src/app/features/search/components/filter-chips/filter-chips.component.scss b/src/app/features/search/components/filter-chips/filter-chips.component.scss
index e461f550b..bd49db7d9 100644
--- a/src/app/features/search/components/filter-chips/filter-chips.component.scss
+++ b/src/app/features/search/components/filter-chips/filter-chips.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 :host {
   display: flex;
diff --git a/src/app/features/search/components/resource-filters/resource-filters.component.scss b/src/app/features/search/components/resource-filters/resource-filters.component.scss
index 8a9b88d9e..4e0e3b708 100644
--- a/src/app/features/search/components/resource-filters/resource-filters.component.scss
+++ b/src/app/features/search/components/resource-filters/resource-filters.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 :host {
   width: 30%;
diff --git a/src/app/features/search/components/resources/resources.component.scss b/src/app/features/search/components/resources/resources.component.scss
index 728af69d1..ebf1f863e 100644
--- a/src/app/features/search/components/resources/resources.component.scss
+++ b/src/app/features/search/components/resources/resources.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 h3 {
   color: var.$pr-blue-1;
diff --git a/src/app/features/settings/addons/addons.component.scss b/src/app/features/settings/addons/addons.component.scss
index 74668a58e..31e688ddc 100644
--- a/src/app/features/settings/addons/addons.component.scss
+++ b/src/app/features/settings/addons/addons.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-column;
diff --git a/src/app/features/settings/addons/components/connect-addon/connect-addon.component.scss b/src/app/features/settings/addons/components/connect-addon/connect-addon.component.scss
index b7c557a76..4e458d78a 100644
--- a/src/app/features/settings/addons/components/connect-addon/connect-addon.component.scss
+++ b/src/app/features/settings/addons/components/connect-addon/connect-addon.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   flex: 1;
diff --git a/src/app/features/settings/developer-apps/developer-apps-container.component.scss b/src/app/features/settings/developer-apps/developer-apps-container.component.scss
index e9dab5325..949099876 100644
--- a/src/app/features/settings/developer-apps/developer-apps-container.component.scss
+++ b/src/app/features/settings/developer-apps/developer-apps-container.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-column;
diff --git a/src/app/features/settings/developer-apps/pages/developer-apps-list/developer-apps-list.component.scss b/src/app/features/settings/developer-apps/pages/developer-apps-list/developer-apps-list.component.scss
index 89734679f..5e2f6500a 100644
--- a/src/app/features/settings/developer-apps/pages/developer-apps-list/developer-apps-list.component.scss
+++ b/src/app/features/settings/developer-apps/pages/developer-apps-list/developer-apps-list.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-column;
diff --git a/src/app/features/settings/notifications/notifications.component.scss b/src/app/features/settings/notifications/notifications.component.scss
index 428620beb..eae57ec5a 100644
--- a/src/app/features/settings/notifications/notifications.component.scss
+++ b/src/app/features/settings/notifications/notifications.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 .notification-item {
   border: 1px solid var(--grey-2);
diff --git a/src/app/features/settings/profile-settings/profile-settings.component.scss b/src/app/features/settings/profile-settings/profile-settings.component.scss
index e9dab5325..949099876 100644
--- a/src/app/features/settings/profile-settings/profile-settings.component.scss
+++ b/src/app/features/settings/profile-settings/profile-settings.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-column;
diff --git a/src/app/features/settings/settings-container.component.scss b/src/app/features/settings/settings-container.component.scss
index e9dab5325..949099876 100644
--- a/src/app/features/settings/settings-container.component.scss
+++ b/src/app/features/settings/settings-container.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-column;
diff --git a/src/app/features/settings/tokens/pages/token-details/token-details.component.scss b/src/app/features/settings/tokens/pages/token-details/token-details.component.scss
index 76d62149e..a72a08007 100644
--- a/src/app/features/settings/tokens/pages/token-details/token-details.component.scss
+++ b/src/app/features/settings/tokens/pages/token-details/token-details.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-column;
diff --git a/src/app/features/settings/tokens/pages/tokens-list/tokens-list.component.scss b/src/app/features/settings/tokens/pages/tokens-list/tokens-list.component.scss
index 2b175c753..72b5c58ee 100644
--- a/src/app/features/settings/tokens/pages/tokens-list/tokens-list.component.scss
+++ b/src/app/features/settings/tokens/pages/tokens-list/tokens-list.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-column;
diff --git a/src/app/features/settings/tokens/tokens.component.scss b/src/app/features/settings/tokens/tokens.component.scss
index e9dab5325..949099876 100644
--- a/src/app/features/settings/tokens/tokens.component.scss
+++ b/src/app/features/settings/tokens/tokens.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   @include mix.flex-column;
diff --git a/src/app/features/static/privacy-policy/privacy-policy.component.scss b/src/app/features/static/privacy-policy/privacy-policy.component.scss
index 89c6fc51e..567391cbc 100644
--- a/src/app/features/static/privacy-policy/privacy-policy.component.scss
+++ b/src/app/features/static/privacy-policy/privacy-policy.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   background-color: var(--white);
diff --git a/src/app/features/static/terms-of-use/terms-of-use.component.scss b/src/app/features/static/terms-of-use/terms-of-use.component.scss
index 89c6fc51e..567391cbc 100644
--- a/src/app/features/static/terms-of-use/terms-of-use.component.scss
+++ b/src/app/features/static/terms-of-use/terms-of-use.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   background-color: var(--white);
diff --git a/src/app/shared/components/add-project-form/add-project-form.component.scss b/src/app/shared/components/add-project-form/add-project-form.component.scss
index a18b1b4c4..a37b87c19 100644
--- a/src/app/shared/components/add-project-form/add-project-form.component.scss
+++ b/src/app/shared/components/add-project-form/add-project-form.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 label {
   color: var.$dark-blue-1;
diff --git a/src/app/shared/components/addons/addon-card/addon-card.component.scss b/src/app/shared/components/addons/addon-card/addon-card.component.scss
index 7990c70bd..1a0e5385d 100644
--- a/src/app/shared/components/addons/addon-card/addon-card.component.scss
+++ b/src/app/shared/components/addons/addon-card/addon-card.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/variables" as var;
-@use "assets/styles/mixins" as mix;
+@use "styles/variables" as var;
+@use "styles/mixins" as mix;
 
 :host {
   display: block;
diff --git a/src/app/shared/components/addons/folder-selector/folder-selector.component.scss b/src/app/shared/components/addons/folder-selector/folder-selector.component.scss
index f00b807e7..e899f12b3 100644
--- a/src/app/shared/components/addons/folder-selector/folder-selector.component.scss
+++ b/src/app/shared/components/addons/folder-selector/folder-selector.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/mixins" as mix;
-@use "assets/styles/variables" as var;
+@use "styles/mixins" as mix;
+@use "styles/variables" as var;
 
 .folders-table {
   min-width: 100%;
diff --git a/src/app/shared/components/bar-chart/bar-chart.component.ts b/src/app/shared/components/bar-chart/bar-chart.component.ts
index 505595f52..c0ea0ba43 100644
--- a/src/app/shared/components/bar-chart/bar-chart.component.ts
+++ b/src/app/shared/components/bar-chart/bar-chart.component.ts
@@ -15,7 +15,7 @@ import {
   signal,
 } from '@angular/core';
 
-import { PIE_CHART_PALETTE } from '@osf/shared/helpers';
+import { PIE_CHART_PALETTE } from '@osf/shared/constants';
 import { DatasetInput } from '@osf/shared/models';
 
 import { LoadingSpinnerComponent } from '../loading-spinner/loading-spinner.component';
diff --git a/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.scss b/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.scss
index b4205d981..59134fadc 100644
--- a/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.scss
+++ b/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/variables" as var;
-@use "assets/styles/mixins" as mix;
+@use "styles/variables" as var;
+@use "styles/mixins" as mix;
 
 .label {
   color: var.$dark-blue-1;
diff --git a/src/app/shared/components/contributors/add-contributor-item/add-contributor-item.component.scss b/src/app/shared/components/contributors/add-contributor-item/add-contributor-item.component.scss
index e5aefaeb7..e476f4d91 100644
--- a/src/app/shared/components/contributors/add-contributor-item/add-contributor-item.component.scss
+++ b/src/app/shared/components/contributors/add-contributor-item/add-contributor-item.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 .label {
   color: var.$dark-blue-1;
diff --git a/src/app/shared/components/doughnut-chart/doughnut-chart.component.ts b/src/app/shared/components/doughnut-chart/doughnut-chart.component.ts
index 68e4b6b6c..928a18898 100644
--- a/src/app/shared/components/doughnut-chart/doughnut-chart.component.ts
+++ b/src/app/shared/components/doughnut-chart/doughnut-chart.component.ts
@@ -15,7 +15,7 @@ import {
   signal,
 } from '@angular/core';
 
-import { PIE_CHART_PALETTE } from '@osf/shared/helpers';
+import { PIE_CHART_PALETTE } from '@osf/shared/constants';
 import { DatasetInput } from '@osf/shared/models';
 
 import { LoadingSpinnerComponent } from '../loading-spinner/loading-spinner.component';
diff --git a/src/app/shared/components/files-tree/files-tree.component.scss b/src/app/shared/components/files-tree/files-tree.component.scss
index 10b30e8c3..e5a04602a 100644
--- a/src/app/shared/components/files-tree/files-tree.component.scss
+++ b/src/app/shared/components/files-tree/files-tree.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/variables" as var;
-@use "assets/styles/mixins" as mix;
+@use "styles/variables" as var;
+@use "styles/mixins" as mix;
 
 :host {
   min-height: 180px;
diff --git a/src/app/shared/components/password-input-hint/password-input-hint.component.scss b/src/app/shared/components/password-input-hint/password-input-hint.component.scss
index 39620e29f..07f6433ca 100644
--- a/src/app/shared/components/password-input-hint/password-input-hint.component.scss
+++ b/src/app/shared/components/password-input-hint/password-input-hint.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 :host {
   color: var.$pr-blue-1;
diff --git a/src/app/shared/components/pie-chart/pie-chart.component.ts b/src/app/shared/components/pie-chart/pie-chart.component.ts
index 0b378e1c1..d71bc015d 100644
--- a/src/app/shared/components/pie-chart/pie-chart.component.ts
+++ b/src/app/shared/components/pie-chart/pie-chart.component.ts
@@ -14,7 +14,7 @@ import {
   signal,
 } from '@angular/core';
 
-import { PIE_CHART_PALETTE } from '@osf/shared/helpers';
+import { PIE_CHART_PALETTE } from '@osf/shared/constants';
 import { DatasetInput } from '@osf/shared/models';
 
 import { LoadingSpinnerComponent } from '../loading-spinner/loading-spinner.component';
diff --git a/src/app/shared/components/registration-card/registration-card.component.scss b/src/app/shared/components/registration-card/registration-card.component.scss
index 468f26648..498d5c14a 100644
--- a/src/app/shared/components/registration-card/registration-card.component.scss
+++ b/src/app/shared/components/registration-card/registration-card.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   .icon-container {
diff --git a/src/app/shared/components/resource-card/resource-card.component.scss b/src/app/shared/components/resource-card/resource-card.component.scss
index 77961708f..5aa64db00 100644
--- a/src/app/shared/components/resource-card/resource-card.component.scss
+++ b/src/app/shared/components/resource-card/resource-card.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 .resource {
   display: flex;
diff --git a/src/app/shared/components/resource-metadata/resource-metadata.component.scss b/src/app/shared/components/resource-metadata/resource-metadata.component.scss
index b3d944f2b..318ef5009 100644
--- a/src/app/shared/components/resource-metadata/resource-metadata.component.scss
+++ b/src/app/shared/components/resource-metadata/resource-metadata.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 .metadata {
   color: var.$dark-blue-1;
diff --git a/src/app/shared/components/search-help-tutorial/search-help-tutorial.component.scss b/src/app/shared/components/search-help-tutorial/search-help-tutorial.component.scss
index 46f997428..62f1bd329 100644
--- a/src/app/shared/components/search-help-tutorial/search-help-tutorial.component.scss
+++ b/src/app/shared/components/search-help-tutorial/search-help-tutorial.component.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/variables" as var;
-@use "assets/styles/mixins" as mix;
+@use "styles/variables" as var;
+@use "styles/mixins" as mix;
 
 .stepper {
   position: absolute;
diff --git a/src/app/shared/components/search-input/search-input.component.scss b/src/app/shared/components/search-input/search-input.component.scss
index 1491d1cb2..1fade62a1 100644
--- a/src/app/shared/components/search-input/search-input.component.scss
+++ b/src/app/shared/components/search-input/search-input.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .search-container {
   position: relative;
diff --git a/src/app/shared/components/stepper/stepper.component.scss b/src/app/shared/components/stepper/stepper.component.scss
index 989771ce0..1ae17b641 100644
--- a/src/app/shared/components/stepper/stepper.component.scss
+++ b/src/app/shared/components/stepper/stepper.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 :host {
   max-width: 100%;
   overflow: auto;
diff --git a/src/app/shared/components/sub-header/sub-header.component.scss b/src/app/shared/components/sub-header/sub-header.component.scss
index ae5c9ccf7..835defefd 100644
--- a/src/app/shared/components/sub-header/sub-header.component.scss
+++ b/src/app/shared/components/sub-header/sub-header.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 :host {
   width: 100%;
diff --git a/src/app/shared/components/view-only-link-message/view-only-link-message.component.spec.ts b/src/app/shared/components/view-only-link-message/view-only-link-message.component.spec.ts
index 68dfe046f..818385f42 100644
--- a/src/app/shared/components/view-only-link-message/view-only-link-message.component.spec.ts
+++ b/src/app/shared/components/view-only-link-message/view-only-link-message.component.spec.ts
@@ -2,13 +2,15 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ViewOnlyLinkMessageComponent } from './view-only-link-message.component';
 
+import { OSFTestingModule } from '@testing/osf.testing.module';
+
 describe('ViewOnlyLinkMessageComponent', () => {
   let component: ViewOnlyLinkMessageComponent;
   let fixture: ComponentFixture<ViewOnlyLinkMessageComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [ViewOnlyLinkMessageComponent],
+      imports: [ViewOnlyLinkMessageComponent, OSFTestingModule],
     }).compileComponents();
 
     fixture = TestBed.createComponent(ViewOnlyLinkMessageComponent);
diff --git a/src/app/shared/components/view-only-table/view-only-table.component.scss b/src/app/shared/components/view-only-table/view-only-table.component.scss
index 1925187ea..9a1a93511 100644
--- a/src/app/shared/components/view-only-table/view-only-table.component.scss
+++ b/src/app/shared/components/view-only-table/view-only-table.component.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .icon-copy-btn {
   top: 50%;
diff --git a/src/app/shared/constants/index.ts b/src/app/shared/constants/index.ts
index bea6d977e..bcfc9908e 100644
--- a/src/app/shared/constants/index.ts
+++ b/src/app/shared/constants/index.ts
@@ -10,8 +10,9 @@ export * from './language.const';
 export * from './meetings-table.constants';
 export * from './my-projects-table.constants';
 export * from './osf-resource-types.const';
+export * from './pie-chart-palette';
+export * from './pie-chart-palette';
 export * from './registry-services-icons.const';
-export * from './remove-nullable.const';
 export * from './resource-filters-defaults';
 export * from './resource-types.const';
 export * from './scientists.const';
@@ -19,4 +20,5 @@ export * from './search-sort-options.const';
 export * from './search-state-defaults.const';
 export * from './search-tab-options.const';
 export * from './search-tutorial-steps.const';
+export * from './social-share.config';
 export * from './sort-options.const';
diff --git a/src/app/shared/helpers/pie-chart-palette.ts b/src/app/shared/constants/pie-chart-palette.ts
similarity index 100%
rename from src/app/shared/helpers/pie-chart-palette.ts
rename to src/app/shared/constants/pie-chart-palette.ts
diff --git a/src/app/shared/config/social-share.config.ts b/src/app/shared/constants/social-share.config.ts
similarity index 100%
rename from src/app/shared/config/social-share.config.ts
rename to src/app/shared/constants/social-share.config.ts
diff --git a/src/app/shared/enums/addon-tab.enum.ts b/src/app/shared/enums/addon-tab.enum.ts
index 52b92b573..2eea4541f 100644
--- a/src/app/shared/enums/addon-tab.enum.ts
+++ b/src/app/shared/enums/addon-tab.enum.ts
@@ -1,4 +1,4 @@
 export enum AddonTabValue {
   ALL_ADDONS = 0,
-  CONNECTED_ADDONS = 1,
+  CONNECTED_ADDONS,
 }
diff --git a/src/app/shared/enums/profile-addons-stepper.enum.ts b/src/app/shared/enums/profile-addons-stepper.enum.ts
index 43ee1793b..2ebd25762 100644
--- a/src/app/shared/enums/profile-addons-stepper.enum.ts
+++ b/src/app/shared/enums/profile-addons-stepper.enum.ts
@@ -1,8 +1,8 @@
 export enum ProjectAddonsStepperValue {
   TERMS = 1,
-  CHOOSE_CONNECTION = 2,
-  CHOOSE_ACCOUNT = 3,
-  CONFIGURE_ROOT_FOLDER = 4,
-  SETUP_NEW_ACCOUNT = 5,
-  AUTH = 6,
+  CHOOSE_CONNECTION,
+  CHOOSE_ACCOUNT,
+  CONFIGURE_ROOT_FOLDER,
+  SETUP_NEW_ACCOUNT,
+  AUTH,
 }
diff --git a/src/app/shared/helpers/index.ts b/src/app/shared/helpers/index.ts
index 3eb49ae4b..aef449431 100644
--- a/src/app/shared/helpers/index.ts
+++ b/src/app/shared/helpers/index.ts
@@ -13,7 +13,7 @@ export * from './header-style.helper';
 export * from './http.helper';
 export * from './password.helper';
 export * from './path-join.helper';
-export * from './pie-chart-palette';
+export * from './remove-nullable.helper';
 export * from './search-pref-to-json-api-query-params.helper';
 export * from './state-error.handler';
 export * from './types.helper';
diff --git a/src/app/shared/constants/remove-nullable.const.ts b/src/app/shared/helpers/remove-nullable.helper.ts
similarity index 100%
rename from src/app/shared/constants/remove-nullable.const.ts
rename to src/app/shared/helpers/remove-nullable.helper.ts
diff --git a/src/app/shared/mappers/resource-overview.mappers.ts b/src/app/shared/mappers/resource-overview.mappers.ts
index 3b68db002..dbe839be6 100644
--- a/src/app/shared/mappers/resource-overview.mappers.ts
+++ b/src/app/shared/mappers/resource-overview.mappers.ts
@@ -19,7 +19,7 @@ export function MapProjectOverview(project: ProjectOverview, isAnonymous = false
     isCollection: project.isCollection,
     tags: project.tags || [],
     accessRequestsEnabled: project.accessRequestsEnabled,
-    nodeLicense: project.nodeLicense || undefined,
+    nodeLicense: project.nodeLicense,
     license: project.license || undefined,
     storage: project.storage || undefined,
     identifiers: project.identifiers?.filter(Boolean) || undefined,
@@ -63,7 +63,7 @@ export function MapRegistryOverview(
     isFork: registry.isFork,
     tags: registry.tags || [],
     accessRequestsEnabled: registry.accessRequestsEnabled,
-    nodeLicense: registry.nodeLicense || undefined,
+    nodeLicense: registry.nodeLicense,
     license: registry.license || undefined,
     identifiers: registry.identifiers?.filter(Boolean) || undefined,
     analyticsKey: registry.analyticsKey,
diff --git a/src/app/shared/models/activity-logs/activity-logs.model.ts b/src/app/shared/models/activity-logs/activity-logs.model.ts
index 0770d466f..039643f32 100644
--- a/src/app/shared/models/activity-logs/activity-logs.model.ts
+++ b/src/app/shared/models/activity-logs/activity-logs.model.ts
@@ -1,3 +1,5 @@
+import { LicensesOption } from '../license.model';
+
 export interface ActivityLog {
   id: string;
   type: string;
@@ -99,10 +101,7 @@ interface OriginalNode {
   collection: boolean;
   tags: string[];
   accessRequestsEnabled: boolean;
-  nodeLicense: {
-    copyrightHolders: string[];
-    year: string | null;
-  };
+  nodeLicense: LicensesOption;
   currentUserCanComment: boolean;
   currentUserPermissions: string[];
   currentUserIsContributor: boolean;
@@ -141,10 +140,7 @@ interface LinkedNode {
   collection: boolean;
   tags: string[];
   accessRequestsEnabled: boolean;
-  nodeLicense: {
-    copyrightHolders: string[];
-    year: string | null;
-  };
+  nodeLicense: LicensesOption;
   currentUserCanComment: boolean;
   currentUserPermissions: string[];
   currentUserIsContributor: boolean;
diff --git a/src/app/shared/models/license.model.ts b/src/app/shared/models/license.model.ts
index 8206e7fb8..37827528c 100644
--- a/src/app/shared/models/license.model.ts
+++ b/src/app/shared/models/license.model.ts
@@ -10,3 +10,8 @@ export interface LicenseOptions {
   copyrightHolders: string;
   year: string;
 }
+
+export interface LicensesOption {
+  copyrightHolders: string[];
+  year: string | null;
+}
diff --git a/src/app/shared/models/profile-settings-update.model.ts b/src/app/shared/models/profile-settings-update.model.ts
index 11a9332fb..a9a758472 100644
--- a/src/app/shared/models/profile-settings-update.model.ts
+++ b/src/app/shared/models/profile-settings-update.model.ts
@@ -1,3 +1,3 @@
-import { Education, Employment, Social, User } from '@osf/shared/models';
+import { Education, Employment, Social, User } from './user';
 
 export type ProfileSettingsUpdate = Partial<Employment>[] | Partial<Education>[] | Partial<Social> | Partial<User>;
diff --git a/src/app/shared/models/project-metadata-update-payload.model.ts b/src/app/shared/models/project-metadata-update-payload.model.ts
index 85a37a3f6..d74e14fa2 100644
--- a/src/app/shared/models/project-metadata-update-payload.model.ts
+++ b/src/app/shared/models/project-metadata-update-payload.model.ts
@@ -1,4 +1,4 @@
-import { LicenseOptions } from '@shared/models/license.model';
+import { LicenseOptions } from './license.model';
 
 export interface ProjectMetadataUpdatePayload {
   id: string;
diff --git a/src/app/shared/models/projects/projects-json-api.models.ts b/src/app/shared/models/projects/projects-json-api.models.ts
index 6465c18e1..7b337ce07 100644
--- a/src/app/shared/models/projects/projects-json-api.models.ts
+++ b/src/app/shared/models/projects/projects-json-api.models.ts
@@ -1,4 +1,5 @@
-import { JsonApiResponse, LicenseRecordJsonApi } from '@shared/models';
+import { JsonApiResponse } from '../common';
+import { LicenseRecordJsonApi } from '../licenses-json-api.model';
 
 export interface ProjectJsonApi {
   id: string;
diff --git a/src/app/shared/models/projects/projects.models.ts b/src/app/shared/models/projects/projects.models.ts
index 3e19835cf..2e41b948e 100644
--- a/src/app/shared/models/projects/projects.models.ts
+++ b/src/app/shared/models/projects/projects.models.ts
@@ -1,5 +1,6 @@
-import { StringOrNull } from '@shared/helpers';
-import { LicenseOptions } from '@shared/models';
+import { StringOrNull } from '@osf/shared/helpers';
+
+import { LicenseOptions } from '../license.model';
 
 export interface Project {
   id: string;
diff --git a/src/app/shared/models/provider/provider.model.ts b/src/app/shared/models/provider/provider.model.ts
index e8cac5eec..249342ac4 100644
--- a/src/app/shared/models/provider/provider.model.ts
+++ b/src/app/shared/models/provider/provider.model.ts
@@ -1,4 +1,4 @@
-import { ReviewPermissions } from '@osf/shared/enums/review-permissions.enum';
+import { ReviewPermissions } from '@osf/shared/enums';
 
 export interface ProviderModel {
   id: string;
diff --git a/src/app/shared/models/provider/providers-json-api.model.ts b/src/app/shared/models/provider/providers-json-api.model.ts
index cc7d26ad8..c31bb99f4 100644
--- a/src/app/shared/models/provider/providers-json-api.model.ts
+++ b/src/app/shared/models/provider/providers-json-api.model.ts
@@ -1,4 +1,4 @@
-import { ReviewPermissions } from '@osf/shared/enums/review-permissions.enum';
+import { ReviewPermissions } from '@osf/shared/enums';
 
 import { ApiData, MetaJsonApi, PaginationLinksJsonApi } from '../common';
 
diff --git a/src/app/shared/models/registration/registration-json-api.model.ts b/src/app/shared/models/registration/registration-json-api.model.ts
index 370c1e0aa..624a3718d 100644
--- a/src/app/shared/models/registration/registration-json-api.model.ts
+++ b/src/app/shared/models/registration/registration-json-api.model.ts
@@ -1,5 +1,7 @@
 import { RegistrationReviewStates, RevisionReviewStates } from '@osf/shared/enums';
-import { ApiData, LicenseRecordJsonApi, MetaJsonApi, PaginationLinksJsonApi } from '@osf/shared/models';
+
+import { ApiData, MetaJsonApi, PaginationLinksJsonApi } from '../common';
+import { LicenseRecordJsonApi } from '../licenses-json-api.model';
 
 export interface DraftRegistrationResponseJsonApi {
   data: DraftRegistrationDataJsonApi;
diff --git a/src/app/shared/models/registration/registration.model.ts b/src/app/shared/models/registration/registration.model.ts
index 5bddecd66..864605bb3 100644
--- a/src/app/shared/models/registration/registration.model.ts
+++ b/src/app/shared/models/registration/registration.model.ts
@@ -1,6 +1,8 @@
 import { RegistryStatus, RevisionReviewStates } from '@osf/shared/enums';
 
+import { IdTypeModel } from '../common';
 import { ContributorModel } from '../contributors';
+import { LicensesOption } from '../license.model';
 import { SubjectModel } from '../subject';
 
 export type RegistrationQuestions = Record<string, string | string[] | { file_id: string; file_name: string }[]>;
@@ -23,10 +25,7 @@ export interface RegistrationModel {
   category: string;
   isFork: boolean;
   accessRequestsEnabled: boolean;
-  nodeLicense?: {
-    copyrightHolders: string[];
-    year: string;
-  };
+  nodeLicense?: LicensesOption;
   license?: {
     name: string;
     text: string;
@@ -44,10 +43,7 @@ export interface RegistrationModel {
   currentUserIsContributor: boolean;
   currentUserIsContributorOrGroupMember: boolean;
   wikiEnabled: boolean;
-  region?: {
-    id: string;
-    type: string;
-  };
+  region?: IdTypeModel;
   subjects?: SubjectModel[];
   hasData: boolean;
   hasAnalyticCode: boolean;
diff --git a/src/app/shared/models/resource-card/user-counts-response.model.ts b/src/app/shared/models/resource-card/user-counts-response.model.ts
index 989f34250..a0d3e4c58 100644
--- a/src/app/shared/models/resource-card/user-counts-response.model.ts
+++ b/src/app/shared/models/resource-card/user-counts-response.model.ts
@@ -1,4 +1,4 @@
-import { ApiData, JsonApiResponse } from '@osf/shared/models/common/json-api.model';
+import { ApiData, JsonApiResponse } from '../common';
 
 export type UserCountsResponse = JsonApiResponse<
   ApiData<
diff --git a/src/app/shared/models/resource-overview.model.ts b/src/app/shared/models/resource-overview.model.ts
index ae771218d..65435d747 100644
--- a/src/app/shared/models/resource-overview.model.ts
+++ b/src/app/shared/models/resource-overview.model.ts
@@ -1,6 +1,9 @@
 import { ProjectOverviewContributor } from '@osf/features/project/overview/models';
 import { RegistrySubject } from '@osf/features/registry/models';
-import { Institution } from '@shared/models/institutions';
+
+import { IdTypeModel } from './common';
+import { Institution } from './institutions';
+import { LicensesOption } from './license.model';
 
 export interface ResourceOverview {
   id: string;
@@ -18,10 +21,7 @@ export interface ResourceOverview {
   isCollection: boolean;
   tags: string[];
   accessRequestsEnabled: boolean;
-  nodeLicense?: {
-    copyrightHolders: string[];
-    year: string;
-  };
+  nodeLicense?: LicensesOption;
   license?: {
     name: string;
     text: string;
@@ -56,10 +56,7 @@ export interface ResourceOverview {
   subjects: RegistrySubject[];
   contributors: ProjectOverviewContributor[];
   customCitation: string | null;
-  region?: {
-    id: string;
-    type: string;
-  };
+  region?: IdTypeModel;
   affiliatedInstitutions?: Institution[];
   forksCount: number;
   viewOnlyLinksCount?: number;
diff --git a/src/app/shared/models/search/filter-options-response.model.ts b/src/app/shared/models/search/filter-options-response.model.ts
index c4778fed3..0269951a6 100644
--- a/src/app/shared/models/search/filter-options-response.model.ts
+++ b/src/app/shared/models/search/filter-options-response.model.ts
@@ -1,4 +1,4 @@
-import { ApiData } from '@osf/shared/models';
+import { ApiData } from '../common';
 
 import { FilterOptionAttributes } from './filter-option.model';
 
diff --git a/src/app/shared/models/select-option.model.ts b/src/app/shared/models/select-option.model.ts
index af0e49b63..6768f2d38 100644
--- a/src/app/shared/models/select-option.model.ts
+++ b/src/app/shared/models/select-option.model.ts
@@ -1,4 +1,4 @@
-import { Primitive } from '@osf/shared/helpers/types.helper';
+import { Primitive } from '../helpers';
 
 export interface SelectOption {
   label: string;
diff --git a/src/app/shared/models/store/async-state-with-total-count.model.ts b/src/app/shared/models/store/async-state-with-total-count.model.ts
index bb70250d5..cd9721ab0 100644
--- a/src/app/shared/models/store/async-state-with-total-count.model.ts
+++ b/src/app/shared/models/store/async-state-with-total-count.model.ts
@@ -1,4 +1,4 @@
-import { AsyncStateModel } from '@shared/models/store/async-state.model';
+import { AsyncStateModel } from './async-state.model';
 
 export type AsyncStateWithTotalCount<T> = AsyncStateModel<T> & {
   totalCount: number;
diff --git a/src/app/shared/models/subject/index.ts b/src/app/shared/models/subject/index.ts
index 98738025a..0088c2e47 100644
--- a/src/app/shared/models/subject/index.ts
+++ b/src/app/shared/models/subject/index.ts
@@ -1,3 +1,2 @@
 export * from './subject.model';
-export * from './subject-service.model';
 export * from './subjects-json-api.model';
diff --git a/src/app/shared/models/subject/subject-service.model.ts b/src/app/shared/models/subject/subject-service.model.ts
deleted file mode 100644
index 4c3355ab0..000000000
--- a/src/app/shared/models/subject/subject-service.model.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Observable } from 'rxjs';
-
-import { SubjectModel } from './subject.model';
-
-export interface ISubjectsService {
-  getSubjects(providerId: string, search?: string): Observable<SubjectModel[]>;
-
-  getChildrenSubjects(parentId: string): Observable<SubjectModel[]>;
-}
diff --git a/src/app/shared/models/user/user.models.ts b/src/app/shared/models/user/user.models.ts
index 0b34071c2..1f1f9d46c 100644
--- a/src/app/shared/models/user/user.models.ts
+++ b/src/app/shared/models/user/user.models.ts
@@ -1,4 +1,6 @@
-import { Education, Employment, Social } from '@osf/shared/models';
+import { Education } from './education.model';
+import { Employment } from './employment.model';
+import { Social } from './social.model';
 
 export interface User {
   id: string;
diff --git a/src/app/shared/models/wiki/index.ts b/src/app/shared/models/wiki/index.ts
index 7210a29ff..2d69f6ed8 100644
--- a/src/app/shared/models/wiki/index.ts
+++ b/src/app/shared/models/wiki/index.ts
@@ -1,3 +1,3 @@
 export * from './wiki.model';
-export * from './wikiMenu.model';
-export * from './wikiType.model';
+export * from './wiki-menu.model';
+export * from './wiki-type.model';
diff --git a/src/app/shared/models/wiki/wikiMenu.model.ts b/src/app/shared/models/wiki/wiki-menu.model.ts
similarity index 73%
rename from src/app/shared/models/wiki/wikiMenu.model.ts
rename to src/app/shared/models/wiki/wiki-menu.model.ts
index 115ce80d6..4a0524a00 100644
--- a/src/app/shared/models/wiki/wikiMenu.model.ts
+++ b/src/app/shared/models/wiki/wiki-menu.model.ts
@@ -1,6 +1,6 @@
 import { MenuItem } from 'primeng/api';
 
-import { WikiItemType } from './wikiType.model';
+import { WikiItemType } from './wiki-type.model';
 
 export interface WikiMenuItem extends MenuItem {
   type?: WikiItemType;
diff --git a/src/app/shared/models/wiki/wikiType.model.ts b/src/app/shared/models/wiki/wiki-type.model.ts
similarity index 100%
rename from src/app/shared/models/wiki/wikiType.model.ts
rename to src/app/shared/models/wiki/wiki-type.model.ts
diff --git a/src/app/shared/models/wiki/wiki.model.ts b/src/app/shared/models/wiki/wiki.model.ts
index 1f90b38d0..2d9d16320 100644
--- a/src/app/shared/models/wiki/wiki.model.ts
+++ b/src/app/shared/models/wiki/wiki.model.ts
@@ -1,4 +1,4 @@
-import { JsonApiResponse, JsonApiResponseWithMeta, MetaAnonymousJsonApi } from '@osf/shared/models';
+import { JsonApiResponse, JsonApiResponseWithMeta, MetaAnonymousJsonApi } from '../common';
 
 export enum WikiModes {
   View = 'view',
diff --git a/src/app/shared/services/social-share.service.ts b/src/app/shared/services/social-share.service.ts
index ed2eb73c1..85e2440c1 100644
--- a/src/app/shared/services/social-share.service.ts
+++ b/src/app/shared/services/social-share.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 
-import { SOCIAL_SHARE_URLS } from '@shared/config/social-share.config';
-import { ShareableContent, SocialShareLinks } from '@shared/models/social-share.model';
+import { SOCIAL_SHARE_URLS } from '../constants';
+import { ShareableContent, SocialShareLinks } from '../models';
 
 import { environment } from 'src/environments/environment';
 
diff --git a/src/assets/styles/_base.scss b/src/styles/_base.scss
similarity index 94%
rename from src/assets/styles/_base.scss
rename to src/styles/_base.scss
index 7d97fa525..02de09bae 100644
--- a/src/assets/styles/_base.scss
+++ b/src/styles/_base.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/variables" as var;
-@use "assets/styles/mixins" as mix;
+@use "styles/variables" as var;
+@use "styles/mixins" as mix;
 
 @layer reset, base, primeng;
 
diff --git a/src/assets/styles/_common.scss b/src/styles/_common.scss
similarity index 98%
rename from src/assets/styles/_common.scss
rename to src/styles/_common.scss
index 650b111bb..635f12951 100644
--- a/src/assets/styles/_common.scss
+++ b/src/styles/_common.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 // ------------------------- Custom scrollbar styles -------------------------
 
diff --git a/src/assets/styles/_fonts.scss b/src/styles/_fonts.scss
similarity index 100%
rename from src/assets/styles/_fonts.scss
rename to src/styles/_fonts.scss
diff --git a/src/assets/styles/_icons.scss b/src/styles/_icons.scss
similarity index 100%
rename from src/assets/styles/_icons.scss
rename to src/styles/_icons.scss
diff --git a/src/assets/styles/_mixins.scss b/src/styles/_mixins.scss
similarity index 97%
rename from src/assets/styles/_mixins.scss
rename to src/styles/_mixins.scss
index 50462b85d..4b70b61c7 100644
--- a/src/assets/styles/_mixins.scss
+++ b/src/styles/_mixins.scss
@@ -1,6 +1,6 @@
 @use "sass:math";
 @use "sass:meta";
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 @function rem($px) {
   @return math.div($px, var.$base-font-size) * 1rem;
diff --git a/src/assets/styles/_variables.scss b/src/styles/_variables.scss
similarity index 100%
rename from src/assets/styles/_variables.scss
rename to src/styles/_variables.scss
diff --git a/src/assets/styles/components/collections.scss b/src/styles/components/collections.scss
similarity index 97%
rename from src/assets/styles/components/collections.scss
rename to src/styles/components/collections.scss
index c4e7a4eeb..07401a6b3 100644
--- a/src/assets/styles/components/collections.scss
+++ b/src/styles/components/collections.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .collections-content {
   background: var(--branding-background-color);
diff --git a/src/assets/styles/components/md-editor.scss b/src/styles/components/md-editor.scss
similarity index 100%
rename from src/assets/styles/components/md-editor.scss
rename to src/styles/components/md-editor.scss
diff --git a/src/assets/styles/components/preprints.scss b/src/styles/components/preprints.scss
similarity index 96%
rename from src/assets/styles/components/preprints.scss
rename to src/styles/components/preprints.scss
index c0e772542..c646dfda6 100644
--- a/src/assets/styles/components/preprints.scss
+++ b/src/styles/components/preprints.scss
@@ -1,5 +1,5 @@
-@use "assets/styles/mixins" as mix;
-@use "assets/styles/variables" as var;
+@use "styles/mixins" as mix;
+@use "styles/variables" as var;
 
 %hero-container-base {
   background-color: var(--branding-secondary-color);
diff --git a/src/assets/styles/overrides/accordion.scss b/src/styles/overrides/accordion.scss
similarity index 100%
rename from src/assets/styles/overrides/accordion.scss
rename to src/styles/overrides/accordion.scss
diff --git a/src/assets/styles/overrides/autocomplete.scss b/src/styles/overrides/autocomplete.scss
similarity index 100%
rename from src/assets/styles/overrides/autocomplete.scss
rename to src/styles/overrides/autocomplete.scss
diff --git a/src/assets/styles/overrides/badge.scss b/src/styles/overrides/badge.scss
similarity index 100%
rename from src/assets/styles/overrides/badge.scss
rename to src/styles/overrides/badge.scss
diff --git a/src/assets/styles/overrides/breadcrumbs.scss b/src/styles/overrides/breadcrumbs.scss
similarity index 100%
rename from src/assets/styles/overrides/breadcrumbs.scss
rename to src/styles/overrides/breadcrumbs.scss
diff --git a/src/assets/styles/overrides/button-toggle.scss b/src/styles/overrides/button-toggle.scss
similarity index 100%
rename from src/assets/styles/overrides/button-toggle.scss
rename to src/styles/overrides/button-toggle.scss
diff --git a/src/assets/styles/overrides/button.scss b/src/styles/overrides/button.scss
similarity index 100%
rename from src/assets/styles/overrides/button.scss
rename to src/styles/overrides/button.scss
diff --git a/src/assets/styles/overrides/card.scss b/src/styles/overrides/card.scss
similarity index 100%
rename from src/assets/styles/overrides/card.scss
rename to src/styles/overrides/card.scss
diff --git a/src/assets/styles/overrides/carousel.scss b/src/styles/overrides/carousel.scss
similarity index 100%
rename from src/assets/styles/overrides/carousel.scss
rename to src/styles/overrides/carousel.scss
diff --git a/src/assets/styles/overrides/cedar-metadata.scss b/src/styles/overrides/cedar-metadata.scss
similarity index 98%
rename from src/assets/styles/overrides/cedar-metadata.scss
rename to src/styles/overrides/cedar-metadata.scss
index d8622262b..693eb5b16 100644
--- a/src/assets/styles/overrides/cedar-metadata.scss
+++ b/src/styles/overrides/cedar-metadata.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 cedar-embeddable-editor,
 cedar-embeddable-metadata-editor,
diff --git a/src/assets/styles/overrides/checkbox.scss b/src/styles/overrides/checkbox.scss
similarity index 100%
rename from src/assets/styles/overrides/checkbox.scss
rename to src/styles/overrides/checkbox.scss
diff --git a/src/assets/styles/overrides/chip.scss b/src/styles/overrides/chip.scss
similarity index 100%
rename from src/assets/styles/overrides/chip.scss
rename to src/styles/overrides/chip.scss
diff --git a/src/assets/styles/overrides/confirmation-dialog.scss b/src/styles/overrides/confirmation-dialog.scss
similarity index 100%
rename from src/assets/styles/overrides/confirmation-dialog.scss
rename to src/styles/overrides/confirmation-dialog.scss
diff --git a/src/assets/styles/overrides/dataview.scss b/src/styles/overrides/dataview.scss
similarity index 100%
rename from src/assets/styles/overrides/dataview.scss
rename to src/styles/overrides/dataview.scss
diff --git a/src/assets/styles/overrides/datepicker.scss b/src/styles/overrides/datepicker.scss
similarity index 97%
rename from src/assets/styles/overrides/datepicker.scss
rename to src/styles/overrides/datepicker.scss
index 9d8e0e8c1..b6e32d912 100644
--- a/src/assets/styles/overrides/datepicker.scss
+++ b/src/styles/overrides/datepicker.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .p-datepicker {
   width: 100%;
diff --git a/src/assets/styles/overrides/dialog.scss b/src/styles/overrides/dialog.scss
similarity index 82%
rename from src/assets/styles/overrides/dialog.scss
rename to src/styles/overrides/dialog.scss
index 13ee187f5..491261261 100644
--- a/src/assets/styles/overrides/dialog.scss
+++ b/src/styles/overrides/dialog.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/mixins" as mix;
+@use "styles/mixins" as mix;
 
 .p-dialog-close-button {
   --p-button-padding-y: 0.75rem;
diff --git a/src/assets/styles/overrides/divider.scss b/src/styles/overrides/divider.scss
similarity index 100%
rename from src/assets/styles/overrides/divider.scss
rename to src/styles/overrides/divider.scss
diff --git a/src/assets/styles/overrides/drawer.scss b/src/styles/overrides/drawer.scss
similarity index 100%
rename from src/assets/styles/overrides/drawer.scss
rename to src/styles/overrides/drawer.scss
diff --git a/src/assets/styles/overrides/iconfield.scss b/src/styles/overrides/iconfield.scss
similarity index 100%
rename from src/assets/styles/overrides/iconfield.scss
rename to src/styles/overrides/iconfield.scss
diff --git a/src/assets/styles/overrides/input-group-addon.scss b/src/styles/overrides/input-group-addon.scss
similarity index 100%
rename from src/assets/styles/overrides/input-group-addon.scss
rename to src/styles/overrides/input-group-addon.scss
diff --git a/src/assets/styles/overrides/input.scss b/src/styles/overrides/input.scss
similarity index 100%
rename from src/assets/styles/overrides/input.scss
rename to src/styles/overrides/input.scss
diff --git a/src/assets/styles/overrides/menu.scss b/src/styles/overrides/menu.scss
similarity index 100%
rename from src/assets/styles/overrides/menu.scss
rename to src/styles/overrides/menu.scss
diff --git a/src/assets/styles/overrides/message.scss b/src/styles/overrides/message.scss
similarity index 100%
rename from src/assets/styles/overrides/message.scss
rename to src/styles/overrides/message.scss
diff --git a/src/assets/styles/overrides/multiselect.scss b/src/styles/overrides/multiselect.scss
similarity index 100%
rename from src/assets/styles/overrides/multiselect.scss
rename to src/styles/overrides/multiselect.scss
diff --git a/src/assets/styles/overrides/paginator.scss b/src/styles/overrides/paginator.scss
similarity index 100%
rename from src/assets/styles/overrides/paginator.scss
rename to src/styles/overrides/paginator.scss
diff --git a/src/assets/styles/overrides/panel-menu.scss b/src/styles/overrides/panel-menu.scss
similarity index 100%
rename from src/assets/styles/overrides/panel-menu.scss
rename to src/styles/overrides/panel-menu.scss
diff --git a/src/assets/styles/overrides/password.scss b/src/styles/overrides/password.scss
similarity index 100%
rename from src/assets/styles/overrides/password.scss
rename to src/styles/overrides/password.scss
diff --git a/src/assets/styles/overrides/radio.scss b/src/styles/overrides/radio.scss
similarity index 100%
rename from src/assets/styles/overrides/radio.scss
rename to src/styles/overrides/radio.scss
diff --git a/src/assets/styles/overrides/select.scss b/src/styles/overrides/select.scss
similarity index 100%
rename from src/assets/styles/overrides/select.scss
rename to src/styles/overrides/select.scss
diff --git a/src/assets/styles/overrides/spinner.scss b/src/styles/overrides/spinner.scss
similarity index 100%
rename from src/assets/styles/overrides/spinner.scss
rename to src/styles/overrides/spinner.scss
diff --git a/src/assets/styles/overrides/stepper.scss b/src/styles/overrides/stepper.scss
similarity index 100%
rename from src/assets/styles/overrides/stepper.scss
rename to src/styles/overrides/stepper.scss
diff --git a/src/assets/styles/overrides/table.scss b/src/styles/overrides/table.scss
similarity index 98%
rename from src/assets/styles/overrides/table.scss
rename to src/styles/overrides/table.scss
index 62f6417dc..78d7c239b 100644
--- a/src/assets/styles/overrides/table.scss
+++ b/src/styles/overrides/table.scss
@@ -1,4 +1,4 @@
-@use "assets/styles/variables" as var;
+@use "styles/variables" as var;
 
 p-table {
   --p-datatable-header-cell-color: var(--dark-blue-1);
diff --git a/src/assets/styles/overrides/tabs.scss b/src/styles/overrides/tabs.scss
similarity index 100%
rename from src/assets/styles/overrides/tabs.scss
rename to src/styles/overrides/tabs.scss
diff --git a/src/assets/styles/overrides/tag.scss b/src/styles/overrides/tag.scss
similarity index 100%
rename from src/assets/styles/overrides/tag.scss
rename to src/styles/overrides/tag.scss
diff --git a/src/assets/styles/overrides/toast.scss b/src/styles/overrides/toast.scss
similarity index 100%
rename from src/assets/styles/overrides/toast.scss
rename to src/styles/overrides/toast.scss
diff --git a/src/assets/styles/overrides/toggleswitch.scss b/src/styles/overrides/toggleswitch.scss
similarity index 100%
rename from src/assets/styles/overrides/toggleswitch.scss
rename to src/styles/overrides/toggleswitch.scss
diff --git a/src/assets/styles/overrides/tooltip.scss b/src/styles/overrides/tooltip.scss
similarity index 100%
rename from src/assets/styles/overrides/tooltip.scss
rename to src/styles/overrides/tooltip.scss
diff --git a/src/assets/styles/overrides/tree.scss b/src/styles/overrides/tree.scss
similarity index 100%
rename from src/assets/styles/overrides/tree.scss
rename to src/styles/overrides/tree.scss
diff --git a/src/assets/styles/styles.scss b/src/styles/styles.scss
similarity index 98%
rename from src/assets/styles/styles.scss
rename to src/styles/styles.scss
index 635570dc6..b93292b73 100644
--- a/src/assets/styles/styles.scss
+++ b/src/styles/styles.scss
@@ -5,6 +5,7 @@
 @use "mixins" as mix;
 @use "common";
 @use "base";
+@use "icons";
 
 @use "./components/md-editor";
 @use "./components/preprints";
@@ -47,4 +48,3 @@
 @use "./overrides/tree";
 @use "./overrides/breadcrumbs";
 @use "./overrides/cedar-metadata";
-@use "./icons";
diff --git a/tsconfig.json b/tsconfig.json
index b6c916315..a4b28b90e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -22,7 +22,7 @@
       "@core/*": ["src/app/core/*"],
       "@osf/*": ["src/app/*"],
       "@shared/*": ["src/app/shared/*"],
-      "@styles/*": ["assets/styles/*"],
+      "@styles/*": ["src/styles/*"],
       "@testing/*": ["src/testing/*"]
     }
   },