diff --git a/.gitignore b/.gitignore
index 06f8c17..5a3fcbc 100755
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ slask*
 bumblebee_junit4_acceptance/reports
 bumblebee_junit4/reports
 bumblebee_jruby/reports
+bumblebee_uml/reports
 bumblebee/reports
 .settings
 bumblebee_junit4_acceptance/.settings
diff --git a/buildfile b/buildfile
index 4f2d31b..da5d64d 100755
--- a/buildfile
+++ b/buildfile
@@ -28,6 +28,7 @@ module Buildr
     end
 end
 
+
 desc 'Bumblebee'
 define 'com.agical.bumblebee' do 
     project.group = 'com.agical.bumblebee'
@@ -39,6 +40,7 @@ define 'com.agical.bumblebee' do
     
     desc 'Bumblebee is a framework for generating useful, human-friendly documentation from executing code.'
     define 'bumblebee' do
+	    project.eclipse.name = 'bumblebee'
         compile.with MUSE, MUSE_PARSER, JUNIT,PMD
         test.include 'com.agical.bumblebee.TestAll'
         package :jar, :id => 'bumblebee'
@@ -50,6 +52,7 @@ define 'com.agical.bumblebee' do
     on the collector and from the comments in classes and methods involved. The script is executed 
     and the resulting output can be processed further if neccessary.'
     define 'bumblebee_jruby' do
+	    project.eclipse.name = 'bumblebee_jruby'
         compile.with BUMBLEBEE, JRUBY, JUNIT
         test.include 'com.agical.bumblebee.jruby.TestAll'
         package :jar, :id => 'bumblebee_jruby'
@@ -59,6 +62,7 @@ define 'com.agical.bumblebee' do
     
     desc 'This is an extension to use JUnit4 for executing the code that Bumblebee collects data from.'
     define 'bumblebee_junit4' do
+	    project.eclipse.name = 'bumblebee_junit4'
         compile.with BUMBLEBEE, JUNIT
         test.include 'com.agical.bumblebee.junit4.TestAll'
         package :jar, :id => 'bumblebee_junit4'
@@ -68,6 +72,7 @@ define 'com.agical.bumblebee' do
 
     desc 'This is a UML extension to draw diagrams of different kinds'
     define 'bumblebee_uml' do
+	    project.eclipse.name = 'bumblebee_uml'
         compile.with BUMBLEBEE, BUMBLEBEE_JUNIT4, BUMBLEBEE_JRUBY,
                   JUNIT, MUSE, MUSE_PARSER, JRUBY, PMD, BATIK, UMLSPEED
         test.include 'com.agical.bumblebee.uml.TestAll'
@@ -78,6 +83,7 @@ define 'com.agical.bumblebee' do
 
     desc 'This is an extension to use Bumblebee with Selenium'
     define 'bumblebee_selenium' do
+	    project.eclipse.name = 'bumblebee_selenium'
         compile.with BUMBLEBEE, BUMBLEBEE_JUNIT4, BUMBLEBEE_JRUBY,
                   JUNIT, MUSE, MUSE_PARSER, JRUBY, PMD, SELENIUM
         test.include 'com.agical.bumblebee.selenium.TestAll'
@@ -88,6 +94,7 @@ define 'com.agical.bumblebee' do
 
     desc 'This is an extension to use Bumblebee with Swing'
     define 'bumblebee_swing' do
+	    project.eclipse.name = 'bumblebee_swing'
         compile.with BUMBLEBEE, BUMBLEBEE_JUNIT4, BUMBLEBEE_JRUBY,
                   JUNIT, MUSE, MUSE_PARSER, JRUBY, PMD
         test.include 'com.agical.bumblebee.swing.TestAll'
@@ -98,6 +105,7 @@ define 'com.agical.bumblebee' do
 
     desc 'This module contains acceptance tests for the JUnit 4 and JRuby modules.'    
     define 'bumblebee_junit4_acceptance' do
+	  project.eclipse.name = 'bumblebee_junit4_acceptance'
       test.include 'com.agical.bumblebee.acceptance.AllTest'
       compile.with BUMBLEBEE, BUMBLEBEE_JUNIT4, BUMBLEBEE_JRUBY, BUMBLEBEE_UML,BUMBLEBEE_SWING, BUMBLEBEE_SELENIUM,
                   JUNIT, MUSE, MUSE_PARSER, JRUBY,PMD,UMLSPEED,BATIK,SELENIUM
diff --git a/bumblebee/.classpath b/bumblebee/.classpath
old mode 100755
new mode 100644
index 7c84f2a..86bc371
--- a/bumblebee/.classpath
+++ b/bumblebee/.classpath
@@ -1,24 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="**/.svn/|**/CVS/" kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry excluding="**/.svn/|**/CVS/" kind="src" path="src/test/java"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/com/thoughtworks/qdox/qdox/1.8/qdox-1.8.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/fr/lifl/parsing/1.0.1/parsing-1.0.1.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/jhighlight/jhighlight/1.0/jhighlight-1.0.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/junit/junit/4.5/junit-4.5.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/oqube/muse/muse-parser/1.0-rc3/muse-parser-1.0-rc3.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/asm/asm/3.1/asm-3.1.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/pmd/pmd/4.2.4/pmd-4.2.4.jar" sourcepath="/M2_REPO/pmd/pmd/4.2.4/pmd-src-4.2.4.zip">
-		<attributes>
-			<attribute name="javadoc_location" value="http://pmd.sourceforge.net/apidocs"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="var" path="M2_REPO/xerces/xercesImpl/2.5.0/xercesImpl-2.5.0.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/xml-apis/xmlParserAPIs/2.0.2/xmlParserAPIs-2.0.2.jar"/>
-	<classpathentry kind="output" path="classes"/>
-</classpath>
+<classpath>
+  <classpathentry kind="src" path="src/main/java" excluding="**/.svn/|**/CVS/"/>
+  <classpathentry kind="src" path="src/test/java" excluding="**/.svn/|**/CVS/" output="target/test/classes"/>
+  <classpathentry kind="src" path="src/test/resources" excluding="**/.svn/|**/CVS/" output="target/test/resources"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="var" path="M2_REPO/oqube/muse/muse-parser/1.0-rc3/muse-parser-1.0-rc3.jar" sourcepath="M2_REPO/oqube/muse/muse-parser/1.0-rc3/muse-parser-1.0-rc3-sources.jar" javadocpath="M2_REPO/oqube/muse/muse-parser/1.0-rc3/muse-parser-1.0-rc3-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/fr/lifl/parsing/1.0.1/parsing-1.0.1.jar" sourcepath="M2_REPO/fr/lifl/parsing/1.0.1/parsing-1.0.1-sources.jar" javadocpath="M2_REPO/fr/lifl/parsing/1.0.1/parsing-1.0.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jhighlight/jhighlight/1.0/jhighlight-1.0.jar" sourcepath="M2_REPO/jhighlight/jhighlight/1.0/jhighlight-1.0-sources.jar" javadocpath="M2_REPO/jhighlight/jhighlight/1.0/jhighlight-1.0-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar" javadocpath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar" javadocpath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar" sourcepath="M2_REPO/junit/junit/4.6/junit-4.6-sources.jar" javadocpath="M2_REPO/junit/junit/4.6/junit-4.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/pmd/pmd/4.2.4/pmd-4.2.4.jar" sourcepath="M2_REPO/pmd/pmd/4.2.4/pmd-4.2.4-sources.jar" javadocpath="M2_REPO/pmd/pmd/4.2.4/pmd-4.2.4-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1.jar" sourcepath="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1-sources.jar" javadocpath="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/asm/asm/3.1/asm-3.1.jar" sourcepath="M2_REPO/asm/asm/3.1/asm-3.1-sources.jar" javadocpath="M2_REPO/asm/asm/3.1/asm-3.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.7/junit-4.7.jar" sourcepath="M2_REPO/junit/junit/4.7/junit-4.7-sources.jar" javadocpath="M2_REPO/junit/junit/4.7/junit-4.7-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-sources.jar" javadocpath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1-sources.jar" javadocpath="M2_REPO/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar" javadocpath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-sources.jar" javadocpath="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-javadoc.jar"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
diff --git a/bumblebee/.project b/bumblebee/.project
old mode 100755
new mode 100644
index b0e7cd3..b8464d5
--- a/bumblebee/.project
+++ b/bumblebee/.project
@@ -1,5 +1,5 @@
 <projectDescription>
