diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/coreutils/Bundle.properties-MERGED
index 17791d159d..a0d535f8e6 100755
--- a/Core/src/org/sleuthkit/autopsy/coreutils/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/Bundle.properties-MERGED
@@ -1,3 +1,10 @@
+FileTypeCategory.Audio.displayName=Audio
+FileTypeCategory.Documents.displayName=Documents
+FileTypeCategory.Executables.displayName=Executables
+FileTypeCategory.Image.displayName=Image
+FileTypeCategory.Media.displayName=Media
+FileTypeCategory.Video.displayName=Video
+FileTypeCategory.Visual.displayName=Visual
 # {0} - file name
 GetOrGenerateThumbnailTask.generatingPreviewFor=Generating preview for {0}
 # {0} - file name
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/utils/FileTypeUtils.java b/Core/src/org/sleuthkit/autopsy/coreutils/FileTypeUtils.java
similarity index 100%
rename from Core/src/org/sleuthkit/autopsy/datamodel/utils/FileTypeUtils.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/FileTypeUtils.java
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/utils/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/datamodel/utils/Bundle.properties-MERGED
deleted file mode 100755
index adfec95fa3..0000000000
--- a/Core/src/org/sleuthkit/autopsy/datamodel/utils/Bundle.properties-MERGED
+++ /dev/null
@@ -1,7 +0,0 @@
-FileTypeCategory.Audio.displayName=Audio
-FileTypeCategory.Documents.displayName=Documents
-FileTypeCategory.Executables.displayName=Executables
-FileTypeCategory.Image.displayName=Image
-FileTypeCategory.Media.displayName=Media
-FileTypeCategory.Video.displayName=Video
-FileTypeCategory.Visual.displayName=Visual