diff --git a/Hakawai.xcodeproj/project.pbxproj b/Hakawai.xcodeproj/project.pbxproj
index 35905eb..7c8641f 100644
--- a/Hakawai.xcodeproj/project.pbxproj
+++ b/Hakawai.xcodeproj/project.pbxproj
@@ -11,7 +11,7 @@
 		77004FD7B4A6E9EDAD723CA9 /* libPods-Hakawai.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6238CF1B85D9D08466AD7A9C /* libPods-Hakawai.a */; };
 		7B2F035424E366C300C98454 /* HKWMentionsPluginV1.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B2F035024E366C200C98454 /* HKWMentionsPluginV1.m */; };
 		7B2F035524E366C300C98454 /* HKWMentionsPluginV2.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B2F035324E366C300C98454 /* HKWMentionsPluginV2.m */; };
-		81453A84260A39A100BDA3F7 /* HKWExternalMentionConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 81453A83260A39A100BDA3F7 /* HKWExternalMentionConstants.m */; };
+		81453A9F260B7FFC00BDA3F7 /* HKWExternalMentionConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 81453A9D260B7FFC00BDA3F7 /* HKWExternalMentionConstants.m */; };
 		8B5E141025A313AA0044A675 /* HKWMentionsCreationStateMachine.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B5E140E25A313AA0044A675 /* HKWMentionsCreationStateMachine.m */; };
 		9C65FBC81F607DEB004A9CB4 /* HKWLayoutManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C65FBC61F607DEB004A9CB4 /* HKWLayoutManagerTests.m */; };
 		9C65FBC91F607DEB004A9CB4 /* HKWMentionsPluginTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C65FBC71F607DEB004A9CB4 /* HKWMentionsPluginTests.m */; };
@@ -85,8 +85,8 @@
 		7B2F035124E366C200C98454 /* HKWMentionsPluginV1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HKWMentionsPluginV1.h; path = Mentions/HKWMentionsPluginV1.h; sourceTree = "<group>"; };
 		7B2F035224E366C200C98454 /* HKWMentionsPluginV2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HKWMentionsPluginV2.h; path = Mentions/HKWMentionsPluginV2.h; sourceTree = "<group>"; };
 		7B2F035324E366C300C98454 /* HKWMentionsPluginV2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HKWMentionsPluginV2.m; path = Mentions/HKWMentionsPluginV2.m; sourceTree = "<group>"; };
-		81453A82260A39A100BDA3F7 /* HKWExternalMentionConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HKWExternalMentionConstants.h; sourceTree = "<group>"; };
-		81453A83260A39A100BDA3F7 /* HKWExternalMentionConstants.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HKWExternalMentionConstants.m; sourceTree = "<group>"; };
+		81453A9D260B7FFC00BDA3F7 /* HKWExternalMentionConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HKWExternalMentionConstants.m; path = Mentions/HKWExternalMentionConstants.m; sourceTree = "<group>"; };
+		81453A9E260B7FFC00BDA3F7 /* HKWExternalMentionConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HKWExternalMentionConstants.h; path = Mentions/HKWExternalMentionConstants.h; sourceTree = "<group>"; };
 		8B5E140E25A313AA0044A675 /* HKWMentionsCreationStateMachine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HKWMentionsCreationStateMachine.m; path = Mentions/HKWMentionsCreationStateMachine.m; sourceTree = "<group>"; };
 		8BF83FE125CB210500B856F8 /* HKWMentionsCreationStateMachineDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HKWMentionsCreationStateMachineDelegate.h; path = Mentions/HKWMentionsCreationStateMachineDelegate.h; sourceTree = "<group>"; };
 		91FF0C96BCF39C932C98A368 /* Pods-HakawaiTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HakawaiTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-HakawaiTests/Pods-HakawaiTests.debug.xcconfig"; sourceTree = "<group>"; };
@@ -259,6 +259,8 @@
 		E1B3088819A2C1140096DE0E /* Mentions */ = {
 			isa = PBXGroup;
 			children = (
+				81453A9E260B7FFC00BDA3F7 /* HKWExternalMentionConstants.h */,
+				81453A9D260B7FFC00BDA3F7 /* HKWExternalMentionConstants.m */,
 				8BF83FE125CB210500B856F8 /* HKWMentionsCreationStateMachineDelegate.h */,
 				E1B308A919A2CC0F0096DE0E /* _HKWMentionsPrivateConstants.h */,
 				E1B3088E19A2C1890096DE0E /* HKWMentionsEntityProtocol.h */,
@@ -277,8 +279,6 @@
 				7B2F035024E366C200C98454 /* HKWMentionsPluginV1.m */,
 				7B2F035224E366C200C98454 /* HKWMentionsPluginV2.h */,
 				7B2F035324E366C300C98454 /* HKWMentionsPluginV2.m */,
-				81453A82260A39A100BDA3F7 /* HKWExternalMentionConstants.h */,
-				81453A83260A39A100BDA3F7 /* HKWExternalMentionConstants.m */,
 			);
 			name = Mentions;
 			sourceTree = "<group>";
@@ -535,7 +535,7 @@
 				E11DF8D119EC8DA30072F4AD /* HKWTextView+TextTransformation.m in Sources */,
 				E1B3088619A2C0D60096DE0E /* HKWLayoutManager.m in Sources */,
 				E1B3088219A2C0D60096DE0E /* HKWTextView+Extras.m in Sources */,
-				81453A84260A39A100BDA3F7 /* HKWExternalMentionConstants.m in Sources */,
+				81453A9F260B7FFC00BDA3F7 /* HKWExternalMentionConstants.m in Sources */,
 				7B2F035424E366C300C98454 /* HKWMentionsPluginV1.m in Sources */,
 				7B2F035524E366C300C98454 /* HKWMentionsPluginV2.m in Sources */,
 				E1B308A719A2C21A0096DE0E /* HKWDefaultChooserView.m in Sources */,
diff --git a/Hakawai/HKWExternalMentionConstants.h b/Hakawai/Mentions/HKWExternalMentionConstants.h
similarity index 100%
rename from Hakawai/HKWExternalMentionConstants.h
rename to Hakawai/Mentions/HKWExternalMentionConstants.h
diff --git a/Hakawai/HKWExternalMentionConstants.m b/Hakawai/Mentions/HKWExternalMentionConstants.m
similarity index 100%
rename from Hakawai/HKWExternalMentionConstants.m
rename to Hakawai/Mentions/HKWExternalMentionConstants.m