-  <name>com.agical.bumblebee-bumblebee</name>
+  <name>bumblebee</name>
   <projects/>
   <buildSpec>
     <buildCommand>
diff --git a/bumblebee_jruby/.classpath b/bumblebee_jruby/.classpath
old mode 100755
new mode 100644
index 1ab2d6d..ee2babf
--- a/bumblebee_jruby/.classpath
+++ b/bumblebee_jruby/.classpath
@@ -1,11 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="**/.svn/|**/CVS/" kind="src" path="src/main/java"/>
-	<classpathentry excluding="**/.svn/|**/CVS/" kind="src" path="src/main/resources"/>
-	<classpathentry excluding="**/.svn/|**/CVS/" kind="src" output="test/classes" path="src/test/java"/>
-	<classpathentry excluding="**/.svn/|**/CVS/" kind="src" output="test/resources" path="src/test/resources"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/org/jruby/jruby-complete/1.1/jruby-complete-1.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/bumblebee"/>
-	<classpathentry kind="output" path="classes"/>
-</classpath>
+<classpath>
+  <classpathentry kind="src" path="src/main/java" excluding="**/.svn/|**/CVS/"/>
+  <classpathentry kind="src" path="src/main/resources" excluding="**/.svn/|**/CVS/" output="target/resources"/>
+  <classpathentry kind="src" path="src/test/java" excluding="**/.svn/|**/CVS/" output="target/test/classes"/>
+  <classpathentry kind="src" path="src/test/resources" excluding="**/.svn/|**/CVS/" output="target/test/resources"/>
+  <classpathentry kind="src" combineaccessrules="false" path="/bumblebee"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="var" path="M2_REPO/org/jruby/jruby-complete/1.1/jruby-complete-1.1.jar" sourcepath="M2_REPO/org/jruby/jruby-complete/1.1/jruby-complete-1.1-sources.jar" javadocpath="M2_REPO/org/jruby/jruby-complete/1.1/jruby-complete-1.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar" sourcepath="M2_REPO/junit/junit/4.6/junit-4.6-sources.jar" javadocpath="M2_REPO/junit/junit/4.6/junit-4.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.7/junit-4.7.jar" sourcepath="M2_REPO/junit/junit/4.7/junit-4.7-sources.jar" javadocpath="M2_REPO/junit/junit/4.7/junit-4.7-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-sources.jar" javadocpath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1-sources.jar" javadocpath="M2_REPO/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar" javadocpath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-sources.jar" javadocpath="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-javadoc.jar"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
diff --git a/bumblebee_jruby/.project b/bumblebee_jruby/.project
old mode 100755
new mode 100644
index 1883c1d..cc89d29
--- a/bumblebee_jruby/.project
+++ b/bumblebee_jruby/.project
@@ -1,5 +1,5 @@
 <projectDescription>
-  <name>com.agical.bumblebee-bumblebee_jruby</name>
+  <name>bumblebee_jruby</name>
   <projects/>
   <buildSpec>
     <buildCommand>
diff --git a/bumblebee_junit4/.classpath b/bumblebee_junit4/.classpath
old mode 100755
new mode 100644
index c9da194..ef3b6dc
--- a/bumblebee_junit4/.classpath
+++ b/bumblebee_junit4/.classpath
@@ -1,8 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="**/.svn/|**/CVS/" kind="src" path="src/main/java"/>
-	<classpathentry excluding="**/.svn/|**/CVS/" kind="src" output="test/classes" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/bumblebee"/>
-	<classpathentry kind="output" path="classes"/>
-</classpath>
+<classpath>
+  <classpathentry kind="src" path="src/main/java" excluding="**/.svn/|**/CVS/"/>
+  <classpathentry kind="src" path="src/test/java" excluding="**/.svn/|**/CVS/" output="target/test/classes"/>
+  <classpathentry kind="src" combineaccessrules="false" path="/bumblebee"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar" sourcepath="M2_REPO/junit/junit/4.6/junit-4.6-sources.jar" javadocpath="M2_REPO/junit/junit/4.6/junit-4.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.7/junit-4.7.jar" sourcepath="M2_REPO/junit/junit/4.7/junit-4.7-sources.jar" javadocpath="M2_REPO/junit/junit/4.7/junit-4.7-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-sources.jar" javadocpath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1-sources.jar" javadocpath="M2_REPO/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar" javadocpath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-sources.jar" javadocpath="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-javadoc.jar"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
diff --git a/bumblebee_junit4/.project b/bumblebee_junit4/.project
old mode 100755
new mode 100644
index e1d16fa..6b0f421
--- a/bumblebee_junit4/.project
+++ b/bumblebee_junit4/.project
@@ -1,5 +1,5 @@
 <projectDescription>
