diff --git a/MVMCoreUI/Atoms/Buttons/ButtonDelegateProtocol.h b/MVMCoreUI/Atoms/Buttons/ButtonDelegateProtocol.h
index 7570b8ab..15fa1379 100644
--- a/MVMCoreUI/Atoms/Buttons/ButtonDelegateProtocol.h
+++ b/MVMCoreUI/Atoms/Buttons/ButtonDelegateProtocol.h
@@ -5,7 +5,7 @@
 //  Created by Scott Pfeil on 2/25/16.
 //  Copyright © 2016 Verizon Wireless. All rights reserved.
 //
-#import "MFButtonProtocol.h"
+#import <MVMCoreUI/MFButtonProtocol.h>
 
 @protocol ButtonDelegateProtocol <NSObject>
 
diff --git a/MVMCoreUI/Atoms/Buttons/MFCustomButton.h b/MVMCoreUI/Atoms/Buttons/MFCustomButton.h
index 52a462e9..93d94092 100644
--- a/MVMCoreUI/Atoms/Buttons/MFCustomButton.h
+++ b/MVMCoreUI/Atoms/Buttons/MFCustomButton.h
@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import <MVMCore/MVMCoreActionDelegateProtocol.h>
+@import MVMCore.MVMCoreActionDelegateProtocol;
 #import <MVMCoreUI/ButtonDelegateProtocol.h>
 #import <MVMCoreUI/MFButtonProtocol.h>
 
diff --git a/MVMCoreUI/Atoms/Buttons/MFCustomButton.m b/MVMCoreUI/Atoms/Buttons/MFCustomButton.m
index d9e3570c..0a78856c 100644
--- a/MVMCoreUI/Atoms/Buttons/MFCustomButton.m
+++ b/MVMCoreUI/Atoms/Buttons/MFCustomButton.m
@@ -7,10 +7,10 @@
 //
 
 #import "MFCustomButton.h"
-#import <MVMCore/MVMCoreSessionObject.h>
-#import <MVMCore/MVMCoreActionHandler.h>
-#import <MVMCore/MVMCoreJSONConstants.h>
-#import <MVMCore/NSDictionary+MFConvenience.h>
+@import MVMCore.MVMCoreSessionObject;
+@import MVMCore.MVMCoreActionHandler;
+@import MVMCore.MVMCoreJSONConstants;
+@import MVMCore.NSDictionary_MFConvenience;
 #import "MVMCoreUIUtility.h"
 #import "MVMCoreUIConstants.h"
 
diff --git a/MVMCoreUI/Atoms/Buttons/MFTextButton.m b/MVMCoreUI/Atoms/Buttons/MFTextButton.m
index 8dc2ae46..f9423c30 100644
--- a/MVMCoreUI/Atoms/Buttons/MFTextButton.m
+++ b/MVMCoreUI/Atoms/Buttons/MFTextButton.m
@@ -11,8 +11,8 @@
 #import <MVMCoreUI/MFSizeObject.h>
 #import "UIColor+MFConvenience.h"
 #import "MVMCoreUISplitViewController.h"
-#import <MVMCore/MVMCoreDispatchUtility.h>
-#import <MVMCore/MVMCoreGetterUtility.h>
+@import MVMCore.MVMCoreDispatchUtility;
+@import MVMCore.MVMCoreGetterUtility;
 
 @interface MFTextButton ()
 
diff --git a/MVMCoreUI/Atoms/Buttons/PrimaryButton.m b/MVMCoreUI/Atoms/Buttons/PrimaryButton.m
index cffd5f8b..c780aef8 100644
--- a/MVMCoreUI/Atoms/Buttons/PrimaryButton.m
+++ b/MVMCoreUI/Atoms/Buttons/PrimaryButton.m
@@ -8,11 +8,11 @@
 
 #import "PrimaryButton.h"
 #import <MVMCoreUI/MFSizeObject.h>
-#import <MVMCore/MVMCoreDispatchUtility.h>
-#import <MVMCore/MVMCoreGetterUtility.h>
 #import "MVMCoreUISplitViewController.h"
 #import "MFStyler.h"
 #import "UIColor+MFConvenience.h"
+@import MVMCore.MVMCoreDispatchUtility;
+@import MVMCore.MVMCoreGetterUtility;
 
 @interface PrimaryButton ()
 
diff --git a/MVMCoreUI/Atoms/TextFields/MFDigitTextBox.m b/MVMCoreUI/Atoms/TextFields/MFDigitTextBox.m
index 49abe4cd..ce0430d0 100644
--- a/MVMCoreUI/Atoms/TextFields/MFDigitTextBox.m
+++ b/MVMCoreUI/Atoms/TextFields/MFDigitTextBox.m
@@ -12,9 +12,9 @@
 #import "UIColor+MFConvenience.h"
 #import <MVMCoreUI/MFSizeObject.h>
 #import "MVMCoreUISplitViewController.h"
