diff --git a/build.xml b/build.xml
index dfb886d5ad..c9671c211d 100644
--- a/build.xml
+++ b/build.xml
@@ -23,12 +23,7 @@
 	<property name="pdiwithhadoopplugin"
 					value="pdi-ce-hadoop" 
 					description="Name of the pdi distribution with Hadoop plugin"/>
-	
-	<property name="libext.stage.dir" location="${stage.dir}/libext" />
-	<property name="plugins.stage.dir" location="${stage.dir}/plugins" />
-	<property name="samples.stage.dir" location="${stage.dir}/samples" />
 
-	<property name="samples.src.dir" location="samples" />
 	<property name="plugin.destination" location="kettle-dist" />
 	
 	
@@ -74,146 +69,13 @@
 	
   <target name="assemble.init">
     <mkdir dir="${stage.dir}" />
-  </target>
-	
-  <target name="assemble" depends="assemble.init,assemble.copy-libs">
-  	<delete>
-		<fileset dir="${stage.dir}/plugins/${ivy.artifact.id}/lib">
-			
-			<!-- Exclude jars that are to be placed in Kettle's lib-ext dir -->
-			<include name="hadoop-*.jar"/>
-			<include name="pentaho-hdfs-vfs*.jar"/>
-			
-			<!-- first remove duplicate jars -->
-			
-			<!-- swt jars -->
-			<include name="x86-*.jar"/>
-			<include name="runtime-*.jar"/>
-			<include name="common-*.jar"/>
-			<include name="jface-*.jar"/>
-			<include name="commands-*.jar"/>
-			<!-- Pentaho's custom vfs browser -->
-			<include name="*-vfs-browser-*.jar"/>
-			<!-- servlet api -->
-			<include name="servlet-api-*.jar"/>
-			<!-- xul jars -->
-			<include name="pentaho-xul-*.jar"/>
-			<!-- kettle jars -->
-			<include name="kettle-*.jar"/>
-			<!-- jetty jars -->
-			<include name="jetty-*.jar"/>
-			<!-- reporting libcore and libformula -->
-			<!-- spring core -->
-  			<include name="spring-core*.jar"/>
-			<!-- mondrian -->
-			<include name="mondrian-*.jar"/>
-			<include name="eigenbase-*.jar"/>
-			<include name="commons-math-*.jar"/>
-			<include name="javacup-*.jar"/>
-			
-			
-			<!-- second, remove unnecessary jars -->
-
-			<!-- batik -->
-			<include name="batik-*.jar"/>
-			<!-- jackrabbit -->
-  			<include name="jackrabbit-*"/>
-			<!-- jasperreports -->
-  			<include name="jasperreports-*.jar"/>
-			<!-- chartbeans -->
-  			<include name="pentaho-chartbeans-*.jar"/>	
-			<!-- hibernate -->
-  			<include name="hibernate-*.jar"/>
-			<!-- castor -->
-  			<include name="castor-*.jar"/>
-			<!-- derby -->
-  			<include name="derby-*.jar"/>
-			<!-- oracle driver -->
-  			<include name="orai18n-*.jar"/>
-			<include name="ojdbc-*.jar"/>
-			<!-- mysql driver -->
-  			<include name="mysql-connector-*.jar"/>
-			<!-- hsqldb driver -->
-  			<include name="hsqldb-*.jar"/>
-			<!-- pentaho cwm -->
-  			<include name="pentaho-cwm-*.jar"/>
-			<!-- spring ldap -->
-  			<include name="spring-ldap-*.jar"/>
-			<!-- quartz -->
-  			<include name="quartz-*.jar"/>
-		    <!-- jpivot -->
-		    <include name="jpivot-*.jar"/>
-
-			<!-- generated by test-src/FindDuplicateJars.java -->
-			<include name="activation-*.jar"/>
-			<include name="commons-beanutils-*.jar"/>
-			<include name="commons-codec-*.jar"/>
-			<include name="commons-collections-*.jar"/>
-			<include name="commons-dbcp-*.jar"/>
-			<include name="commons-digester-*.jar"/>
-			<include name="commons-fileupload-*.jar"/>
-			<include name="commons-httpclient-*.jar"/>
-			<include name="commons-lang-*.jar"/>
-			<include name="commons-logging-*.jar"/>
-			<include name="commons-net-*.jar"/>
-			<include name="commons-pool-*.jar"/>
-			<include name="commons-vfs-*.jar"/>
-			<include name="dom4j-*.jar"/>
-			<include name="feed4j-*.jar"/>
-			<include name="georss-rome-*.jar"/>
-			<include name="janino-*.jar"/>
-			<include name="jaxen-*.jar"/>
-			<include name="jcommon-*.jar"/>
-			<include name="jfreechart-*.jar"/>
-			<include name="js-*.jar"/>
-			<include name="jug-lgpl-*.jar"/>
-			<include name="junit-*.jar"/>
-			<include name="jxl-*.jar"/>
-			<include name="log4j-*.jar"/>
-			<include name="mail-*.jar"/>
-			<include name="nekohtml-*.jar"/>
-			<include name="ognl-*.jar"/>
-			<include name="pentaho-database-*.jar"/>
-			<include name="rome-*.jar"/>
-			<include name="salesforce-*.jar"/>
-			<include name="simple-jndi-*.jar"/>
-			<include name="spring-beans-*.jar"/>
-			<include name="spring-context-*.jar"/>
-			<include name="spring-context-support-*.jar"/>
-			<include name="wsdl4j-*.jar"/>
-			<include name="wstx-asl-*.jar"/>
-			<include name="xercesImpl-*.jar"/>
-			<include name="jmiutils-*.jar"/>
-			<include name="xml-apis-*.jar"/>
-			
-			<exclude name="pentaho-database-model-*.jar"/>			
-
-      <include name="openide-util-*.jar"/>
-			<include name="xmlParserAPIs-*.jar"/>
-      <include name="geronimo-stax-api-*.jar"/>
-      <include name="stax-api*.jar"/>
-			<include name="jtidy*.jar"/>
-		</fileset>
-  	</delete>
-  	
-  	
   </target>
 	
 	  <target name="assemble.copy-libs">
