diff --git a/src/app/shared/components/addons/addon-card-list/addon-card-list.component.ts b/src/app/shared/components/addons/addon-card-list/addon-card-list.component.ts
index 88922ed4a..cc1d8d41c 100644
--- a/src/app/shared/components/addons/addon-card-list/addon-card-list.component.ts
+++ b/src/app/shared/components/addons/addon-card-list/addon-card-list.component.ts
@@ -2,9 +2,10 @@ import { TranslatePipe } from '@ngx-translate/core';
 
 import { Component, input } from '@angular/core';
 
-import { AddonCardComponent } from '@shared/components/addons';
 import { AddonModel, AuthorizedAccountModel, ConfiguredAddonModel } from '@shared/models';
 
+import { AddonCardComponent } from '../addon-card/addon-card.component';
+
 @Component({
   selector: 'osf-addon-card-list',
   imports: [AddonCardComponent, TranslatePipe],
diff --git a/src/app/shared/components/addons/index.ts b/src/app/shared/components/addons/index.ts
index ee8d4f816..8c5184159 100644
--- a/src/app/shared/components/addons/index.ts
+++ b/src/app/shared/components/addons/index.ts
@@ -1,5 +1,5 @@
-export { AddonCardComponent } from '@shared/components/addons/addon-card/addon-card.component';
-export { AddonCardListComponent } from '@shared/components/addons/addon-card-list/addon-card-list.component';
-export { AddonSetupAccountFormComponent } from '@shared/components/addons/addon-setup-account-form/addon-setup-account-form.component';
-export { AddonTermsComponent } from '@shared/components/addons/addon-terms/addon-terms.component';
-export { StorageItemSelectorComponent } from '@shared/components/addons/storage-item-selector/storage-item-selector.component';
+export { AddonCardComponent } from './addon-card/addon-card.component';
+export { AddonCardListComponent } from './addon-card-list/addon-card-list.component';
+export { AddonSetupAccountFormComponent } from './addon-setup-account-form/addon-setup-account-form.component';
+export { AddonTermsComponent } from './addon-terms/addon-terms.component';
+export { StorageItemSelectorComponent } from './storage-item-selector/storage-item-selector.component';
diff --git a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts
index 06b15c0ca..5ba74e824 100644
--- a/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts
+++ b/src/app/shared/components/addons/storage-item-selector/storage-item-selector.component.ts
@@ -28,12 +28,13 @@ import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
 import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms';
 
 import { OperationNames } from '@osf/features/project/addons/enums';
-import { SelectComponent } from '@shared/components';
-import { ResourceTypeInfoDialogComponent } from '@shared/components/addons/resource-type-info-dialog/resource-type-info-dialog.component';
-import { AddonType, StorageItemType } from '@shared/enums';
-import { convertCamelCaseToNormal, IS_MEDIUM, IS_XSMALL } from '@shared/helpers';
-import { OperationInvokeData, StorageItem } from '@shared/models';
-import { AddonsSelectors, ClearOperationInvocations } from '@shared/stores/addons';
+import { AddonType, StorageItemType } from '@osf/shared/enums';
+import { convertCamelCaseToNormal, IS_MEDIUM, IS_XSMALL } from '@osf/shared/helpers';
+import { OperationInvokeData, StorageItem } from '@osf/shared/models';
+import { AddonsSelectors, ClearOperationInvocations } from '@osf/shared/stores';
+
+import { SelectComponent } from '../../select/select.component';
+import { ResourceTypeInfoDialogComponent } from '../resource-type-info-dialog/resource-type-info-dialog.component';
 
 import { GoogleFilePickerComponent } from './google-file-picker/google-file-picker.component';
 
diff --git a/src/app/shared/components/resource-card/components/file-secondary-metadata/file-secondary-metadata.component.html b/src/app/shared/components/resource-card/components/file-secondary-metadata/file-secondary-metadata.component.html
index f176a523d..7612fa4f0 100644
--- a/src/app/shared/components/resource-card/components/file-secondary-metadata/file-secondary-metadata.component.html
+++ b/src/app/shared/components/resource-card/components/file-secondary-metadata/file-secondary-metadata.component.html
@@ -28,26 +28,18 @@
   @if (nodeLicense) {
     <p>
       {{ 'resourceCard.labels.license' | translate }}
-      <<<<<<< HEAD
-      <a class="font-bold" [attr.href]="nodeLicense!.absoluteUrl || null" target="_blank" rel="noopener noreferrer">{{
-        nodeLicense!.name
-      }}</a>
-      =======
-      <a class="font-bold" [attr.href]="nodeLicense!.absoluteUrl || null">{{ nodeLicense!.name }}</a>
-      >>>>>>> origin/develop
+      <a class="font-bold" [attr.href]="nodeLicense!.absoluteUrl || null" target="_blank" rel="noopener noreferrer">
+        {{ nodeLicense!.name }}
+      </a>
     </p>
   }
 
   @if (resourceValue.absoluteUrl) {
     <p>
       {{ 'resourceCard.labels.url' | translate }}
-      <<<<<<< HEAD
-      <a class="font-bold" [href]="resourceValue.absoluteUrl" target="_blank" rel="noopener noreferrer">{{
-        resourceValue.absoluteUrl
-      }}</a>
-      =======
-      <a class="font-bold" [href]="resourceValue.absoluteUrl">{{ resourceValue.absoluteUrl }}</a>
-      >>>>>>> origin/develop
+      <a class="font-bold" [href]="resourceValue.absoluteUrl" target="_blank" rel="noopener noreferrer">
+        {{ resourceValue.absoluteUrl }}
+      </a>
     </p>
   }
 
@@ -55,11 +47,7 @@
     <p>
       {{ 'resourceCard.labels.doi' | translate }}
       @for (doi of resourceValue.doi.slice(0, limit); track $index) {
-        <<<<<<< HEAD
         <a class="font-bold" [href]="doi" target="_blank" rel="noopener noreferrer">{{ doi }}{{ $last ? '' : ', ' }}</a>
-        =======
-        <a class="font-bold" [href]="doi" target="_blank">{{ doi }}{{ $last ? '' : ', ' }}</a>
-        >>>>>>> origin/develop
       }
       @if (resourceValue.doi.length > limit) {
         <span>{{ 'resourceCard.andCountMore' | translate: { count: resourceValue.doi.length - limit } }} </span>
diff --git a/src/app/shared/components/resource-card/resource-card.component.html b/src/app/shared/components/resource-card/resource-card.component.html
index f74185f10..e598feca7 100644
--- a/src/app/shared/components/resource-card/resource-card.component.html
+++ b/src/app/shared/components/resource-card/resource-card.component.html
@@ -7,11 +7,7 @@
 
           <div class="flex align-items-center gap-2">
             <h2>
-              <<<<<<< HEAD
               <a [href]="resource().absoluteUrl" target="_blank" rel="noopener noreferrer">{{ displayTitle() }}</a>
-              =======
-              <a [href]="resource().absoluteUrl">{{ displayTitle() }}</a>
-              >>>>>>> origin/develop
             </h2>
             @if (isWithdrawn()) {
               <p-tag severity="secondary">{{ 'resourceCard.labels.withdrawn' | translate }}</p-tag>
diff --git a/src/app/shared/components/resource-metadata/resource-metadata.component.ts b/src/app/shared/components/resource-metadata/resource-metadata.component.ts
index 4bab85051..519f42d73 100644
--- a/src/app/shared/components/resource-metadata/resource-metadata.component.ts
+++ b/src/app/shared/components/resource-metadata/resource-metadata.component.ts
@@ -9,9 +9,9 @@ import { RouterLink } from '@angular/router';
 
 import { OverviewCollectionsComponent } from '@osf/features/project/overview/components/overview-collections/overview-collections.component';
 import { CurrentResourceType } from '@osf/shared/enums';
-import { AffiliatedInstitutionsViewComponent } from '@shared/components';
 import { ResourceOverview } from '@shared/models';
 
+import { AffiliatedInstitutionsViewComponent } from '../affiliated-institutions-view/affiliated-institutions-view.component';
 import { ResourceCitationsComponent } from '../resource-citations/resource-citations.component';
 import { TruncatedTextComponent } from '../truncated-text/truncated-text.component';
 
diff --git a/src/app/shared/components/status-badge/status-badge.component.ts b/src/app/shared/components/status-badge/status-badge.component.ts
index 2e6fe03ff..dfcc56bd8 100644
--- a/src/app/shared/components/status-badge/status-badge.component.ts
+++ b/src/app/shared/components/status-badge/status-badge.component.ts
@@ -4,11 +4,10 @@ import { Tag } from 'primeng/tag';
 
 import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 
+import { RegistryStatusMap } from '@osf/shared/constants';
 import { RegistryStatus } from '@osf/shared/enums';
 import { SeverityType } from '@osf/shared/models';
 
-import { RegistryStatusMap } from './default-statuses';
-
 @Component({
   selector: 'osf-status-badge',
   imports: [Tag, TranslatePipe],
diff --git a/src/app/shared/components/stepper/stepper.component.ts b/src/app/shared/components/stepper/stepper.component.ts
index 4924f3192..a8b0fe146 100644
--- a/src/app/shared/components/stepper/stepper.component.ts
+++ b/src/app/shared/components/stepper/stepper.component.ts
@@ -2,9 +2,10 @@ import { TranslatePipe } from '@ngx-translate/core';
 
 import { ChangeDetectionStrategy, Component, input, model } from '@angular/core';
 
-import { IconComponent } from '@shared/components';
 import { StepOption } from '@shared/models';
 
+import { IconComponent } from '../icon/icon.component';
+
 @Component({
   selector: 'osf-stepper',
   imports: [IconComponent, TranslatePipe],
diff --git a/src/app/shared/components/subjects/subjects.component.ts b/src/app/shared/components/subjects/subjects.component.ts
index d87b132d5..cb0879323 100644
--- a/src/app/shared/components/subjects/subjects.component.ts
+++ b/src/app/shared/components/subjects/subjects.component.ts
@@ -15,7 +15,7 @@ import { ChangeDetectionStrategy, Component, computed, input, output } from '@an
 import { FormControl } from '@angular/forms';
 
 import { SubjectModel } from '@osf/shared/models';
-import { SubjectsSelectors } from '@shared/stores';
+import { SubjectsSelectors } from '@osf/shared/stores';
 
 import { SearchInputComponent } from '../search-input/search-input.component';
 
diff --git a/src/app/shared/components/wiki/add-wiki-dialog/add-wiki-dialog.component.ts b/src/app/shared/components/wiki/add-wiki-dialog/add-wiki-dialog.component.ts
index a6d662da0..5be3cbf7c 100644
--- a/src/app/shared/components/wiki/add-wiki-dialog/add-wiki-dialog.component.ts
+++ b/src/app/shared/components/wiki/add-wiki-dialog/add-wiki-dialog.component.ts
@@ -8,13 +8,14 @@ import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
 import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
 
-import { TextInputComponent } from '@osf/shared/components';
 import { InputLimits } from '@osf/shared/constants';
 import { ResourceType } from '@osf/shared/enums';
 import { CustomValidators } from '@osf/shared/helpers';
 import { ToastService } from '@osf/shared/services';
 import { CreateWiki, WikiSelectors } from '@osf/shared/stores';
 
+import { TextInputComponent } from '../../text-input/text-input.component';
+
 @Component({
   selector: 'osf-add-wiki-dialog-component',
   imports: [Button, ReactiveFormsModule, TranslatePipe, TextInputComponent],
diff --git a/src/app/shared/components/wiki/view-section/view-section.component.ts b/src/app/shared/components/wiki/view-section/view-section.component.ts
index b0371ada9..a7b6ea907 100644
--- a/src/app/shared/components/wiki/view-section/view-section.component.ts
+++ b/src/app/shared/components/wiki/view-section/view-section.component.ts
@@ -7,9 +7,10 @@ import { Skeleton } from 'primeng/skeleton';
 import { ChangeDetectionStrategy, Component, computed, effect, input, output, signal } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 
-import { MarkdownComponent } from '@osf/shared/components';
 import { WikiVersion } from '@osf/shared/models';
 
+import { MarkdownComponent } from '../../markdown/markdown.component';
+
 @Component({
   selector: 'osf-view-section',
   imports: [PanelModule, Select, FormsModule, TranslatePipe, Skeleton, MarkdownComponent],
diff --git a/src/app/shared/constants/index.ts b/src/app/shared/constants/index.ts
index 243495732..6d9b00431 100644
--- a/src/app/shared/constants/index.ts
+++ b/src/app/shared/constants/index.ts
@@ -9,6 +9,7 @@ export * from './input-limits.const';
 export * from './input-validation-messages.const';
 export * from './language.const';
 export * from './pie-chart-palette';
+export * from './registration-statuses';
 export * from './registry-services-icons.const';
 export * from './resource-card-labels.const';
 export * from './resource-types.const';
diff --git a/src/app/shared/components/status-badge/default-statuses.ts b/src/app/shared/constants/registration-statuses.ts
similarity index 93%
rename from src/app/shared/components/status-badge/default-statuses.ts
rename to src/app/shared/constants/registration-statuses.ts
index 101c7f5e0..156d7a693 100644
--- a/src/app/shared/components/status-badge/default-statuses.ts
+++ b/src/app/shared/constants/registration-statuses.ts
@@ -1,5 +1,5 @@
-import { RegistryStatus } from '@osf/shared/enums';
-import { StatusInfo } from '@osf/shared/models';
+import { RegistryStatus } from '../enums';
+import { StatusInfo } from '../models';
 
 export const RegistryStatusMap: Record<RegistryStatus, StatusInfo> = {
   [RegistryStatus.None]: { label: '', severity: null },