-  <name>com.agical.bumblebee-bumblebee_junit4</name>
+  <name>bumblebee_junit4</name>
   <projects/>
   <buildSpec>
     <buildCommand>
diff --git a/bumblebee_junit4_acceptance/.classpath b/bumblebee_junit4_acceptance/.classpath
old mode 100755
new mode 100644
index 7866f84..48dcb5c
--- a/bumblebee_junit4_acceptance/.classpath
+++ b/bumblebee_junit4_acceptance/.classpath
@@ -1,16 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="**/.svn/|**/CVS/" kind="src" path="src/main/java"/>
-	<classpathentry excluding="**/.svn/|**/CVS/" kind="src" output="resources" path="src/main/resources"/>
-	<classpathentry excluding="**/.svn/|**/CVS/" kind="src" output="test/classes" path="src/test/java"/>
-	<classpathentry excluding="**/.svn/|**/CVS/" kind="src" output="test/resources" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/bumblebee"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/bumblebee_jruby"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/bumblebee_junit4"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/bumblebee_uml"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/bumblebee_selenium"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/bumblebee_swing"/>
-	<classpathentry kind="var" path="M2_REPO/junit/junit/4.5/junit-4.5.jar"/>
-	<classpathentry kind="output" path="classes"/>
-</classpath>
+<classpath>
+  <classpathentry kind="src" path="src/main/java" excluding="**/.svn/|**/CVS/"/>
+  <classpathentry kind="src" path="src/main/resources" excluding="**/.svn/|**/CVS/" output="target/resources"/>
+  <classpathentry kind="src" path="src/test/java" excluding="**/.svn/|**/CVS/" output="target/test/classes"/>
+  <classpathentry kind="src" path="src/test/resources" excluding="**/.svn/|**/CVS/" output="target/test/resources"/>
+  <classpathentry kind="src" combineaccessrules="false" path="/bumblebee"/>
+  <classpathentry kind="src" combineaccessrules="false" path="/bumblebee_jruby"/>
+  <classpathentry kind="src" combineaccessrules="false" path="/bumblebee_junit4"/>
+  <classpathentry kind="src" combineaccessrules="false" path="/bumblebee_selenium"/>
+  <classpathentry kind="src" combineaccessrules="false" path="/bumblebee_swing"/>
+  <classpathentry kind="src" combineaccessrules="false" path="/bumblebee_uml"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar" sourcepath="M2_REPO/junit/junit/4.6/junit-4.6-sources.jar" javadocpath="M2_REPO/junit/junit/4.6/junit-4.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/oqube/muse/muse-parser/1.0-rc3/muse-parser-1.0-rc3.jar" sourcepath="M2_REPO/oqube/muse/muse-parser/1.0-rc3/muse-parser-1.0-rc3-sources.jar" javadocpath="M2_REPO/oqube/muse/muse-parser/1.0-rc3/muse-parser-1.0-rc3-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/fr/lifl/parsing/1.0.1/parsing-1.0.1.jar" sourcepath="M2_REPO/fr/lifl/parsing/1.0.1/parsing-1.0.1-sources.jar" javadocpath="M2_REPO/fr/lifl/parsing/1.0.1/parsing-1.0.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jhighlight/jhighlight/1.0/jhighlight-1.0.jar" sourcepath="M2_REPO/jhighlight/jhighlight/1.0/jhighlight-1.0-sources.jar" javadocpath="M2_REPO/jhighlight/jhighlight/1.0/jhighlight-1.0-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar" javadocpath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar" javadocpath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jruby/jruby-complete/1.1/jruby-complete-1.1.jar" sourcepath="M2_REPO/org/jruby/jruby-complete/1.1/jruby-complete-1.1-sources.jar" javadocpath="M2_REPO/org/jruby/jruby-complete/1.1/jruby-complete-1.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/pmd/pmd/4.2.4/pmd-4.2.4.jar" sourcepath="M2_REPO/pmd/pmd/4.2.4/pmd-4.2.4-sources.jar" javadocpath="M2_REPO/pmd/pmd/4.2.4/pmd-4.2.4-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1.jar" sourcepath="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1-sources.jar" javadocpath="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/asm/asm/3.1/asm-3.1.jar" sourcepath="M2_REPO/asm/asm/3.1/asm-3.1-sources.jar" javadocpath="M2_REPO/asm/asm/3.1/asm-3.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/umlspeed/umlspeed/0.19/umlspeed-0.19.jar" sourcepath="M2_REPO/umlspeed/umlspeed/0.19/umlspeed-0.19-sources.jar" javadocpath="M2_REPO/umlspeed/umlspeed/0.19/umlspeed-0.19-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-rasterizer/1.6/batik-rasterizer-1.6.jar" sourcepath="M2_REPO/batik/batik-rasterizer/1.6/batik-rasterizer-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-rasterizer/1.6/batik-rasterizer-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-awt-util/1.6/batik-awt-util-1.6.jar" sourcepath="M2_REPO/batik/batik-awt-util/1.6/batik-awt-util-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-awt-util/1.6/batik-awt-util-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-bridge/1.6/batik-bridge-1.6.jar" sourcepath="M2_REPO/batik/batik-bridge/1.6/batik-bridge-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-bridge/1.6/batik-bridge-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-css/1.6/batik-css-1.6.jar" sourcepath="M2_REPO/batik/batik-css/1.6/batik-css-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-css/1.6/batik-css-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-dom/1.6/batik-dom-1.6.jar" sourcepath="M2_REPO/batik/batik-dom/1.6/batik-dom-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-dom/1.6/batik-dom-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-ext/1.6/batik-ext-1.6.jar" sourcepath="M2_REPO/batik/batik-ext/1.6/batik-ext-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-ext/1.6/batik-ext-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-gvt/1.6/batik-gvt-1.6.jar" sourcepath="M2_REPO/batik/batik-gvt/1.6/batik-gvt-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-gvt/1.6/batik-gvt-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-parser/1.6/batik-parser-1.6.jar" sourcepath="M2_REPO/batik/batik-parser/1.6/batik-parser-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-parser/1.6/batik-parser-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-script/1.6/batik-script-1.6.jar" sourcepath="M2_REPO/batik/batik-script/1.6/batik-script-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-script/1.6/batik-script-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-svg-dom/1.6/batik-svg-dom-1.6.jar" sourcepath="M2_REPO/batik/batik-svg-dom/1.6/batik-svg-dom-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-svg-dom/1.6/batik-svg-dom-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-transcoder/1.6/batik-transcoder-1.6.jar" sourcepath="M2_REPO/batik/batik-transcoder/1.6/batik-transcoder-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-transcoder/1.6/batik-transcoder-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-util/1.6/batik-util-1.6.jar" sourcepath="M2_REPO/batik/batik-util/1.6/batik-util-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-util/1.6/batik-util-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-xml/1.6/batik-xml-1.6.jar" sourcepath="M2_REPO/batik/batik-xml/1.6/batik-xml-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-xml/1.6/batik-xml-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.5.0/xercesImpl-2.5.0.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.5.0/xercesImpl-2.5.0-sources.jar" javadocpath="M2_REPO/xerces/xercesImpl/2.5.0/xercesImpl-2.5.0-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xmlParserAPIs/2.0.2/xmlParserAPIs-2.0.2.jar" sourcepath="M2_REPO/xml-apis/xmlParserAPIs/2.0.2/xmlParserAPIs-2.0.2-sources.jar" javadocpath="M2_REPO/xml-apis/xmlParserAPIs/2.0.2/xmlParserAPIs-2.0.2-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/client-drivers/selenium-java-client-driver/1.0.1/selenium-java-client-driver-1.0.1.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/client-drivers/selenium-java-client-driver/1.0.1/selenium-java-client-driver-1.0.1-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/client-drivers/selenium-java-client-driver/1.0.1/selenium-java-client-driver-1.0.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/server/selenium-server/1.0.1/selenium-server-1.0.1.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/server/selenium-server/1.0.1/selenium-server-1.0.1-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/server/selenium-server/1.0.1/selenium-server-1.0.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/server/selenium-server/1.0.1/selenium-server-1.0.1-standalone.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/server/selenium-server/1.0.1/selenium-server-1.0.1-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/server/selenium-server/1.0.1/selenium-server-1.0.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/core/selenium-core/1.0.1/selenium-core-1.0.1.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/core/selenium-core/1.0.1/selenium-core-1.0.1-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/core/selenium-core/1.0.1/selenium-core-1.0.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/server/selenium-server-coreless/1.0.1/selenium-server-coreless-1.0.1.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/server/selenium-server-coreless/1.0.1/selenium-server-coreless-1.0.1-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/server/selenium-server-coreless/1.0.1/selenium-server-coreless-1.0.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.7/junit-4.7.jar" sourcepath="M2_REPO/junit/junit/4.7/junit-4.7-sources.jar" javadocpath="M2_REPO/junit/junit/4.7/junit-4.7-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-sources.jar" javadocpath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1-sources.jar" javadocpath="M2_REPO/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar" javadocpath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-sources.jar" javadocpath="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-javadoc.jar"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
diff --git a/bumblebee_junit4_acceptance/.project b/bumblebee_junit4_acceptance/.project
old mode 100755
new mode 100644
index 8aa7a43..abffc59
--- a/bumblebee_junit4_acceptance/.project
+++ b/bumblebee_junit4_acceptance/.project
@@ -1,5 +1,5 @@
 <projectDescription>
