diff --git a/api-java/buildfile b/api-java/buildfile
deleted file mode 100644
index 09857bdcbc..0000000000
--- a/api-java/buildfile
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'buildr/scala'
- 
-repositories.remote << 'http://www.ibiblio.org/maven2'
-repositories.remote << 'http://scala-tools.org/repo-releases'
-repositories.remote << 'http://scala-tools.org/repo-snapshots'
-repositories.remote << 'http://www.lag.net/repo'
-
-AKKA = ['com.scalablesolutions.akka:akka-kernel:jar:0.1',
-        'com.scalablesolutions.akka:akka-supervisor:jar:0.1,
-        'com.scalablesolutions.akka:akka-util-java:jar:0.1']
-GUICEYFRUIT = 'org.guiceyfruit:guice-core:jar:2.0-SNAPSHOT'
-JUNIT4 = 'junit:junit:jar:4.0'
-
-desc 'Java API for the Akka kernel'
-define 'akka-api-java' do
-  project.version = '0.1'
-  project.group = 'com.scalablesolutions.akka' 
-  compile.with(AKKA, GUICEYFRUIT, JUNIT4)
-  package :jar
-end
-
diff --git a/buildfile b/buildfile
index 3ece043c52..ac7a797aad 100644
--- a/buildfile
+++ b/buildfile
@@ -1,9 +1,68 @@
 require 'buildr/scala'
 
+#options.test = false
+
+VERSION_NUMBER = '0.1'
+
+repositories.remote << 'http://www.ibiblio.org/maven2'
+repositories.remote << 'http://scala-tools.org/repo-releases'
+repositories.remote << 'http://scala-tools.org/repo-snapshots'
+repositories.remote << 'http://www.lag.net/repo'
+
+AKKA_KERNEL =     'com.scalablesolutions.akka:akka-kernel:jar:0.1' 
+AKKA_SUPERVISOR = 'com.scalablesolutions.akka:akka-supervisor:jar:0.1' 
+AKKA_UTIL_JAVA =  'com.scalablesolutions.akka:akka-util-java:jar:0.1'
+
+GUICEYFRUIT = ['org.guiceyfruit:guice-core:jar:2.0-SNAPSHOT', 
+               'org.guiceyfruit:guice-jsr250:jar:2.0-SNAPSHOT']
+JERSEY =      ['com.sun.jersey:jersey-core:jar:1.0.1',
+               'com.sun.jersey:jersey-server:jar:1.0.1',
+               'com.sun.jersey:jersey-json:jar:1.0.1',
+               'com.sun.jersey:jersey-atom:jar:1.0.1',
+               'javax.ws.rs:jsr311-api:jar:1.0']
+VOLDEMORT =   ['voldemort:voldemort:jar:0.4a',
+               'voldemort:voldemort-contrib:jar:0.4a']
+SLF4J =       ['org.slf4j:slf4j-log4j12:jar:1.4.3', 
+               'org.slf4j:slf4j-api:jar:1.4.3',
+               'log4j:log4j:jar:1.2.13']
+CONFIGGY =     'net.lag:configgy:jar:1.2'
+ZOOKEEPER =    'org.apache:zookeeper:jar:3.1.0'
+GRIZZLY =      'com.sun.grizzly:grizzly-servlet-webserver:jar:1.8.6.3'
+JUNIT4 =       'junit:junit:jar:4.0'
+
 desc 'The Akka Actor Kernel'
 define 'akka' do
-  project.version = '0.1'
+  project.version = VERSION_NUMBER
   project.group = 'com.scalablesolutions.akka' 
+  manifest['Copyright'] = 'Scalable Solutions (C) 2009'
+  compile.options.target = '1.5'
+
+  desc 'Akka Java Utilities (annotations)'
+  define 'util-java' do
+    compile
+    package :jar
+  end
+  
+  desc 'Implementation of Erlangs Supervisor and GenericServer behaviors'
+  define 'supervisor' do
+    compile.with(CONFIGGY)
+    test.using :specs
+   package :jar
+  end
+  
+  desc 'Akka Actor kernel core implementation'
+  define 'kernel' do
+    compile.with(AKKA_SUPERVISOR, AKKA_UTIL_JAVA, GUICEYFRUIT, JERSEY, VOLDEMORT, ZOOKEEPER, SLF4J, GRIZZLY, CONFIGGY, JUNIT4)
+    test.using :specs
+    package :jar
+  end
+  
+  #desc 'Akka Java API'
+  #define 'api-java' do
+  #  compile.with(AKKA_KERNEL, AKKA_SUPERVISOR, AKKA_UTIL_JAVA, GUICEYFRUIT, JUNIT4)
+  #  package :jar
+  #end
+
   package(:zip).include 'README'
   package(:zip).include 'bin/*', :path=>'bin'
   package(:zip).include 'config/*', :path=>'config'