-#import <MVMCore/MVMCoreDispatchUtility.h>
-#import <MVMCore/MVMCoreGetterUtility.h>
 #import "SeparatorView.h"
+@import MVMCore.MVMCoreDispatchUtility;
+@import MVMCore.MVMCoreGetterUtility;
 
 @interface MFDigitTextBox()
 
diff --git a/MVMCoreUI/Atoms/TextFields/MFDigitTextField.m b/MVMCoreUI/Atoms/TextFields/MFDigitTextField.m
index 26b28f08..d04cd56c 100644
--- a/MVMCoreUI/Atoms/TextFields/MFDigitTextField.m
+++ b/MVMCoreUI/Atoms/TextFields/MFDigitTextField.m
@@ -16,9 +16,9 @@
 #import "MFDigitTextBox.h"
 #import <MVMCoreUI/MFSizeObject.h>
 #import "MVMCoreUISplitViewController.h"
-#import <MVMCore/MVMCoreDispatchUtility.h>
 #import "MVMCoreUIUtility.h"
 #import "MVMCoreUIConstants.h"
+@import MVMCore.MVMCoreDispatchUtility;
 
 @interface MFDigitTextField () <UITextFieldDelegate, MFDigitTextBoxDelegate>
 
diff --git a/MVMCoreUI/Atoms/TextFields/MFMdnTextField.m b/MVMCoreUI/Atoms/TextFields/MFMdnTextField.m
index 84e0869e..6313f00c 100644
--- a/MVMCoreUI/Atoms/TextFields/MFMdnTextField.m
+++ b/MVMCoreUI/Atoms/TextFields/MFMdnTextField.m
@@ -7,9 +7,9 @@
 //
 
 #import "MFMdnTextField.h"
-#import <MVMCore/MVMCoreJSONConstants.h>
+@import MVMCore.MVMCoreJSONConstants;
+@import MVMCore.MVMCoreNavigationHandler;
 #import "MVMCoreUICommonViewsUtility.h"
-#import <MVMCore/MVMCoreNavigationHandler.h>
 #import "UIColor+MFConvenience.h"
 #import "MVMCoreUIUtility.h"
 #import "MVMCoreUIConstants.h"
diff --git a/MVMCoreUI/Atoms/TextFields/MFTextField.m b/MVMCoreUI/Atoms/TextFields/MFTextField.m
index 2e41a4ca..7cdab21a 100644
--- a/MVMCoreUI/Atoms/TextFields/MFTextField.m
+++ b/MVMCoreUI/Atoms/TextFields/MFTextField.m
@@ -9,15 +9,15 @@
 #import "MFTextField.h"
 #import "DashLine.h"
 #import "MFTextFieldSubclassExtension.h"
-#import <MVMCore/MVMCoreDispatchUtility.h>
 #import "MFStyler.h"
 #import "UIColor+MFConvenience.h"
-#import <MVMCore/NSDictionary+MFConvenience.h>
 #import "MVMCoreUICommonViewsUtility.h"
-#import <MVMCore/MVMCoreJSONConstants.h>
 #import "MFLabel.h"
 #import "MVMCoreUIUtility.h"
 #import "MVMCoreUIConstants.h"
+@import MVMCore.MVMCoreDispatchUtility;
+@import MVMCore.NSDictionary_MFConvenience;
+@import MVMCore.MVMCoreJSONConstants;
 
 @interface MFTextField()
 
diff --git a/MVMCoreUI/Atoms/Views/DashLine.m b/MVMCoreUI/Atoms/Views/DashLine.m
index 0837daa3..b99f4dab 100644
--- a/MVMCoreUI/Atoms/Views/DashLine.m
+++ b/MVMCoreUI/Atoms/Views/DashLine.m
@@ -8,7 +8,7 @@
 
 #import "DashLine.h"
 #import "UIColor+MFConvenience.h"
-#import <MVMCore/MVMCoreDispatchUtility.h>
+@import MVMCore.MVMCoreDispatchUtility;
 
 @implementation DashLine
 
diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m
index 1b7b0860..9167884e 100644
--- a/MVMCoreUI/Atoms/Views/MFLabel.m
+++ b/MVMCoreUI/Atoms/Views/MFLabel.m
@@ -12,7 +12,7 @@
 #import "UIColor+MFConvenience.h"
 #import "MFFonts.h"
 #import "MVMCoreUISplitViewController.h"
-#import <MVMCore/MVMCoreGetterUtility.h>
+@import MVMCore.MVMCoreGetterUtility;
 
 @interface MFLabel ()
 