-  <name>com.agical.bumblebee-bumblebee_junit4_acceptance</name>
+  <name>bumblebee_junit4_acceptance</name>
   <projects/>
   <buildSpec>
     <buildCommand>
diff --git a/bumblebee_selenium/.classpath b/bumblebee_selenium/.classpath
old mode 100755
new mode 100644
index 9f5dc79..089c10f
--- a/bumblebee_selenium/.classpath
+++ b/bumblebee_selenium/.classpath
@@ -1,25 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="**/.svn/|**/CVS/" kind="src" path="src/main/java"/>
-	<classpathentry excluding="**/.svn/|**/CVS/" kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/bumblebee"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/bumblebee_jruby"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/bumblebee_junit4"/>
-	<classpathentry kind="var" path="M2_REPO/com/thoughtworks/qdox/qdox/1.7-20070527.154641-2/qdox-1.7-20070527.154641-2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/fr/lifl/parsing/1.0.1/parsing-1.0.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/jhighlight/jhighlight/1.0/jhighlight-1.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/oqube/muse/muse-parser/1.0-rc3/muse-parser-1.0-rc3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jruby/jruby-complete/1.1/jruby-complete-1.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/org/seleniumhq/selenium/client-drivers/selenium-java-client-driver/1.0-beta-2/selenium-java-client-driver-1.0-beta-2.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/org/seleniumhq/selenium/core/selenium-core/1.0-beta-2/selenium-core-1.0-beta-2.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/org/seleniumhq/selenium/server/selenium-server/1.0-beta-2/selenium-server-1.0-beta-2.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/org/seleniumhq/selenium/server/selenium-server/1.0-beta-2/selenium-server-1.0-beta-2-standalone.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/org/seleniumhq/selenium/server/selenium-server-coreless/1.0-beta-2/selenium-server-coreless-1.0-beta-2.jar"/>
-	<classpathentry kind="output" path="classes"/>
-</classpath>
+<classpath>
+  <classpathentry kind="src" path="src/main/java" excluding="**/.svn/|**/CVS/"/>
+  <classpathentry kind="src" combineaccessrules="false" path="/bumblebee"/>
+  <classpathentry kind="src" combineaccessrules="false" path="/bumblebee_jruby"/>
+  <classpathentry kind="src" combineaccessrules="false" path="/bumblebee_junit4"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar" sourcepath="M2_REPO/junit/junit/4.6/junit-4.6-sources.jar" javadocpath="M2_REPO/junit/junit/4.6/junit-4.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/oqube/muse/muse-parser/1.0-rc3/muse-parser-1.0-rc3.jar" sourcepath="M2_REPO/oqube/muse/muse-parser/1.0-rc3/muse-parser-1.0-rc3-sources.jar" javadocpath="M2_REPO/oqube/muse/muse-parser/1.0-rc3/muse-parser-1.0-rc3-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/fr/lifl/parsing/1.0.1/parsing-1.0.1.jar" sourcepath="M2_REPO/fr/lifl/parsing/1.0.1/parsing-1.0.1-sources.jar" javadocpath="M2_REPO/fr/lifl/parsing/1.0.1/parsing-1.0.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jhighlight/jhighlight/1.0/jhighlight-1.0.jar" sourcepath="M2_REPO/jhighlight/jhighlight/1.0/jhighlight-1.0-sources.jar" javadocpath="M2_REPO/jhighlight/jhighlight/1.0/jhighlight-1.0-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar" javadocpath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar" javadocpath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jruby/jruby-complete/1.1/jruby-complete-1.1.jar" sourcepath="M2_REPO/org/jruby/jruby-complete/1.1/jruby-complete-1.1-sources.jar" javadocpath="M2_REPO/org/jruby/jruby-complete/1.1/jruby-complete-1.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/pmd/pmd/4.2.4/pmd-4.2.4.jar" sourcepath="M2_REPO/pmd/pmd/4.2.4/pmd-4.2.4-sources.jar" javadocpath="M2_REPO/pmd/pmd/4.2.4/pmd-4.2.4-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1.jar" sourcepath="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1-sources.jar" javadocpath="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/asm/asm/3.1/asm-3.1.jar" sourcepath="M2_REPO/asm/asm/3.1/asm-3.1-sources.jar" javadocpath="M2_REPO/asm/asm/3.1/asm-3.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium/2.0a5/selenium-2.0a5.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium/2.0a5/selenium-2.0a5-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/selenium/2.0a5/selenium-2.0a5-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-server/2.0a5/selenium-server-2.0a5.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-server/2.0a5/selenium-server-2.0a5-sources.jar" javadocpath="M2_REPO/org/seleniumhq/selenium/selenium-server/2.0a5/selenium-server-2.0a5-javadoc.jar"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
diff --git a/bumblebee_selenium/.project b/bumblebee_selenium/.project
old mode 100755
new mode 100644
index 4521d54..3535efa
--- a/bumblebee_selenium/.project
+++ b/bumblebee_selenium/.project
@@ -1,17 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>bumblebee_selenium</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
+  <name>bumblebee_selenium</name>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
 </projectDescription>
