diff --git a/Packages/ComposeUI/Sources/ComposeUI/Controllers/AutocompleteEmojisController.swift b/Packages/ComposeUI/Sources/ComposeUI/Controllers/AutocompleteEmojisController.swift
index 5bdea88f..1ea23b0b 100644
--- a/Packages/ComposeUI/Sources/ComposeUI/Controllers/AutocompleteEmojisController.swift
+++ b/Packages/ComposeUI/Sources/ComposeUI/Controllers/AutocompleteEmojisController.swift
@@ -8,6 +8,7 @@
 import SwiftUI
 import Pachyderm
 import Combine
+import TuskerComponents
 
 class AutocompleteEmojisController: ViewController {
     unowned let composeController: ComposeController
diff --git a/Packages/ComposeUI/Sources/ComposeUI/Controllers/AutocompleteHashtagsController.swift b/Packages/ComposeUI/Sources/ComposeUI/Controllers/AutocompleteHashtagsController.swift
index 674fce4d..cb8e4e12 100644
--- a/Packages/ComposeUI/Sources/ComposeUI/Controllers/AutocompleteHashtagsController.swift
+++ b/Packages/ComposeUI/Sources/ComposeUI/Controllers/AutocompleteHashtagsController.swift
@@ -8,6 +8,7 @@
 import SwiftUI
 import Combine
 import Pachyderm
+import TuskerComponents
 
 class AutocompleteHashtagsController: ViewController {
     unowned let composeController: ComposeController
diff --git a/Packages/ComposeUI/Sources/ComposeUI/FuzzyMatcher.swift b/Packages/TuskerComponents/Sources/TuskerComponents/FuzzyMatcher.swift
similarity index 93%
rename from Packages/ComposeUI/Sources/ComposeUI/FuzzyMatcher.swift
rename to Packages/TuskerComponents/Sources/TuskerComponents/FuzzyMatcher.swift
index a1344836..a29da8ad 100644
--- a/Packages/ComposeUI/Sources/ComposeUI/FuzzyMatcher.swift
+++ b/Packages/TuskerComponents/Sources/TuskerComponents/FuzzyMatcher.swift
@@ -1,6 +1,6 @@
 //
 //  FuzzyMatcher.swift
-//  ComposeUI
+//  TuskerComponents
 //
 //  Created by Shadowfacts on 10/10/20.
 //  Copyright © 2020 Shadowfacts. All rights reserved.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-struct FuzzyMatcher {
+public struct FuzzyMatcher {
     
     private init() {}
     
@@ -21,7 +21,7 @@ struct FuzzyMatcher {
     /// +2 points for every char in `pattern` that occurs in `str` sequentially
     /// -2 points for every char in `pattern` that does not occur in `str` sequentially
     /// -1 point for every char in `str` skipped between matching chars from the `pattern`
-    static func match(pattern: String, str: String) -> (matched: Bool, score: Int) {
+    public static func match(pattern: String, str: String) -> (matched: Bool, score: Int) {
         let pattern = pattern.lowercased()
         let str = str.lowercased()