diff --git a/base/.classpath b/base/.classpath
index e49c515468..97323ffef4 100644
--- a/base/.classpath
+++ b/base/.classpath
@@ -3,98 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="/tools"/>
-	<classpathentry kind="lib" path="/tools/lib/commons-net-1.4.0.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/ant.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/jpedal.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/jnlp.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/junit.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/postgresql.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/ojdbc6.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/c3p0-0.9.1.2.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/script-api.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/barbecue-1.5-beta1.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/poi-3.0.1-FINAL-20070705.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.16.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.13.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/swingx-1.6.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/looks-2.0.4.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/commons-collections-3.1.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/activemq-core-5.0.0.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/cron4j-2.2.1.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" path="/JasperReportsTools"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/base/META-INF/MANIFEST.MF b/base/META-INF/MANIFEST.MF
index e2a910ebeb..499d9ab1a5 100644
--- a/base/META-INF/MANIFEST.MF
+++ b/base/META-INF/MANIFEST.MF
@@ -3,27 +3,9 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.adempiere.base
 Bundle-SymbolicName: org.adempiere.base;singleton:=true
 Bundle-Version: 0.0.0.2
-Bundle-ClassPath: base.jar,
- lib/commons-net-1.4.0.jar,
- lib/ant.jar,
- lib/jpedal.jar,
- lib/jnlp.jar,
- lib/junit.jar,
- client/jbossall-client.jar,
- lib/postgresql.jar,
- lib/ocrs12.jar,
- lib/ojdbc14.jar,
- lib/c3p0-0.9.1.2.jar,
- lib/script-api.jar,
- lib/barbecue-1.5-beta1.jar,
- lib/poi-3.0.1-FINAL-20070705.jar,
- lib/jcommon-1.0.14.jar,
- lib/jfreechart-1.0.11.jar,
- lib/swingx-0.9.0.jar,
- lib/looks-2.0.4.jar,
- lib/commons-collections-3.1.jar,
- lib/activemq-core-5.0.0.jar
-Export-Package: org.adempiere.apps.graph,
+Bundle-ClassPath: base.jar
+Export-Package: com.akunagroup.uk.postcode,
+ org.adempiere.apps.graph,
  org.adempiere.base,
  org.adempiere.exceptions,
  org.adempiere.impexp,
@@ -65,3 +47,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
  com.springsource.javax.servlet;bundle-version="2.5.0",
  com.springsource.javax.jms;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Eclipse-ExtensibleAPI: true
+
diff --git a/base/build.properties b/base/build.properties
index db97164a20..947dfe409b 100644
--- a/base/build.properties
+++ b/base/build.properties
@@ -1,51 +1,5 @@
 source.base.jar = src/
+output.base.jar = build
 bin.includes = META-INF/,\
                base.jar,\
                plugin.xml
-jars.extra.classpath = platform:/plugin/org.adempiere.tools/lib/activemq-core-5.0.0.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/ant-commons-net.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/ant-contrib-1.0b1.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/ant-launcher.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/ant.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/barbecue-1.5-beta1.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/bsh-2.0b5.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/bsh-engine.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/c3p0-0.9.1.2.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/c3p0-oracle-thin-extras-0.9.1.2.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/cglib.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/commons-codec.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/commons-collections-3.1.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/commons-logging.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/commons-net-1.4.0.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/groovy-all-1.5.1.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/groovy-engine.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/iText-2.1.7.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/javaee.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/jcommon-1.0.16.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/jfreechart-1.0.13.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/jgraph.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/jnlp.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/jpayment.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/jpedal.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/jsp-api.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/jstl.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/junit.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/jython-engine.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/jython.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/log4j.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/logkit.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/looks-2.0.4.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/mail.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/miglayout-3.7.1-swing.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/ojdbc6.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/poi-3.0.1-FINAL-20070705.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/postgresql.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/script-api.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/servlet-api.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/standard.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/swingx-1.6.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/Verisign.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/wizard.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/xercesImpl.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/xjavadoc-1.1.jar,\
-                       platform:/plugin/org.adempiere.tools/lib/xml-apis.jar
diff --git a/base/build.xml b/base/build.xml
index 1ef11b5992..fdb45b3145 100644
--- a/base/build.xml
+++ b/base/build.xml
@@ -4,7 +4,7 @@
 <!-- ============================================= -->
 <!-- $Header: /cvs/adempiere/base/build.xml,v 1.1 2006/04/21 17:41:36 jjanke Exp $ -->
 
-<project name="base" default="dist" basedir=".">
+<project name="base" default="plugin" basedir=".">
 
   <description>
     This buildfile is used to build the base subproject within
@@ -12,144 +12,30 @@
   </description>
 
   <!-- set global properties for this build -->
-  <property name="src" value="src"/>
-  <property name="looksSrc" value="../looks/src"/>
-  <property name="build.dir" value="build"/>
-  <property name="dist.dir" value="."/>
-  <property name="jar.path" value="../lib"/>
-  <property name="jar.name" value="Base"/>
   <import file="../utils_dev/properties.xml"/>
 
