diff --git a/org.apache.hadoop.eclipse/.classpath b/org.apache.hadoop.eclipse/.classpath
index 8b07870..3354a37 100644
--- a/org.apache.hadoop.eclipse/.classpath
+++ b/org.apache.hadoop.eclipse/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="hadoop-core-1.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/hadoop-core-1.0.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.apache.hadoop.eclipse/META-INF/MANIFEST.MF b/org.apache.hadoop.eclipse/META-INF/MANIFEST.MF
index e074ebe..eb241fd 100644
--- a/org.apache.hadoop.eclipse/META-INF/MANIFEST.MF
+++ b/org.apache.hadoop.eclipse/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: OSGi Hadoop Bungle
+Bundle-Name: OSGi Hadoop Bundle
 Bundle-SymbolicName: org.apache.hadoop.eclipse
 Bundle-Version: 0.0.0
 Bundle-Vendor: Apache Software Foundation
@@ -103,3 +103,4 @@
  org.apache.hadoop.util,
  org.apache.hadoop.util.bloom,
  org.apache.hadoop.util.hash
+Bundle-ClassPath: lib/hadoop-core-1.0.4.jar
diff --git a/org.apache.hadoop.eclipse/build.properties b/org.apache.hadoop.eclipse/build.properties
index 34d2e4d..9b6f741 100644
--- a/org.apache.hadoop.eclipse/build.properties
+++ b/org.apache.hadoop.eclipse/build.properties
@@ -1,4 +1,3 @@
-source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               lib/hadoop-core-1.0.4.jar
diff --git a/org.apache.hadoop.eclipse/hadoop-core-1.0.4.jar b/org.apache.hadoop.eclipse/lib/hadoop-core-1.0.4.jar
similarity index 100%
rename from org.apache.hadoop.eclipse/hadoop-core-1.0.4.jar
rename to org.apache.hadoop.eclipse/lib/hadoop-core-1.0.4.jar
Binary files differ
diff --git a/org.apache.hdt.core/.classpath b/org.apache.hdt.core/.classpath
index 355df07..ad32c83 100644
--- a/org.apache.hdt.core/.classpath
+++ b/org.apache.hdt.core/.classpath
@@ -3,6 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="/Users/amberry/tools/hadoop-1.0.4/hadoop-core-1.0.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.apache.hdt.core/META-INF/MANIFEST.MF b/org.apache.hdt.core/META-INF/MANIFEST.MF
index af22705..a9547a3 100644
--- a/org.apache.hdt.core/META-INF/MANIFEST.MF
+++ b/org.apache.hdt.core/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@
  org.eclipse.swt,
  org.eclipse.jface,
  org.eclipse.ui,
- org.eclipse.jdt.ui
+ org.eclipse.jdt.ui,
+ org.apache.hadoop.eclipse
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.apache.hdt.core,
diff --git a/org.apache.hdt.ui/src/org/apache/hdt/ui/cluster/IHadoopClusterListener.java b/org.apache.hdt.core/src/org/apache/hdt/core/cluster/IHadoopClusterListener.java
similarity index 91%
rename from org.apache.hdt.ui/src/org/apache/hdt/ui/cluster/IHadoopClusterListener.java
rename to org.apache.hdt.core/src/org/apache/hdt/core/cluster/IHadoopClusterListener.java
index 8d33cc8..8becbfc 100644
--- a/org.apache.hdt.ui/src/org/apache/hdt/ui/cluster/IHadoopClusterListener.java
+++ b/org.apache.hdt.core/src/org/apache/hdt/core/cluster/IHadoopClusterListener.java
@@ -16,9 +16,8 @@
  * limitations under the License.
  */
 
-package org.apache.hdt.ui.cluster;
+package org.apache.hdt.core.cluster;
 
-import org.apache.hdt.core.cluster.HadoopCluster;
 
 /**
  * Interface for monitoring server changes
diff --git a/org.apache.hdt.ui/src/org/apache/hdt/ui/cluster/ServerRegistry.java b/org.apache.hdt.ui/src/org/apache/hdt/ui/cluster/ServerRegistry.java
index 974315b..b1e172b 100644
--- a/org.apache.hdt.ui/src/org/apache/hdt/ui/cluster/ServerRegistry.java
+++ b/org.apache.hdt.ui/src/org/apache/hdt/ui/cluster/ServerRegistry.java
@@ -30,6 +30,7 @@
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hdt.core.cluster.HadoopCluster;
+import org.apache.hdt.core.cluster.IHadoopClusterListener;
 import org.apache.hdt.ui.Activator;
 import org.eclipse.jface.dialogs.MessageDialog;
 
diff --git a/org.apache.hdt.ui/src/org/apache/hdt/ui/views/ClusterView.java b/org.apache.hdt.ui/src/org/apache/hdt/ui/views/ClusterView.java
index 0c53a19..711ccf3 100644
--- a/org.apache.hdt.ui/src/org/apache/hdt/ui/views/ClusterView.java
+++ b/org.apache.hdt.ui/src/org/apache/hdt/ui/views/ClusterView.java
@@ -22,12 +22,12 @@
 
 import org.apache.hdt.core.cluster.HadoopCluster;
 import org.apache.hdt.core.cluster.HadoopJob;
+import org.apache.hdt.core.cluster.IHadoopClusterListener;
 import org.apache.hdt.core.cluster.IJobListener;
 import org.apache.hdt.core.cluster.utils.JarModule;
 import org.apache.hdt.ui.ImageLibrary;
 import org.apache.hdt.ui.actions.EditLocationAction;
 import org.apache.hdt.ui.actions.NewLocationAction;
-import org.apache.hdt.ui.cluster.IHadoopClusterListener;
 import org.apache.hdt.ui.cluster.ServerRegistry;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;