diff --git a/AppwiseCore.podspec b/AppwiseCore.podspec
index 84e167f..30f148d 100644
--- a/AppwiseCore.podspec
+++ b/AppwiseCore.podspec
@@ -25,34 +25,42 @@ Pod::Spec.new do |s|
 	}
 	s.preserve_paths = ['Scripts/*', 'Sourcery/*']
 	s.default_subspec = 'Core', 'Behaviours', 'UI'
+
+	# VC behaviours
+	s.subspec 'Behaviours' do |ss|
+		ss.source_files = 'Sources/Behaviours/**/*.swift'
+
+		# dependencies
+		ss.dependency 'AppwiseCore/Common'
+		ss.dependency 'Then'
+	end
 	
-	# core spec
-	s.subspec 'Core' do |ss|
-		ss.source_files = 'Sources/Core/**/*.swift'
+	# Common files
+	s.subspec 'Common' do |ss|
+		ss.source_files = 'Sources/Common/**/*.swift'
 		ss.pod_target_xcconfig = {
 			'SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=Debug]' => 'DEBUG'
 		}
+	end
+	
+	# core spec
+	s.subspec 'Core' do |ss|
+		ss.source_files = 'Sources/Core/**/*.swift'
 		
 		# dependencies
+		ss.dependency 'AppwiseCore/Common'
 		ss.dependency 'Alamofire'
 		ss.dependency 'CocoaLumberjack/Swift'
 		ss.dependency 'CrashlyticsRecorder'
 		ss.dependency 'Then'
 	end
-
-	# VC behaviours
-	s.subspec 'Behaviours' do |ss|
-		ss.source_files = 'Sources/Behaviours/**/*.swift'
-
-		# dependencies
-		ss.dependency 'Then'
-	end
 	
 	# coredata
 	s.subspec 'CoreData' do |ss|
 		ss.source_files = 'Sources/CoreData/**/*.swift'
 
 		# dependencies
+		ss.dependency 'AppwiseCore/Common'
 		ss.dependency 'AppwiseCore/Core'
 		ss.dependency 'Groot'
 		ss.dependency 'SugarRecord/CoreData'
@@ -64,6 +72,7 @@ Pod::Spec.new do |s|
 
 		# dependencies
 		ss.dependency 'AppwiseCore/Behaviours'
+		ss.dependency 'AppwiseCore/Common'
 	end
 	
 	# UI
diff --git a/Sources/Core/Other/Require.swift b/Sources/Common/Require.swift
similarity index 100%
rename from Sources/Core/Other/Require.swift
rename to Sources/Common/Require.swift
diff --git a/Sources/Core/Core+Deprecations.swift b/Sources/Common/SwiftSupport.swift
similarity index 98%
rename from Sources/Core/Core+Deprecations.swift
rename to Sources/Common/SwiftSupport.swift
index c340a44..de2e571 100644
--- a/Sources/Core/Core+Deprecations.swift
+++ b/Sources/Common/SwiftSupport.swift
@@ -1,5 +1,5 @@
 //
-//  Deprecations.swift
+//  SwiftSupport.swift
 //  AppwiseCore
 //
 //  Created by David Jennes on 06/03/2017.