diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.java
index 0bad76d40d98b331909a2ba3619dea6a2ac69cd0..a4d6fe7b17bf9a14dfa06f8d39a8873ff7946994 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.java
@@ -19,7 +19,7 @@
 package org.sleuthkit.autopsy.commonfilesearch;
 
 import org.sleuthkit.autopsy.guiutils.DataSourceComboBoxModel;
-import org.sleuthkit.autopsy.guiutils.DataSourceLoader;
+import org.sleuthkit.autopsy.datamodel.utils.DataSourceLoader;
 import java.awt.Dimension;
 import java.sql.SQLException;
 import java.util.ArrayList;
diff --git a/Core/src/org/sleuthkit/autopsy/guiutils/DataSourceLoader.java b/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/guiutils/DataSourceLoader.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java
index deb333780ae172d4c31002769c9f73bd2ede3c21..0c1329d9f67abb6324568f5efa0ac3a7a3e41c86 100644
--- a/Core/src/org/sleuthkit/autopsy/guiutils/DataSourceLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/utils/DataSourceLoader.java
@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.guiutils;
+package org.sleuthkit.autopsy.datamodel.utils;
 
 import java.io.File;
 import java.sql.ResultSet;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/case_uco/ReportCaseUcoConfigPanel.java b/Core/src/org/sleuthkit/autopsy/modules/case_uco/ReportCaseUcoConfigPanel.java
index 4ed5a8f6249e24e22e15f84e7e816a88f606b10b..d2859fd6bc96631c0bee2a5d9b3ec4e3c0285474 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/case_uco/ReportCaseUcoConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/case_uco/ReportCaseUcoConfigPanel.java
@@ -24,7 +24,7 @@
 import java.util.Map.Entry;
 import javax.swing.ComboBoxModel;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
-import org.sleuthkit.autopsy.guiutils.DataSourceLoader;
+import org.sleuthkit.autopsy.datamodel.utils.DataSourceLoader;
 import org.sleuthkit.autopsy.guiutils.DataSourceComboBoxModel;
 import org.sleuthkit.datamodel.TskCoreException;
 
diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/InterCaseTestUtils.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/InterCaseTestUtils.java
index 5148f68670645d20e180d897c9db2ee51195fbf4..0a237315fe7dfc9d405ce9eb23ea68686bc351a0 100644
--- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/InterCaseTestUtils.java
+++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/InterCaseTestUtils.java
@@ -56,7 +56,7 @@
 import org.sleuthkit.autopsy.commonfilesearch.CentralRepoCommonAttributeInstance;
 import org.sleuthkit.autopsy.commonfilesearch.CentralRepoCommonAttributeInstanceNode;
 import org.sleuthkit.autopsy.commonfilesearch.CommonAttributeCountSearchResults;
-import org.sleuthkit.autopsy.guiutils.DataSourceLoader;
+import org.sleuthkit.autopsy.datamodel.utils.DataSourceLoader;
 import org.sleuthkit.autopsy.commonfilesearch.CommonAttributeValue;
 import org.sleuthkit.autopsy.commonfilesearch.CommonAttributeValueList;
 import org.sleuthkit.autopsy.datamodel.DisplayableItemNode;
diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseTestUtils.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseTestUtils.java
index 6177b5c3050d6fb27141c7c34b46f0d4873dc472..339b174f77446c2d79a2676b7b0c0fb78ed53a58 100644
--- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseTestUtils.java
+++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseTestUtils.java
@@ -34,7 +34,7 @@
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.commonfilesearch.AbstractCommonAttributeInstance;
 import org.sleuthkit.autopsy.commonfilesearch.CommonAttributeCountSearchResults;
-import org.sleuthkit.autopsy.guiutils.DataSourceLoader;
+import org.sleuthkit.autopsy.datamodel.utils.DataSourceLoader;
 import org.sleuthkit.autopsy.commonfilesearch.CommonAttributeValue;
 import org.sleuthkit.autopsy.commonfilesearch.CommonAttributeValueList;
 import org.sleuthkit.autopsy.coreutils.TimeStampUtils;