diff --git a/VDSSample.xcodeproj/project.pbxproj b/VDSSample.xcodeproj/project.pbxproj
index 6817376..dabf535 100644
--- a/VDSSample.xcodeproj/project.pbxproj
+++ b/VDSSample.xcodeproj/project.pbxproj
@@ -10,7 +10,6 @@
 		EA3C3B9D289966EF000CA526 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3C3B9C289966EF000CA526 /* AppDelegate.swift */; };
 		EA3C3B9F289966EF000CA526 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3C3B9E289966EF000CA526 /* SceneDelegate.swift */; };
 		EA3C3BA4289966EF000CA526 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EA3C3BA2289966EF000CA526 /* Main.storyboard */; };
-		EA3C3BA6289966F1000CA526 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA3C3BA5289966F1000CA526 /* Assets.xcassets */; };
 		EA3C3BA9289966F1000CA526 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EA3C3BA7289966F1000CA526 /* LaunchScreen.storyboard */; };
 		EA3C3BB428996775000CA526 /* PickerBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3C3BB028996775000CA526 /* PickerBase.swift */; };
 		EA3C3BB528996775000CA526 /* StoryboardInitable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3C3BB128996775000CA526 /* StoryboardInitable.swift */; };
@@ -24,6 +23,8 @@
 		EA3C3BC1289968A0000CA526 /* VDSFormControlsTokens.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EA3C3BBB289968A0000CA526 /* VDSFormControlsTokens.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		EA3C3BC4289968B1000CA526 /* VDS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA3C3BC3289968B1000CA526 /* VDS.framework */; };
 		EA3C3BC5289968B1000CA526 /* VDS.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EA3C3BC3289968B1000CA526 /* VDS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		EAF7F07C2899698800B287F5 /* Components.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EAF7F07A2899698800B287F5 /* Components.storyboard */; };
+		EAF7F07D2899698800B287F5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EAF7F07B2899698800B287F5 /* Assets.xcassets */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -48,7 +49,6 @@
 		EA3C3B9C289966EF000CA526 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		EA3C3B9E289966EF000CA526 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
 		EA3C3BA3289966EF000CA526 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		EA3C3BA5289966F1000CA526 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		EA3C3BA8289966F1000CA526 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		EA3C3BAA289966F1000CA526 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		EA3C3BB028996775000CA526 /* PickerBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PickerBase.swift; sourceTree = "<group>"; };
@@ -59,6 +59,8 @@
 		EA3C3BBA289968A0000CA526 /* VDSTypographyTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSTypographyTokens.xcframework; path = ../SharedFrameworks/VDSTypographyTokens.xcframework; sourceTree = "<group>"; };
 		EA3C3BBB289968A0000CA526 /* VDSFormControlsTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSFormControlsTokens.xcframework; path = ../SharedFrameworks/VDSFormControlsTokens.xcframework; sourceTree = "<group>"; };
 		EA3C3BC3289968B1000CA526 /* VDS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = VDS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		EAF7F07A2899698800B287F5 /* Components.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Components.storyboard; sourceTree = "<group>"; };
+		EAF7F07B2899698800B287F5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -96,15 +98,13 @@
 		EA3C3B9B289966EF000CA526 /* VDSSample */ = {
 			isa = PBXGroup;
 			children = (
+				EAF7F0792899698800B287F5 /* Resources */,
 				EA3C3BB228996775000CA526 /* MenuViewController.swift */,
 				EA3C3BB028996775000CA526 /* PickerBase.swift */,
 				EA3C3BB128996775000CA526 /* StoryboardInitable.swift */,
 				EA3C3BB328996775000CA526 /* ToggleViewController.swift */,
 				EA3C3B9C289966EF000CA526 /* AppDelegate.swift */,
 				EA3C3B9E289966EF000CA526 /* SceneDelegate.swift */,
-				EA3C3BA2289966EF000CA526 /* Main.storyboard */,
-				EA3C3BA5289966F1000CA526 /* Assets.xcassets */,
-				EA3C3BA7289966F1000CA526 /* LaunchScreen.storyboard */,
 				EA3C3BAA289966F1000CA526 /* Info.plist */,
 			);
 			path = VDSSample;
@@ -121,6 +121,17 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		EAF7F0792899698800B287F5 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				EA3C3BA2289966EF000CA526 /* Main.storyboard */,
+				EA3C3BA7289966F1000CA526 /* LaunchScreen.storyboard */,
+				EAF7F07A2899698800B287F5 /* Components.storyboard */,
+				EAF7F07B2899698800B287F5 /* Assets.xcassets */,
+			);
+			path = Resources;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -181,7 +192,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				EA3C3BA9289966F1000CA526 /* LaunchScreen.storyboard in Resources */,
-				EA3C3BA6289966F1000CA526 /* Assets.xcassets in Resources */,
+				EAF7F07C2899698800B287F5 /* Components.storyboard in Resources */,
+				EAF7F07D2899698800B287F5 /* Assets.xcassets in Resources */,
 				EA3C3BA4289966EF000CA526 /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/VDSSample.xcodeproj/xcuserdata/mattbruce.xcuserdatad/xcschemes/xcschememanagement.plist b/VDSSample.xcodeproj/xcuserdata/mattbruce.xcuserdatad/xcschemes/xcschememanagement.plist
index 7d6fb99..d2c0116 100644
--- a/VDSSample.xcodeproj/xcuserdata/mattbruce.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/VDSSample.xcodeproj/xcuserdata/mattbruce.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>VDSSample.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>4</integer>
 		</dict>
 	</dict>
 </dict>
diff --git a/VDSSample/Assets.xcassets/AccentColor.colorset/Contents.json b/VDSSample/Resources/Assets.xcassets/AccentColor.colorset/Contents.json
similarity index 100%
rename from VDSSample/Assets.xcassets/AccentColor.colorset/Contents.json
rename to VDSSample/Resources/Assets.xcassets/AccentColor.colorset/Contents.json
diff --git a/VDSSample/Assets.xcassets/AppIcon.appiconset/Contents.json b/VDSSample/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from VDSSample/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to VDSSample/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/VDSSample/Assets.xcassets/Contents.json b/VDSSample/Resources/Assets.xcassets/Contents.json
similarity index 100%
rename from VDSSample/Assets.xcassets/Contents.json
rename to VDSSample/Resources/Assets.xcassets/Contents.json
diff --git a/VDSSample/Base.lproj/LaunchScreen.storyboard b/VDSSample/Resources/Base.lproj/LaunchScreen.storyboard
similarity index 100%
rename from VDSSample/Base.lproj/LaunchScreen.storyboard
rename to VDSSample/Resources/Base.lproj/LaunchScreen.storyboard
diff --git a/VDSSample/Base.lproj/Main.storyboard b/VDSSample/Resources/Base.lproj/Main.storyboard
similarity index 100%
rename from VDSSample/Base.lproj/Main.storyboard
rename to VDSSample/Resources/Base.lproj/Main.storyboard
diff --git a/VDSSample/Resources/Components.storyboard b/VDSSample/Resources/Components.storyboard
new file mode 100644
index 0000000..dd79351
--- /dev/null
+++ b/VDSSample/Resources/Components.storyboard
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17150" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17122"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="s0d-6b-0kx">
+            <objects>
+                <viewController id="Y6W-OH-hqX" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>