diff --git a/contrib/comp_tree/contrib/quix/lib/quix/diagnostic.rb b/contrib/comp_tree/contrib/quix/lib/quix/diagnostic.rb
index fdb10ae02..bf735e5ba 100644
--- a/contrib/comp_tree/contrib/quix/lib/quix/diagnostic.rb
+++ b/contrib/comp_tree/contrib/quix/lib/quix/diagnostic.rb
@@ -1,7 +1,7 @@
 
-require 'rake/comp_tree/quix/builtin/kernel/tap'
+require 'rake/comp_tree/tap'
 
-module Rake::CompTree::Quix
+module Rake::CompTree
   module Diagnostic
     def show(desc = nil, stream = STDOUT, &block)
       if desc
diff --git a/contrib/comp_tree/contrib/quix/lib/quix/kernel.rb b/contrib/comp_tree/contrib/quix/lib/quix/kernel.rb
index d15782aaa..692ff8abf 100644
--- a/contrib/comp_tree/contrib/quix/lib/quix/kernel.rb
+++ b/contrib/comp_tree/contrib/quix/lib/quix/kernel.rb
@@ -1,8 +1,8 @@
 
 require 'thread'
 
-module Rake::CompTree::Quix
-  module Kernel
+module Rake::CompTree
+  module Misc
     def let
       yield self
     end
diff --git a/contrib/comp_tree/lib/comp_tree/algorithm.rb b/contrib/comp_tree/lib/comp_tree/algorithm.rb
index 6bc0fc062..5c32094b3 100644
--- a/contrib/comp_tree/lib/comp_tree/algorithm.rb
+++ b/contrib/comp_tree/lib/comp_tree/algorithm.rb
@@ -1,10 +1,10 @@
 
-require 'rake/comp_tree/quix/diagnostic'
+require 'rake/comp_tree/diagnostic'
 require 'rake/comp_tree/retriable_fork'
 
 module Rake::CompTree
   module Algorithm
-    include Quix::Diagnostic
+    include Diagnostic
 
     def compute_multithreaded(root, num_threads, use_fork, buckets)
       trace "Computing #{root.name} with #{num_threads} threads"
diff --git a/contrib/comp_tree/lib/comp_tree/bucket_ipc.rb b/contrib/comp_tree/lib/comp_tree/bucket_ipc.rb
index 0d75f031e..20e6b1213 100644
--- a/contrib/comp_tree/lib/comp_tree/bucket_ipc.rb
+++ b/contrib/comp_tree/lib/comp_tree/bucket_ipc.rb
@@ -3,13 +3,13 @@
 require 'thread'
 
 require 'rake/comp_tree/retriable_fork'
-require 'rake/comp_tree/quix/diagnostic'
-require 'rake/comp_tree/quix/builtin/kernel/tap'
+require 'rake/comp_tree/diagnostic'
+require 'rake/comp_tree/tap'
 
 module Rake::CompTree
   module BucketIPC
     class Bucket
-      include Quix::Diagnostic
+      include Diagnostic
       include RetriableFork
 
       def initialize(address, timeout, wait_interval)
diff --git a/contrib/comp_tree/lib/comp_tree/diagnostic.rb b/contrib/comp_tree/lib/comp_tree/diagnostic.rb
new file mode 120000
index 000000000..2375aa2ec
--- /dev/null
+++ b/contrib/comp_tree/lib/comp_tree/diagnostic.rb
@@ -0,0 +1 @@
+../../contrib/quix/lib/quix/diagnostic.rb
\ No newline at end of file
diff --git a/contrib/comp_tree/lib/comp_tree/driver.rb b/contrib/comp_tree/lib/comp_tree/driver.rb
index 7c1b97980..0916c2ea7 100644
--- a/contrib/comp_tree/lib/comp_tree/driver.rb
+++ b/contrib/comp_tree/lib/comp_tree/driver.rb
@@ -1,7 +1,7 @@
 
 require 'rake/comp_tree/bucket_ipc'
