diff --git a/distribution/distribution.xml b/distribution/distribution.xml
index 6f7e7efd..80b569b3 100644
--- a/distribution/distribution.xml
+++ b/distribution/distribution.xml
@@ -18,23 +18,9 @@
 			<directory>src/main/java/samples</directory>
 			<outputDirectory>/src/main/java/samples</outputDirectory>
 		</fileSet>
-		<fileSet>
-			<directory>samples/diff</directory>
-			<includes>
-				<include>schema-diff-sample.*</include>
-				<include>wsdl-diff-sample.*</include>
-			</includes>
-			<!-- Add these specific files with execute permissions -->
-			<fileMode>0755</fileMode>
-			<outputDirectory>/samples/diff</outputDirectory>
-		</fileSet>
 		<fileSet>
 			<directory>samples</directory>
 			<outputDirectory>/samples</outputDirectory>
-			<excludes>
-				<exclude>diff/schema-diff-sample.*</exclude>
-				<exclude>diff/wsdl-diff-sample.*</exclude>
-			</excludes>
 		</fileSet>
 		<fileSet>
 			<directory>src/main/resources/web</directory>
diff --git a/distribution/doc/distribution-README.txt b/distribution/doc/distribution-README.txt
index 0a6bd9a5..972b8318 100644
--- a/distribution/doc/distribution-README.txt
+++ b/distribution/doc/distribution-README.txt
@@ -3,49 +3,37 @@ Membrane SOA Model
 
 Command Line Tools
 ------------------
-WSDL Diff:
-
-bin\wsdldiff <<first wsdl file or url>> <<second wsdl file or url>> [<<report output folder>>]
-
-Example:
-1. cd c:\soa-model-home
-2. c:\soa-model-home>bin\wsdldiff samples\diff\original\article.wsdl samples\diff\modified\article.wsdl
-
 
 
-Schema Diff:
-
-bin\schemadiff <<first schema file or url>> <<second schema file or url>> [<<report output folder>>]
+WSDL Diff:
 
-Example:
-1. cd c:\soa-model-home
-2. c:\soa-model-home>bin\schemadiff samples\diff\original\common.xsd samples\diff\modified\common.xsd
+bin\wsdldiff <FirstWsdlFileOrUrl> <SecondWsdlFileOrUrl> [<ReportOutputFolder>]
 
+Windows Example:
+1. change to SOA_MODEL_HOME folder
+2. > bin\wsdldiff samples\diff\original\article.wsdl samples\diff\modified\article.wsdl
 
+Linux/Mac Example:
+1. change to SOA_MODEL_HOME folder
+2. > bin/wsdldiff.sh samples/diff/{original,modified}/article.wsdl
 
 If no output folder is given, the report will be generated in 'diff-report' in your current directory.
 
 
+Schema Diff:
 
+Windows: bin\schemadiff <FirstSchemaFileOrUrl> <SecondSchemaFileOrUrl> [<ReportOutputFolder>]
+Linux: bin/schemadiff.sh <FirstSchemaFileOrUrl> <SecondSchemaFileOrUrl> [<ReportOutputFolder>]
 
+Windows Example:
+1. change to SOA_MODEL_HOME folder
+2. > bin\schemadiff samples\diff\original\common.xsd samples\diff\modified\common.xsd
 
-Diff Examples
--------------
-To generate a sample diff report for WSDL:
-
-1. go to 'samples\diff\' folder
-2. run the 'wsdl-sample-diff.bat' with a double click
-3. go to 'wsdl-diff-output' and open 'diff-report.html'
-
-
-
-To generate a sample diff report for XSD Schema:
-
-1. go to 'samples\diff\' folder
-2. run the 'schema-sample-diff.bat' with a doble click
-3. go to 'schema-diff-output' and open 'diff-report.html'
-
+Linux/Mac Example:
+1. change to SOA_MODEL_HOME folder
+2. > bin/schemadiff.sh samples/diff/{original,modified}/common.xsd
 
+If no output folder is given, the report will be generated in 'diff-report' in your current directory.
 
 
 
@@ -54,8 +42,11 @@ Running the Samples in Eclipse
 The binary distribution of SOA Model can be imported as a project to eclipse by the following steps:
 
 1. In eclipse click on File/Import...
-2. In the Wizard select 'General' --> 'Existing Projects into Workspace' as import source and click 'Next'
-3. Select root directory and Click on 'Browse...' 
-4. Choose the directory, where you've extracted the soa-model-distribution-x-bin.zip
+2. In the Wizard select 'General' --> 'Existing Projects into Workspace' as
+   import source and click 'Next'
+3. Select root directory and Click on 'Browse...'
+4. Choose the directory, where you've extracted the
+   soa-model-distribution-VERSION-bin.zip
 5. Click on Finish
