diff --git a/source/tristanable/manager/manager.d b/source/tristanable/manager/manager.d
index 28ecee1..014e9db 100644
--- a/source/tristanable/manager/manager.d
+++ b/source/tristanable/manager/manager.d
@@ -4,7 +4,7 @@
 module tristanable.manager.manager;
 
 import std.socket;
-import tristanable.queue : Queue;
+import tristanable.queue.queue : Queue;
 import core.sync.mutex : Mutex;
 import tristanable.manager.watcher : Watcher;
 import tristanable.encoding : TaggedMessage;
diff --git a/source/tristanable/manager/watcher.d b/source/tristanable/manager/watcher.d
index 4c9ba38..b766482 100644
--- a/source/tristanable/manager/watcher.d
+++ b/source/tristanable/manager/watcher.d
@@ -11,7 +11,7 @@ import std.socket;
 import bformat;
 import tristanable.encoding;
 import tristanable.exceptions;
-import tristanable.queue;
+import tristanable.queue.queue;
 import bformat.client;
 
 /** 
diff --git a/source/tristanable/package.d b/source/tristanable/package.d
index b473058..022b740 100644
--- a/source/tristanable/package.d
+++ b/source/tristanable/package.d
@@ -13,7 +13,7 @@ public import tristanable.manager;
  * A queue of queue items all of the same tag
  * and queue-related facilities
  */
-public import tristanable.queue;
+public import tristanable.queue.queue : Queue;
 
 /**
  * Error handling type definitions