diff --git a/build/build.xml b/build/build.xml
index 935bd4658..8557cbaa9 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -109,23 +109,6 @@
       <fileset dir="shared/tools" />
     </copy>
 
-    <!-- copy library folder -->
-    <copy todir="${target.path}/libraries">
-      <fileset dir="../libraries" />
-    </copy>
-
-    <!-- copy hardware folder -->
-    <copy todir="${target.path}/hardware">
-      <fileset dir="../hardware">
-        <exclude name="arduino/sam/system/CMSIS/Device/ATMEL/*/svd/"/>
-        <exclude name="arduino/sam/system/CMSIS/Device/ATMEL/*/html/"/>
-        <exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/ARM/*M0*"/>
-        <exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/ARM/*M4*"/>
-        <exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/GCC/*M0*"/>
-        <exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/GCC/*M4*"/>
-      </fileset>
-    </copy>
-
     <!-- copy shared examples folder -->
     <copy todir="${target.path}/examples">
       <fileset dir="shared/examples" />
@@ -141,8 +124,16 @@
 
     <!-- Write the revision file! -->
     <echo file="${target.path}/lib/version.txt" message="${version}" />
+
+    <!-- copy library folder -->
+    <antcall target="assemble-libraries" />
   </target>
 
+  <target name="assemble-libraries" if="bundle_libraries">
+    <copy todir="${target.path}/libraries">
+      <fileset dir="../libraries" />
+    </copy>
+  </target>
 
   <!-- - - - - - - - - -->
   <!-- Revision check  -->
@@ -209,6 +200,7 @@
 
   <target name="macosx-old-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
     <mkdir dir="macosx/work" />
+    <mkdir dir="macosx/work/${staging_hardware_folder}" />
 
     <!-- assemble the pde -->
     <copy todir="macosx/work/Arduino.app">
@@ -246,6 +238,7 @@
     </antcall>
 
     <mkdir dir="${staging_folder}/work" />
+    <mkdir dir="${staging_folder}/work/${staging_hardware_folder}" />
 
     <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-upstream1/appbundler-1.0ea-upstream1.jar"/>
 
@@ -316,38 +309,10 @@
 
   <target name="macosx-build-common">
 
-    <!-- Unzip AVR tools -->
-    <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/avr-toolchain-mac32-3.4.5.zip" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/avr-toolchain-mac32-3.4.5.zip" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
-      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
-    </antcall>
-
-    <copy todir="macosx/work/${staging_hardware_folder}/tools/">
-      <fileset file="macosx/dist/bossac" />
-    </copy>
-
-    <chmod file="macosx/work/${staging_hardware_folder}/tools/bossac" perm="+x" />
-
     <antcall target="assemble">
       <param name="target.path" value="macosx/work/${staging_hardware_folder}/../" />
     </antcall>
 
-    <antcall target="untar">
-      <param name="archive_file" value="${staging_folder}/dist/gcc-arm-none-eabi-4.8.3-2014q1-mac.tar.gz" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/gcc-arm-none-eabi-4.8.3-2014q1-mac.tar.gz" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/gcc-arm-none-eabi-4.8.3-2014q1" />
-      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/" />
-    </antcall>
-
-    <delete includeEmptyDirs="true" quiet="true">
-      <fileset dir="macosx/work/${staging_hardware_folder}/tools" includes="**/3.4.6/**/*"/>
-      <fileset dir="macosx/work/${staging_hardware_folder}/tools" includes="**/3.4.6"/>
-      <fileset dir="macosx/work/${staging_hardware_folder}/tools" includes="**/man/**/*"/>
-      <fileset dir="macosx/work/${staging_hardware_folder}/tools" includes="**/man"/>
-    </delete>
-
     <antcall target="unzip">
       <param name="archive_file" value="./libastylej-2.05.zip" />
       <param name="archive_url" value="http://arduino.cc/download.php?f=/libastylej-2.05.zip" />
@@ -359,12 +324,6 @@
     <copy file="macosx/libastylej/libastylej.jnilib" tofile="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
     <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
 
-    <chmod perm="+x">
-      <fileset dir="macosx/work/${staging_hardware_folder}/tools/avr/bin" includes="**/*" />
-      <fileset dir="macosx/work/${staging_hardware_folder}/tools/avr/avr/bin" includes="**/*" />
-      <fileset dir="macosx/work/${staging_hardware_folder}/tools/avr/libexec/gcc/avr/4.8.1/" includes="*" />
-    </chmod>
-
   </target>
 
   <target name="macosx-old-run" depends="macosx-old-build" description="Run Mac OS X version">
@@ -551,6 +510,7 @@
 
   <target name="linux-build" depends="revision-check, linux-checkos, subprojects-build" description="Build linux version">
     <mkdir dir="linux/work" />
+    <mkdir dir="linux/work/${staging_hardware_folder}" />
 
     <copy todir="linux/work">
       <fileset dir="shared" includes="lib/**" />
@@ -572,15 +532,6 @@
     <copy todir="linux/work" file="linux/dist/arduino" />
     <chmod perm="755" file="linux/work/arduino" />
 
-    <mkdir dir="linux/work/hardware/tools" />
-    <copy file="linux/dist/tools/adk2install" todir="linux/work/hardware/tools" />
-    <copy file="linux/dist/tools/adk2tool" todir="linux/work/hardware/tools" />
-    <copy file="linux/dist/tools/bossac${arch-bits}" tofile="linux/work/hardware/tools/bossac" />
-
-    <chmod perm="755" file="linux/work/hardware/tools/bossac" />
-    <chmod perm="755" file="linux/work/hardware/tools/adk2tool" />
-    <chmod perm="755" file="linux/work/hardware/tools/adk2install" />
-
     <copy todir="linux/work" file="linux/dist/arduino" />
     <chmod perm="755" file="linux/work/arduino" />
 