-  <!-- set path to include the necessary jar files for javac -->
-  <path id="project.class.path">
-    <pathelement path="${classpath}"/>
-    <pathelement path="${jar.path}/CCTools.jar"/>
-    <pathelement path="${jar.path}/oracle.jar"/>
-    <pathelement path="${jar.path}/postgresql.jar"/>
-    <pathelement path="${jar.path}/jboss.jar"/>
-    <pathelement path="${jar.path}/glassfish.jar"/>
-    <pathelement path="../tools/lib/junit.jar"/>
-    <pathelement path="../tools/lib/j2ee.jar"/>
-    <pathelement path="../tools/lib/jnlp.jar"/>
-    <pathelement path="../tools/lib/servlet-api.jar" />
-  	<pathelement path="../tools/lib/cron4j-2.2.1.jar" />
-  </path>
-
-
   <target name="init" description="initialization target">
     <echo message="=========== Build Base"/>
-    <!-- create the time stamp -->
-    <tstamp/>
-    <!-- create the build directory structure used by compile -->
-    <mkdir dir="${build.dir}"/>
-    <!-- check for the distribution directory -->
-    <available file="${dist.dir}" type="dir" property="dist.dir.exists"/>
   </target>
 
-  <target name="makedir" depends="init" unless="dist.dir.exists">
-    <!-- create the distribution directory if not available -->
-    <mkdir dir="${dist.dir}"/>
-  </target>
-
-
-  <target name="compile" depends="makedir">
-    <!-- compile the java code from ${src} into ${build.dir} -->
-    <javac target="1.6" fork="true" destdir="${build.dir}" deprecation="on" debug="on" memoryinitialsize="512m" memorymaximumsize="512m">
-      <src path="${src}"/>
-      <src path="${looksSrc}"/>
-      <classpath refid="project.class.path"/>
-    </javac>
-    <!-- copy all image & sound files from src to the build directory -->
-    <copy todir="${build.dir}">
-      <fileset dir="${src}">
-        <include name="**/images/*"/>
-        <include name="**/*.gif"/>
-        <include name="**/*.jpg"/>
-        <include name="**/*.png"/>
-        <include name="**/*.wav"/>
-        <include name="**/*.htm"/>
-        <include name="**/*.html"/>
-        <include name="**/*.properties"/>
-        <exclude name="**/package.html"/>
-      </fileset>
-    </copy>
-    <!-- copy all image & sound files from looksSrc to the build directory -->
-    <copy todir="${build.dir}">
-      <fileset dir="${looksSrc}">
-        <include name="**/images/*"/>
-        <include name="**/*.gif"/>
-        <include name="**/*.jpg"/>
-        <include name="**/*.png"/>
-        <include name="**/*.wav"/>
-        <include name="**/*.htm"/>
-        <include name="**/*.html"/>
-        <include name="**/*.properties"/>
-        <exclude name="**/package.html"/>
-      </fileset>
-    </copy>
-  </target>
-
-
   <!-- =========================================== -->
   <!-- Distribution                                -->
   <!-- =========================================== -->
-  <target name="dist" depends="compile">
-    <!-- put everything from ${build.dir} into the ${jar.name}.jar file -->
-    <jar jarfile="${dist.dir}/${jar.name}.jar" basedir="${build.dir}"/>
+  <target name="plugin" depends="init">
+	<buildPlugin workspaceDirectory="${workspace}"
+	             projectName="base"
+	             targetPlatformId="target.platform"
+	             destination="../lib"
+	 			 buildSourceJar="false"
+				 clean="no"/>
   </target>
 
-	  <target name="plugin">
-		<buildPlugin workspaceDirectory=".."
-		             projectName="base"
-		             targetPlatformId="target.platform"
-		             destination="../lib"
-		 			 buildSourceJar="false"
-					 clean="no"/>
-	  </target>
-
-	  <target name="plugin-dist">
-		<buildPlugin workspaceDirectory=".."
-		             projectName="base"
-		             targetPlatformId="target.platform"
-		             destination="${env.ADEMPIERE_ROOT}/Adempiere/osgi"
-		 			 buildSourceJar="false"
-					 clean="no"/>
-	  </target>
-
-  <target name="dist-standalone" depends="plugin">
-  	<copy file="${dist.dir}/${bundle.name}_${bundle.version}.jar"
-  		todir="${equinox.target}/dist/standalone/plugins"/>
-  </target>
-
-  <path id="class.path.test">
-    <pathelement path="${build.dir}"/>
-    <pathelement path="${classpath}"/>
-    <pathelement path="${jar.path}/CCTools.jar"/>
-    <pathelement path="../base/build"/>
-    <pathelement path="../tools/lib/junit.jar"/>
-    <pathelement path="../adempiere/Adempiere/lib/Adempiere.jar" />
-    <pathelement path="../adempiere/Adempiere/lib/jboss.jar" />
-    <pathelement path="../adempiere/Adempiere/lib/oracle.jar" />
-    <pathelement path="../adempiere/Adempiere/lib/postgresql.jar" />
-    <pathelement path="./base.jar" />
-  </path>
-
-<target name="GenerateModel" depends="dist">
-      <java fork="true" classname="org.compiere.util.GenerateModel">
-      	<classpath refid="class.path.test" />
-	<arg value="/work2/adempiere/base/src/org/compiere/model/"/>
-	<arg value="org.compiere.model"/>
-	<arg value="'D'"/>
-	<arg value="'AD_Package_Exp_Detail'"/>
-      </java>
-  </target>
-
-
-
   <target name="clean">
-    <!-- Delete the ${build.dir} directory trees -->
-    <delete dir="${build.dir}"/>
-    <delete file="${dist.dir}/${jar.name}.jar" failonerror="false"/>
+  	<delete>
+   		<fileset dir="../lib/plugins">
+			<include name="*base*.jar"/>
+		</fileset>
+   </delete>
   </target>
 
 </project>