-require 'rake/comp_tree/quix/diagnostic'
-require 'rake/comp_tree/quix/kernel'
+require 'rake/comp_tree/diagnostic'
+require 'rake/comp_tree/misc'
 require 'rake/comp_tree/algorithm'
 require 'rake/comp_tree/node'
 require 'rake/comp_tree/task_node'
@@ -22,8 +22,8 @@ class Driver
       :wait_interval => 0.02,
     }
 
-    include Quix::Diagnostic #:nodoc:
-    include Quix::Kernel #:nodoc:
+    include Diagnostic
+    include Misc
     
     #
     # Begin a new computation tree.
diff --git a/contrib/comp_tree/lib/comp_tree/misc.rb b/contrib/comp_tree/lib/comp_tree/misc.rb
new file mode 120000
index 000000000..39c2c9aea
--- /dev/null
+++ b/contrib/comp_tree/lib/comp_tree/misc.rb
@@ -0,0 +1 @@
+../../contrib/quix/lib/quix/kernel.rb
\ No newline at end of file
diff --git a/contrib/comp_tree/lib/comp_tree/node.rb b/contrib/comp_tree/lib/comp_tree/node.rb
index 324c6848f..400b411d0 100644
--- a/contrib/comp_tree/lib/comp_tree/node.rb
+++ b/contrib/comp_tree/lib/comp_tree/node.rb
@@ -1,5 +1,5 @@
 
-require 'rake/comp_tree/quix/diagnostic'
+require 'rake/comp_tree/diagnostic'
 require 'thread'
 
 module Rake::CompTree
@@ -7,7 +7,7 @@ module Rake::CompTree
   # Base class for nodes in the computation tree.
   # 
   class Node
-    include Quix::Diagnostic #:nodoc:
+    include Diagnostic
 
     attr_reader :name                   #:nodoc:
 
diff --git a/contrib/comp_tree/lib/comp_tree/quix/builtin/kernel/tap.rb b/contrib/comp_tree/lib/comp_tree/quix/builtin/kernel/tap.rb
deleted file mode 120000
index 416b736d5..000000000
--- a/contrib/comp_tree/lib/comp_tree/quix/builtin/kernel/tap.rb
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../contrib/quix/lib/quix/builtin/kernel/tap.rb
\ No newline at end of file
diff --git a/contrib/comp_tree/lib/comp_tree/quix/diagnostic.rb b/contrib/comp_tree/lib/comp_tree/quix/diagnostic.rb
deleted file mode 120000
index 59686465b..000000000
--- a/contrib/comp_tree/lib/comp_tree/quix/diagnostic.rb
+++ /dev/null
@@ -1 +0,0 @@
-../../../contrib/quix/lib/quix/diagnostic.rb
\ No newline at end of file
diff --git a/contrib/comp_tree/lib/comp_tree/quix/kernel.rb b/contrib/comp_tree/lib/comp_tree/quix/kernel.rb
deleted file mode 120000
index e3297daa1..000000000
--- a/contrib/comp_tree/lib/comp_tree/quix/kernel.rb
+++ /dev/null
@@ -1 +0,0 @@
-../../../contrib/quix/lib/quix/kernel.rb
\ No newline at end of file
diff --git a/contrib/comp_tree/lib/comp_tree/tap.rb b/contrib/comp_tree/lib/comp_tree/tap.rb
new file mode 120000
index 000000000..df2132882
--- /dev/null
+++ b/contrib/comp_tree/lib/comp_tree/tap.rb
@@ -0,0 +1 @@
+../../contrib/quix/lib/quix/builtin/kernel/tap.rb
\ No newline at end of file
diff --git a/contrib/comp_tree/test/test_comp_tree.rb b/contrib/comp_tree/test/test_comp_tree.rb
index edec3e746..54dd37580 100644
--- a/contrib/comp_tree/test/test_comp_tree.rb
+++ b/contrib/comp_tree/test/test_comp_tree.rb
@@ -14,7 +14,7 @@ module Rake::CompTree
   DO_FORK = (HAVE_FORK and not ARGV.include?("--no-fork"))
 
   module TestCommon
-    include Rake::CompTree::Quix::Diagnostic
+    include Rake::CompTree::Diagnostic
 
     if  ARGV.include?("--bench")
       def separator