diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..297a187
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,21 @@
+version: 2
+
+jobs:
+    build-and-test:
+        macos:
+            xcode: "9.3.0"
+        # Use custom shell per https://circleci.com/docs/2.0/testing-ios/#using-custom-versions-of-cocoapods-and-other-ruby-gems
+        shell: /bin/bash --login -o pipefail
+        steps:
+            - checkout
+            - run:
+                name: Run iOS Tests
+                command: set -o pipefail && xcodebuild clean build test -project Demo.xcodeproj -scheme "iOSTests" -destination 'platform=iOS Simulator,name=iPhone 7' | xcpretty --color && exit ${PIPESTATUS[0]}
+            - run:
+                name: Run tvOS Tests
+                command: set -o pipefail && xcodebuild clean build test -project Demo.xcodeproj -scheme "tvOSTests" -destination 'platform=tvOS Simulator,name=Apple TV' | xcpretty --color && exit ${PIPESTATUS[0]}
+workflows:
+  version: 2
+  build-and-test:
+      jobs:
+          - build-and-test
diff --git a/.swift-version b/.swift-version
index 5186d07..7d5c902 100644
--- a/.swift-version
+++ b/.swift-version
@@ -1 +1 @@
-4.0
+4.1
diff --git a/Demo.xcodeproj/project.pbxproj b/Demo.xcodeproj/project.pbxproj
index 51e12dc..13d721b 100755
--- a/Demo.xcodeproj/project.pbxproj
+++ b/Demo.xcodeproj/project.pbxproj
@@ -88,6 +88,7 @@
 		14D9866C1DBF58A900D7842C /* TableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14D986671DBF58A900D7842C /* TableViewCell.swift */; };
 		2B3FEEE91EAA04BB00EF8D20 /* DemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B3FEEE81EAA04BB00EF8D20 /* DemoViewController.swift */; };
 		2B440A6B1EA9EB0A00AC33F8 /* SearchableCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B440A6A1EA9EB0A00AC33F8 /* SearchableCollectionViewController.swift */; };
+		334F248E20889A330048EC4F /* SweetUIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 149D816C1DBD2AFB00A9EB1A /* SweetUIKit.framework */; };
 		440998811DC0B1C600C11852 /* UICollectionViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 440998801DC0B1C600C11852 /* UICollectionViewTests.swift */; };
 		440998821DC0B1C600C11852 /* UICollectionViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 440998801DC0B1C600C11852 /* UICollectionViewTests.swift */; };
 		440E05871DC0B07D0044F59F /* UITableViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 440E05861DC0B07D0044F59F /* UITableViewTests.swift */; };
@@ -128,6 +129,20 @@
 			remoteGlobalIDString = 14028E261E9285BE00EEE567;
 			remoteInfo = "UITests-App";
 		};
+		334F248920876FE30048EC4F /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146D728B1AB782920058798C /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 140124C01DBF582900EA92FB;
+			remoteInfo = iOSDemo;
+		};
+		334F248B208895E00048EC4F /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146D728B1AB782920058798C /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 149D81511DBD2ADD00A9EB1A;
+			remoteInfo = "SweetUIKit-iOS";
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -196,7 +211,6 @@
 		149D81521DBD2ADD00A9EB1A /* SweetUIKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SweetUIKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		149D816C1DBD2AFB00A9EB1A /* SweetUIKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SweetUIKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		149D81811DBD2E8000A9EB1A /* SweetUIKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SweetUIKit.h; sourceTree = "<group>"; };
-		14C0AF801BD6D4230009ECBE /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = "<group>"; };
 		14C0AF811BD6D4230009ECBE /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
 		14C0AF821BD6D4230009ECBE /* CONTRIBUTING.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CONTRIBUTING.md; sourceTree = "<group>"; };
 		14C0AF831BD6D4230009ECBE /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -258,6 +272,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				334F248E20889A330048EC4F /* SweetUIKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -281,18 +296,10 @@
 		140124C21DBF582900EA92FB /* iOSDemo */ = {
 			isa = PBXGroup;
 			children = (
-				9F2BDE1C1E092B0C00E32CAD /* EditViewController.swift */,
-				14D986631DBF58A900D7842C /* CollectionController.swift */,
-				14D986641DBF58A900D7842C /* CollectionViewCell.swift */,
-				14D986651DBF58A900D7842C /* Localizable.strings */,
-				14D986661DBF58A900D7842C /* TableController.swift */,
-				14D986671DBF58A900D7842C /* TableViewCell.swift */,
-				2B440A6A1EA9EB0A00AC33F8 /* SearchableCollectionViewController.swift */,
-				2B3FEEE81EAA04BB00EF8D20 /* DemoViewController.swift */,
 				140124C31DBF582900EA92FB /* AppDelegate.swift */,
-				140124CA1DBF582900EA92FB /* Assets.xcassets */,
-				140124CC1DBF582900EA92FB /* LaunchScreen.storyboard */,
-				140124CF1DBF582900EA92FB /* Info.plist */,
+				338FEBCA2086172E0024366A /* Resources */,
+				338FEBC9208616E00024366A /* Cells */,
+				338FEBC8208616BC0024366A /* ViewControllers */,
 				9F589E761EAF42D200C1B294 /* RevealServer.framework */,
 			);
 			path = iOSDemo;
@@ -340,6 +347,7 @@
 				14028E471E92881D00EEE567 /* UITests-App */,
 				14028E581E92888600EEE567 /* UITests-Tests */,
 				146D72941AB782920058798C /* Products */,
+				334F248D20889A330048EC4F /* Frameworks */,
 			);
 			indentWidth = 4;
 			sourceTree = "<group>";