diff --git a/bumblebee_swing/.classpath b/bumblebee_swing/.classpath
old mode 100755
new mode 100644
index f8ad532..15fd952
--- a/bumblebee_swing/.classpath
+++ b/bumblebee_swing/.classpath
@@ -1,10 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="**/.svn/|**/CVS/" kind="src" path="src/main/java"/>
-	<classpathentry excluding="**/.svn/|**/CVS/" kind="src" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/bumblebee_jruby"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/bumblebee"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/bumblebee_junit4"/>
-	<classpathentry kind="output" path="classes"/>
-</classpath>
+<classpath>
+  <classpathentry kind="src" path="src/main/java" excluding="**/.svn/|**/CVS/"/>
+  <classpathentry kind="src" combineaccessrules="false" path="/bumblebee"/>
+  <classpathentry kind="src" combineaccessrules="false" path="/bumblebee_jruby"/>
+  <classpathentry kind="src" combineaccessrules="false" path="/bumblebee_junit4"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar" sourcepath="M2_REPO/junit/junit/4.6/junit-4.6-sources.jar" javadocpath="M2_REPO/junit/junit/4.6/junit-4.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/oqube/muse/muse-parser/1.0-rc3/muse-parser-1.0-rc3.jar" sourcepath="M2_REPO/oqube/muse/muse-parser/1.0-rc3/muse-parser-1.0-rc3-sources.jar" javadocpath="M2_REPO/oqube/muse/muse-parser/1.0-rc3/muse-parser-1.0-rc3-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/fr/lifl/parsing/1.0.1/parsing-1.0.1.jar" sourcepath="M2_REPO/fr/lifl/parsing/1.0.1/parsing-1.0.1-sources.jar" javadocpath="M2_REPO/fr/lifl/parsing/1.0.1/parsing-1.0.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jhighlight/jhighlight/1.0/jhighlight-1.0.jar" sourcepath="M2_REPO/jhighlight/jhighlight/1.0/jhighlight-1.0-sources.jar" javadocpath="M2_REPO/jhighlight/jhighlight/1.0/jhighlight-1.0-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar" javadocpath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar" javadocpath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jruby/jruby-complete/1.1/jruby-complete-1.1.jar" sourcepath="M2_REPO/org/jruby/jruby-complete/1.1/jruby-complete-1.1-sources.jar" javadocpath="M2_REPO/org/jruby/jruby-complete/1.1/jruby-complete-1.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/pmd/pmd/4.2.4/pmd-4.2.4.jar" sourcepath="M2_REPO/pmd/pmd/4.2.4/pmd-4.2.4-sources.jar" javadocpath="M2_REPO/pmd/pmd/4.2.4/pmd-4.2.4-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1.jar" sourcepath="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1-sources.jar" javadocpath="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/asm/asm/3.1/asm-3.1.jar" sourcepath="M2_REPO/asm/asm/3.1/asm-3.1-sources.jar" javadocpath="M2_REPO/asm/asm/3.1/asm-3.1-javadoc.jar"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
diff --git a/bumblebee_swing/.project b/bumblebee_swing/.project
old mode 100755
new mode 100644
index f93d5de..02cd66b
--- a/bumblebee_swing/.project
+++ b/bumblebee_swing/.project
@@ -1,17 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>bumblebee_swing</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
+  <name>bumblebee_swing</name>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
 </projectDescription>
