diff --git a/core/CollectionClass.inc b/core/CollectionClass.inc
index 397a4a9d..4d337435 100644
--- a/core/CollectionClass.inc
+++ b/core/CollectionClass.inc
@@ -498,8 +498,8 @@ class CollectionClass {
    */
   function showFieldSets($page_number) {
     module_load_include('inc', 'fedora_repository', 'api/fedora_item');
-    module_load_include('inc', 'fedora_repository', 'CollectionManagement');
-    module_load_include('inc', 'fedora_repository', 'BatchIngest');
+    module_load_include('inc', 'fedora_repository', 'core/CollectionManagement');
+    module_load_include('inc', 'fedora_repository', 'core/BatchIngest');
     global $base_url;
     $tabset = array();
     global $user;
diff --git a/core/formClass.inc b/core/formClass.inc
index 48cc0ef7..a469fa01 100644
--- a/core/formClass.inc
+++ b/core/formClass.inc
@@ -432,7 +432,7 @@ class formClass {
    * @return type 
    */
   function can_ingest_here($collection_pid) {
-    module_load_include('inc', 'fedora_repository', 'SecurityClass');
+    module_load_include('inc', 'fedora_repository', 'core/SecurityClass');
     $securityClass = new SecurityClass();
     return $securityClass->canIngestHere($collection_pid);
   }
@@ -447,7 +447,7 @@ class formClass {
       drupal_set_message(t('You do not have permission to ingest.'), 'error');
       return FALSE;
     }
-    module_load_include('inc', 'fedora_repository', 'SecurityClass');
+    module_load_include('inc', 'fedora_repository', 'core/SecurityClass');
     $security_class = new SecurityClass();
     if (!$security_class->canIngestHere($collection_pid)) {
       // Queries the collection object for a child security datastream and if found parses it
diff --git a/fedora_repository.module b/fedora_repository.module
index 989c6290..43286b73 100644
--- a/fedora_repository.module
+++ b/fedora_repository.module
@@ -1265,7 +1265,7 @@ function fedora_repository_search_page($resultData) {
  */
 function fedora_repository_form_alter(&$form, &$form_state, $form_id) {
 // Advanced node search form
-  module_load_include('inc', 'fedora_repository', 'SearchClass');
+  module_load_include('inc', 'fedora_repository', 'core/SearchClass');
   $path = drupal_get_path('module', 'fedora_repository');
   if ($form_id == 'search_form' && arg(1) == 'fedora_repository' && user_access('use advanced search')) {
     $default_value = $form['basic']['inline']['keys']['#default_value'];
@@ -1368,7 +1368,7 @@ function fedora_repository_theme() {
  * @return type 
  */
 function fedora_repository_list_terms($field, $startTerm = NULL, $displayName = NULL) {
-  module_load_include('inc', 'fedora_repository', 'SearchClass');
+  module_load_include('inc', 'fedora_repository', 'core/SearchClass');
   $searchClass = new SearchClass();
   return $searchClass->getTerms($field, $startTerm, $displayName);
 }
@@ -1378,7 +1378,7 @@ function fedora_repository_list_terms($field, $startTerm = NULL, $displayName =
  * @return type 
  */
 function fedora_repository_mnpl_advanced_search_form() {
-  module_load_include('inc', 'fedora_repository', 'SearchClass');
+  module_load_include('inc', 'fedora_repository', 'core/SearchClass');
   $searchClass = new SearchClass();
   return $searchClass->build_advanced_search_form();
 }
@@ -1389,7 +1389,7 @@ function fedora_repository_mnpl_advanced_search_form() {
  * @return type 
  */
 function theme_fedora_repository_mnpl_advanced_search_form($form) {
-  module_load_include('inc', 'fedora_repository', 'SearchClass');
+  module_load_include('inc', 'fedora_repository', 'core/SearchClass');
   $advanced_search_form = new SearchClass();
   return $advanced_search_form->theme_advanced_search_form($form);
 }
@@ -1401,7 +1401,7 @@ function theme_fedora_repository_mnpl_advanced_search_form($form) {
  * @return type 
  */
 function fedora_repository_mnpl_advanced_search($query, $startPage = 1) {
-  module_load_include('inc', 'fedora_repository', 'SearchClass');
+  module_load_include('inc', 'fedora_repository', 'core/SearchClass');
   $searchClass = new SearchClass();
   $retVal = $searchClass->custom_search($query, $startPage);
   return $searchClass->custom_search($query, $startPage);
diff --git a/plugins/PersonalCollectionClass.inc b/plugins/PersonalCollectionClass.inc
index b81d75df..ea16c5a5 100644
--- a/plugins/PersonalCollectionClass.inc
+++ b/plugins/PersonalCollectionClass.inc
@@ -119,7 +119,7 @@ class PersonalCollectionClass {
    * @return type 
    */
   function createPolicyStream($user, $dom, $rootElement) {
-    module_load_include('inc', 'fedora_repository', 'SecurityClass');
+    module_load_include('inc', 'fedora_repository', 'core/SecurityClass');
 
     $securityClass = new SecurityClass();
     $policyStreamDoc = $securityClass->createPersonalPolicy($user);
diff --git a/plugins/Refworks.inc b/plugins/Refworks.inc
index 50361526..f1558a5e 100644
--- a/plugins/Refworks.inc
+++ b/plugins/Refworks.inc
@@ -7,7 +7,7 @@
  * Refworks class
  */
 
-module_load_include('inc', 'fedora_repository', 'SecurityClass');
+module_load_include('inc', 'fedora_repository', 'core/SecurityClass');
 
 /**
  * Refworks class