diff --git a/MockingbirdFramework.podspec b/MockingbirdFramework.podspec
index db15baac..7cdc3659 100644
--- a/MockingbirdFramework.podspec
+++ b/MockingbirdFramework.podspec
@@ -2,23 +2,34 @@ Pod::Spec.new do |s|
   s.name                        = 'MockingbirdFramework'
   s.module_name                 = 'Mockingbird'
   s.version                     = `/usr/libexec/PlistBuddy -c 'Print :CFBundleShortVersionString' Sources/MockingbirdFramework/Info.plist`
-  s.summary                     = 'A convenient mocking framework for Swift.'
+  s.summary                     = 'A Swifty mocking framework for Swift and Objective-C.'
   s.homepage                    = 'https://github.com/birdrides/mockingbird'
-  s.license                     = { :type => 'MIT', :file => 'LICENSE' }
+  s.license                     = { :type => 'MIT', :file => 'LICENSE.md' }
   s.author                      = { 'Andrew Chang' => 'typealiased@gmail.com' }
   s.source                      = { :git => s.homepage + '.git', :tag => s.version }
-  s.source_files                = 'Sources/MockingbirdFramework/**/*.{swift,h,m,mm}'
   s.ios.deployment_target       = '9.0'
   s.osx.deployment_target       = '10.10'
   s.tvos.deployment_target      = '9.0'
   s.watchos.deployment_target   = '7.4'
-  s.frameworks                  = 'XCTest'
-  s.user_target_xcconfig        = { 'FRAMEWORK_SEARCH_PATHS' => '$(PLATFORM_DIR)/Developer/Library/Frameworks' }
-  s.pod_target_xcconfig         = { 'ENABLE_BITCODE' => 'NO', 'ENABLE_TESTABILITY' => 'YES' }
   s.swift_version               = '5.0'
-  s.preserve_paths              = [ 'README.md',
-                                    'LICENSE.md',
-                                    'mockingbird',
-                                    'Scripts/Resources/CodesigningRequirements/*',
-                                    'Sources/MockingbirdFramework/Info.plist' ]
+  s.preserve_paths              = [
+    'README.md',
+    'LICENSE.md',
+    'mockingbird',
+    'Scripts/Resources/CodesigningRequirements/*',
+    'Sources/MockingbirdFramework/Info.plist',
+  ]
+
+  s.subspec 'Common' do |common|
+    common.source_files         = 'Sources/MockingbirdCommon/**/*.swift'
+  end
+
+  s.subspec 'Core' do |core|
+    core.dependency 'MockingbirdFramework/Common'
+    core.source_files           = 'Sources/MockingbirdFramework/**/*.{swift,h,m,mm}'
+    core.exclude_files          = 'Sources/MockingbirdFramework/Utilities/ExportedModules.swift'
+    core.frameworks             = 'XCTest'
+    core.user_target_xcconfig   = { 'FRAMEWORK_SEARCH_PATHS' => '$(PLATFORM_DIR)/Developer/Library/Frameworks' }
+    core.pod_target_xcconfig    = { 'ENABLE_BITCODE' => 'NO', 'ENABLE_TESTABILITY' => 'YES' }
+  end
 end
diff --git a/Sources/MockingbirdFramework/Utilities/StackTrace.swift b/Sources/MockingbirdFramework/Utilities/StackTrace.swift
index 2f773a36..fa60eec6 100644
--- a/Sources/MockingbirdFramework/Utilities/StackTrace.swift
+++ b/Sources/MockingbirdFramework/Utilities/StackTrace.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import MockingbirdCommon
 
 struct StackTrace {
   let callStackSymbols: [String]