-6. Run any of the programs in the samples package
+6. Run any of the programs from src/main/java/samples/...
+
diff --git a/distribution/samples/diff/readme.txt b/distribution/samples/diff/readme.txt
deleted file mode 100644
index a65bd817..00000000
--- a/distribution/samples/diff/readme.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-Membrane SOA Model
-==================
-
-Command Line Tools
-------------------
-WSDL Diff:
-
-bin\wsdldiff <<first wsdl file or url>> <<second wsdl file or url>> [<<report output folder>>]
-
-
-Windows Exsample:
-cd c:\soa-model-home
-c:\soa-model-home>bin\wsdldiff samples\diff\original\article.wsdl samples\diff\modified\article.wsdl
-
-
-Linux/Mac Exsample:
-cd soa-model-home
-bin/wsdldiff.sh samples/diff/original/article.wsdl samples/diff/modified/article.wsdl
-
-
-Schema Diff:
-
-bin\schemadiff <<first schema file or url>> <<second schema file or url>> [<<report output folder>>]
-
-Windows Exsample:
-c:\soa-model-home>bin\schemadiff samples\diff\original\common.xsd samples\diff\modified\common.xsd
-
-
-Linux/Mac Exsample:
-bin/schemadiff.sh samples/diff/original/common.xsd samples/diff/modified/common.xsd
-
-
-If no output folder is given, the report will be generated in 'diff-report' in your current directory.
-
-
-
-
-
-Diff Examples
--------------
-To generate a sample diff report for WSDL:
-
-1. go to 'samples\diff\' folder
-2. run the 'wsdl-sample-diff.bat' with a double click
-3. go to 'wsdl-diff-output' and open 'diff-report.html'
-
-
-
-To generate a sample diff report for XSD Schema:
-
-1. go to 'samples\diff\' folder
-2. run the 'schema-sample-diff.bat' with a doble click
-3. go to 'schema-diff-output' and open 'diff-report.html'
-
-
-
-
-
-Running the Samples in Eclipse
-------------------------------
-The binary distribution of SOA Model can be imported as a project to eclipse by the following steps:
-
-1. In eclipse click on File/Import...
-2. In the Wizard select 'General' --> 'Existing Projects into Workspace' as import source and click 'Next'
-3. Select root directory and Click on 'Browse...'
-4. Choose the directory, where you've extracted the soa-model-distribution-x-bin.zip
-5. Click on Finish
-6. Run any of the programs in the samples package
diff --git a/distribution/samples/diff/schema-diff-sample.bat b/distribution/samples/diff/schema-diff-sample.bat
deleted file mode 100644
index 4180dca8..00000000
--- a/distribution/samples/diff/schema-diff-sample.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off
-
-pushd ..\..
-
-bin\schemadiff samples\diff\original\article.xsd samples\diff\modified\article.xsd samples\diff\schema-diff-output
-
-pushd samples\diff
-
-:end
\ No newline at end of file
diff --git a/distribution/samples/diff/schema-diff-sample.sh b/distribution/samples/diff/schema-diff-sample.sh
deleted file mode 100644
index 958bcc2b..00000000
--- a/distribution/samples/diff/schema-diff-sample.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# find out folder that the script is stored in (so it can be called from anywhere)
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd $DIR/../..
-sh bin/schemadiff.sh samples/diff/original/article.xsd samples/diff/modified/article.xsd samples/diff/schema-diff-output
-cd $DIR
diff --git a/distribution/samples/diff/wsdl-diff-sample.bat b/distribution/samples/diff/wsdl-diff-sample.bat
deleted file mode 100644
index 902c6e5d..00000000
--- a/distribution/samples/diff/wsdl-diff-sample.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off
-
-pushd ..\..
-
-bin\wsdldiff samples\diff\original\article.wsdl samples\diff\modified\article.wsdl samples\diff\wsdl-diff-output
-
-pushd samples\diff
-
-:end
\ No newline at end of file
diff --git a/distribution/samples/diff/wsdl-diff-sample.sh b/distribution/samples/diff/wsdl-diff-sample.sh
deleted file mode 100644
index bf87dd2d..00000000
--- a/distribution/samples/diff/wsdl-diff-sample.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# find out folder that the script is stored in (so it can be called from anywhere)
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd $DIR/../..
-sh bin/wsdldiff.sh samples/diff/original/article.wsdl samples/diff/modified/article.wsdl samples/diff/wsdl-diff-output
-cd $DIR