@@ -595,39 +546,9 @@
   </target>
 
   <target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
-    <!-- Unzip ARM tools -->
-    <antcall target="untar">
-      <param name="archive_file" value="${staging_folder}/dist/gcc-arm-none-eabi-4.8.3-2014q1-linux32.tar.gz" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/gcc-arm-none-eabi-4.8.3-2014q1-linux32.tar.gz" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/gcc-arm-none-eabi-4.8.3-2014q1" />
-      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/" />
-    </antcall>
-
-    <!-- Unzip AVR tools -->
-    <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/avr-toolchain-linux32-3.4.5.zip" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/avr-toolchain-linux32-3.4.5.zip" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
-      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
-    </antcall>
   </target>
 
   <target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
-    <!-- Unzip ARM tools -->
-    <antcall target="untar">
-      <param name="archive_file" value="${staging_folder}/dist/gcc-arm-none-eabi-4.8.3-2014q1-linux64.tar.gz" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/gcc-arm-none-eabi-4.8.3-2014q1-linux64.tar.gz" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/gcc-arm-none-eabi-4.8.3-2014q1" />
-      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/" />
-    </antcall>
-
-    <!-- Unzip AVR tools -->
-    <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/avr-toolchain-linux64-3.4.5.zip" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/avr-toolchain-linux64-3.4.5.zip" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
-      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
-    </antcall>
   </target>
 
   <target name="linux32-run" depends="linux32-build" description="Run Linux (32-bit) version">
@@ -792,6 +713,7 @@
 	  depends="revision-check, windows-checkos, subprojects-build"
 	  description="Build windows version">
     <mkdir dir="windows/work" />
+    <mkdir dir="windows/work/${staging_hardware_folder}" />
 
     <!-- assemble the pde -->
     <mkdir dir="windows/work/lib" />
@@ -815,14 +737,6 @@
       <fileset dir="windows/dist" includes="drivers/**" />
     </copy>
 
-    <!-- Unzip AVR tools -->
-    <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/avr-toolchain-win32-3.4.5-arduino1.zip" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/avr-toolchain-win32-3.4.5-arduino1.zip" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
-      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
-    </antcall>
-
     <antcall target="unzip">
       <param name="archive_file" value="./libastylej-2.05.zip" />
       <param name="archive_url" value="http://arduino.cc/download.php?f=/libastylej-2.05.zip" />
@@ -833,13 +747,11 @@
     <copy file="windows/msvcp100.dll" todir="windows/work" />
     <copy file="windows/msvcr100.dll" todir="windows/work" />
 
-    <!-- Copy bossac.exe tool -->
+    <!-- Copy listComPort.exe tool -->
     <copy todir="windows/work/hardware/tools">
-      <fileset file="windows/bossac.exe" />
       <fileset file="windows/listComPorts.exe" />
     </copy>
     <chmod perm="755">
-      <fileset file="windows/work/hardware/tools/bossac.exe" />
       <fileset file="windows/work/hardware/tools/listComPorts.exe" />
     </chmod>
 
@@ -868,18 +780,6 @@
     <chmod perm="755">
       <fileset dir="windows/work" includes="**/*.html, **/*.dll, **/*.exe" />
     </chmod>
-
-    <!-- Unzip ARM toolchain -->
-    <antcall target="untar">
-      <param name="archive_file" value="${staging_folder}/dist/gcc-arm-none-eabi-4.8.3-2014q1-windows.tar.gz" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/gcc-arm-none-eabi-4.8.3-2014q1-windows.tar.gz" />
-      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/gcc-arm-none-eabi-4.8.3-2014q1" />
-      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/" />
-    </antcall>
-
-    <delete includeEmptyDirs="true" quiet="true">
-      <fileset dir="windows/work/hardware/tools/avr/doc" />
-    </delete>
   </target>
 
   <target name="windows-run" depends="windows-build"
diff --git a/build/linux/dist/tools/adk2install b/build/linux/dist/tools/adk2install
deleted file mode 100755
index 8ec59a207..000000000
--- a/build/linux/dist/tools/adk2install
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# simple wrapper around the adk2tool and bossac to properly erase and reset the 
-# adk2 board
-
-echo $1 /dev/$2 erase
-$1 /dev/$2 erase
-
-echo $3 --port=$2 -w -e -v -b $4
-$3 --port=$2 -w -e -v -b $4
-
-echo $1 /dev/$2 reset
-$1 /dev/$2 reset
-
diff --git a/build/linux/dist/tools/adk2tool b/build/linux/dist/tools/adk2tool
deleted file mode 100755
index d951baf17..000000000
Binary files a/build/linux/dist/tools/adk2tool and /dev/null differ
diff --git a/build/linux/dist/tools/bossac32 b/build/linux/dist/tools/bossac32
deleted file mode 100755
index 573e7d9e7..000000000
Binary files a/build/linux/dist/tools/bossac32 and /dev/null differ
diff --git a/build/linux/dist/tools/bossac64 b/build/linux/dist/tools/bossac64
deleted file mode 100755
index c4c799438..000000000
Binary files a/build/linux/dist/tools/bossac64 and /dev/null differ
diff --git a/build/macosx/dist/bossac b/build/macosx/dist/bossac
deleted file mode 100755
index 49a20b38a..000000000
Binary files a/build/macosx/dist/bossac and /dev/null differ
diff --git a/build/windows/bossac.exe b/build/windows/bossac.exe
deleted file mode 100755
index a42bf5896..000000000
Binary files a/build/windows/bossac.exe and /dev/null differ