diff --git a/bumblebee_uml/.classpath b/bumblebee_uml/.classpath
old mode 100755
new mode 100644
index 64dac98..50e6c1a
--- a/bumblebee_uml/.classpath
+++ b/bumblebee_uml/.classpath
@@ -1,26 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="**/.svn/|**/CVS/" kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry excluding="**/.svn/|**/CVS/" kind="src" path="src/test/java"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/junit/junit/4.5/junit-4.5.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/asm/asm/3.1/asm-3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="umlspeed-0.19/umlspeed.jar" sourcepath="umlspeed-0.19/src"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/batik/batik-rasterizer/1.6/batik-rasterizer-1.6.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/batik/batik-awt-util/1.6/batik-awt-util-1.6.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/batik/batik-bridge/1.6/batik-bridge-1.6.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/batik/batik-css/1.6/batik-css-1.6.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/batik/batik-dom/1.6/batik-dom-1.6.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/batik/batik-gvt/1.6/batik-gvt-1.6.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/batik/batik-parser/1.6/batik-parser-1.6.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/batik/batik-script/1.6/batik-script-1.6.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/batik/batik-svg-dom/1.6/batik-svg-dom-1.6.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/batik/batik-transcoder/1.6/batik-transcoder-1.6.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/batik/batik-util/1.6/batik-util-1.6.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/batik/batik-xml/1.6/batik-xml-1.6.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/batik/batik-ext/1.6/batik-ext-1.6.jar"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/bumblebee"/>
-	<classpathentry kind="output" path="classes"/>
-</classpath>
+<classpath>
+  <classpathentry kind="src" path="src/main/java" excluding="**/.svn/|**/CVS/"/>
+  <classpathentry kind="src" path="src/main/resources" excluding="**/.svn/|**/CVS/" output="target/resources"/>
+  <classpathentry kind="src" path="src/test/java" excluding="**/.svn/|**/CVS/" output="target/test/classes"/>
+  <classpathentry kind="src" path="src/test/resources" excluding="**/.svn/|**/CVS/" output="target/test/resources"/>
+  <classpathentry kind="src" combineaccessrules="false" path="/bumblebee"/>
+  <classpathentry kind="src" combineaccessrules="false" path="/bumblebee_jruby"/>
+  <classpathentry kind="src" combineaccessrules="false" path="/bumblebee_junit4"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar" sourcepath="M2_REPO/junit/junit/4.6/junit-4.6-sources.jar" javadocpath="M2_REPO/junit/junit/4.6/junit-4.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/oqube/muse/muse-parser/1.0-rc3/muse-parser-1.0-rc3.jar" sourcepath="M2_REPO/oqube/muse/muse-parser/1.0-rc3/muse-parser-1.0-rc3-sources.jar" javadocpath="M2_REPO/oqube/muse/muse-parser/1.0-rc3/muse-parser-1.0-rc3-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/fr/lifl/parsing/1.0.1/parsing-1.0.1.jar" sourcepath="M2_REPO/fr/lifl/parsing/1.0.1/parsing-1.0.1-sources.jar" javadocpath="M2_REPO/fr/lifl/parsing/1.0.1/parsing-1.0.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jhighlight/jhighlight/1.0/jhighlight-1.0.jar" sourcepath="M2_REPO/jhighlight/jhighlight/1.0/jhighlight-1.0-sources.jar" javadocpath="M2_REPO/jhighlight/jhighlight/1.0/jhighlight-1.0-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar" javadocpath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar" javadocpath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jruby/jruby-complete/1.1/jruby-complete-1.1.jar" sourcepath="M2_REPO/org/jruby/jruby-complete/1.1/jruby-complete-1.1-sources.jar" javadocpath="M2_REPO/org/jruby/jruby-complete/1.1/jruby-complete-1.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/pmd/pmd/4.2.4/pmd-4.2.4.jar" sourcepath="M2_REPO/pmd/pmd/4.2.4/pmd-4.2.4-sources.jar" javadocpath="M2_REPO/pmd/pmd/4.2.4/pmd-4.2.4-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1.jar" sourcepath="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1-sources.jar" javadocpath="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/asm/asm/3.1/asm-3.1.jar" sourcepath="M2_REPO/asm/asm/3.1/asm-3.1-sources.jar" javadocpath="M2_REPO/asm/asm/3.1/asm-3.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-rasterizer/1.6/batik-rasterizer-1.6.jar" sourcepath="M2_REPO/batik/batik-rasterizer/1.6/batik-rasterizer-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-rasterizer/1.6/batik-rasterizer-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-awt-util/1.6/batik-awt-util-1.6.jar" sourcepath="M2_REPO/batik/batik-awt-util/1.6/batik-awt-util-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-awt-util/1.6/batik-awt-util-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-bridge/1.6/batik-bridge-1.6.jar" sourcepath="M2_REPO/batik/batik-bridge/1.6/batik-bridge-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-bridge/1.6/batik-bridge-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-css/1.6/batik-css-1.6.jar" sourcepath="M2_REPO/batik/batik-css/1.6/batik-css-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-css/1.6/batik-css-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-dom/1.6/batik-dom-1.6.jar" sourcepath="M2_REPO/batik/batik-dom/1.6/batik-dom-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-dom/1.6/batik-dom-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-ext/1.6/batik-ext-1.6.jar" sourcepath="M2_REPO/batik/batik-ext/1.6/batik-ext-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-ext/1.6/batik-ext-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-gvt/1.6/batik-gvt-1.6.jar" sourcepath="M2_REPO/batik/batik-gvt/1.6/batik-gvt-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-gvt/1.6/batik-gvt-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-parser/1.6/batik-parser-1.6.jar" sourcepath="M2_REPO/batik/batik-parser/1.6/batik-parser-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-parser/1.6/batik-parser-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-script/1.6/batik-script-1.6.jar" sourcepath="M2_REPO/batik/batik-script/1.6/batik-script-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-script/1.6/batik-script-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-svg-dom/1.6/batik-svg-dom-1.6.jar" sourcepath="M2_REPO/batik/batik-svg-dom/1.6/batik-svg-dom-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-svg-dom/1.6/batik-svg-dom-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-transcoder/1.6/batik-transcoder-1.6.jar" sourcepath="M2_REPO/batik/batik-transcoder/1.6/batik-transcoder-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-transcoder/1.6/batik-transcoder-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-util/1.6/batik-util-1.6.jar" sourcepath="M2_REPO/batik/batik-util/1.6/batik-util-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-util/1.6/batik-util-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/batik/batik-xml/1.6/batik-xml-1.6.jar" sourcepath="M2_REPO/batik/batik-xml/1.6/batik-xml-1.6-sources.jar" javadocpath="M2_REPO/batik/batik-xml/1.6/batik-xml-1.6-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.5.0/xercesImpl-2.5.0.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.5.0/xercesImpl-2.5.0-sources.jar" javadocpath="M2_REPO/xerces/xercesImpl/2.5.0/xercesImpl-2.5.0-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xmlParserAPIs/2.0.2/xmlParserAPIs-2.0.2.jar" sourcepath="M2_REPO/xml-apis/xmlParserAPIs/2.0.2/xmlParserAPIs-2.0.2-sources.jar" javadocpath="M2_REPO/xml-apis/xmlParserAPIs/2.0.2/xmlParserAPIs-2.0.2-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/umlspeed/umlspeed/0.19/umlspeed-0.19.jar" sourcepath="M2_REPO/umlspeed/umlspeed/0.19/umlspeed-0.19-sources.jar" javadocpath="M2_REPO/umlspeed/umlspeed/0.19/umlspeed-0.19-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.7/junit-4.7.jar" sourcepath="M2_REPO/junit/junit/4.7/junit-4.7-sources.jar" javadocpath="M2_REPO/junit/junit/4.7/junit-4.7-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-sources.jar" javadocpath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1-sources.jar" javadocpath="M2_REPO/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar" javadocpath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-javadoc.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-sources.jar" javadocpath="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-javadoc.jar"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
diff --git a/bumblebee_uml/.project b/bumblebee_uml/.project
old mode 100755
new mode 100644
index 32543bd..29673e9
--- a/bumblebee_uml/.project
+++ b/bumblebee_uml/.project
@@ -1,17 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>bumblebee_uml</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
+  <name>bumblebee_uml</name>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
 </projectDescription>
