diff --git a/apps/docs/app/components/[...slug]/page.tsx b/apps/docs/app/components/[...slug]/page.tsx
index 4dd47e7f1..97f7e8758 100644
--- a/apps/docs/app/components/[...slug]/page.tsx
+++ b/apps/docs/app/components/[...slug]/page.tsx
@@ -1,8 +1,8 @@
 import { notFound } from "next/navigation";
 
 import Heading from "@/app/ui/components/heading/Heading.tsx";
-import SubHeader from "@/app/ui/layout/subHeader/SubHeader.tsx";
 import Aside from "@/app/ui/layout/aside/Aside.tsx";
+import SubHeader from "@/app/ui/layout/subHeader/SubHeader.tsx";
 
 import { getComponentDetails } from "@/app/lib/getComponentDetails.ts";
 import getSectionLinks from "@/app/lib/getSectionLinks.ts";
@@ -54,7 +54,8 @@ export default async function ComponentPage({ params }: PageProps) {
         },
         {
             name: "issue",
-            src: "https://github.com/gsoft-inc/wl-hopper/issues/new",
+            // eslint-disable-next-line max-len
+            src: `https://github.com/gsoft-inc/wl-hopper/issues/new?title=🐛%20[${title}]%20-%20<TITLE>&body=Component:%20Button%0A%0AIssue%20Summary:%0A_Describe%20the%20issue%20or%20enhancement%20you're%20experiencing%20with%20the%20component._%0A%0ASteps%20to%20Reproduce:%0A1.%20_Step%20one..._%0A2.%20_Step%20two..._%0A%0AExpected%20Behaviour:%0A_What%20did%20you%20expect%20to%20happen?_%0A%0AActual%20Behaviour:%0A_What%20actually%20happened?_%0A%0AScreenshots%20or%20Code%20Snippet:%0A_Include%20any%20screenshots,%20GIFs,%20or%20code%20snippets%20that%20help%20explain%20the%20issue._%0A%0AEnvironment:%0A-%20Design%20System%20Version:%20_Version%20number_%0A-%20Browser%20and%20Version:%20_Browser%20and%20version%20where%20the%20issue%20occurs_%0A-%20Operating%20System:%20_OS%20and%20version_%0A%0AAdditional%20Context:%0A_Any%20other%20details%20or%20context%20related%20to%20the%20issue._`,
             label: "Report an issue"
         },
         ...(links.aria ? [{
diff --git a/apps/docs/content/components/collections/Listbox.mdx b/apps/docs/content/components/collections/Listbox.mdx
index 52863d85f..69eb8aab5 100644
--- a/apps/docs/content/components/collections/Listbox.mdx
+++ b/apps/docs/content/components/collections/Listbox.mdx
@@ -3,7 +3,7 @@ title: ListBox
 description: A list box displays actions relevant to the user’s current selection.
 category: "collections"
 links:
-    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/listbox/src/ListBox.tsx
+    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/ListBox/src/ListBox.tsx
     aria: https://www.w3.org/WAI/ARIA/apg/patterns/listbox/
 ---
 
diff --git a/apps/docs/content/components/content/Avatar.mdx b/apps/docs/content/components/content/Avatar.mdx
index a61f9390c..9f577c2b9 100644
--- a/apps/docs/content/components/content/Avatar.mdx
+++ b/apps/docs/content/components/content/Avatar.mdx
@@ -3,7 +3,7 @@ title: Avatar
 description: An avatar is used to represent a user, team or another entity.
 category: "content"
 links:
-    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/Avatar/src/index.tsx
+    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/Avatar/src/Avatar.tsx
 ---
 
 <Example src="Avatar/docs/preview" isOpen />
diff --git a/apps/docs/content/components/content/Divider.mdx b/apps/docs/content/components/content/Divider.mdx
index f10294591..106c950f8 100644
--- a/apps/docs/content/components/content/Divider.mdx
+++ b/apps/docs/content/components/content/Divider.mdx
@@ -3,7 +3,7 @@ title: Divider
 description: A divider separates sections of content or groups.
 category: "content"
 links:
-    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/content/src/Divider.tsx
+    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/Divider/src/Divider.tsx
 ---
 
 <Example src="Divider/docs/preview" isOpen />
diff --git a/apps/docs/content/components/content/Heading.mdx b/apps/docs/content/components/content/Heading.mdx
index 1162e4795..d7673a59b 100644
--- a/apps/docs/content/components/content/Heading.mdx
+++ b/apps/docs/content/components/content/Heading.mdx
@@ -3,7 +3,7 @@ title: Heading
 description: A heading is a primitive component matching Hopper's typography type scale.
 category: "content"
 links:
-    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/typoegraphy/heading/src/Heading.tsx
+    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/typography/Heading/src/Heading.tsx
 ---
 <Example src="typography/Heading/docs/preview" isOpen />
 
diff --git a/apps/docs/content/components/content/Label.mdx b/apps/docs/content/components/content/Label.mdx
index 5c6f137be..f4b14795c 100644
--- a/apps/docs/content/components/content/Label.mdx
+++ b/apps/docs/content/components/content/Label.mdx
@@ -3,7 +3,7 @@ title: Label
 description: A label is a primitive component matching Hopper's typography type scale.
 category: "content"
 links:
-    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/typography/Label/src/label.tsx
+    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/typography/Label/src/Label.tsx
 ---
 <Example src="typography/Label/docs/preview" isOpen />
 
diff --git a/apps/docs/content/components/content/Text.mdx b/apps/docs/content/components/content/Text.mdx
index e7f6afdce..9fd3f31ab 100644
--- a/apps/docs/content/components/content/Text.mdx
+++ b/apps/docs/content/components/content/Text.mdx
@@ -3,7 +3,7 @@ title: Text
 description: A text component is a primitive component matching Hopper's typography type scale.
 category: "content"
 links:
-    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/typoegraphy/Text/src/Text.tsx
+    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/typography/Text/src/Text.tsx
 ---
 
 <Example src="typography/Text/docs/text/preview" isOpen />
diff --git a/apps/docs/content/components/forms/Form.mdx b/apps/docs/content/components/forms/Form.mdx
index 802c54419..be15d5acc 100644
--- a/apps/docs/content/components/forms/Form.mdx
+++ b/apps/docs/content/components/forms/Form.mdx
@@ -3,7 +3,7 @@ title: Form
 description: Forms are used to gather information from the user.
 category: "forms"
 links:
-    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/form/src/Form.tsx
+    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/Form/src/Form.tsx
 ---
 
 <Example src="Form/docs/preview" />
diff --git a/apps/docs/content/components/forms/HelperMessage.mdx b/apps/docs/content/components/forms/HelperMessage.mdx
index 29fd2057b..44f0633fe 100644
--- a/apps/docs/content/components/forms/HelperMessage.mdx
+++ b/apps/docs/content/components/forms/HelperMessage.mdx
@@ -3,7 +3,7 @@ title: HelperMessage
 description: A helper message component displays auxiliary text to guide users in the interface.
 category: "forms"
 links:
-    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/helpMessage/src/HelpMessage.tsx
+    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/HelperMessage/src/HelperMessage.tsx
 ---
 
 <Example src="HelperMessage/docs/preview" isOpen />
diff --git a/apps/docs/content/components/forms/NumberField.mdx b/apps/docs/content/components/forms/NumberField.mdx
index 93d6bee05..cbf10f95d 100644
--- a/apps/docs/content/components/forms/NumberField.mdx
+++ b/apps/docs/content/components/forms/NumberField.mdx
@@ -3,7 +3,7 @@ title: NumberField
 description: A number field is a specialized input that allows a user to enter a number.
 category: "forms"
 links:
-    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/inputs/src/NumberInputField.tsx
+    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/inputs/src/NumberField.tsx
 ---
 
 <Example src="inputs/docs/numberField/preview" isOpen />
diff --git a/apps/docs/content/components/forms/RemainingCharacterCount.mdx b/apps/docs/content/components/forms/RemainingCharacterCount.mdx
index 2d5d9f449..258d1f92d 100644
--- a/apps/docs/content/components/forms/RemainingCharacterCount.mdx
+++ b/apps/docs/content/components/forms/RemainingCharacterCount.mdx
@@ -3,7 +3,7 @@ title: RemainingCharacterCount
 description: A component that counts characters
 category: "forms"
 links:
-    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/typography/Label/src/label.tsx
+    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/inputs/src/RemainingCharacterCount.tsx
 ---
 <Example src="inputs/docs/remainingCharacterCount/preview" isOpen />
 
diff --git a/apps/docs/content/components/overlays/Popover.mdx b/apps/docs/content/components/overlays/Popover.mdx
index d4ef167a7..52017c74b 100644
--- a/apps/docs/content/components/overlays/Popover.mdx
+++ b/apps/docs/content/components/overlays/Popover.mdx
@@ -3,7 +3,7 @@ title: Popover
 description: A popover displays additional content when a user interacts with a trigger element.
 category: "overlays"
 links:
-    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/overlays/src/Popover.tsx
+    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/overlays/Popover/src/Popover.tsx
 ---
 
 <Example src="overlays/Popover/docs/preview" isOpen />
diff --git a/apps/docs/content/components/pickers/Select.mdx b/apps/docs/content/components/pickers/Select.mdx
index 3ee2ab092..96cbf1808 100644
--- a/apps/docs/content/components/pickers/Select.mdx
+++ b/apps/docs/content/components/pickers/Select.mdx
@@ -3,7 +3,7 @@ title: Select
 description: A select displays a collapsible list of options from which the user can select one.
 category: "pickers"
 links:
-    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/TBD/src/TBD.tsx
+    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/Select/src/Select.tsx
 ---
 
 <Example src="Select/docs/preview" isOpen />
diff --git a/apps/docs/content/components/status/Badge.mdx b/apps/docs/content/components/status/Badge.mdx
index 9bc8247ed..409155587 100644
--- a/apps/docs/content/components/status/Badge.mdx
+++ b/apps/docs/content/components/status/Badge.mdx
@@ -3,7 +3,7 @@ title: Badge
 description: A badge is used to bring attention to an element.
 category: "status"
 links:
-    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/badge/src/Badge.tsx
+    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/Badge/src/Badge.tsx
 ---
 
 <Example src="Badge/docs/badge/preview" isOpen />
diff --git a/apps/docs/content/components/status/FloatingBadge.mdx b/apps/docs/content/components/status/FloatingBadge.mdx
index 24e1d06a5..f0879d3cc 100644
--- a/apps/docs/content/components/status/FloatingBadge.mdx
+++ b/apps/docs/content/components/status/FloatingBadge.mdx
@@ -3,7 +3,7 @@ title: FloatingBadge
 description: A floating badge allows the user to position a badge relative to another component.
 category: "status"
 links:
-    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/badge/src/FloatingBadge.tsx
+    source: https://github.com/gsoft-inc/wl-hopper/blob/main/packages/components/src/Badge/src/FloatingBadge.tsx
 ---
 
 <Example src="Badge/docs/floatingbadge/preview" isOpen />