diff --git a/LokiKit/LokiKit.podspec b/LokiKit/LokiKit.podspec
index e16e29303..fbdcaced5 100644
--- a/LokiKit/LokiKit.podspec
+++ b/LokiKit/LokiKit.podspec
@@ -1,16 +1,8 @@
-#
-#  Be sure to run `pod spec lint LokiKit.podspec' to ensure this is a
-#  valid spec and to remove all comments including this before submitting the spec.
-#
-#  To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html
-#  To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/
-#
-
 Pod::Spec.new do |s|
 
   s.name         = "LokiKit"
-  s.version      = "0.0.1"
-  s.summary      = "A library used to add loki functionality to the messenger"
+  s.version      = "1.0.0"
+  s.summary      = "A library containing Loki specific tools used in Session."
 
   s.description  = <<-DESC
   A library used to add loki functionality to the messenger
@@ -27,18 +19,6 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.source_files = 'src/**/*.{h,m,mm,swift}'
 
-  # We want to use modules to avoid clobbering CocoaLumberjack macros defined
-  # by other OWS modules which *also* import CocoaLumberjack. But because we
-  # also use Objective-C++, modules are disabled unless we explicitly enable
-  # them
-
-  # s.compiler_flags = "-fcxx-modules"
-
-  # s.prefix_header_file = 'SignalServiceKit/src/TSPrefix.h'
-  # s.xcconfig = { 'OTHER_CFLAGS' => '$(inherited) -DSQLITE_HAS_CODEC' }
-
-  # s.resources = ["SignalServiceKit/Resources/Certificates/*"]
-
   s.dependency 'Curve25519Kit'
   s.dependency 'CryptoSwift'
   s.dependency 'SignalCoreKit'
diff --git a/LokiKit/LokiKit.xcodeproj/project.pbxproj b/LokiKit/LokiKit.xcodeproj/project.pbxproj
index 5d7781fb0..dbd51b2f6 100644
--- a/LokiKit/LokiKit.xcodeproj/project.pbxproj
+++ b/LokiKit/LokiKit.xcodeproj/project.pbxproj
@@ -51,7 +51,7 @@
 		24B23963227BBA2D008EFC1C /* LokiKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LokiKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		24B23968227BBA2D008EFC1C /* LokiKitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LokiKitTests.swift; sourceTree = "<group>"; };
 		24B2396A227BBA2D008EFC1C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		24B2398B227BBB21008EFC1C /* LokiKit.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; fileEncoding = 4; path = LokiKit.podspec; sourceTree = SOURCE_ROOT; };
+		24B2398B227BBB21008EFC1C /* LokiKit.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; fileEncoding = 4; path = LokiKit.podspec; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		24B2398E227BBEDA008EFC1C /* CryptoSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CryptoSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		24B23990227BBEDC008EFC1C /* Curve25519Kit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Curve25519Kit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		24B23992227BBEE2008EFC1C /* SignalServiceKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SignalServiceKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -92,10 +92,10 @@
 			isa = PBXGroup;
 			children = (
 				2470AF5E227BD02E00D2F01F /* japanese.txt */,
-				2470AF5F227BD02E00D2F01F /* Mnemonic.swift */,
 				2470AF60227BD02E00D2F01F /* english.txt */,
 				2470AF61227BD02E00D2F01F /* spanish.txt */,
 				2470AF62227BD02E00D2F01F /* portuguese.txt */,
+				2470AF5F227BD02E00D2F01F /* Mnemonic.swift */,
 			);
 			path = Mnemonic;
 			sourceTree = "<group>";
diff --git a/LokiKit/LokiKit/Supporting Files/LokiKit.h b/LokiKit/LokiKit/Supporting Files/LokiKit.h
index 87d17e152..25a6961e6 100644
--- a/LokiKit/LokiKit/Supporting Files/LokiKit.h	
+++ b/LokiKit/LokiKit/Supporting Files/LokiKit.h	
@@ -1,8 +1,4 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-// 
-
-#import <UIKit/UIKit.h>
+@import UIKit
 
 //! Project version number for LokiKit.
 FOUNDATION_EXPORT double LokiKitVersionNumber;
@@ -10,7 +6,5 @@ FOUNDATION_EXPORT double LokiKitVersionNumber;
 //! Project version string for LokiKit.
 FOUNDATION_EXPORT const unsigned char LokiKitVersionString[];
 
-// In this header, you should import all the public headers of your framework using statements like #import <LokiKit/PublicHeader.h>
+// Public headers
 #import "ECKeyPair.h"
-
-
diff --git a/LokiKit/LokiKitTests/LokiKitTests.swift b/LokiKit/LokiKitTests/LokiKitTests.swift
index 0559a5d7b..96da252f9 100644
--- a/LokiKit/LokiKitTests/LokiKitTests.swift
+++ b/LokiKit/LokiKitTests/LokiKitTests.swift
@@ -1,11 +1,7 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-// 
-
 import XCTest
 @testable import LokiKit
 
-class LokiKitTests: XCTestCase {
+class LokiKitTests : XCTestCase {
 
     override func setUp() {
         // Put setup code here. This method is called before the invocation of each test method in the class.
@@ -22,9 +18,8 @@ class LokiKitTests: XCTestCase {
 
     func testPerformanceExample() {
         // This is an example of a performance test case.
-        self.measure {
+        measure {
             // Put the code you want to measure the time of here.
         }
     }
-
 }
diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj
index e0389f85d..5fdd6fcbc 100644
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@@ -1456,12 +1456,12 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		2482B0C8227BD34D00143B38 /* Loki */ = {
+		2482B0C8227BD34D00143B38 /* Loki Utilities */ = {
 			isa = PBXGroup;
 			children = (
 				2482B0C9227BD34D00143B38 /* LokiMessagingAPI.swift */,
 			);
-			path = Loki;
+			path = "Loki Utilities";
 			sourceTree = "<group>";
 		};
 		34074F54203D0722004596AE /* Sounds */ = {
@@ -2429,7 +2429,6 @@
 				3496956121A301A100DCFE74 /* Backup */,
 				B90418E4183E9DD40038554A /* DateUtil.h */,
 				B90418E5183E9DD40038554A /* DateUtil.m */,
-				2482B0C8227BD34D00143B38 /* Loki */,
 				34B0796C1FCF46B000E248C2 /* MainAppContext.h */,
 				34B0796B1FCF46B000E248C2 /* MainAppContext.m */,
 				34D99C911F2937CC00D284D6 /* OWSAnalytics.swift */,
@@ -2680,6 +2679,7 @@
 				B67EBF5C19194AC60084CCFD /* Settings.bundle */,
 				B657DDC91911A40500F45B0C /* Signal.entitlements */,
 				34074F54203D0722004596AE /* Sounds */,
+				2482B0C8227BD34D00143B38 /* Loki Utilities */,
 				76EB03C118170B33006006FC /* src */,
 				D221A094169C9E5E00537ABF /* Supporting Files */,
 				B660F66C1C29867F00687D6E /* test */,
diff --git a/Signal/src/util/Loki/LokiMessagingAPI.swift b/Signal/Loki Utilities/LokiMessagingAPI.swift
similarity index 100%
rename from Signal/src/util/Loki/LokiMessagingAPI.swift
rename to Signal/Loki Utilities/LokiMessagingAPI.swift