diff --git a/MVMCoreUI/Atoms/Views/MFLoadImageView.h b/MVMCoreUI/Atoms/Views/MFLoadImageView.h
index 261cb810..895da071 100644
--- a/MVMCoreUI/Atoms/Views/MFLoadImageView.h
+++ b/MVMCoreUI/Atoms/Views/MFLoadImageView.h
@@ -9,7 +9,7 @@
 
 #import <Foundation/Foundation.h>
 #import <MVMCoreUI/MFTransparentGIFView.h>
-#import <MVMCore/MVMCoreCache.h>
+@import MVMCore.MVMCoreCache;
 
 @class MFLoadingSpinner;
 
diff --git a/MVMCoreUI/Atoms/Views/MFLoadImageView.m b/MVMCoreUI/Atoms/Views/MFLoadImageView.m
index c8397fc9..2a0572da 100644
--- a/MVMCoreUI/Atoms/Views/MFLoadImageView.m
+++ b/MVMCoreUI/Atoms/Views/MFLoadImageView.m
@@ -8,12 +8,12 @@
 
 #import "MFLoadImageView.h"
 #import "MFLoadingSpinner.h"
-#import <MVMCore/NSDictionary+MFConvenience.h>
-#import <MVMCore/MVMCoreDispatchUtility.h>
-#import <MVMCore/MVMCoreGetterUtility.h>
-#import <MVMCore/MVMCoreCache.h>
 #import "NSLayoutConstraint+MFConvenience.h"
 #import "MVMCoreUIUtility.h"
+@import MVMCore.NSDictionary_MFConvenience;
+@import MVMCore.MVMCoreDispatchUtility;
+@import MVMCore.MVMCoreGetterUtility;
+@import MVMCore.MVMCoreCache;
 
 @interface MFLoadImageView ()
 
diff --git a/MVMCoreUI/Atoms/Views/MFTextView.m b/MVMCoreUI/Atoms/Views/MFTextView.m
index df4206d7..1e734e3f 100644
--- a/MVMCoreUI/Atoms/Views/MFTextView.m
+++ b/MVMCoreUI/Atoms/Views/MFTextView.m
@@ -9,8 +9,8 @@
 #import "MFTextView.h"
 #import "UIColor+MFConvenience.h"
 #import "MVMCoreUIUtility.h"
-#import <MVMCore/MVMCoreConstants.h>
 #import "MVMCoreUIConstants.h"
+@import MVMCore.MVMCoreConstants;
 
 @protocol CustomTextViewDelegate <UITextViewDelegate>
 
diff --git a/MVMCoreUI/Atoms/Views/MFTransparentGIFView.m b/MVMCoreUI/Atoms/Views/MFTransparentGIFView.m
index a2e15eb8..8c05e1f1 100644
--- a/MVMCoreUI/Atoms/Views/MFTransparentGIFView.m
+++ b/MVMCoreUI/Atoms/Views/MFTransparentGIFView.m
@@ -8,9 +8,9 @@
 
 #import "MFTransparentGIFView.h"
 #import "FLAnimatedImage.h"
-#import <MVMCore/MFFreebeeHandler.h>
-#import <MVMCore/MVMCoreConstants.h>
 #import "MVMCoreUIUtility.h"
+@import MVMCore.MFFreebeeHandler;
+@import MVMCore.MVMCoreConstants;
 
 @interface MFTransparentGIFView ()
 
diff --git a/MVMCoreUI/Atoms/Views/MFView.h b/MVMCoreUI/Atoms/Views/MFView.h
index 9980073c..e985d1a9 100644
--- a/MVMCoreUI/Atoms/Views/MFView.h
+++ b/MVMCoreUI/Atoms/Views/MFView.h
@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import <MVMCore/MVMCoreViewProtocol.h>
+@import MVMCore.MVMCoreViewProtocol;
 
 @interface MFView : UIView <MVMCoreViewProtocol>
 
diff --git a/MVMCoreUI/Atoms/Views/ViewConstrainingView.m b/MVMCoreUI/Atoms/Views/ViewConstrainingView.m
index 55ce29aa..c8ecd3d6 100644
--- a/MVMCoreUI/Atoms/Views/ViewConstrainingView.m
+++ b/MVMCoreUI/Atoms/Views/ViewConstrainingView.m
@@ -7,8 +7,8 @@
 //
 
 #import "ViewConstrainingView.h"
-#import <MVMCore/MVMCoreConstants.h>
-#import <MVMCore/MVMCoreDispatchUtility.h>
+@import MVMCore.MVMCoreConstants;
+@import MVMCore.MVMCoreDispatchUtility;
 #import "MFStyler.h"
 
 @interface ViewConstrainingView ()