@@ -395,7 +403,6 @@
 			isa = PBXGroup;
 			children = (
 				14C47E0D1CD2AE5F004A48DF /* Info.plist */,
-				14C0AF801BD6D4230009ECBE /* .travis.yml */,
 				14C0AF811BD6D4230009ECBE /* CHANGELOG.md */,
 				14C0AF821BD6D4230009ECBE /* CONTRIBUTING.md */,
 				14F393961CC6517E00616696 /* LICENSE.md */,
@@ -431,6 +438,45 @@
 			path = Sources;
 			sourceTree = "<group>";
 		};
+		334F248D20889A330048EC4F /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		338FEBC8208616BC0024366A /* ViewControllers */ = {
+			isa = PBXGroup;
+			children = (
+				14D986631DBF58A900D7842C /* CollectionController.swift */,
+				2B3FEEE81EAA04BB00EF8D20 /* DemoViewController.swift */,
+				9F2BDE1C1E092B0C00E32CAD /* EditViewController.swift */,
+				2B440A6A1EA9EB0A00AC33F8 /* SearchableCollectionViewController.swift */,
+				14D986661DBF58A900D7842C /* TableController.swift */,
+			);
+			path = ViewControllers;
+			sourceTree = "<group>";
+		};
+		338FEBC9208616E00024366A /* Cells */ = {
+			isa = PBXGroup;
+			children = (
+				14D986641DBF58A900D7842C /* CollectionViewCell.swift */,
+				14D986671DBF58A900D7842C /* TableViewCell.swift */,
+			);
+			path = Cells;
+			sourceTree = "<group>";
+		};
+		338FEBCA2086172E0024366A /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				140124CA1DBF582900EA92FB /* Assets.xcassets */,
+				140124CF1DBF582900EA92FB /* Info.plist */,
+				140124CC1DBF582900EA92FB /* LaunchScreen.storyboard */,
+				14D986651DBF58A900D7842C /* Localizable.strings */,
+			);
+			path = Resources;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -498,6 +544,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				334F248C208895E00048EC4F /* PBXTargetDependency */,
 			);
 			name = iOSDemo;
 			productName = iOSDemo;
@@ -554,6 +601,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				334F248A20876FE30048EC4F /* PBXTargetDependency */,
 			);
 			name = iOSTests;
 			productName = PodTests;
@@ -622,7 +670,7 @@
 			attributes = {
 				CLASSPREFIX = "";
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					140124C01DBF582900EA92FB = {
@@ -935,6 +983,16 @@
 			target = 14028E261E9285BE00EEE567 /* UITests-App */;
 			targetProxy = 14028E5C1E92888600EEE567 /* PBXContainerItemProxy */;
 		};
+		334F248A20876FE30048EC4F /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 140124C01DBF582900EA92FB /* iOSDemo */;
+			targetProxy = 334F248920876FE30048EC4F /* PBXContainerItemProxy */;
+		};
+		334F248C208895E00048EC4F /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 149D81511DBD2ADD00A9EB1A /* SweetUIKit-iOS */;
+			targetProxy = 334F248B208895E00048EC4F /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -973,12 +1031,13 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 29X3GG489T;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/iOSDemo",
 				);
