diff --git a/src/tedi/components/buttons/index.ts b/src/tedi/components/buttons/index.ts
index e8291eb58..7e89d39ba 100644
--- a/src/tedi/components/buttons/index.ts
+++ b/src/tedi/components/buttons/index.ts
@@ -2,7 +2,6 @@ export * from "./button/button.component";
export * from "./button-group";
export * from "./card-button";
export * from "./info-button/info-button.component";
-export * from "./collapse/collapse.component";
export * from "./collapse-button/collapse-button.component";
export * from "./closing-button/closing-button.component";
export * from "./floating-button";
diff --git a/src/tedi/components/content/accordion/accordion.stories.ts b/src/tedi/components/content/accordion/accordion.stories.ts
index 1f83a676c..9d3ce1436 100644
--- a/src/tedi/components/content/accordion/accordion.stories.ts
+++ b/src/tedi/components/content/accordion/accordion.stories.ts
@@ -8,7 +8,7 @@ import { TextComponent } from "../../base/text/text.component";
import { ButtonComponent } from "../../buttons/button/button.component";
import { StatusBadgeComponent } from "../../tags/status-badge/status-badge.component";
import { CheckboxComponent } from "../../form/checkbox/checkbox.component";
-import { LabelComponent } from "../../form/label/label.component";
+import { LabelComponent } from "../label/label.component";
import { FormFieldComponent } from "../../form/form-field/form-field.component";
import { TextFieldComponent } from "../../form/text-field/text-field.component";
import { SeparatorComponent } from "../../helpers/separator/separator.component";
diff --git a/src/tedi/components/content/card/card.stories.ts b/src/tedi/components/content/card/card.stories.ts
index 2791ea90c..af4453c14 100644
--- a/src/tedi/components/content/card/card.stories.ts
+++ b/src/tedi/components/content/card/card.stories.ts
@@ -18,7 +18,7 @@ import { IconComponent } from "../../base/icon/icon.component";
import { AlertComponent } from "../../notifications/alert/alert.component";
import { ButtonComponent } from "../../buttons/button/button.component";
import { InfoButtonComponent } from "../../buttons/info-button/info-button.component";
-import { CollapseComponent } from "../../buttons/collapse/collapse.component";
+import { CollapseComponent } from "../collapse/collapse.component";
import { LinkComponent } from "../../navigation/link/link.component";
import { StatusBadgeComponent } from "../../tags/status-badge/status-badge.component";
import { SeparatorComponent } from "../../helpers/separator/separator.component";
diff --git a/src/tedi/components/buttons/collapse/collapse.component.html b/src/tedi/components/content/collapse/collapse.component.html
similarity index 100%
rename from src/tedi/components/buttons/collapse/collapse.component.html
rename to src/tedi/components/content/collapse/collapse.component.html
diff --git a/src/tedi/components/buttons/collapse/collapse.component.scss b/src/tedi/components/content/collapse/collapse.component.scss
similarity index 100%
rename from src/tedi/components/buttons/collapse/collapse.component.scss
rename to src/tedi/components/content/collapse/collapse.component.scss
diff --git a/src/tedi/components/buttons/collapse/collapse.component.spec.ts b/src/tedi/components/content/collapse/collapse.component.spec.ts
similarity index 100%
rename from src/tedi/components/buttons/collapse/collapse.component.spec.ts
rename to src/tedi/components/content/collapse/collapse.component.spec.ts
diff --git a/src/tedi/components/buttons/collapse/collapse.component.ts b/src/tedi/components/content/collapse/collapse.component.ts
similarity index 97%
rename from src/tedi/components/buttons/collapse/collapse.component.ts
rename to src/tedi/components/content/collapse/collapse.component.ts
index 2d6dcde05..ac7072824 100644
--- a/src/tedi/components/buttons/collapse/collapse.component.ts
+++ b/src/tedi/components/content/collapse/collapse.component.ts
@@ -11,7 +11,7 @@ import {
CollapseButtonComponent,
type CollapseButtonArrowType,
type CollapseButtonSize,
-} from "../collapse-button/collapse-button.component";
+} from "../../buttons/collapse-button/collapse-button.component";
import { generateUUID } from "../../../helpers/generate-uuid";
export type ArrowType = CollapseButtonArrowType;
diff --git a/src/tedi/components/buttons/collapse/collapse.stories.ts b/src/tedi/components/content/collapse/collapse.stories.ts
similarity index 98%
rename from src/tedi/components/buttons/collapse/collapse.stories.ts
rename to src/tedi/components/content/collapse/collapse.stories.ts
index 63e88c34a..b888ff838 100644
--- a/src/tedi/components/buttons/collapse/collapse.stories.ts
+++ b/src/tedi/components/content/collapse/collapse.stories.ts
@@ -10,7 +10,7 @@ import { CollapseComponent } from "./collapse.component";
*/
export default {
- title: "TEDI Ready/Components/Buttons/Collapse",
+ title: "TEDI-Ready/Content/Collapse",
component: CollapseComponent,
args: {
defaultOpen: false,
diff --git a/src/tedi/components/helpers/empty-state/empty-state.component.html b/src/tedi/components/content/empty-state/empty-state.component.html
similarity index 100%
rename from src/tedi/components/helpers/empty-state/empty-state.component.html
rename to src/tedi/components/content/empty-state/empty-state.component.html
diff --git a/src/tedi/components/helpers/empty-state/empty-state.component.scss b/src/tedi/components/content/empty-state/empty-state.component.scss
similarity index 100%
rename from src/tedi/components/helpers/empty-state/empty-state.component.scss
rename to src/tedi/components/content/empty-state/empty-state.component.scss
diff --git a/src/tedi/components/helpers/empty-state/empty-state.component.spec.ts b/src/tedi/components/content/empty-state/empty-state.component.spec.ts
similarity index 100%
rename from src/tedi/components/helpers/empty-state/empty-state.component.spec.ts
rename to src/tedi/components/content/empty-state/empty-state.component.spec.ts
diff --git a/src/tedi/components/helpers/empty-state/empty-state.component.ts b/src/tedi/components/content/empty-state/empty-state.component.ts
similarity index 100%
rename from src/tedi/components/helpers/empty-state/empty-state.component.ts
rename to src/tedi/components/content/empty-state/empty-state.component.ts
diff --git a/src/tedi/components/helpers/empty-state/empty-state.stories.ts b/src/tedi/components/content/empty-state/empty-state.stories.ts
similarity index 99%
rename from src/tedi/components/helpers/empty-state/empty-state.stories.ts
rename to src/tedi/components/content/empty-state/empty-state.stories.ts
index 732c83651..60191d3bf 100644
--- a/src/tedi/components/helpers/empty-state/empty-state.stories.ts
+++ b/src/tedi/components/content/empty-state/empty-state.stories.ts
@@ -22,7 +22,7 @@ import { LinkComponent } from "../../navigation/link/link.component";
* Zeroheight ↗
*/
export default {
- title: "TEDI-Ready/Components/Helpers/EmptyState",
+ title: "TEDI-Ready/Content/EmptyState",
component: EmptyStateComponent,
decorators: [
moduleMetadata({
diff --git a/src/tedi/components/helpers/empty-state/index.ts b/src/tedi/components/content/empty-state/index.ts
similarity index 100%
rename from src/tedi/components/helpers/empty-state/index.ts
rename to src/tedi/components/content/empty-state/index.ts
diff --git a/src/tedi/components/content/index.ts b/src/tedi/components/content/index.ts
index d20f2eba5..8e267e709 100644
--- a/src/tedi/components/content/index.ts
+++ b/src/tedi/components/content/index.ts
@@ -1,6 +1,9 @@
export * from "./accordion";
export * from "./card";
+export * from "./collapse/collapse.component";
+export * from "./empty-state";
export * from "./heading-with-icon";
+export * from "./label/label.component";
export * from "./list/list.component";
export * from "./text-group/";
export * from "./carousel";
diff --git a/src/tedi/components/form/label/label.component.html b/src/tedi/components/content/label/label.component.html
similarity index 100%
rename from src/tedi/components/form/label/label.component.html
rename to src/tedi/components/content/label/label.component.html
diff --git a/src/tedi/components/form/label/label.component.scss b/src/tedi/components/content/label/label.component.scss
similarity index 100%
rename from src/tedi/components/form/label/label.component.scss
rename to src/tedi/components/content/label/label.component.scss
diff --git a/src/tedi/components/form/label/label.component.spec.ts b/src/tedi/components/content/label/label.component.spec.ts
similarity index 96%
rename from src/tedi/components/form/label/label.component.spec.ts
rename to src/tedi/components/content/label/label.component.spec.ts
index 71a37813c..7c4467f97 100644
--- a/src/tedi/components/form/label/label.component.spec.ts
+++ b/src/tedi/components/content/label/label.component.spec.ts
@@ -1,8 +1,8 @@
import { Component } from "@angular/core";
import { ComponentFixture, TestBed } from "@angular/core/testing";
import { LabelComponent } from "./label.component";
-import { FormFieldComponent } from "../form-field/form-field.component";
-import { TextFieldComponent } from "../text-field/text-field.component";
+import { FormFieldComponent } from "../../form/form-field/form-field.component";
+import { TextFieldComponent } from "../../form/text-field/text-field.component";
import { TEDI_TRANSLATION_DEFAULT_TOKEN } from "../../../tokens/translation.token";
describe("LabelComponent", () => {
diff --git a/src/tedi/components/form/label/label.component.ts b/src/tedi/components/content/label/label.component.ts
similarity index 96%
rename from src/tedi/components/form/label/label.component.ts
rename to src/tedi/components/content/label/label.component.ts
index e2da3c3a5..6fa5c00de 100644
--- a/src/tedi/components/form/label/label.component.ts
+++ b/src/tedi/components/content/label/label.component.ts
@@ -7,7 +7,7 @@ import {
ViewEncapsulation,
} from "@angular/core";
import { TediTranslationPipe } from "../../../services";
-import { TEDI_FIELD_CONTEXT } from "../form-field/field-context.token";
+import { TEDI_FIELD_CONTEXT } from "../../form/form-field/field-context.token";
export type LabelSize = "small" | "default";
export type LabelColor = "primary" | "secondary";
diff --git a/src/tedi/components/form/label/label.stories.ts b/src/tedi/components/content/label/label.stories.ts
similarity index 96%
rename from src/tedi/components/form/label/label.stories.ts
rename to src/tedi/components/content/label/label.stories.ts
index 0f04adf1e..5973c88dc 100644
--- a/src/tedi/components/form/label/label.stories.ts
+++ b/src/tedi/components/content/label/label.stories.ts
@@ -5,11 +5,11 @@ import {
StoryObj,
} from "@storybook/angular";
import { LabelComponent } from "./label.component";
-import { LabelRowComponent } from "../label-row/label-row.component";
+import { LabelRowComponent } from "../../form/label-row/label-row.component";
import { RowComponent } from "../../helpers/grid/row/row.component";
import { ColComponent } from "../../helpers/grid/col/col.component";
import { InfoTooltipComponent } from "../../overlay/info-tooltip/info-tooltip.component";
-import { TextFieldComponent } from "../text-field/text-field.component";
+import { TextFieldComponent } from "../../form/text-field/text-field.component";
/**
* Figma ↗
@@ -17,7 +17,7 @@ import { TextFieldComponent } from "../text-field/text-field.component";
*/
export default {
- title: "TEDI-Ready/Components/Form/Label",
+ title: "TEDI-Ready/Content/Label",
component: LabelComponent,
decorators: [
moduleMetadata({
diff --git a/src/tedi/components/content/table/table.stories.ts b/src/tedi/components/content/table/table.stories.ts
index 8831f659c..db09c8277 100644
--- a/src/tedi/components/content/table/table.stories.ts
+++ b/src/tedi/components/content/table/table.stories.ts
@@ -35,7 +35,7 @@ import { LinkComponent } from "../../navigation/link/link.component";
import { InfoButtonComponent } from "../../buttons/info-button/info-button.component";
import { FormFieldComponent } from "../../form/form-field/form-field.component";
import { TextFieldComponent } from "../../form/text-field/text-field.component";
-import { LabelComponent } from "../../form/label/label.component";
+import { LabelComponent } from "../label/label.component";
import { DateFieldComponent } from "../../form/date-field/date-field.component";
import { CheckboxComponent } from "../../form/checkbox/checkbox.component";
import {
@@ -60,7 +60,7 @@ import { DropdownComponent } from "../../overlay/dropdown/dropdown.component";
import { DropdownContentComponent } from "../../overlay/dropdown/dropdown-content/dropdown-content.component";
import { DropdownItemComponent } from "../../overlay/dropdown/dropdown-item/dropdown-item.component";
import { DropdownTriggerDirective } from "../../overlay/dropdown/dropdown-trigger/dropdown-trigger.directive";
-import { EmptyStateComponent } from "../../helpers/empty-state/empty-state.component";
+import { EmptyStateComponent } from "../empty-state/empty-state.component";
import {
BreakpointService,
type Breakpoint,
diff --git a/src/tedi/components/content/text-group/text-group.component.ts b/src/tedi/components/content/text-group/text-group.component.ts
index 3560351a9..bcb56d270 100644
--- a/src/tedi/components/content/text-group/text-group.component.ts
+++ b/src/tedi/components/content/text-group/text-group.component.ts
@@ -10,7 +10,7 @@ import {
BreakpointInputs,
BreakpointService,
} from "../../../services/breakpoint/breakpoint.service";
-import { LabelComponent } from "../../../components/form";
+import { LabelComponent } from "../label/label.component";
export type TextGroupType = "vertical" | "horizontal";
diff --git a/src/tedi/components/filter/filter.stories.ts b/src/tedi/components/filter/filter.stories.ts
index 190f23189..99675112b 100644
--- a/src/tedi/components/filter/filter.stories.ts
+++ b/src/tedi/components/filter/filter.stories.ts
@@ -16,7 +16,7 @@ import { TextComponent } from "../base/text/text.component";
import { IconComponent } from "../base/icon/icon.component";
import { RadioComponent } from "../form/radio/radio.component";
import { RadioGroupComponent } from "../form/radio-group/radio-group.component";
-import { LabelComponent } from "../form/label/label.component";
+import { LabelComponent } from "../content/label/label.component";
/**
* Figma ↗
diff --git a/src/tedi/components/form/checkbox-group/checkbox-group.component.spec.ts b/src/tedi/components/form/checkbox-group/checkbox-group.component.spec.ts
index 752a54d69..4b2073d6f 100644
--- a/src/tedi/components/form/checkbox-group/checkbox-group.component.spec.ts
+++ b/src/tedi/components/form/checkbox-group/checkbox-group.component.spec.ts
@@ -8,7 +8,7 @@ import {
import { CheckboxComponent } from "../checkbox/checkbox.component";
import { CheckboxCardComponent } from "../checkbox-card/checkbox-card.component";
import { CheckboxCardGroupComponent } from "../checkbox-card-group/checkbox-card-group.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { FeedbackTextComponent } from "../feedback-text/feedback-text.component";
@Component({
diff --git a/src/tedi/components/form/checkbox/checkbox.stories.ts b/src/tedi/components/form/checkbox/checkbox.stories.ts
index cc4de9d13..499c3064d 100644
--- a/src/tedi/components/form/checkbox/checkbox.stories.ts
+++ b/src/tedi/components/form/checkbox/checkbox.stories.ts
@@ -12,7 +12,7 @@ import { CheckboxCardGroupComponent } from "../checkbox-card-group/checkbox-card
import { RowComponent } from "../../helpers/grid/row/row.component";
import { ColComponent } from "../../helpers/grid/col/col.component";
import { TextComponent } from "../../base/text/text.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { IconComponent } from "../../base/icon/icon.component";
import { TooltipComponent } from "../../overlay/tooltip/tooltip.component";
import { TooltipTriggerComponent } from "../../overlay/tooltip/tooltip-trigger/tooltip-trigger.component";
diff --git a/src/tedi/components/form/date-field/date-field.component.spec.ts b/src/tedi/components/form/date-field/date-field.component.spec.ts
index b92633196..90a77b01b 100644
--- a/src/tedi/components/form/date-field/date-field.component.spec.ts
+++ b/src/tedi/components/form/date-field/date-field.component.spec.ts
@@ -5,7 +5,7 @@ import { By } from "@angular/platform-browser";
import { DateFieldComponent } from "./date-field.component";
import { TextFieldComponent } from "../text-field/text-field.component";
import { FormFieldComponent } from "../form-field/form-field.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { FeedbackTextComponent } from "../feedback-text/feedback-text.component";
import { DateRange } from "../../content/calendar/types";
import { TediTranslationService } from "../../../services/translation/translation.service";
diff --git a/src/tedi/components/form/date-field/date-field.stories.ts b/src/tedi/components/form/date-field/date-field.stories.ts
index b774a49ca..afb4d60ce 100644
--- a/src/tedi/components/form/date-field/date-field.stories.ts
+++ b/src/tedi/components/form/date-field/date-field.stories.ts
@@ -7,7 +7,7 @@ import {
} from "@angular/forms";
import { DateFieldComponent } from "./date-field.component";
import { FormFieldComponent } from "../form-field/form-field.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { FeedbackTextComponent } from "../feedback-text/feedback-text.component";
import { ButtonComponent } from "../../buttons/button/button.component";
import { IconComponent } from "../../base/icon/icon.component";
diff --git a/src/tedi/components/form/date-picker/date-picker.stories.ts b/src/tedi/components/form/date-picker/date-picker.stories.ts
index e47510c9d..8da817b94 100644
--- a/src/tedi/components/form/date-picker/date-picker.stories.ts
+++ b/src/tedi/components/form/date-picker/date-picker.stories.ts
@@ -8,7 +8,7 @@ import { FormControl, ReactiveFormsModule } from "@angular/forms";
import { DatePickerComponent } from "./date-picker.component";
import { AlertComponent } from "../../notifications/alert/alert.component";
import { TextComponent } from "../../base/text/text.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
/**
* Figma ↗
diff --git a/src/tedi/components/form/form-field/form-field.component.spec.ts b/src/tedi/components/form/form-field/form-field.component.spec.ts
index b467aacf8..69d89cb73 100644
--- a/src/tedi/components/form/form-field/form-field.component.spec.ts
+++ b/src/tedi/components/form/form-field/form-field.component.spec.ts
@@ -11,7 +11,7 @@ import {
} from "./form-field-control";
import { FeedbackTextComponent } from "../feedback-text/feedback-text.component";
import { TextareaComponent } from "../textarea/textarea.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { LabelRowComponent } from "../label-row/label-row.component";
import { FormFieldExtraDirective } from "./form-field-extra.directive";
import { TEDI_TRANSLATION_DEFAULT_TOKEN } from "../../../tokens/translation.token";
diff --git a/src/tedi/components/form/index.ts b/src/tedi/components/form/index.ts
index adc07b28a..557690f65 100644
--- a/src/tedi/components/form/index.ts
+++ b/src/tedi/components/form/index.ts
@@ -9,7 +9,6 @@ export * from "./radio-card-group/radio-card-group.component";
export * from "./date-field";
export * from "./date-picker/date-picker.component";
export * from "./feedback-text/feedback-text.component";
-export * from "./label/label.component";
export * from "./label-row";
export * from "./number-field/number-field.component";
export * from "./search";
diff --git a/src/tedi/components/form/input-group/input-group.component.spec.ts b/src/tedi/components/form/input-group/input-group.component.spec.ts
index 9aad36193..cc20fff12 100644
--- a/src/tedi/components/form/input-group/input-group.component.spec.ts
+++ b/src/tedi/components/form/input-group/input-group.component.spec.ts
@@ -5,7 +5,7 @@ import { InputGroupPrefixDirective } from "./input-group-prefix.directive";
import { InputGroupSuffixDirective } from "./input-group-suffix.directive";
import { FormFieldComponent } from "../form-field/form-field.component";
import { TextFieldComponent } from "../text-field/text-field.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { FeedbackTextComponent } from "../feedback-text/feedback-text.component";
import { LabelRowComponent } from "../label-row/label-row.component";
import { TEDI_TRANSLATION_DEFAULT_TOKEN } from "../../../tokens/translation.token";
diff --git a/src/tedi/components/form/input-group/input-group.stories.ts b/src/tedi/components/form/input-group/input-group.stories.ts
index 34bca50ad..2717a046a 100644
--- a/src/tedi/components/form/input-group/input-group.stories.ts
+++ b/src/tedi/components/form/input-group/input-group.stories.ts
@@ -12,7 +12,7 @@ import { TextFieldComponent } from "../text-field/text-field.component";
import { SelectComponent } from "../select/select.component";
import { DateFieldComponent } from "../date-field/date-field.component";
import { TimeFieldComponent } from "../time-field/time-field.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { FeedbackTextComponent } from "../feedback-text/feedback-text.component";
import { ButtonComponent } from "../../buttons/button/button.component";
import { IconComponent } from "../../base/icon/icon.component";
diff --git a/src/tedi/components/form/label-row/label-row.component.spec.ts b/src/tedi/components/form/label-row/label-row.component.spec.ts
index 48d3e9d01..5a66c3046 100644
--- a/src/tedi/components/form/label-row/label-row.component.spec.ts
+++ b/src/tedi/components/form/label-row/label-row.component.spec.ts
@@ -2,7 +2,7 @@ import { Component } from "@angular/core";
import { ComponentFixture, TestBed } from "@angular/core/testing";
import { OverlayContainer } from "@angular/cdk/overlay";
import { LabelRowComponent } from "./label-row.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { InfoTooltipComponent } from "../../overlay/info-tooltip/info-tooltip.component";
import { TediTranslationService } from "../../../services";
import { TEDI_TRANSLATION_DEFAULT_TOKEN } from "../../../tokens/translation.token";
diff --git a/src/tedi/components/form/number-field/number-field.component.spec.ts b/src/tedi/components/form/number-field/number-field.component.spec.ts
index 337f4bebc..f361b683a 100644
--- a/src/tedi/components/form/number-field/number-field.component.spec.ts
+++ b/src/tedi/components/form/number-field/number-field.component.spec.ts
@@ -1,7 +1,7 @@
import { ComponentFixture, TestBed } from "@angular/core/testing";
import { LiveAnnouncer } from "@angular/cdk/a11y";
import { NumberFieldComponent } from "./number-field.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { ButtonComponent } from "../../buttons/button/button.component";
import { IconComponent } from "../../base/icon/icon.component";
import { TextComponent } from "../../base/text/text.component";
diff --git a/src/tedi/components/form/number-field/number-field.component.ts b/src/tedi/components/form/number-field/number-field.component.ts
index fac56e732..b263070c2 100644
--- a/src/tedi/components/form/number-field/number-field.component.ts
+++ b/src/tedi/components/form/number-field/number-field.component.ts
@@ -18,7 +18,7 @@ import { TediTranslationService } from "../../../services/translation/translatio
import { ComponentInputs } from "../../../types/inputs.type";
import { IconComponent } from "../../base/icon/icon.component";
import { TextComponent } from "../../base/text/text.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { FeedbackTextComponent } from "../feedback-text/feedback-text.component";
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from "@angular/forms";
diff --git a/src/tedi/components/form/number-field/number-field.stories.ts b/src/tedi/components/form/number-field/number-field.stories.ts
index c2d4a8ee4..ab30ff1d8 100644
--- a/src/tedi/components/form/number-field/number-field.stories.ts
+++ b/src/tedi/components/form/number-field/number-field.stories.ts
@@ -6,7 +6,7 @@ import {
} from "@storybook/angular";
import { NumberFieldComponent } from "./number-field.component";
import { RowComponent } from "../../helpers/grid/row/row.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { FeedbackTextComponent } from "../feedback-text/feedback-text.component";
/**
diff --git a/src/tedi/components/form/radio-group/radio-group.component.spec.ts b/src/tedi/components/form/radio-group/radio-group.component.spec.ts
index 5d722cb61..f4251f337 100644
--- a/src/tedi/components/form/radio-group/radio-group.component.spec.ts
+++ b/src/tedi/components/form/radio-group/radio-group.component.spec.ts
@@ -8,7 +8,7 @@ import {
import { RadioComponent } from "../radio/radio.component";
import { RadioCardComponent } from "../radio-card/radio-card.component";
import { RadioCardGroupComponent } from "../radio-card-group/radio-card-group.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { FeedbackTextComponent } from "../feedback-text/feedback-text.component";
@Component({
diff --git a/src/tedi/components/form/radio/radio.stories.ts b/src/tedi/components/form/radio/radio.stories.ts
index 916ef464d..3ddbfa564 100644
--- a/src/tedi/components/form/radio/radio.stories.ts
+++ b/src/tedi/components/form/radio/radio.stories.ts
@@ -12,7 +12,7 @@ import { RadioCardGroupComponent } from "../radio-card-group/radio-card-group.co
import { RowComponent } from "../../helpers/grid/row/row.component";
import { ColComponent } from "../../helpers/grid/col/col.component";
import { TextComponent } from "../../base/text/text.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { IconComponent } from "../../base/icon/icon.component";
import { TooltipComponent } from "../../overlay/tooltip/tooltip.component";
import { TooltipTriggerComponent } from "../../overlay/tooltip/tooltip-trigger/tooltip-trigger.component";
diff --git a/src/tedi/components/form/search/search.component.spec.ts b/src/tedi/components/form/search/search.component.spec.ts
index 59917ca86..74c8db22e 100644
--- a/src/tedi/components/form/search/search.component.spec.ts
+++ b/src/tedi/components/form/search/search.component.spec.ts
@@ -5,7 +5,7 @@ import { SearchComponent } from "./search.component";
import { SearchFooterTemplateDirective } from "./search-templates.directive";
import { FormFieldComponent } from "../form-field/form-field.component";
import { TextFieldComponent } from "../text-field/text-field.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { FeedbackTextComponent } from "../feedback-text/feedback-text.component";
import { ButtonComponent } from "../../buttons/button/button.component";
import { IconComponent } from "../../base/icon/icon.component";
diff --git a/src/tedi/components/form/search/search.component.ts b/src/tedi/components/form/search/search.component.ts
index 4329525ec..a1dfaea06 100644
--- a/src/tedi/components/form/search/search.component.ts
+++ b/src/tedi/components/form/search/search.component.ts
@@ -48,7 +48,7 @@ import {
InputSize,
} from "../form-field/form-field.component";
import { TextFieldComponent } from "../text-field/text-field.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { FeedbackTextComponent } from "../feedback-text/feedback-text.component";
import { SearchSuggestionComponent } from "./search-suggestion.component";
import {
diff --git a/src/tedi/components/form/select/select.component.ts b/src/tedi/components/form/select/select.component.ts
index 366828d3e..0cf26330c 100644
--- a/src/tedi/components/form/select/select.component.ts
+++ b/src/tedi/components/form/select/select.component.ts
@@ -41,7 +41,7 @@ import { TediTranslationPipe } from "../../../services";
import { ComponentInputs } from "../../../types";
import { calculateVisibleTagCount } from "../../../utils/tag-overflow.util";
import { FeedbackTextComponent } from "../feedback-text/feedback-text.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { LabelRowComponent } from "../label-row/label-row.component";
import { TagComponent, TagEllipsis } from "../../tags/tag/tag.component";
import { EllipsisComponent, EllipsisPosition } from "../../helpers/ellipsis";
diff --git a/src/tedi/components/form/slider/slider.component.ts b/src/tedi/components/form/slider/slider.component.ts
index fc16881db..f3ffe32f8 100644
--- a/src/tedi/components/form/slider/slider.component.ts
+++ b/src/tedi/components/form/slider/slider.component.ts
@@ -10,7 +10,10 @@ import {
ViewEncapsulation,
} from "@angular/core";
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from "@angular/forms";
-import { LabelComponent, LabelVisuallyHidden } from "../label/label.component";
+import {
+ LabelComponent,
+ LabelVisuallyHidden,
+} from "../../content/label/label.component";
import { FeedbackTextComponent } from "../feedback-text/feedback-text.component";
import { ComponentInputs } from "../../../types/inputs.type";
import { TooltipComponent } from "../../overlay/tooltip/tooltip.component";
diff --git a/src/tedi/components/form/text-field/text-field.stories.ts b/src/tedi/components/form/text-field/text-field.stories.ts
index 32a0f488c..7227edddb 100644
--- a/src/tedi/components/form/text-field/text-field.stories.ts
+++ b/src/tedi/components/form/text-field/text-field.stories.ts
@@ -17,7 +17,7 @@ import { ColComponent } from "../../helpers/grid/col/col.component";
import { RowComponent } from "../../helpers/grid/row/row.component";
import { FeedbackTextComponent } from "../feedback-text/feedback-text.component";
import { TextComponent } from "../../base/text/text.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { LabelRowComponent } from "../label-row/label-row.component";
import { InfoTooltipComponent } from "../../overlay/info-tooltip/info-tooltip.component";
diff --git a/src/tedi/components/form/textarea/textarea.stories.ts b/src/tedi/components/form/textarea/textarea.stories.ts
index 0af1eec53..fea77bb8f 100644
--- a/src/tedi/components/form/textarea/textarea.stories.ts
+++ b/src/tedi/components/form/textarea/textarea.stories.ts
@@ -16,7 +16,7 @@ import { ColComponent } from "../../helpers/grid/col/col.component";
import { RowComponent } from "../../helpers/grid/row/row.component";
import { FeedbackTextComponent } from "../feedback-text/feedback-text.component";
import { TextComponent } from "../../base/text/text.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { AlertComponent } from "../../notifications/alert/alert.component";
const PSEUDO_STATE = ["Default", "Hover", "Active", "Disabled", "Focus"];
diff --git a/src/tedi/components/form/time-field/time-field.component.spec.ts b/src/tedi/components/form/time-field/time-field.component.spec.ts
index 79b04e0fd..8dc769cdc 100644
--- a/src/tedi/components/form/time-field/time-field.component.spec.ts
+++ b/src/tedi/components/form/time-field/time-field.component.spec.ts
@@ -3,7 +3,7 @@ import { Component, signal } from "@angular/core";
import { FormControl, ReactiveFormsModule } from "@angular/forms";
import { TimeFieldComponent } from "./time-field.component";
import { FormFieldComponent } from "../form-field/form-field.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { FeedbackTextComponent } from "../feedback-text/feedback-text.component";
import { TEDI_TRANSLATION_DEFAULT_TOKEN } from "../../../tokens/translation.token";
import { BreakpointService } from "../../../services/breakpoint/breakpoint.service";
diff --git a/src/tedi/components/form/time-field/time-field.stories.ts b/src/tedi/components/form/time-field/time-field.stories.ts
index 04459a67a..281a114cd 100644
--- a/src/tedi/components/form/time-field/time-field.stories.ts
+++ b/src/tedi/components/form/time-field/time-field.stories.ts
@@ -2,7 +2,7 @@ import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
import { FormControl, ReactiveFormsModule } from "@angular/forms";
import { TimeFieldComponent } from "./time-field.component";
import { FormFieldComponent } from "../form-field/form-field.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { FeedbackTextComponent } from "../feedback-text/feedback-text.component";
import { RowComponent } from "../../helpers/grid/row/row.component";
import { ColComponent } from "../../helpers/grid/col/col.component";
diff --git a/src/tedi/components/form/toggle/toggle.stories.ts b/src/tedi/components/form/toggle/toggle.stories.ts
index 162f6d08e..ccdff98e2 100644
--- a/src/tedi/components/form/toggle/toggle.stories.ts
+++ b/src/tedi/components/form/toggle/toggle.stories.ts
@@ -8,7 +8,7 @@ import {
import { ToggleComponent } from "./toggle.component";
import { ColComponent } from "../../helpers/grid/col/col.component";
import { RowComponent } from "../../helpers/grid/row/row.component";
-import { LabelComponent } from "../label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
const PSEUDO_STATE = ["Default", "Hover", "Active", "Focus"];
diff --git a/src/tedi/components/helpers/index.ts b/src/tedi/components/helpers/index.ts
index 4c3cd8330..a1e619de7 100644
--- a/src/tedi/components/helpers/index.ts
+++ b/src/tedi/components/helpers/index.ts
@@ -1,5 +1,4 @@
export * from "./attachment";
-export * from "./empty-state";
export * from "./ellipsis";
export * from "./grid";
export * from "./scroll-fade";
diff --git a/src/tedi/components/helpers/timeline/timeline.stories.ts b/src/tedi/components/helpers/timeline/timeline.stories.ts
index 37ef49fd3..7ad816b04 100644
--- a/src/tedi/components/helpers/timeline/timeline.stories.ts
+++ b/src/tedi/components/helpers/timeline/timeline.stories.ts
@@ -5,7 +5,7 @@ import { TimelineItemComponent } from "./timeline-item/timeline-item.component";
import { TimelineTitleComponent } from "./timeline-title/timeline-title.component";
import { TimelineDescriptionComponent } from "./timeline-description/timeline-description.component";
import { TimelineTimingsBottomDirective } from "./timeline-timings-bottom.directive";
-import { CollapseComponent } from "../../buttons/collapse/collapse.component";
+import { CollapseComponent } from "../../content/collapse/collapse.component";
import { TextComponent } from "../../base/text/text.component";
import { ButtonComponent } from "../../buttons/button/button.component";
import { InfoButtonComponent } from "../../buttons/info-button/info-button.component";
diff --git a/src/tedi/components/layout/header/header.stories.ts b/src/tedi/components/layout/header/header.stories.ts
index c0882fe35..77db4bee5 100644
--- a/src/tedi/components/layout/header/header.stories.ts
+++ b/src/tedi/components/layout/header/header.stories.ts
@@ -47,7 +47,7 @@ import { HeaderSearchComponent } from "./header-search/header-search.component";
import { HeaderBottomComponent } from "./header-bottom/header-bottom.component";
import { HeaderTopComponent } from "./header-top/header-top.component";
import { FormFieldComponent } from "../../form/form-field/form-field.component";
-import { LabelComponent } from "../../form/label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { TextFieldComponent } from "../../form/text-field/text-field.component";
import { SearchComponent } from "../../form/search/search.component";
import { TextComponent } from "../../base/text/text.component";
diff --git a/src/tedi/components/loader/progress-bar/progress-bar.component.ts b/src/tedi/components/loader/progress-bar/progress-bar.component.ts
index 2aa42addf..cdc0bafcd 100644
--- a/src/tedi/components/loader/progress-bar/progress-bar.component.ts
+++ b/src/tedi/components/loader/progress-bar/progress-bar.component.ts
@@ -12,7 +12,7 @@ import {
ViewEncapsulation,
} from "@angular/core";
import { _IdGenerator } from "@angular/cdk/a11y";
-import { LabelComponent } from "../../form/label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { BreakpointService } from "../../../services/breakpoint/breakpoint.service";
export type ProgressBarSize = "default" | "small";
diff --git a/src/tedi/components/overlay/info-tooltip/info-tooltip.stories.ts b/src/tedi/components/overlay/info-tooltip/info-tooltip.stories.ts
index ccc086b00..78113d487 100644
--- a/src/tedi/components/overlay/info-tooltip/info-tooltip.stories.ts
+++ b/src/tedi/components/overlay/info-tooltip/info-tooltip.stories.ts
@@ -5,7 +5,7 @@ import {
StoryObj,
} from "@storybook/angular";
import { InfoTooltipComponent } from "./info-tooltip.component";
-import { LabelComponent } from "../../form/label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { LabelRowComponent } from "../../form/label-row/label-row.component";
import { expect, userEvent, waitFor, within } from "storybook/test";
diff --git a/src/tedi/components/overlay/modal/modal.stories.ts b/src/tedi/components/overlay/modal/modal.stories.ts
index 0729dc7d3..87f304292 100644
--- a/src/tedi/components/overlay/modal/modal.stories.ts
+++ b/src/tedi/components/overlay/modal/modal.stories.ts
@@ -11,7 +11,7 @@ import { ModalService } from "./modal.service";
import { ModalRef } from "./modal-ref";
import { MODAL_DATA, ModalConfig, ModalFullscreen } from "./modal.types";
import { ButtonComponent } from "../../buttons/button/button.component";
-import { LabelComponent } from "../../form/label/label.component";
+import { LabelComponent } from "../../content/label/label.component";
import { IconComponent } from "../../base/icon/icon.component";
import { ScrollFadeComponent } from "../../helpers/scroll-fade/scroll-fade.component";
import { TextFieldComponent } from "../../form/text-field/text-field.component";
diff --git a/src/tedi/components/overlay/popover/popover.stories.ts b/src/tedi/components/overlay/popover/popover.stories.ts
index 983e13399..fa7f49645 100644
--- a/src/tedi/components/overlay/popover/popover.stories.ts
+++ b/src/tedi/components/overlay/popover/popover.stories.ts
@@ -13,8 +13,8 @@ import { IconComponent } from "../../base/icon/icon.component";
import { InfoButtonComponent } from "../../buttons/info-button/info-button.component";
import { ToggleComponent } from "../../form/toggle/toggle.component";
import { SeparatorComponent } from "../../helpers/separator/separator.component";
-import { EmptyStateComponent } from "../../helpers/empty-state/empty-state.component";
-import { LabelComponent } from "../../form/label/label.component";
+import { EmptyStateComponent } from "../../content/empty-state/empty-state.component";
+import { LabelComponent } from "../../content/label/label.component";
import { DropdownItemValueComponent } from "../dropdown/dropdown-item-value/dropdown-item-value.component";
import { DropdownItemValueLabelComponent } from "../dropdown/dropdown-item-value/dropdown-item-value-label.component";
import { SearchComponent } from "../../form/search/search.component";