diff --git a/samples/Samples.storybook.lua b/samples/Samples.storybook.lua
new file mode 100644
index 0000000..86f5efc
--- /dev/null
+++ b/samples/Samples.storybook.lua
@@ -0,0 +1,6 @@
+return {
+	name = "OnyxUI Samples",
+	storyRoots = {
+		script.Parent,
+	},
+}
diff --git a/src/Examples/SettingToggle.lua b/samples/SettingsMenu/SettingToggle.lua
similarity index 96%
rename from src/Examples/SettingToggle.lua
rename to samples/SettingsMenu/SettingToggle.lua
index 7d6311b..0262acf 100644
--- a/src/Examples/SettingToggle.lua
+++ b/samples/SettingsMenu/SettingToggle.lua
@@ -1,4 +1,4 @@
-local OnyxUI = script.Parent.Parent
+local OnyxUI = script.Parent.Parent.Parent.OnyxUI.Packages.OnyxUI
 local Themer = require(OnyxUI.Themer)
 local Fusion = require(OnyxUI.Packages.Fusion)
 local Util = require(OnyxUI.Util)
diff --git a/samples/SettingsMenu/SettingsMenu.story.lua b/samples/SettingsMenu/SettingsMenu.story.lua
new file mode 100644
index 0000000..6fee376
--- /dev/null
+++ b/samples/SettingsMenu/SettingsMenu.story.lua
@@ -0,0 +1,33 @@
+local OnyxUI = script.Parent.Parent.Parent.OnyxUI.Packages.OnyxUI
+local Fusion = require(OnyxUI.Packages.Fusion)
+local Themer = require(OnyxUI.Themer)
+
+local Children = Fusion.Children
+local Scoped = Fusion.scoped
+
+local Frame = require(OnyxUI.Components.Frame)
+local SettingsMenu = require(script.Parent)
+local Components = {
+	Frame = Frame,
+	SettingsMenu = SettingsMenu,
+}
+
+return function(Parent: GuiObject)
+	local Scope: Fusion.Scope<typeof(Fusion) & typeof(Components)> = Scoped(Fusion, Components)
+	local Theme: Themer.ThemeObject = Themer.Theme:now()
+
+	Scope:Frame {
+		Parent = Parent,
+		Padding = Scope:Computed(function(use)
+			return UDim.new(0, use(Theme.StrokeThickness["1"]))
+		end),
+
+		[Children] = {
+			Scope:SettingsMenu {},
+		},
+	}
+
+	return function()
+		Scope:doCleanup()
+	end
+end
diff --git a/src/Examples/SettingsMenu.lua b/samples/SettingsMenu/init.lua
similarity index 95%
rename from src/Examples/SettingsMenu.lua
rename to samples/SettingsMenu/init.lua
index b3295ec..39445bd 100644
--- a/src/Examples/SettingsMenu.lua
+++ b/samples/SettingsMenu/init.lua
@@ -1,5 +1,4 @@
-local OnyxUI = script.Parent.Parent
-
+local OnyxUI = script.Parent.Parent.OnyxUI.Packages.OnyxUI
 local Fusion = require(OnyxUI.Packages.Fusion)
 local Themer = require(OnyxUI.Themer)
 local Util = require(OnyxUI.Util)
@@ -10,7 +9,7 @@ local MenuFrame = require(OnyxUI.Components.MenuFrame)
 local Button = require(OnyxUI.Components.Button)
 local TitleBar = require(OnyxUI.Components.TitleBar)
 local Scroller = require(OnyxUI.Components.Scroller)
-local SettingToggle = require(OnyxUI.Examples.SettingToggle)
+local SettingToggle = require(script.SettingToggle)
 local TextInput = require(OnyxUI.Components.TextInput)
 local Components = {
 	MenuFrame = MenuFrame,
diff --git a/src/Examples/ThemeTest.story.lua b/samples/Testing/ContextualPalette.story.lua
similarity index 95%
rename from src/Examples/ThemeTest.story.lua
rename to samples/Testing/ContextualPalette.story.lua
index 8aed55d..42bdfcb 100644
--- a/src/Examples/ThemeTest.story.lua
+++ b/samples/Testing/ContextualPalette.story.lua
@@ -1,4 +1,4 @@
-local OnyxUI = script.Parent.Parent
+local OnyxUI = script.Parent.Parent.Parent.OnyxUI.Packages.OnyxUI
 local Util = require(OnyxUI.Util)
 local Fusion = require(OnyxUI.Packages.Fusion)
 local Themer = require(OnyxUI.Themer)
@@ -56,7 +56,7 @@ return function(Parent: GuiObject)
 		},
 	})
 
-	local Object = Scope:Base {
+	Scope:Base {
 		Parent = Parent,
 		ListEnabled = true,
 		ListFillDirection = Enum.FillDirection.Horizontal,
diff --git a/src/Examples/SettingsMenu.story.lua b/src/Examples/SettingsMenu.story.lua
deleted file mode 100644
index f294aa4..0000000
--- a/src/Examples/SettingsMenu.story.lua
+++ /dev/null
@@ -1,36 +0,0 @@
-local OnyxUI = script.Parent.Parent
-
-local Fusion = require(OnyxUI.Packages.Fusion)
-local Themer = require(OnyxUI.Themer)
-
-local Children = Fusion.Children
-local Scoped = Fusion.scoped
-
-local Frame = require(OnyxUI.Components.Frame)
-local SettingsMenu = require(OnyxUI.Examples.SettingsMenu)
-local Components = {
-	Frame = Frame,
-	SettingsMenu = SettingsMenu,
-}
-
-return {
-	story = function(Parent: GuiObject)
-		local Scope: Fusion.Scope<typeof(Fusion) & typeof(Components)> = Scoped(Fusion, Components)
-		local Theme: Themer.ThemeObject = Themer.Theme:now()
-
-		Scope:Frame {
-			Parent = Parent,
-			Padding = Scope:Computed(function(use)
-				return UDim.new(0, use(Theme.StrokeThickness["1"]))
-			end),
-
-			[Children] = {
-				Scope:SettingsMenu {},
-			},
-		}
-
-		return function()
-			Scope:doCleanup()
-		end
-	end,
-}
diff --git a/src/OnyxUI.storybook.lua b/src/OnyxUI.storybook.lua
index 361e94f..435cecf 100644
--- a/src/OnyxUI.storybook.lua
+++ b/src/OnyxUI.storybook.lua
@@ -1,6 +1,6 @@
 return {
 	name = "OnyxUI",
 	storyRoots = {
-		script.Parent,
+		script.Parent.Components,
 	},
 }
diff --git a/testing.project.json b/testing.project.json
index d30a150..d54481c 100644
--- a/testing.project.json
+++ b/testing.project.json
@@ -12,6 +12,9 @@
             "$path": "src"
           }
         }
+      },
+      "Samples": {
+        "$path": "samples"
       }
     }
   }