-				INFOPLIST_FILE = iOSDemo/Info.plist;
+				INFOPLIST_FILE = iOSDemo/Resources/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.usesweet.iOSDemo;
@@ -998,12 +1057,13 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 29X3GG489T;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/iOSDemo",
 				);
-				INFOPLIST_FILE = iOSDemo/Info.plist;
+				INFOPLIST_FILE = iOSDemo/Resources/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.usesweet.iOSDemo;
@@ -1103,12 +1163,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1154,12 +1216,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1190,6 +1254,7 @@
 		146D72BA1AB782920058798C /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/iOSDemo.app/iOSDemo";
 				CLANG_ENABLE_MODULES = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				FRAMEWORK_SEARCH_PATHS = "";
@@ -1204,12 +1269,14 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOSDemo.app/iOSDemo";
 			};
 			name = Debug;
 		};
 		146D72BB1AB782920058798C /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/iOSDemo.app/iOSDemo";
 				CLANG_ENABLE_MODULES = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				FRAMEWORK_SEARCH_PATHS = "";
@@ -1219,6 +1286,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 4.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOSDemo.app/iOSDemo";
 			};
 			name = Release;
 		};
diff --git a/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Demo.xcodeproj/xcshareddata/xcschemes/SweetUIKit-iOS.xcscheme b/Demo.xcodeproj/xcshareddata/xcschemes/SweetUIKit-iOS.xcscheme
index 26ac155..b286d9f 100644
--- a/Demo.xcodeproj/xcshareddata/xcschemes/SweetUIKit-iOS.xcscheme
+++ b/Demo.xcodeproj/xcshareddata/xcschemes/SweetUIKit-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -37,7 +36,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Demo.xcodeproj/xcshareddata/xcschemes/SweetUIKit-tvOS.xcscheme b/Demo.xcodeproj/xcshareddata/xcschemes/SweetUIKit-tvOS.xcscheme
index 0b24024..817c52a 100644
--- a/Demo.xcodeproj/xcshareddata/xcschemes/SweetUIKit-tvOS.xcscheme
+++ b/Demo.xcodeproj/xcshareddata/xcschemes/SweetUIKit-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -37,7 +36,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Demo.xcodeproj/xcshareddata/xcschemes/UITests-App.xcscheme b/Demo.xcodeproj/xcshareddata/xcschemes/UITests-App.xcscheme
index 0a55864..8863c2b 100644
--- a/Demo.xcodeproj/xcshareddata/xcschemes/UITests-App.xcscheme
+++ b/Demo.xcodeproj/xcshareddata/xcschemes/UITests-App.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Demo.xcodeproj/xcshareddata/xcschemes/iOSDemo.xcscheme b/Demo.xcodeproj/xcshareddata/xcschemes/iOSDemo.xcscheme
index 5309809..f133a68 100644
--- a/Demo.xcodeproj/xcshareddata/xcschemes/iOSDemo.xcscheme
+++ b/Demo.xcodeproj/xcshareddata/xcschemes/iOSDemo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
+      codeCoverageEnabled = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +56,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Demo.xcodeproj/xcshareddata/xcschemes/iOSTests.xcscheme b/Demo.xcodeproj/xcshareddata/xcschemes/iOSTests.xcscheme
index f3fc3cb..b77433c 100644
--- a/Demo.xcodeproj/xcshareddata/xcschemes/iOSTests.xcscheme
+++ b/Demo.xcodeproj/xcshareddata/xcschemes/iOSTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
+      codeCoverageEnabled = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +56,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -81,15 +80,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "146D72AB1AB782920058798C"
-            BuildableName = "iOSTests.xctest"
-            BlueprintName = "iOSTests"
-            ReferencedContainer = "container:Demo.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/Demo.xcodeproj/xcshareddata/xcschemes/tvOSTests.xcscheme b/Demo.xcodeproj/xcshareddata/xcschemes/tvOSTests.xcscheme
index 5b6bbc8..60b8b76 100755
--- a/Demo.xcodeproj/xcshareddata/xcschemes/tvOSTests.xcscheme
+++ b/Demo.xcodeproj/xcshareddata/xcschemes/tvOSTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
+      codeCoverageEnabled = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -47,7 +47,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Tests/StringTests.swift b/Tests/StringTests.swift
index 1d0245a..9f24521 100644
--- a/Tests/StringTests.swift
+++ b/Tests/StringTests.swift
@@ -18,6 +18,16 @@ class StringTests: XCTestCase {
 
         string = "aa"
         XCTAssertEqual(floor(string.width(for: smallFont)), 16)
-        XCTAssertEqual(floor(string.width(for: bigFont)), 32)
+
+        switch bigFont.fontName {
+        case ".SFUIDisplay-Semibold":
+            // Used on iOS
+            XCTAssertEqual(floor(string.width(for: bigFont)), 32)
+        case ".SFUIText-Bold":
+            // Used on tvOS, is a bit fatter
+            XCTAssertEqual(floor(string.width(for: bigFont)), 33)
+        default:
+            XCTFail("Unexpected default large font: \(bigFont.fontName)")
+        }
     }
 }
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 09d7e90..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-machine:
-  xcode:
-    version: "9.0"
diff --git a/iOSDemo/CollectionViewCell.swift b/iOSDemo/Cells/CollectionViewCell.swift
similarity index 100%
rename from iOSDemo/CollectionViewCell.swift
rename to iOSDemo/Cells/CollectionViewCell.swift
diff --git a/iOSDemo/TableViewCell.swift b/iOSDemo/Cells/TableViewCell.swift
similarity index 100%
rename from iOSDemo/TableViewCell.swift
rename to iOSDemo/Cells/TableViewCell.swift
diff --git a/iOSDemo/Assets.xcassets/AppIcon.appiconset/Contents.json b/iOSDemo/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from iOSDemo/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to iOSDemo/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/iOSDemo/Base.lproj/LaunchScreen.storyboard b/iOSDemo/Resources/Base.lproj/LaunchScreen.storyboard
similarity index 100%
rename from iOSDemo/Base.lproj/LaunchScreen.storyboard
rename to iOSDemo/Resources/Base.lproj/LaunchScreen.storyboard
diff --git a/iOSDemo/Info.plist b/iOSDemo/Resources/Info.plist
similarity index 100%
rename from iOSDemo/Info.plist
rename to iOSDemo/Resources/Info.plist
diff --git a/iOSDemo/Localizable.strings b/iOSDemo/Resources/Localizable.strings
similarity index 100%
rename from iOSDemo/Localizable.strings
rename to iOSDemo/Resources/Localizable.strings
diff --git a/iOSDemo/CollectionController.swift b/iOSDemo/ViewControllers/CollectionController.swift
similarity index 100%
rename from iOSDemo/CollectionController.swift
rename to iOSDemo/ViewControllers/CollectionController.swift
diff --git a/iOSDemo/DemoViewController.swift b/iOSDemo/ViewControllers/DemoViewController.swift
similarity index 99%
rename from iOSDemo/DemoViewController.swift
rename to iOSDemo/ViewControllers/DemoViewController.swift
index 88e6baa..d86de8a 100644
--- a/iOSDemo/DemoViewController.swift
+++ b/iOSDemo/ViewControllers/DemoViewController.swift
@@ -7,6 +7,7 @@ enum DemoItem: Int {
 
     static var titles: [String] {
         let allItems: [DemoItem] = [.edit, .collection, .searchableCollection]
+
         return allItems.map { $0.title }
     }
 
diff --git a/iOSDemo/EditViewController.swift b/iOSDemo/ViewControllers/EditViewController.swift
similarity index 100%
rename from iOSDemo/EditViewController.swift
rename to iOSDemo/ViewControllers/EditViewController.swift
diff --git a/iOSDemo/SearchableCollectionViewController.swift b/iOSDemo/ViewControllers/SearchableCollectionViewController.swift
similarity index 100%
rename from iOSDemo/SearchableCollectionViewController.swift
rename to iOSDemo/ViewControllers/SearchableCollectionViewController.swift
diff --git a/iOSDemo/TableController.swift b/iOSDemo/ViewControllers/TableController.swift
similarity index 100%
rename from iOSDemo/TableController.swift
rename to iOSDemo/ViewControllers/TableController.swift