diff --git a/SignalServiceKit/src/Util/Collection+OWS.swift b/SignalMessaging/categories/Collection+OWS.swift
similarity index 100%
rename from SignalServiceKit/src/Util/Collection+OWS.swift
rename to SignalMessaging/categories/Collection+OWS.swift
diff --git a/SignalServiceKit/src/Util/NSAttributedString+OWS.h b/SignalMessaging/categories/NSAttributedString+OWS.h
similarity index 100%
rename from SignalServiceKit/src/Util/NSAttributedString+OWS.h
rename to SignalMessaging/categories/NSAttributedString+OWS.h
diff --git a/SignalServiceKit/src/Util/NSAttributedString+OWS.m b/SignalMessaging/categories/NSAttributedString+OWS.m
similarity index 88%
rename from SignalServiceKit/src/Util/NSAttributedString+OWS.m
rename to SignalMessaging/categories/NSAttributedString+OWS.m
index 203ddb308..bd6d3fa93 100644
--- a/SignalServiceKit/src/Util/NSAttributedString+OWS.m
+++ b/SignalMessaging/categories/NSAttributedString+OWS.m
@@ -10,8 +10,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @implementation NSAttributedString (OWS)
 
-- (NSAttributedString *)rtlSafeAppend:(NSString *)text
-                           attributes:(NSDictionary *)attributes
+- (NSAttributedString *)rtlSafeAppend:(NSString *)text attributes:(NSDictionary *)attributes
 {
     OWSAssert(text);
     OWSAssert(attributes);
diff --git a/SignalServiceKit/src/Util/NSString+OWS.h b/SignalMessaging/categories/NSString+OWS.h
similarity index 100%
rename from SignalServiceKit/src/Util/NSString+OWS.h
rename to SignalMessaging/categories/NSString+OWS.h
diff --git a/SignalServiceKit/src/Util/NSString+OWS.m b/SignalMessaging/categories/NSString+OWS.m
similarity index 100%
rename from SignalServiceKit/src/Util/NSString+OWS.m
rename to SignalMessaging/categories/NSString+OWS.m
diff --git a/SignalServiceKit/src/Util/String+OWS.swift b/SignalMessaging/categories/String+OWS.swift
similarity index 100%
rename from SignalServiceKit/src/Util/String+OWS.swift
rename to SignalMessaging/categories/String+OWS.swift
diff --git a/SignalServiceKit/src/Util/Theme.h b/SignalMessaging/categories/Theme.h
similarity index 100%
rename from SignalServiceKit/src/Util/Theme.h
rename to SignalMessaging/categories/Theme.h
diff --git a/SignalServiceKit/src/Util/Theme.m b/SignalMessaging/categories/Theme.m
similarity index 100%
rename from SignalServiceKit/src/Util/Theme.m
rename to SignalMessaging/categories/Theme.m
diff --git a/SignalServiceKit/src/Util/UIColor+OWS.h b/SignalMessaging/categories/UIColor+OWS.h
similarity index 98%
rename from SignalServiceKit/src/Util/UIColor+OWS.h
rename to SignalMessaging/categories/UIColor+OWS.h
index 621a1f0cb..0be600dab 100644
--- a/SignalServiceKit/src/Util/UIColor+OWS.h
+++ b/SignalMessaging/categories/UIColor+OWS.h
@@ -30,7 +30,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark - ConversationColor
 
-+ (nullable UIColor *)ows_conversationColorForColorName:(NSString *)colorName NS_SWIFT_NAME(ows_conversationColor(colorName:));
++ (nullable UIColor *)ows_conversationColorForColorName:(NSString *)colorName
+    NS_SWIFT_NAME(ows_conversationColor(colorName:));
 + (nullable NSString *)ows_conversationColorNameForColor:(UIColor *)color
     NS_SWIFT_NAME(ows_conversationColorName(color:));
 
diff --git a/SignalServiceKit/src/Util/UIColor+OWS.m b/SignalMessaging/categories/UIColor+OWS.m
similarity index 91%
rename from SignalServiceKit/src/Util/UIColor+OWS.m
rename to SignalMessaging/categories/UIColor+OWS.m
index 525c5e01a..7caee12dd 100644
--- a/SignalServiceKit/src/Util/UIColor+OWS.m
+++ b/SignalMessaging/categories/UIColor+OWS.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
-#import "UIColor+OWS.h"
 #import "OWSMath.h"
+#import "UIColor+OWS.h"
 #import <SignalServiceKit/Cryptography.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -278,19 +278,19 @@ NS_ASSUME_NONNULL_BEGIN
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         colorMap = @{
-                     @"red" : self.ows_red700Color,
-                     @"pink": self.ows_pink600Color,
-                     @"purple": self.ows_purple600Color,
-                     @"indigo": self.ows_indigo600Color,
-                     @"blue": self.ows_blue700Color,
-                     @"cyan": self.ows_cyan800Color,
-                     @"teal": self.ows_teal700Color,
-                     @"green": self.ows_green800Color,
-                     @"deep_orange": self.ows_deepOrange900Color,
-                     @"grey": self.ows_grey600Color
-                     };
+            @"red" : self.ows_red700Color,
+            @"pink" : self.ows_pink600Color,
+            @"purple" : self.ows_purple600Color,
+            @"indigo" : self.ows_indigo600Color,
+            @"blue" : self.ows_blue700Color,
+            @"cyan" : self.ows_cyan800Color,
+            @"teal" : self.ows_teal700Color,
+            @"green" : self.ows_green800Color,
+            @"deep_orange" : self.ows_deepOrange900Color,
+            @"grey" : self.ows_grey600Color
+        };
     });
