diff --git a/CommonJS/Jakefile b/CommonJS/Jakefile
index 311843c93..3bb461275 100644
--- a/CommonJS/Jakefile
+++ b/CommonJS/Jakefile
@@ -15,6 +15,15 @@ new FileList("**/*").exclude("Jakefile").forEach(function(aFilename)
         cp(aFilename, buildFilename);
     });
 
+    // HACK: narwhal should copy permissions
+    if (FILE.dirname(aFilename) === FILE.join("bin"))
+    {
+        filedir (buildFilename, function ()
+        {
+            FILE.chmod(buildFilename, 0755);
+        });
+    }
+
     task ("build", buildFilename);
     CLOBBER.include(buildFilename);
 });
diff --git a/Tools/press/cib-dump b/CommonJS/bin/cib-dump
similarity index 88%
rename from Tools/press/cib-dump
rename to CommonJS/bin/cib-dump
index 87fff35a5..98470ee6c 100755
--- a/Tools/press/cib-dump
+++ b/CommonJS/bin/cib-dump
@@ -1,7 +1,8 @@
 #!/usr/bin/env objj
 
 @import <Foundation/Foundation.j>
-@import "cib-analysis-tools.j"
+
+@import "../lib/cappuccino/cib-analysis-tools.j"
 
 var FILE = require("file");
 
diff --git a/Tools/flatten/flatten b/CommonJS/bin/flatten
similarity index 98%
rename from Tools/flatten/flatten
rename to CommonJS/bin/flatten
index 6889a931d..760efc6c3 100755
--- a/Tools/flatten/flatten
+++ b/CommonJS/bin/flatten
@@ -3,9 +3,8 @@
 require("narwhal").ensureEngine("rhino");
 
 @import <Foundation/Foundation.j>
-@import <AppKit/AppKit.j>
 
-@import "../press/objj-analysis-tools.j"
+@import "../lib/cappuccino/objj-analysis-tools.j"
 
 var FILE = require("file");
 
diff --git a/Tools/ojdepcheck b/CommonJS/bin/ojdepcheck
similarity index 97%
rename from Tools/ojdepcheck
rename to CommonJS/bin/ojdepcheck
index 2c38d8ecd..a06f4f431 100755
--- a/Tools/ojdepcheck
+++ b/CommonJS/bin/ojdepcheck
@@ -4,7 +4,7 @@ require("narwhal").ensureEngine("rhino");
 
 @import <Foundation/Foundation.j>
 
-@import "press/objj-analysis-tools.j"
+@import "../lib/cappuccino/objj-analysis-tools.j"
 
 var FILE = require("file");
 
diff --git a/Tools/press/main.j b/CommonJS/bin/press
old mode 100644
new mode 100755
similarity index 99%
rename from Tools/press/main.j
rename to CommonJS/bin/press
index 35047fad3..632b0717f
--- a/Tools/press/main.j
+++ b/CommonJS/bin/press
@@ -1,10 +1,11 @@
+#!/usr/bin/env objj
+
 require("narwhal").ensureEngine("rhino");
 
 @import <Foundation/Foundation.j>
-@import <AppKit/AppKit.j>
 
-@import "objj-analysis-tools.j"
-@import "cib-analysis-tools.j"
+@import "../lib/cappuccino/objj-analysis-tools.j"
+@import "../lib/cappuccino/cib-analysis-tools.j"
 
 var FILE = require("file");
 var OS = require("os");
diff --git a/Tools/press/cib-analysis-tools.j b/CommonJS/lib/cappuccino/cib-analysis-tools.j
similarity index 100%
rename from Tools/press/cib-analysis-tools.j
rename to CommonJS/lib/cappuccino/cib-analysis-tools.j
diff --git a/Tools/press/objj-analysis-tools.j b/CommonJS/lib/cappuccino/objj-analysis-tools.j
similarity index 100%
rename from Tools/press/objj-analysis-tools.j
rename to CommonJS/lib/cappuccino/objj-analysis-tools.j
diff --git a/Objective-J/Jakefile b/Objective-J/Jakefile
index d09aeb2b4..f7c474127 100644
--- a/Objective-J/Jakefile
+++ b/Objective-J/Jakefile
@@ -73,7 +73,8 @@ new FileList("CommonJS/**/*").forEach(function(aFilename)
                 buildFilename,
                 environmentFlags("CommonJS", "ObjJ").concat($INCLUDE_FLAGS, $DEBUG_FLAGS), false);
     });
-        
+
+    // HACK: narwhal should copy permissions
     if (FILE.dirname(aFilename) === FILE.join("CommonJS", "bin"))
     {
         filedir (buildFilename, function ()
diff --git a/Tools/Jakefile b/Tools/Jakefile
index 93affadcf..fe675b736 100644
--- a/Tools/Jakefile
+++ b/Tools/Jakefile
@@ -2,4 +2,4 @@
 require("../common.jake");
 
 // nib2cib has to come before capp since capp uses nib2cib
-subtasks(["nib2cib", "capp"/*, "bake"*/, "press"], ["build"/*, "clean", "clobber"*/]);
+subtasks(["nib2cib", "capp"], ["build"/*, "clean", "clobber"*/]);
diff --git a/Tools/press/Jakefile b/Tools/press/Jakefile
deleted file mode 100644
index bfbdadfc6..000000000
--- a/Tools/press/Jakefile
+++ /dev/null
@@ -1,39 +0,0 @@
-
-require ("../../common.jake");
-
-var app = require("objective-j/jake").app;
-var BundleTask = require("objective-j/jake").BundleTask;
-
-app ("press", function(pressTask)
-{
-    pressTask.setBuildIntermediatesPath(FILE.join($BUILD_DIR, "press.build", $CONFIGURATION))
-    pressTask.setBuildPath($BUILD_CJS_CAPPUCCINO_LIB);
-
-    pressTask.setAuthor("280 North, Inc.");
-    pressTask.setEmail("feedback @nospam@ 280north.com");
-    pressTask.setSummary("Deployment tool for Cappuccino applications");
-    pressTask.setIdentifier("com.280n.press");
-    pressTask.setLicense(BundleTask.License.LGPL_v2_1);
-    pressTask.setVersion("0.7.9");
-    pressTask.setSources(FILE.glob("*.j"));
-    pressTask.setResources(FILE.glob("Resources/*"));
-    pressTask.setEnvironments(require("objective-j/jake/environment").CommonJS);
-    pressTask.setFlattensSources(true);
-
-    if ($CONFIGURATION === "Release")
-        pressTask.setCompilerFlags("-O");
-    else
-        pressTask.setCompilerFlags("-DDEBUG -g");
-});
-
-$BUILD_CJS_PRESS = FILE.join($BUILD_CJS_CAPPUCCINO_BIN, 'press');
-
-// executable in environment directory
-filedir($BUILD_CJS_PRESS, ["press"], function()
-{
-    make_objj_executable($BUILD_CJS_PRESS);
-});
-
-task ("build", ["press", $BUILD_CJS_PRESS]);
-
-CLOBBER.include($BUILD_CJS_PRESS);