diff --git a/bumblebee_uml/reports/junit/TEST-com.agical.bumblebee.uml.TestAll.txt b/bumblebee_uml/reports/junit/TEST-com.agical.bumblebee.uml.TestAll.txt
deleted file mode 100755
index adc1587..0000000
--- a/bumblebee_uml/reports/junit/TEST-com.agical.bumblebee.uml.TestAll.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Testsuite: com.agical.bumblebee.uml.TestAll
-Tests run: 5, Failures: 0, Errors: 0, Time elapsed: 4.157 sec
-------------- Standard Output ---------------
-About to transcoder source of type: org.apache.batik.apps.rasterizer.SVGConverterFileSource
-------------- ---------------- ---------------
-
-Testcase: generateClassDefinition took 0.408 sec
-Testcase: generateClassDiagram took 0.001 sec
-Testcase: generateDiagramForAllClassesUsedInAMethod took 0.041 sec
-Testcase: writeClassDiagramFile took 0.032 sec
-Testcase: testUmlspeedAndBatikGeneration took 3.274 sec
diff --git a/bumblebee_uml/reports/junit/TEST-com.agical.bumblebee.uml.TestAll.xml b/bumblebee_uml/reports/junit/TEST-com.agical.bumblebee.uml.TestAll.xml
deleted file mode 100755
index 32de535..0000000
--- a/bumblebee_uml/reports/junit/TEST-com.agical.bumblebee.uml.TestAll.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="0" hostname="daniel-ubuntu" name="com.agical.bumblebee.uml.TestAll" tests="5" time="4.157" timestamp="2009-05-21T20:09:51">
-  <properties>
-    <property name="jna.platform.library.path" value="/usr/lib32:/usr/lib:/lib" />
-    <property name="java.runtime.name" value="Java(TM) SE Runtime Environment" />
-    <property name="jruby.home" value="/opt/app/jruby-1.2.0" />
-    <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.13/jre/lib/i386" />
-    <property name="java.vm.version" value="11.3-b02" />
-    <property name="ant.version" value="Apache Ant version 1.7.1 compiled on June 27 2008" />
-    <property name="ant.java.version" value="1.6" />
-    <property name="java.vm.vendor" value="Sun Microsystems Inc." />
-    <property name="java.vendor.url" value="http://java.sun.com/" />
-    <property name="path.separator" value=":" />
-    <property name="java.vm.name" value="Java HotSpot(TM) Server VM" />
-    <property name="file.encoding.pkg" value="sun.io" />
-    <property name="user.country" value="US" />
-    <property name="sun.java.launcher" value="SUN_STANDARD" />
-    <property name="sun.os.patch.level" value="unknown" />
-    <property name="java.vm.specification.name" value="Java Virtual Machine Specification" />
-    <property name="user.dir" value="/home/daniel/dev/bumblebee/bumblebee_uml" />
-    <property name="java.runtime.version" value="1.6.0_13-b03" />
-    <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment" />
-    <property name="basedir" value="/home/daniel/dev/bumblebee" />
-    <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.13/jre/lib/endorsed" />
-    <property name="os.arch" value="i386" />
-    <property name="java.io.tmpdir" value="/tmp" />
-    <property name="ant.core.lib" value="/home/daniel/.m2/repository/org/apache/ant/ant/1.7.1/ant-1.7.1.jar" />
-    <property name="line.separator" value="
-" />
-    <property name="java.vm.specification.vendor" value="Sun Microsystems Inc." />
-    <property name="os.name" value="Linux" />
-    <property name="jna.boot.library.path" value="/opt/app/jruby-1.2.0/lib/native/linux-i386:/opt/app/jruby-1.2.0/lib/native/linux-amd64" />
-    <property name="ant.project.name" value="junit" />
-    <property name="sun.jnu.encoding" value="UTF-8" />
-    <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.13/jre/lib/i386/server:/usr/lib/jvm/java-6-sun-1.6.0.13/jre/lib/i386:/usr/lib/jvm/java-6-sun-1.6.0.13/jre/../lib/i386:/usr/lib/jvm/java-6-sun-1.6.0.13/jre/lib/i386/client:/usr/lib/jvm/java-6-sun-1.6.0.13/jre/lib/i386:/usr/lib/jvm/java-6-sun-1.6.0.13/jre/../lib/i386:/usr/java/packages/lib/i386:/lib:/usr/lib" />
-    <property name="jruby.memory.max" value="500m" />
-    <property name="java.specification.name" value="Java Platform API Specification" />
-    <property name="java.class.version" value="50.0" />
-    <property name="sun.management.compiler" value="HotSpot Tiered Compilers" />
-    <property name="os.version" value="2.6.28-11-generic" />
-    <property name="jffi.boot.library.path" value="/opt/app/jruby-1.2.0/lib/native/i386-Linux" />
-    <property name="user.home" value="/home/daniel" />
-    <property name="user.timezone" value="" />
-    <property name="java.awt.printerjob" value="sun.print.PSPrinterJob" />
-    <property name="java.specification.version" value="1.6" />
-    <property name="file.encoding" value="UTF-8" />
-    <property name="user.name" value="daniel" />
-    <property name="jruby.stack.max" value="1024k" />
-    <property name="jruby.script" value="jruby" />
-    <property name="java.class.path" value="/home/daniel/dev/bumblebee/bumblebee_uml/target/test/classes:/home/daniel/dev/bumblebee/bumblebee_uml/target/test/resources:/home/daniel/dev/bumblebee/bumblebee_uml/target/classes:/home/daniel/dev/bumblebee/bumblebee_uml/target/resources:/home/daniel/dev/bumblebee/bumblebee/target/bumblebee-1.1.1.jar:/home/daniel/dev/bumblebee/bumblebee_junit4/target/bumblebee_junit4-1.1.1.jar:/home/daniel/dev/bumblebee/bumblebee_jruby/target/bumblebee_jruby-1.1.1.jar:/home/daniel/.m2/repository/junit/junit/4.6/junit-4.6.jar:/home/daniel/.m2/repository/oqube/muse/muse-parser/1.0-rc3/muse-parser-1.0-rc3.jar:/home/daniel/.m2/repository/fr/lifl/parsing/1.0.1/parsing-1.0.1.jar:/home/daniel/.m2/repository/jhighlight/jhighlight/1.0/jhighlight-1.0.jar:/home/daniel/.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.jar:/home/daniel/.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar:/home/daniel/.m2/repository/org/jruby/jruby-complete/1.1/jruby-complete-1.1.jar:/home/daniel/.m2/repository/pmd/pmd/4.2.4/pmd-4.2.4.jar:/home/daniel/.m2/repository/jaxen/jaxen/1.1.1/jaxen-1.1.1.jar:/home/daniel/.m2/repository/asm/asm/3.1/asm-3.1.jar:/home/daniel/.m2/repository/batik/batik-rasterizer/1.6/batik-rasterizer-1.6.jar:/home/daniel/.m2/repository/batik/batik-awt-util/1.6/batik-awt-util-1.6.jar:/home/daniel/.m2/repository/batik/batik-bridge/1.6/batik-bridge-1.6.jar:/home/daniel/.m2/repository/batik/batik-css/1.6/batik-css-1.6.jar:/home/daniel/.m2/repository/batik/batik-dom/1.6/batik-dom-1.6.jar:/home/daniel/.m2/repository/batik/batik-ext/1.6/batik-ext-1.6.jar:/home/daniel/.m2/repository/batik/batik-gvt/1.6/batik-gvt-1.6.jar:/home/daniel/.m2/repository/batik/batik-parser/1.6/batik-parser-1.6.jar:/home/daniel/.m2/repository/batik/batik-script/1.6/batik-script-1.6.jar:/home/daniel/.m2/repository/batik/batik-svg-dom/1.6/batik-svg-dom-1.6.jar:/home/daniel/.m2/repository/batik/batik-transcoder/1.6/batik-transcoder-1.6.jar:/home/daniel/.m2/repository/batik/batik-util/1.6/batik-util-1.6.jar:/home/daniel/.m2/repository/batik/batik-xml/1.6/batik-xml-1.6.jar:/home/daniel/.m2/repository/xerces/xercesImpl/2.5.0/xercesImpl-2.5.0.jar:/home/daniel/.m2/repository/xml-apis/xmlParserAPIs/2.0.2/xmlParserAPIs-2.0.2.jar:/home/daniel/.m2/repository/umlspeed/umlspeed/0.19/umlspeed-0.19.jar:/home/daniel/.m2/repository/junit/junit/4.4/junit-4.4.jar:/home/daniel/.m2/repository/jmock/jmock/1.2.0/jmock-1.2.0.jar:/home/daniel/.m2/repository/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.jar:/home/daniel/.m2/repository/org/apache/ant/ant/1.7.1/ant-1.7.1.jar:/home/daniel/.m2/repository/org/apache/ant/ant-junit/1.7.1/ant-junit-1.7.1.jar" />
-    <property name="jruby.shell" value="/bin/sh" />
-    <property name="java.vm.specification.version" value="1.0" />
-    <property name="sun.arch.data.model" value="32" />
-    <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.13/jre" />
-    <property name="java.specification.vendor" value="Sun Microsystems Inc." />
-    <property name="user.language" value="en" />
-    <property name="java.vm.info" value="mixed mode" />
-    <property name="java.version" value="1.6.0_13" />
-    <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.13/jre/lib/ext:/usr/java/packages/lib/ext" />
-    <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.13/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.13/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.13/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.13/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.13/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.13/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.13/jre/classes" />
-    <property name="java.vendor" value="Sun Microsystems Inc." />
-    <property name="file.separator" value="/" />
-    <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi" />
-    <property name="sun.io.unicode.encoding" value="UnicodeLittle" />
-    <property name="sun.cpu.endian" value="little" />
-    <property name="jruby.lib" value="/opt/app/jruby-1.2.0/lib" />
-    <property name="sun.desktop" value="gnome" />
-    <property name="sun.cpu.isalist" value="" />
-  </properties>
-  <testcase classname="com.agical.bumblebee.uml.TestUmlspeedBuilder" name="generateClassDefinition" time="0.409" />
-  <testcase classname="com.agical.bumblebee.uml.TestUmlspeedBuilder" name="generateClassDiagram" time="0.0020" />
-  <testcase classname="com.agical.bumblebee.uml.TestUmlspeedBuilder" name="generateDiagramForAllClassesUsedInAMethod" time="0.041" />
-  <testcase classname="com.agical.bumblebee.uml.TestUmlspeedBuilder" name="writeClassDiagramFile" time="0.032" />
-  <testcase classname="com.agical.bumblebee.uml.UmlSpeedAndBatik" name="testUmlspeedAndBatikGeneration" time="3.274" />
-  <system-out><![CDATA[About to transcoder source of type: org.apache.batik.apps.rasterizer.SVGConverterFileSource
-]]></system-out>
-  <system-err><![CDATA[]]></system-err>
-</testsuite>
diff --git a/bumblebee_uml/reports/junit/last_successful_run b/bumblebee_uml/reports/junit/last_successful_run
deleted file mode 100755
index e69de29..0000000
diff --git a/dependencies.rb b/dependencies.rb
index 7a883aa..31e9b01 100755
--- a/dependencies.rb
+++ b/dependencies.rb
@@ -41,11 +41,15 @@
     'org.openqa.selenium.server:selenium-server-coreless:jar:0.9.2']
 
 SELENIUM_1_0 = [
-    'org.seleniumhq.selenium.client-drivers:selenium-java-client-driver:jar:1.0-beta-2',
-    'org.seleniumhq.selenium.server:selenium-server:jar:1.0-beta-2',
-    'org.seleniumhq.selenium.server:selenium-server:jar:standalone:1.0-beta-2',
-    'org.seleniumhq.selenium.core:selenium-core:jar:1.0-beta-2',
-    'org.seleniumhq.selenium.server:selenium-server-coreless:jar:1.0-beta-2']
+    'org.seleniumhq.selenium.client-drivers:selenium-java-client-driver:jar:1.0.1',
+    'org.seleniumhq.selenium.server:selenium-server:jar:1.0.1',
+    'org.seleniumhq.selenium.server:selenium-server:jar:standalone:1.0.1',
+    'org.seleniumhq.selenium.core:selenium-core:jar:1.0.1',
+    'org.seleniumhq.selenium.server:selenium-server-coreless:jar:1.0.1']
+
+SELENIUM_2_0 = [
+    'org.seleniumhq.selenium:selenium:jar:2.0a5',
+    'org.seleniumhq.selenium:selenium-server:jar:2.0a5']
 
 SELENIUM = SELENIUM_1_0
 JETTY = ['jetty:jetty:jar:5.01.1']