diff --git a/org.eclipse.emf.refactor.build/build/refactor-0.7.0.20121217142207.jar b/org.eclipse.emf.refactor.build/build/refactor-0.7.0.20121217142207.jar
new file mode 100644
index 0000000..d91118c
--- /dev/null
+++ b/org.eclipse.emf.refactor.build/build/refactor-0.7.0.20121217142207.jar
Binary files differ
diff --git a/org.eclipse.emf.refactor.build/build_1.xml b/org.eclipse.emf.refactor.build/build_1.xml
deleted file mode 100644
index 76e6498..0000000
--- a/org.eclipse.emf.refactor.build/build_1.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-IMPORTANT: Run it in the same JRE as the workspace. 
-Run AS -> ANT Build.. -> JRE -> Run in the same JRE as the workspace.
-
--->
-<project default="feature.export" name="feature.generate" basedir=".">
-
-	<property name="home" location=""/>
-	<property name="build.dir" location="build"/>
-	<property name="qualifier.file" location="qualifier.txt"/>
-	
-	<target name="clean">
-	   <delete dir="${build.dir}"/>
-	</target>
-
-	<target name="init" depends="clean">
-		<tstamp>
-			<format property="qualifier" pattern="yyyyMMddHHmmss" />
-		</tstamp>
-		<echo file="${qualifier.file}">qualifier=${qualifier}</echo>
-	</target>
-	
-	<!-- Have to be replaced: -->	
-	<target name="feature.export" depends="init">
-		<pde.exportFeatures  
-			destination="${build.dir}/source" 
-			exportSource="false" 
-			exportType="directory" 
-			qualifier="${qualifier}"
-			features="org.eclipse.emf.refactor.runtime.feature,org.eclipse.emf.refactor.generator.feature,org.eclipse.emf.refactor.henshin.feature,org.eclipse.emf.refactor.examples.feature" useJARFormat="true"/>
-	</target>
-	
-</project>
diff --git a/org.eclipse.emf.refactor.build/build_1_features.xml b/org.eclipse.emf.refactor.build/build_1_features.xml
new file mode 100644
index 0000000..d93f29a
--- /dev/null
+++ b/org.eclipse.emf.refactor.build/build_1_features.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+IMPORTANT: Run it in the same JRE as the workspace. 
+Run AS -> ANT Build.. -> JRE -> Run in the same JRE as the workspace.
+
+-->
+
+<project default="feature.export" name="feature.generate" basedir=".">
+
+	<property name="home" location=""/>
+	<property name="builddirectory" location="build"/>
+	<property name="qualifierfile" location="qualifier.txt"/>
+	
+	<!-- delete directory 'build/' -->	
+	<target name="clean">
+	   <delete dir="${builddirectory}"/>
+	</target>
+
+	<!-- remember time stamp in file 'qualifier.txt' -->	
+	<target name="init" depends="clean">
+		<tstamp>
+			<format property="qualifier" pattern="yyyyMMddHHmmss" />
+		</tstamp>
+		<echo file="${qualifierfile}">qualifier=${qualifier}</echo>
+	</target>
+	
+	<!-- export 'basic' feature to 'build/source/' -->	
+	<target name="feature.export" depends="init">
+		<pde.exportFeatures  
+			destination="${builddirectory}/source" 
+			exportSource="false" 
+			exportType="directory" 
+			qualifier="${qualifier}"
+			features="org.eclipse.emf.refactor.basic.feature" useJARFormat="true"/>
+	</target>
+	
+</project>
diff --git a/org.eclipse.emf.refactor.build/build_2.xml b/org.eclipse.emf.refactor.build/build_2.xml
deleted file mode 100644
index 5075e65..0000000
--- a/org.eclipse.emf.refactor.build/build_2.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-IMPORTANT: Run it in the same JRE as the workspace. 
-Run AS -> ANT Build.. -> JRE -> Run in the same JRE as the workspace.
-
--->
-<!--project default="feature.publish" name="build.site" basedir="."-->
-<project default="download.page.generate" name="build.site" basedir=".">
-
-	<property name="home" location=""/>
-	<property name="build.dir" location="build"/>
-	<property file="qualifier.txt" prefix="input"/>
-	<property name="resources.dir" location="resources"/>
-	<property name="repository.name" value="updatesite"/>
-	<property name="release.no" value="0.6.0"/>
-	
-	<!-- Read Qualifier from file: -->
-	<target name="init">
-		<property name="qualifier" value="${input.qualifier}"/>
-	</target>    		
-
-	<!-- Generate update site: -->
-	<target name="site.add" depends="init">
-		<copy todir="${build.dir}/${repository.name}/" overwrite="true">
-		    <fileset dir="${resources.dir}/site">
- 		   	  <exclude name="site.xml"/>
-		    </fileset>
-	    </copy>
-<echo file="${build.dir}/${repository.name}/site.xml" append="false">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;site&gt;
-   &lt;feature url="features/org.eclipse.emf.refactor.generator.feature_${release.no}.${qualifier}.jar" id="org.eclipse.emf.refactor.generator.feature" version="${release.no}.${qualifier}"&gt;
-      &lt;category name="org.eclipse.emf.refactor.BASIC"/&gt;
-   &lt;/feature&gt;
-   &lt;feature url="features/org.eclipse.emf.refactor.runtime.feature_${release.no}.${qualifier}.jar" id="org.eclipse.emf.refactor.runtime.feature" version="${release.no}.${qualifier}"&gt;
-      &lt;category name="org.eclipse.emf.refactor.BASIC"/&gt;
-   &lt;/feature&gt;
-   &lt;feature url="features/org.eclipse.emf.refactor.henshin.feature_${release.no}.${qualifier}.jar" id="org.eclipse.emf.refactor.henshin.feature" version="${release.no}.${qualifier}"&gt;
-      &lt;category name="org.eclipse.emf.refactor.EXTENSION"/&gt;
-   &lt;/feature&gt;
-   &lt;feature url="features/org.eclipse.emf.refactor.examples.feature_${release.no}.${qualifier}.jar" id="org.eclipse.emf.refactor.examples.feature" version="${release.no}.${qualifier}"&gt;
-      &lt;category name="org.eclipse.emf.refactor.EXTENSION"/&gt;
-   &lt;/feature&gt;	
-   &lt;category-def name="org.eclipse.emf.refactor.BASIC" label="Emf Refactor" version="${release.no}.${qualifier}"&gt;
-      &lt;description&gt;
-         Emf Refactor
-      &lt;/description&gt;
-   &lt;/category-def&gt;
-   &lt;category-def name="org.eclipse.emf.refactor.EXTENSION" label="EMF Refactor Extensions" version="${release.no}.${qualifier}"&gt;
-      &lt;description&gt;
-         EMF Refactor Extensions
-      &lt;/description&gt;
-   &lt;/category-def&gt;
-&lt;/site&gt;
-</echo>
-	</target>    		
-
-	<!-- Publish update site: -->
-	<target name="feature.publish" depends="site.add">	
-		<eclipse.publish.featuresAndBundles
-			 site="file:${build.dir}/${repository.name}/site.xml"
-			 categoryversion="${release.no}.${qualifier}"
-			 repository="file:${build.dir}/${repository.name}" 			  
-			 compress="true"			 
-			 >
-		     <features dir="${build.dir}/source/features/" includes="*.jar"/>
-		     <bundles dir="${build.dir}/source/plugins/" includes="*.jar"/>
-		</eclipse.publish.featuresAndBundles>
-		<zip destfile="${build.dir}/refactor-${release.no}.${qualifier}.jar">
-			<fileset dir="${build.dir}/${repository.name}/"/>
-		</zip>
-	</target>    		
-
-	<!-- Cleanup: -->
-	<target name="cleanup" depends="feature.publish">
-		<delete includeEmptyDirs="true">
-			<fileset dir="${build.dir}/${repository.name}/"/>
-			<fileset dir="${build.dir}/source/"/>
-		</delete>
-	</target>    		
-	
-
-	<!-- Publish update site: -->
-	<target name="download.page.generate" depends="cleanup">
-		<tstamp>
-			<format property="timestamp" pattern="MMM dd, yyyy HH:mm" />
-		</tstamp>
-		<!-- Copy Release: -->
-		<delete failonerror="false">
-			<fileset dir="../refactor/downloads/" includes="refactor-${release.no}.*.jar"/>
-		</delete>
-		<copy todir="../refactor/downloads/">
-		    <fileset file="${build.dir}/refactor-${release.no}.${qualifier}.jar"/>
-	    </copy>
-		
-		<!-- Generate Download-File: -->
-		<copy todir="${build.dir}/web-eclipse">
-		    <fileset dir="resources/web-eclipse" includes="*"/>
-	    </copy>
-<echo file="${build.dir}/web-eclipse/downloads_1.php" append="true">
-&lt;h3&gt;Version ${release.no}&lt;/h3&gt;
-&lt;ul class="midlist"&gt;
-    &lt;li&gt;&lt;a href="downloads/refactor-${release.no}.${qualifier}.jar"&gt;refactor-${release.no}.${qualifier}.jar&lt;/a&gt; (released ${timestamp})&lt;/li&gt;
-&lt;/ul&gt;
-</echo>
-		<concat destfile="${build.dir}/web-eclipse/downloads.php">
-		    <fileset dir="${build.dir}/web-eclipse" includes="downloads_*.php"/>
-		</concat>
-		
-		<!-- Update Download-File on website: -->
-		<copy todir="../refactor/" overwrite="true">
-		    <fileset file="${build.dir}/web-eclipse/downloads.php"/>
-	    </copy>
-
-		<delete includeEmptyDirs="true" failonerror="false">
-			<fileset dir="${build.dir}/web-eclipse/"/>
-		</delete>
-		
-	</target>    		
-
-	
-</project>
diff --git a/org.eclipse.emf.refactor.build/build_2_updatesite.xml b/org.eclipse.emf.refactor.build/build_2_updatesite.xml
new file mode 100644
index 0000000..65922bc
--- /dev/null
+++ b/org.eclipse.emf.refactor.build/build_2_updatesite.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+IMPORTANT: Run it in the same JRE as the workspace. 
+Run AS -> ANT Build.. -> JRE -> Run in the same JRE as the workspace.
+
+-->
+
+<project default="feature.publish" name="updatesite.build" basedir=".">
+
+	<property name="home" location=""/>
+	<property name="builddirectory" location="build"/>
+	<property file="qualifier.txt" prefix="input"/>
+	<property name="resourcesdirectory" location="resources"/>
+	<property name="updatesite" value="updatesite"/>
+	<property name="releaseno" value="0.7.0"/>
+	
+	<!-- Read qualifier from file: -->
+	<target name="init">
+		<property name="qualifier" value="${input.qualifier}"/>
+	</target>    		
+
+	<!-- Generate update site: -->
+	<target name="site.add" depends="init">
+		<copy todir="${builddirectory}/${updatesite}/" overwrite="true">
+		    <fileset dir="${resourcesdirectory}/site">
+ 		   	  <exclude name="site.xml"/>
+		    </fileset>
+	    </copy>
+<echo file="${builddirectory}/${updatesite}/site.xml" append="false">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;site&gt;
+   &lt;feature url="features/org.eclipse.emf.refactor.basic.feature_${releaseno}.${qualifier}.jar" id="org.eclipse.emf.refactor.basic.feature" version="${releaseno}.${qualifier}"&gt;
+      &lt;category name="org.eclipse.emf.refactor.BASIC"/&gt;
+   &lt;/feature&gt;
+   &lt;category-def name="org.eclipse.emf.refactor.BASIC" label="EMF Refactor - Basic Components" version="${releaseno}.${qualifier}"/&gt;
+   
+&lt;/site&gt;
+</echo>
+	</target>    		
+
+	<!-- Publish update site: -->
+	<target name="feature.publish" depends="site.add">	
+		<eclipse.publish.featuresAndBundles
+			 site="file:${builddirectory}/${updatesite}/site.xml"
+			 categoryversion="${releaseno}.${qualifier}"
+			 repository="file:${builddirectory}/${updatesite}" 			  
+			 compress="true"			 
+			 >
+		     <features dir="${builddirectory}/source/features/" includes="*.jar"/>
+		     <bundles dir="${builddirectory}/source/plugins/" includes="*.jar"/>
+		</eclipse.publish.featuresAndBundles>
+		<zip destfile="${builddirectory}/refactor-${releaseno}.${qualifier}.jar">
+			<fileset dir="${builddirectory}/${updatesite}/"/>
+		</zip>
+	</target>
+	
+</project>
diff --git a/org.eclipse.emf.refactor.build/build_3_website.xml b/org.eclipse.emf.refactor.build/build_3_website.xml
new file mode 100644
index 0000000..7f788d6
--- /dev/null
+++ b/org.eclipse.emf.refactor.build/build_3_website.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+IMPORTANT: Run it in the same JRE as the workspace. 
+Run AS -> ANT Build.. -> JRE -> Run in the same JRE as the workspace.
+
+-->
+
+<project default="downloadpage.generate" name="downloadpage.generate" basedir=".">
+
+	<property name="home" location=""/>
+	<property name="builddirectory" location="build"/>
+	<property file="qualifier.txt" prefix="input"/>
+	<property name="releaseno" value="0.7.0"/>  
+	
+	<!-- Read qualifier from file: -->
+	<target name="init">
+		<property name="qualifier" value="${input.qualifier}"/>
+	</target>    
+
+	<!-- Publish download page: -->
+	<target name="downloadpage.generate" depends="init">
+		<tstamp>
+			<format property="timestamp" pattern="MMM dd, yyyy HH:mm" />
+		</tstamp>
+		
+		<!-- Copy release: -->
+		<delete failonerror="false">
+			<fileset dir="../../emf-refactor/downloads/" includes="refactor-${releaseno}.*.jar"/>
+		</delete>
+		<copy todir="../../emf-refactor/downloads/">
+		    <fileset file="${builddirectory}/refactor-${releaseno}.${qualifier}.jar"/>
+	    </copy>
+		
+		<!-- Generate download file: -->
+		<copy todir="${builddirectory}/web-eclipse">
+		    <fileset dir="resources/web-eclipse" includes="*"/>
+	    </copy>
+<echo file="${builddirectory}/web-eclipse/downloads_1.php" append="true">
+&lt;h3&gt;Version ${releaseno}&lt;/h3&gt;
+&lt;ul class="midlist"&gt;
+    &lt;li&gt;&lt;a href="downloads/refactor-${releaseno}.${qualifier}.jar"&gt;refactor-${releaseno}.${qualifier}.jar&lt;/a&gt; (released ${timestamp})&lt;/li&gt;
+&lt;/ul&gt;
+</echo>
+		<concat destfile="${builddirectory}/web-eclipse/downloads.php">
+		    <fileset dir="${builddirectory}/web-eclipse" includes="downloads_*.php"/>
+		</concat>
+		
+		<!-- Update Download-File on website: -->
+		<copy todir="../../emf-refactor/" overwrite="true">
+		    <fileset file="${builddirectory}/web-eclipse/downloads.php"/>
+	    </copy>
+		
+	</target>    		
+
+	
+</project>
diff --git a/org.eclipse.emf.refactor.build/clean.xml b/org.eclipse.emf.refactor.build/clean.xml
new file mode 100644
index 0000000..1dff4fe
--- /dev/null
+++ b/org.eclipse.emf.refactor.build/clean.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+IMPORTANT: Run it in the same JRE as the workspace. 
+Run AS -> ANT Build.. -> JRE -> Run in the same JRE as the workspace.
+
+-->
+
+<project default="cleanup" name="clean" basedir=".">
+
+	<property name="home" location=""/>
+	<property name="builddirectory" location="build"/>
+
+	<!-- Cleanup: -->
+	<target name="cleanup">
+		<delete includeEmptyDirs="true" quiet="true">
+			<fileset dir="${builddirectory}/updatesite/"/>
+			<fileset dir="${builddirectory}/source/"/>
+			<fileset dir="${builddirectory}/web-eclipse/"/>
+		</delete>
+	</target>
+	
+</project>
diff --git a/org.eclipse.emf.refactor.build/qualifier.txt b/org.eclipse.emf.refactor.build/qualifier.txt
new file mode 100644
index 0000000..dca4abf
--- /dev/null
+++ b/org.eclipse.emf.refactor.build/qualifier.txt
@@ -0,0 +1 @@
+qualifier=20121217142207
\ No newline at end of file
diff --git a/org.eclipse.emf.refactor.build/readme.txt b/org.eclipse.emf.refactor.build/readme.txt
index 2973c9e..9a272dd 100644
--- a/org.eclipse.emf.refactor.build/readme.txt
+++ b/org.eclipse.emf.refactor.build/readme.txt
@@ -1,9 +1,9 @@
 How to build EMF Refactor:
 --------------------------
-1. Run build_1.xml with ANT in the workspace. (Run AS -> ANT Build.. -> JRE -> Run in the same JRE as the workspace.)
+1. Run build_1_features.xml with ANT in the workspace. (Run AS -> ANT Build.. -> JRE -> Run in the same JRE as the workspace.)
    Important: Wait until PDE-Build in the lower right corner of eclipse is finished.
-2. Run build_2.xml with ANT in the workspace. 
-
-The build process will be revised in the future.
+2. Run build_2_updatesite.xml with ANT in the workspace. 
+3. Run build_3_website.xml with ANT in the workspace. 
+4. Run clean.xml with ANT in the workspace. 
 
     
\ No newline at end of file