diff --git a/content_models/COLLECTIONCM.xml b/content_models/COLLECTIONCM.xml
index 91d6f8f9..e60288d8 100644
--- a/content_models/COLLECTIONCM.xml
+++ b/content_models/COLLECTIONCM.xml
@@ -1,5 +1,5 @@
 
-<content_model xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Collection" version="2" xsi:schemaLocation="http://www.islandora.ca http://localhost/islandoracm.xsd">
+<content_model xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Collection" version="2" xsi:schemaLocation="http://www.islandora.ca http://localhost/xsl/islandoracm.xsd">
     <mimetypes>
         <type>text/xml</type>
         <type>text/plain</type>
diff --git a/core/ContentModel.inc b/core/ContentModel.inc
index 0b232eea..a6698152 100644
--- a/core/ContentModel.inc
+++ b/core/ContentModel.inc
@@ -15,7 +15,7 @@ module_load_include('inc', 'fedora_repository', 'core/XMLDatastream');
  */
 class ContentModel extends XMLDatastream {
 
-  static $SCHEMA_URI = 'http://localhost/islandoracm.xsd';
+  static $SCHEMA_URI = 'http://localhost/xsl/islandoracm.xsd';
   static $DEFAULT_DSID = 'ISLANDORACM';
   private $mimes = NULL;
   public $pid_namespace;
diff --git a/core/SearchClass.inc b/core/SearchClass.inc
index fd15de40..36392fe4 100644
--- a/core/SearchClass.inc
+++ b/core/SearchClass.inc
@@ -50,7 +50,7 @@ class SearchClass {
    * @return type 
    */
   function build_solr_search_form($repeat = NULL, $pathToSearchTerms = NULL, $query = NULL) {
-    $types = $this->get_search_terms_array(NULL, 'solrSearchTerms.xml');
+    $types = $this->get_search_terms_array(NULL, 'xsl/solrSearchTerms.xml');
     $queryArray = NULL;
     if (isset($query)) {
       $queryArray = explode('AND', $query);
@@ -594,7 +594,7 @@ class SearchClass {
     }
     $xmlDoc = new DomDocument();
     if (!isset($file)) {
-      $file = 'searchTerms.xml';
+      $file = 'xsl/searchTerms.xml';
     }
     $xmlDoc->load($path . '/' . $file);
     $nodeList = $xmlDoc->getElementsByTagName('term');
diff --git a/core/formClass.inc b/core/formClass.inc
index 923f0418..203f170d 100644
--- a/core/formClass.inc
+++ b/core/formClass.inc
@@ -52,7 +52,7 @@ class formClass {
     $items['xsl/islandoracm.xsd'] = array(
       'title' => t('Islandora Content Model XML Schema Definition'),
       'page callback' => 'fedora_repository_display_schema',
-      'page arguments' => array('islandoracm.xsd'),
+      'page arguments' => array('xsl/islandoracm.xsd'),
       'type' => MENU_CALLBACK,
       'access arguments' => array('view fedora collection'),
     );
diff --git a/fedora_repository.module b/fedora_repository.module
index 43286b73..1038d87f 100644
--- a/fedora_repository.module
+++ b/fedora_repository.module
@@ -1139,7 +1139,7 @@ function fedora_repository_search($op = 'search', $keys = NULL) {
 
         $path = drupal_get_path('module', 'fedora_repository');
         $xmlDoc = new DomDocument();
-        $xmlDoc->load($path . '/searchTerms.xml');
+        $xmlDoc->load($path . '/xsl/searchTerms.xml');
         $nodeList = $xmlDoc->getElementsByTagName('default');
         if (!$type) {
 //$type = 'dc.description';
@@ -1293,7 +1293,7 @@ function fedora_repository_form_alter(&$form, &$form_state, $form_id) {
       '#suffix' => '</div>',
     );
     $xmlDoc = new DomDocument();
-    $xmlDoc->load($path . '/searchTerms.xml');
+    $xmlDoc->load($path . '/xsl/searchTerms.xml');
     $nodeList = $xmlDoc->getElementsByTagName('term');
     $searchClass = new SearchClass();
     $types = $searchClass->get_search_terms_array();
diff --git a/installer_files/foxml/islandora-collectionCModel.xml b/installer_files/foxml/islandora-collectionCModel.xml
index 83876580..1514cb79 100644
--- a/installer_files/foxml/islandora-collectionCModel.xml
+++ b/installer_files/foxml/islandora-collectionCModel.xml
@@ -87,7 +87,7 @@
       MIMETYPE="application/xml" SIZE="4646">
             <foxml:xmlContent>
                 <content_model name="Collection" xmlns="http://www.islandora.ca"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.islandora.ca http://localhost/islandoracm.xsd">
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.islandora.ca http://localhost/xsl/islandoracm.xsd">
                     <mimetypes>
                         <type>text/xml</type>
                         <type>text/plain</type>
diff --git a/installer_files/foxml/islandora-strictpdfCModel.xml b/installer_files/foxml/islandora-strictpdfCModel.xml
index 9a6ded18..b025d80b 100644
--- a/installer_files/foxml/islandora-strictpdfCModel.xml
+++ b/installer_files/foxml/islandora-strictpdfCModel.xml
@@ -686,7 +686,7 @@
       LABEL="Islandora content model datastream" MIMETYPE="text/xml" SIZE="5473">
             <foxml:xmlContent>
                 <content_model name="strict_pdf" xmlns="http://www.islandora.ca"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.islandora.ca http://localhost/islandoracm.xsd">
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.islandora.ca http://localhost/xsl/islandoracm.xsd">
                     <mimetypes>
                         <type>application/pdf</type>
                     </mimetypes>