diff --git a/includes/tuque.inc b/includes/tuque.inc
index ec278192..09bbe792 100644
--- a/includes/tuque.inc
+++ b/includes/tuque.inc
@@ -8,25 +8,25 @@
 $islandora_module_path = drupal_get_path('module', 'islandora');
 
 // Do this until we expose these in a module or library.
-@include_once 'sites/all/libraries/tuque/Datastream.php';
-@include_once 'sites/all/libraries/tuque/FedoraApi.php';
-@include_once 'sites/all/libraries/tuque/FedoraApiSerializer.php';
-@include_once 'sites/all/libraries/tuque/Object.php';
-@include_once 'sites/all/libraries/tuque/RepositoryConnection.php';
+@include_once 'sites/all/libraries/tuque/implementations/fedora3/Datastream.php';
+@include_once 'sites/all/libraries/tuque/implementations/fedora3/FedoraApi.php';
+@include_once 'sites/all/libraries/tuque/implementations/fedora3/FedoraApiSerializer.php';
+@include_once 'sites/all/libraries/tuque/implementations/fedora3/Object.php';
+@include_once 'sites/all/libraries/tuque/implementations/fedora3/RepositoryConnection.php';
+@include_once 'sites/all/libraries/tuque/implementaitons/fedora3/Repository.php';
+@include_once 'sites/all/libraries/tuque/implementations/fedora3/FedoraRelationships.php';
 @include_once 'sites/all/libraries/tuque/Cache.php';
 @include_once 'sites/all/libraries/tuque/RepositoryException.php';
-@include_once 'sites/all/libraries/tuque/Repository.php';
-@include_once 'sites/all/libraries/tuque/FedoraRelationships.php';
 
-@include_once "$islandora_module_path/libraries/tuque/Datastream.php";
-@include_once "$islandora_module_path/libraries/tuque/FedoraApi.php";
-@include_once "$islandora_module_path/libraries/tuque/FedoraApiSerializer.php";
-@include_once "$islandora_module_path/libraries/tuque/Object.php";
-@include_once "$islandora_module_path/libraries/tuque/RepositoryConnection.php";
+@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/Datastream.php";
+@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/FedoraApi.php";
+@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/FedoraApiSerializer.php";
+@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/Object.php";
+@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/RepositoryConnection.php";
+@include_once "$islandora_module_path/libraries/tuque/implementaitons/fedora3/Repository.php";
+@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/FedoraRelationships.php";
 @include_once "$islandora_module_path/libraries/tuque/Cache.php";
 @include_once "$islandora_module_path/libraries/tuque/RepositoryException.php";
-@include_once "$islandora_module_path/libraries/tuque/Repository.php";
-@include_once "$islandora_module_path/libraries/tuque/FedoraRelationships.php";
 
 class IslandoraTuque {
 
diff --git a/includes/tuque_wrapper.inc b/includes/tuque_wrapper.inc
index 14a770e2..ad86c0a9 100644
--- a/includes/tuque_wrapper.inc
+++ b/includes/tuque_wrapper.inc
@@ -11,25 +11,25 @@
 $islandora_module_path = drupal_get_path('module', 'islandora');
 
 // @todo this until we expost these in a module or library
-@include_once 'sites/all/libraries/tuque/Datastream.php';
-@include_once 'sites/all/libraries/tuque/FedoraApi.php';
-@include_once 'sites/all/libraries/tuque/FedoraApiSerializer.php';
-@include_once 'sites/all/libraries/tuque/Object.php';
-@include_once 'sites/all/libraries/tuque/RepositoryConnection.php';
+@include_once 'sites/all/libraries/tuque/implementations/fedora3/Datastream.php';
+@include_once 'sites/all/libraries/tuque/implementations/fedora3/FedoraApi.php';
+@include_once 'sites/all/libraries/tuque/implementations/fedora3/FedoraApiSerializer.php';
+@include_once 'sites/all/libraries/tuque/implementations/fedora3/Object.php';
+@include_once 'sites/all/libraries/tuque/implementations/fedora3/RepositoryConnection.php';
+@include_once 'sites/all/libraries/tuque/implementaitons/fedora3/Repository.php';
+@include_once 'sites/all/libraries/tuque/implementations/fedora3/FedoraRelationships.php';
 @include_once 'sites/all/libraries/tuque/Cache.php';
 @include_once 'sites/all/libraries/tuque/RepositoryException.php';
-@include_once 'sites/all/libraries/tuque/Repository.php';
-@include_once 'sites/all/libraries/tuque/FedoraRelationships.php';
-
-@include_once "$islandora_module_path/libraries/tuque/Datastream.php";
-@include_once "$islandora_module_path/libraries/tuque/FedoraApi.php";
-@include_once "$islandora_module_path/libraries/tuque/FedoraApiSerializer.php";
-@include_once "$islandora_module_path/libraries/tuque/Object.php";
-@include_once "$islandora_module_path/libraries/tuque/RepositoryConnection.php";
+
+@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/Datastream.php";
+@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/FedoraApi.php";
+@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/FedoraApiSerializer.php";
+@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/Object.php";
+@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/RepositoryConnection.php";
+@include_once "$islandora_module_path/libraries/tuque/implementaitons/fedora3/Repository.php";
+@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/FedoraRelationships.php";
 @include_once "$islandora_module_path/libraries/tuque/Cache.php";
 @include_once "$islandora_module_path/libraries/tuque/RepositoryException.php";
-@include_once "$islandora_module_path/libraries/tuque/Repository.php";
-@include_once "$islandora_module_path/libraries/tuque/FedoraRelationships.php";
 
 /**
  * Allow modules to alter an object before a mutable event occurs.