diff --git a/Objective-J/Rakefile b/Objective-J/Rakefile
index ebb76627f..c8ee921dd 100644
--- a/Objective-J/Rakefile
+++ b/Objective-J/Rakefile
@@ -10,7 +10,7 @@ $PRODUCT                = File.join($PRODUCT_DIR, 'Objective-J')
 $ENVIRONMENT_PRODUCT    = File.join($ENVIRONMENT_FRAMEWORKS_DIR, 'Objective-J')
 $LICENSE_PRODUCT        = File.join($PRODUCT, 'LICENSE')
 
-$LICENSE_FILE           = File.join($HOME_DIR, 'Rake', 'lib', 'licenses', 'LGPL-v2.1')
+$LICENSE_FILE           = File.join($HOME_DIR, 'Tools', 'Rake', 'lib', 'licenses', 'LGPL-v2.1')
 
 $BROWSER_FILE           = File.join($PRODUCT, 'Objective-J.js')
 $RHINO_FILE             = File.join($PRODUCT, 'rhino.platform', 'Objective-J.js')
diff --git a/Tools/Install/install-tools b/Tools/Install/install-tools
index 3452f666d..184fcdf50 100755
--- a/Tools/Install/install-tools
+++ b/Tools/Install/install-tools
@@ -36,4 +36,6 @@ done
 
 chmod +x $INSTALL_DIR/share/objj/bin/*
 
+gem install /Users/tlrobinson/cappuccino/capp_build/Release/rake/*.gem
+
 echo "Cappuccino Tools Installed"
diff --git a/Rake/Rakefile b/Tools/Rake/Rakefile
similarity index 61%
rename from Rake/Rakefile
rename to Tools/Rake/Rakefile
index c924c3978..bca10e943 100644
--- a/Rake/Rakefile
+++ b/Tools/Rake/Rakefile
@@ -1,10 +1,12 @@
 
-require '../common'
+require '../../common'
 require 'rubygems'
 require 'rubygems/installer'
 require 'rake'
 require 'rake/gempackagetask'
+require 'rake/clean'
 
+$TOOLS_DOWNLOAD                 = File.join($BUILD_DIR, 'Cappuccino', 'Tools')
 
 PKG_FILES = FileList['lib/**/*']
 
@@ -31,6 +33,13 @@ Rake::GemPackageTask.new(spec) do |pkg|
     pkg.package_dir = File.join($BUILD_DIR, $CONFIGURATION, 'rake')
 end
 
-task :install do
-    Gem::Installer.new(File.join($BUILD_DIR, $CONFIGURATION, 'rake', 'objective-j-0.7.0.gem')).install
-end
\ No newline at end of file
+#task :install do
+#    Gem::Installer.new(File.join($BUILD_DIR, $CONFIGURATION, 'rake', 'objective-j-0.7.0.gem')).install
+#end
+
+task :build => :gem do
+  mkdir_p $TOOLS_DOWNLOAD
+  cp(File.join($BUILD_DIR, $CONFIGURATION, 'rake', spec.file_name), File.join($TOOLS_DOWNLOAD, spec.file_name))
+end
+
+CLOBBER.include(File.join($BUILD_DIR, $CONFIGURATION, 'rake'), File.join($TOOLS_DOWNLOAD, spec.file_name))
diff --git a/Rake/lib/licenses/LGPL-v2.1 b/Tools/Rake/lib/licenses/LGPL-v2.1
similarity index 100%
rename from Rake/lib/licenses/LGPL-v2.1
rename to Tools/Rake/lib/licenses/LGPL-v2.1
diff --git a/Rake/lib/objective-j.rb b/Tools/Rake/lib/objective-j.rb
similarity index 100%
rename from Rake/lib/objective-j.rb
rename to Tools/Rake/lib/objective-j.rb
diff --git a/Rake/lib/objective-j/bundletask.rb b/Tools/Rake/lib/objective-j/bundletask.rb
similarity index 100%
rename from Rake/lib/objective-j/bundletask.rb
rename to Tools/Rake/lib/objective-j/bundletask.rb
diff --git a/Rake/lib/objj-executable b/Tools/Rake/lib/objj-executable
similarity index 100%
rename from Rake/lib/objj-executable
rename to Tools/Rake/lib/objj-executable
diff --git a/Tools/Rakefile b/Tools/Rakefile
index 16198aee2..04bdcab1a 100644
--- a/Tools/Rakefile
+++ b/Tools/Rakefile
@@ -3,7 +3,7 @@
 require 'rake'
 require '../common'
 
-subprojects = %w{capp bake nib2cib press}
+subprojects = %w{Rake capp bake nib2cib press}
 
 %w(build clean clobber).each do |task_name|
   task task_name do
diff --git a/common.rb b/common.rb
index 6f4cc60a0..1ae320f40 100644
--- a/common.rb
+++ b/common.rb
@@ -59,7 +59,7 @@ if !(defined? COMMON_DO_ONCE)
     
     COMMON_DO_ONCE = true
     
-    $LOAD_PATH << File.join($HOME_DIR, 'Rake', 'lib')
+    $LOAD_PATH << File.join($HOME_DIR, 'Tools', 'Rake', 'lib')
     ENV['PATH'] = $ENVIRONMENT_BIN_DIR + ':' + ENV['PATH']
 end
 
@@ -89,7 +89,7 @@ def executable_exists?(name)
   ENV["PATH"].split(":").any? {|p| File.executable? File.join(p, name) }
 end
 
-$OBJJ_TEMPLATE_EXECUTABLE   = File.join($HOME_DIR, 'Rake', 'lib', 'objj-executable')
+$OBJJ_TEMPLATE_EXECUTABLE   = File.join($HOME_DIR, 'Tools', 'Rake', 'lib', 'objj-executable')
 
 def make_objj_executable(path)
     cp($OBJJ_TEMPLATE_EXECUTABLE, path)