-    
+
     return colorMap;
 }
 
@@ -307,7 +307,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (nullable UIColor *)ows_conversationColorForColorName:(NSString *)colorName
 {
     OWSAssert(colorName.length > 0);
-    
+
     return [self.ows_conversationColorMap objectForKey:colorName];
 }
 
diff --git a/SignalServiceKit/src/Util/UIDevice+featureSupport.swift b/SignalMessaging/categories/UIDevice+featureSupport.swift
similarity index 100%
rename from SignalServiceKit/src/Util/UIDevice+featureSupport.swift
rename to SignalMessaging/categories/UIDevice+featureSupport.swift
diff --git a/SignalServiceKit/src/Util/UIFont+OWS.h b/SignalMessaging/categories/UIFont+OWS.h
similarity index 100%
rename from SignalServiceKit/src/Util/UIFont+OWS.h
rename to SignalMessaging/categories/UIFont+OWS.h
diff --git a/SignalServiceKit/src/Util/UIFont+OWS.m b/SignalMessaging/categories/UIFont+OWS.m
similarity index 100%
rename from SignalServiceKit/src/Util/UIFont+OWS.m
rename to SignalMessaging/categories/UIFont+OWS.m
diff --git a/SignalServiceKit/src/Util/UIView+OWS.h b/SignalMessaging/categories/UIView+OWS.h
similarity index 100%
rename from SignalServiceKit/src/Util/UIView+OWS.h
rename to SignalMessaging/categories/UIView+OWS.h
diff --git a/SignalServiceKit/src/Util/UIView+OWS.m b/SignalMessaging/categories/UIView+OWS.m
similarity index 100%
rename from SignalServiceKit/src/Util/UIView+OWS.m
rename to SignalMessaging/categories/UIView+OWS.m
index 7ff361669..0041884f7 100644
--- a/SignalServiceKit/src/Util/UIView+OWS.m
+++ b/SignalMessaging/categories/UIView+OWS.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
-#import "UIView+OWS.h"
 #import "OWSMath.h"
+#import "UIView+OWS.h"
 #import <SignalServiceKit/AppContext.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Util/UIViewController+OWS.h b/SignalMessaging/categories/UIViewController+OWS.h
similarity index 100%
rename from SignalServiceKit/src/Util/UIViewController+OWS.h
rename to SignalMessaging/categories/UIViewController+OWS.h
diff --git a/SignalServiceKit/src/Util/UIViewController+OWS.m b/SignalMessaging/categories/UIViewController+OWS.m
similarity index 97%
rename from SignalServiceKit/src/Util/UIViewController+OWS.m
rename to SignalMessaging/categories/UIViewController+OWS.m
index 012b7635d..34b83d949 100644
--- a/SignalServiceKit/src/Util/UIViewController+OWS.m
+++ b/SignalMessaging/categories/UIViewController+OWS.m
@@ -73,7 +73,8 @@ NS_ASSUME_NONNULL_BEGIN
     // in a UIBarButtonItem.
     [backButton addTarget:target action:selector forControlEvents:UIControlEventTouchUpInside];
 
-    UIImage *backImage = [[UIImage imageNamed:(isRTL ? @"NavBarBackRTL" : @"NavBarBack")] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+    UIImage *backImage = [[UIImage imageNamed:(isRTL ? @"NavBarBackRTL" : @"NavBarBack")]
+        imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
     OWSAssert(backImage);
     [backButton setImage:backImage forState:UIControlStateNormal];
     backButton.tintColor = Theme.navbarIconColor;
diff --git a/SignalServiceKit/src/Contacts/ContactsUpdater.m b/SignalServiceKit/src/Contacts/ContactsUpdater.m
index 4fa4ddb79..f89157f3c 100644
--- a/SignalServiceKit/src/Contacts/ContactsUpdater.m
+++ b/SignalServiceKit/src/Contacts/ContactsUpdater.m
@@ -9,6 +9,7 @@
 #import "OWSRequestFactory.h"
 #import "PhoneNumber.h"
 #import "TSNetworkManager.h"
+#import "Threading.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <YapDatabase/YapDatabase.h>