diff --git a/kernel/buildfile b/kernel/buildfile
deleted file mode 100644
index 9ca2464f10..0000000000
--- a/kernel/buildfile
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'buildr/scala'
- 
-repositories.remote << 'http://www.ibiblio.org/maven2'
-repositories.remote << 'http://scala-tools.org/repo-releases'
-repositories.remote << 'http://scala-tools.org/repo-snapshots'
-repositories.remote << 'http://www.lag.net/repo'
-
-AKKA =        ['com.scalablesolutions.akka:akka-supervisor:jar:0.1', 
-               'com.scalablesolutions.akka:akka-util-java:jar:0.1']
-GUICEYFRUIT = ['org.guiceyfruit:guice-core:jar:2.0-SNAPSHOT', 
-               'org.guiceyfruit:guice-jsr250:jar:2.0-SNAPSHOT']
-JERSEY =      ['com.sun.jersey:jersey-core:jar:1.0.1',
-               'com.sun.jersey:jersey-server:jar:1.0.1',
-               'com.sun.jersey:jersey-json:jar:1.0.1',
-               'com.sun.jersey:jersey-atom:jar:1.0.1',
-               'javax.ws.rs:jsr311-api:jar:1.0']
-VOLDEMORT =   ['voldemort:voldemort:jar:0.4a',
-               'voldemort:voldemort-contrib:jar:0.4a']
-SLF4J =       ['org.slf4j:slf4j-log4j12:jar:1.4.3', 
-               'org.slf4j:slf4j-api:jar:1.4.3',
-               'log4j:log4j:jar:1.2.13']
-CONFIGGY =     'net.lag:configgy:jar:1.2'
-ZOOKEEPER =    'org.apache:zookeeper:jar:3.1.0'
-GRIZZLY =      'com.sun.grizzly:grizzly-servlet-webserver:jar:1.8.6.3'
-JUNIT4 =       'junit:junit:jar:4.0'
-
-desc 'The Akka Actor kernel core implementation'
-define 'akka-kernel' do
-  project.version = '0.1'
-  project.group = 'com.scalablesolutions.akka' 
-  compile.with [AKKA, GUICEYFRUIT, JERSEY, VOLDEMORT, ZOOKEEPER, SLF4J, GRIZZLY, CONFIGGY, JUNIT4]
-  test.using :specs
-  package :jar
-end
-
diff --git a/supervisor/buildfile b/supervisor/buildfile
deleted file mode 100644
index 6550ae3d47..0000000000
--- a/supervisor/buildfile
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'buildr/scala'
- 
-repositories.remote << 'http://www.ibiblio.org/maven2'
-repositories.remote << 'http://scala-tools.org/repo-releases'
-repositories.remote << 'http://scala-tools.org/repo-snapshots'
-repositories.remote << 'http://www.lag.net/repo'
-
-CONFIGGY = 'net.lag:configgy:jar:1.2'
-
-desc 'Implementation of Erlangs Supervisor and GenericServer behaviors'
-define 'akka-supervisor' do
-  project.version = '0.1'
-  project.group = 'com.scalablesolutions.akka' 
-  compile.with CONFIGGY
-  #test.using :specs
-  package :jar
-end
-
diff --git a/util-java/buildfile b/util-java/buildfile
deleted file mode 100644
index 955cf89cc9..0000000000
--- a/util-java/buildfile
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'buildr/scala'
- 
-repositories.remote << 'http://www.ibiblio.org/maven2'
-repositories.remote << 'http://scala-tools.org/repo-releases'
-repositories.remote << 'http://scala-tools.org/repo-snapshots'
-repositories.remote << 'http://www.lag.net/repo'
-
-desc 'Java utilities for the Akka kernel'
-define 'akka-util-java' do
-  project.version = '0.1'
-  project.group = 'com.scalablesolutions.akka' 
-  compile
-  package :jar
-end
-