-	  	<copy todir="${libext.stage.dir}/${ivy.artifact.id}">
-          <fileset dir="${lib.dir}">
-          	<!-- These files are required by the plugin to be in Kettle -->
-          	<include name="hadoop-*.jar"/>
-          	<include name="pentaho-hdfs-vfs-*.jar"/>
-          </fileset>
-	    </copy>
-  	    <copy todir="${samples.stage.dir}">
-  	        <fileset dir="${samples.src.dir}" />
-  	    </copy>
-	    <copy todir="${plugins.stage.dir}/${ivy.artifact.id}/lib">
+	    <copy todir="${stage.dir}/${ivy.artifact.id}/lib">
 	      <fileset dir="${lib.dir}" />
 	    </copy>
-	    <copy todir="${plugins.stage.dir}/${ivy.artifact.id}">
+	    <copy todir="${stage.dir}/${ivy.artifact.id}">
 	      <fileset file="${dist.dir}/${ivy.artifact.id}-${project.revision}.jar" />
 	    </copy>
 	  </target>
diff --git a/package-ivy.xml b/package-ivy.xml
index 4ef36be0f6..469bb3c2f6 100644
--- a/package-ivy.xml
+++ b/package-ivy.xml
@@ -3,11 +3,16 @@
   <info organisation="${ivy.artifact.group}" module="${ivy.artifact.id}" revision="${project.revision}" />
   <configurations>
     <conf name="default" />
+    <conf name="runtime" visibility="public" />
     <conf name="test" visibility="private" />
+    <conf name="codegen" visibility="private" />
+    <conf name="codegen-linux" extends="codegen" visibility="private" />
+    <conf name="codegen-mac" extends="codegen" visibility="private" />
+    <conf name="codegen-win" extends="codegen" visibility="private" />
   </configurations>
 
   <publications>
-    <artifact name="${ivy.artifact.id}" type="jar" />
+    <artifact name="${ivy.artifact.id}" type="zip" />
   </publications>
 
   <dependencies defaultconf="default->default">