diff --git a/.idea/ant.xml b/.idea/ant.xml
deleted file mode 100644
index a2a47698..00000000
--- a/.idea/ant.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AntConfiguration">
-    <buildFile url="file://$PROJECT_DIR$/build.xml" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 58e7fa5e..00000000
--- a/AUTHORS
+++ /dev/null
@@ -1,14 +0,0 @@
-Mark Richters
-Martin Gogolla
-Joern Bohling
-Fabian Buettner
-Fabian Gutsche
-Hanna Bauerdick
-Antje Werner
-Jens Bruening
-Mirco Kuhlmann
-Duc-Hanh Dang
-Lars Hamann
-Daniel Gent
-Frank Hilken
-Andreas Kaestner
diff --git a/HACKING b/HACKING
deleted file mode 100644
index 33b73fa3..00000000
--- a/HACKING
+++ /dev/null
@@ -1,66 +0,0 @@
--*- Text -*-
-$ReleaseVersion: 2.3.1 $
-
-This document gives some guide lines how to make changes to USE and
-how to work with PRCS.
-
-1. Checking out a working copy from the repository.
-
- - Make sure the environment variable PRCS_REPOSITORY is set to the
-   location of the central PRCS repository.
-  
- - Change to an empty directory for your working copies of USE.
-
-   % mkdir ~/use
-   % cd ~/use
-
- - Checkout out the project files:
-    
-   % prcs checkout use
-
-2. Making changes to files.
-  
- - Edit existing files does not require any special steps.
-
- - If you add new files, you must also add entries for them to the
-   project file "use.prj". You can do this with
-
-   % prcs populate
-
- - If you remove new files, you must also remove entries for them
-   from the project file "use.prj". You can do this with
-
-   % prcs populate -d
-
-   For reasons of readability, the file entries in "use.prj" are
-   sorted alphabetically. This has to be done manually. Please
-   maintain this ordering, when adding or deleting files. You can edit
-   "use.prj" with a text editor. Just don't break the structure.
-
- - These steps can be done in any order and as often as you like.
-
-3. Checking in your changes.
-
- - Make sure your changes don't break the build. Run a fresh build and
-   all tests:
-
-   % ant all
-
- - Document all changes that concern the user interface (in a broad
-   sense) in the "NEWS" file. This is important for users who want to
-   know what has changed between two releases.
-
- - For each changed file, add a short description to the "ChangeLog"
-   file so that other people can understand what your changes are
-   about. This can easily be done within emacs by typing "C-x 4 a"
-   within the changed file's buffer.
-
- - Add an entry "* VERSION: 0.n" at the top of the "ChangeLog" file
-   where n is the next minor number that will be assigned by PRCS to
-   your checked-in version. Look at "use.prj" to determine n or at
-   previos entries in "ChangeLog".
-
- - Checkin your changes and update all version identifiers.
-
-   % prcs checkin
-   % prcs rekey
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 4bb9064c..00000000
--- a/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-## -*- Makefile -*-
-## $ProjectHeader: use 0.393 Wed, 16 May 2007 14:10:28 +0200 opti $
-
-# In previous versions this Makefile was used to build the USE system.
-# Apache Ant is now used for this task. See the file build.xml for details.
-# This Makefile is now only used for some maintenance tasks.
-
-package = use
-
-src_dir = src/main/org
-
-all:
-	@echo "Please use Ant for building."
-
-# rules below are for maintainance
-
-count-lines:
-	find $(src_dir) -name "*.java" | xargs -n 1 wc | awk '{ s += $$1 } END { print s}'
-
-find-fixme:
-	find $(src_dir) -name "*.java" | xargs grep -n FIXME
-
-find-todo:
-	find $(src_dir) -name "*.java" | xargs grep -n TODO
diff --git a/README.md b/README.md
index b01a8ba8..19e9053e 100644
--- a/README.md
+++ b/README.md
@@ -139,19 +139,27 @@ These steps will help diagnose the problem.
 
 ## Acknowledgments
 
-The following people from the database systems working group at the
-University of Bremen made very helpful contributions to the USE
+The following people made very helpful contributions to the USE
 project. A big "thank you" to all of you.
 
+Hanna Bauerdick
+Joern Bohling
+Jens Brüning
 Fabian Büttner
+Duc-Hanh Dang
 Heino Gärtner
+Daniel Gent
 Martin Gogolla
+Fabian Gutsche
+Lars Hamann
 Frank Hilken
 Andreas Kästner
 Ralf Kollmann
 Mirco Kuhlmann
 Arne Lindow
 Oliver Radfelder
+Mark Richters
+Antje Werner
 Paul Ziemann
 
 There are many other people who provided comments and input on
diff --git a/build.xml b/build.xml
deleted file mode 100644
index a3f40fd1..00000000
--- a/build.xml
+++ /dev/null
@@ -1,672 +0,0 @@
-<project name="use" default="build" basedir=".">
-	<description>Build file for USE</description>
-
-	<property environment="env"/>
-
-	<property name="release.version.base" value="6.0.0"/>
-
-	<condition property="release.version" value="${release.version.base}-${env.BUILD_NUMBER}" else="${release.version.base}">
-		<isset property="env.BUILD_NUMBER"/>
-	</condition>
-
-	<!-- set release name to "use-x.y.z" -->
-	<property name="release.name" value="${ant.project.name}-${release.version}"/>
-
-	<!-- define Java source and target version -->
-	<property name="java.targetversion" value="1.8" />
-	<property name="java.sourceversion" value="1.8" />
-	<property name="use.mainClass" value="org.tzi.use.main.Main" />
-	<!-- DO NOT ENABLE DEBUG HERE!
-		 To enable debug LOCALLY, run ant with argument '-Djavac.debug=true' -->
-	<property name="javac.debug" value="off" />
-
-	<!-- define top-level directories -->
-	<property name="bin.dir"            location="${basedir}/bin"/>
-	<property name="etc.dir"            location="${basedir}/etc"/>
-	<property name="examples.dir"       location="${basedir}/examples"/>
-	<property name="images.dir"         location="${basedir}/images"/>
-	<property name="lib.dir"            location="${basedir}/lib"/>
-	<property name="src.dir"            location="${basedir}/src"/>
-	<property name="src.main.dir"       location="${src.dir}/main"/>
-	<property name="src.gui.dir"        location="${src.dir}/gui"/>
-	<property name="src.runtime.dir"    location="${src.dir}/runtime" />
-	<property name="src.test.dir"       location="${src.dir}/test"/>
-	<property name="test.dir"           location="${basedir}/test"/>
-	<property name="test.lang"          value="en_US.UTF-8"/>
-
-	<!-- define build directories and files -->
-	<property name="build.dir"           location="${basedir}/build"/>
-	<property name="build.classes.dir"   location="${build.dir}/classes"/>
-	<property name="build.lib.dir"       location="${basedir}/lib"/>
-	<property name="build.javadoc.dir"   location="${build.dir}/javadoc"/>
-	<property name="build.release.dir"   location="${build.dir}/release/${release.name}"/>
-	<property name="build.doc.dir"       location="${build.dir}/doc"/>
-	<property name="use.jar"             location="${build.lib.dir}/use.jar"/>
-	<property name="use-gui.jar"         location="${build.lib.dir}/use-gui.jar"/>
-	<property name="use-runtime.jar"     location="${build.lib.dir}/use-runtime.jar" />
-	<property name="build.libbuild.dir"  location="${basedir}/lib_build"/>
-
-	<property name="antlr.jar"            location="${lib.dir}/antlr-3.4-complete.jar"/>
-	<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
-	<property name="gsbase.jar"           location="${lib.dir}/gsbase.jar"/>
-	<property name="jruby.jar"            location="${lib.dir}/jruby-1.7.2.jar"/>
-	<property name="combinatoricslib.jar" location="${lib.dir}/combinatoricslib-0.2.jar"/>
-    <property name="vtd-xml.jar"          location="${lib.dir}/vtd-xml.jar"/>
-    <property name="itextpdf.jar"         location="${lib.dir}/itextpdf-5.5.2.jar"/>
-	<property name="guava.jar"            location="${lib.dir}/guava-20.0.jar"/>
-	<property name="annotation.jar"       location="${build.libbuild.dir}/org.eclipse.jdt.annotation_1.1.0.v20130513-1648.jar"/> 
-	<property name="readline.src.dir"     location="${src.main.dir}/org/tzi/use/util/input"/>
-	<property name="parser.dir"           location="${src.main.dir}/org/tzi/use/parser"/>
-	<path id="use.classpath.absolute">
-		<fileset dir="${lib.dir}" includes="*.jar" excludes="use*"/>
-		<pathelement path="${use-gui.jar}"/>
-		<pathelement path="${use-runtime.jar}"/>
-	</path>
-	<manifestclasspath property="use.classpath" jarfile="${use.jar}">
-		<classpath refid="use.classpath.absolute"/>
-	</manifestclasspath>
-
-	<condition property="os.windows">
-		<os family="windows"/>
-	</condition>
-
-	<condition property="os.mac">
-		<os family="mac" />
-	</condition>
-
-	<!-- perform all major targets. Should be done before a checkin to
-       avoid broken snapshots.  -->
-	<target name="all" description="perform clean, build, test-junit, javadoc" depends="clean, build, test-junit, javadoc" />
-
-	<!-- compile with jikes. Use like "ant with.jikes build" -->
-	<target name="with.jikes" description="compile using jikes">
-		<property name="build.compiler" value="jikes"/>
-		<property name="build.compiler.emacs" value="true"/>
-		<property name="build.compiler.pedantic" value="false"/>
-		<property name="build.compiler.warnings" value="false"/>
-	</target>
-
-	<!-- help -->
-	<target name="help" description="Shows how to get a list of available targets">
-		<echo>run "ant -projecthelp" for a list of available targets</echo>
-	</target>
-
-	<!-- output configuration information -->
-	<target name="config-info">
-		<echo>Operating System: ${os.name} ${os.version}</echo>
-		<echo>Java Runtime:     ${java.runtime.name}</echo>
-		<echo>Java Home:        ${java.home}</echo>
-		<echo>Java Version:     ${java.vm.version}</echo>
-		<echo>Build Compiler:   ${build.compiler}</echo>
-		<echo>Ant Version:      ${ant.version}</echo>
-	</target>
-
-	<!-- initialization required before all targets -->
-	<target name="init">
-		<tstamp/>
-	</target>
-
-	<!-- check whether ANTLR generated parser is up-to-date -->
-	<target name="check-parser-uptodate" depends="init">
-		<condition property="parser.uptodate">
-			<and>
-				<!-- ocl parser grammar exists -->
-				<available file="${parser.dir}/ocl/OCL.g" />
-
-				<!-- ocl parser to ocl base -->
-				<uptodate srcfile="${parser.dir}/base/OCLBase.gpart" 
-                  targetfile="${parser.dir}/ocl/OCLParser.java"/>
-
-				<!-- ocl parser to ocl lexer rules -->
-				<uptodate srcfile="${parser.dir}/base/OCLLexerRules.gpart" 
-      			  targetfile="${parser.dir}/ocl/OCLParser.java"/>
-
-				<!-- ocl parser to ocl -->
-				<uptodate srcfile="${parser.dir}/ocl/OCL.gpart" 
-      			  targetfile="${parser.dir}/ocl/OCLParser.java"/>
-
-				<!-- use parser grammar exists -->
-				<available file="${parser.dir}/use/USE.g" />
-
-				<!-- use parser to required grammars -->
-				<uptodate srcfile="${parser.dir}/use/USE.gpart" 
-                  targetfile="${parser.dir}/use/USEParser.java"/>
-
-				<uptodate srcfile="${parser.dir}/base/USEBase.gpart" 
-                  targetfile="${parser.dir}/use/USEParser.java"/>
-
-				<!-- <uptodate srcfile="${parser.dir}/use/USELexerRules.gpart" 
-				  targetfile="${parser.dir}/use/USEParser.java"/> -->
-
-				<!-- shell grammar exists -->
-				<available file="${parser.dir}/shell/ShellCommand.g" />
-
-				<!-- shell language parser to required grammars -->
-				<uptodate srcfile="${parser.dir}/base/ShellCommandBase.gpart" 
-      			  targetfile="${parser.dir}/shell/ShellCommandParser.java"/>
-
-				<uptodate srcfile="${parser.dir}/shell/ShellCommand.gpart" 
-                  targetfile="${parser.dir}/shell/ShellCommandParser.java"/>
-
-				<!-- generator parser grammar exists -->
-				<available file="${parser.dir}/generator/Generator.g" />
-
-				<!-- generator parser -->
-				<uptodate srcfile="${parser.dir}/generator/Generator.gpart" 
-                  targetfile="${parser.dir}/generator/GeneratorParser.java"/>
-
-				<!-- soil parser grammar exists -->
-				<available file="${parser.dir}/soil/Soil.g" />
-
-				<!-- soil parser -->
-				<uptodate srcfile="${parser.dir}/soil/Soil.gpart"
-      	          targetfile="${parser.dir}/soil/SoilParser.java"/>
-
-				<uptodate srcfile="${parser.dir}/base/SoilBase.gpart"
-      	          targetfile="${parser.dir}/soil/SoilParser.java"/>
-
-				<!-- testsuite parser grammar exists -->
-				<available file="${parser.dir}/testsuite/TestSuite.g" />
-
-				<!-- testsuite parser -->
-				<uptodate srcfile="${parser.dir}/testsuite/TestSuite.gpart" 
-                  targetfile="${parser.dir}/testsuite/TestSuiteParser.java"/>
-
-			</and>
-		</condition>
-	</target>
-
-	<!-- create ANTLR generated parser -->
-	<target name="create-parser" depends="check-parser-uptodate" unless="parser.uptodate">
-
-		<!-- ocl parser -->
-		<echo>Generating ocl parser</echo>
-		<concat destfile="${parser.dir}/ocl/OCL.g">
-			<fileset file="${parser.dir}/ocl/OCL.gpart" />
-			<fileset file="${parser.dir}/base/OCLBase.gpart" />
-			<fileset file="${parser.dir}/base/OCLLexerRules.gpart" />
-		</concat>
-
-		<java classname="org.antlr.Tool" dir="${parser.dir}/ocl" fork="yes">
-			<classpath path="${antlr.jar}"/>
-			<arg line="OCL.g"/>
-		</java>
-
-		<!-- soil parser -->
-		<echo>Generating soil parser</echo>
-		<concat destfile="${parser.dir}/soil/Soil.g">
-			<fileset file="${parser.dir}/soil/Soil.gpart" />
-			<fileset file="${parser.dir}/base/SoilBase.gpart" />
-			<fileset file="${parser.dir}/base/OCLBase.gpart" />
-			<fileset file="${parser.dir}/base/OCLLexerRules.gpart" />
-		</concat>
-		<java classname="org.antlr.Tool" dir="${parser.dir}/soil" fork="yes">
-			<classpath path="${antlr.jar}"/>
-			<arg line="Soil.g"/>
-		</java>
-
-		<!-- use parser -->
-		<echo>Generating use parser</echo>
-		<concat destfile="${parser.dir}/use/USE.g">
-			<fileset file="${parser.dir}/use/USE.gpart" />
-			<fileset file="${parser.dir}/base/USEBase.gpart" />
-			<fileset file="${parser.dir}/base/OCLBase.gpart" />
-			<fileset file="${parser.dir}/base/SoilBase.gpart" />
-			<!-- <fileset file="${parser.dir}/use/USELexerRules.gpart" /> -->
-			<fileset file="${parser.dir}/base/OCLLexerRules.gpart" />
-		</concat>
-
-		<java classname="org.antlr.Tool" dir="${parser.dir}/use" fork="yes">
-			<classpath path="${antlr.jar}"/>
-			<arg line="USE.g"/>
-		</java>
-
-		<!-- shell command parser -->
-		<echo>Generating shell command parser</echo>
-		<concat destfile="${parser.dir}/shell/ShellCommand.g">
-			<fileset file="${parser.dir}/shell/ShellCommand.gpart" />
-			<fileset file="${parser.dir}/base/ShellCommandBase.gpart" />
-			<fileset file="${parser.dir}/base/OCLBase.gpart" />
-			<fileset file="${parser.dir}/base/SoilBase.gpart" />
-			<fileset file="${parser.dir}/base/OCLLexerRules.gpart" />
-		</concat>
-
-		<java classname="org.antlr.Tool" dir="${parser.dir}/shell" fork="yes">
-			<classpath path="${antlr.jar}"/>
-			<arg line="-lib ../base ShellCommand.g"/>
-		</java>
-
-		<!-- generator parser -->
-		<echo>Generating generator parser</echo>
-		<concat destfile="${parser.dir}/generator/Generator.g">
-			<fileset file="${parser.dir}/generator/Generator.gpart" />
-			<fileset file="${parser.dir}/base/USEBase.gpart" />
-			<fileset file="${parser.dir}/base/OCLBase.gpart" />
-			<fileset file="${parser.dir}/base/SoilBase.gpart" />
-			<fileset file="${parser.dir}/base/OCLLexerRules.gpart" />
-		</concat>
-		<java classname="org.antlr.Tool" dir="${parser.dir}/generator" fork="yes">
-			<classpath path="${antlr.jar}"/>
-			<arg line="Generator.g"/>
-		</java>
-
-		<!-- test suite parser -->
-		<echo>Generating testsuite parser</echo>
-		<concat destfile="${parser.dir}/testsuite/TestSuite.g">
-			<fileset file="${parser.dir}/testsuite/TestSuite.gpart" />
-			<fileset file="${parser.dir}/base/OCLBase.gpart" />
-			<fileset file="${parser.dir}/base/ShellCommandBase.gpart" />
-			<fileset file="${parser.dir}/base/SoilBase.gpart" />
-			<fileset file="${parser.dir}/base/OCLLexerRules.gpart" />
-		</concat>
-
-		<java classname="org.antlr.Tool" dir="${parser.dir}/testsuite" fork="yes">
-			<classpath path="${antlr.jar}"/>
-			<arg line="-lib ../base TestSuite.g"/>
-		</java>
-
-	</target>
-
-	<!-- compile USE sources -->
-	<target name="compile-use" depends="compile-use-runtime" />
-
-	<target name="compile-use-main" depends="create-parser, setversion">
-		<mkdir dir="${build.classes.dir}" />
-		<javac srcdir="${src.main.dir}:${src.runtime.dir}:${src.gui.dir}"
-			destdir="${build.classes.dir}" deprecation="on" debug="${javac.debug}" listfiles="off"
-			classpath="${antlr.jar}:${jruby.jar}:${combinatoricslib.jar}:${vtd-xml.jar}:${itextpdf.jar}:${guava.jar}:${annotation.jar}"
-			source="${java.sourceversion}" target="${java.targetversion}" includeantruntime="false">
-		</javac>
-		<javac srcdir="${src.test.dir}"
-			destdir="${build.classes.dir}" deprecation="on" debug="${javac.debug}" listfiles="off"
-			classpath="${antlr.jar}:${junit.jar}:${gsbase.jar}:${combinatoricslib.jar}:${vtd-xml.jar}:${itextpdf.jar}"
-			source="${java.sourceversion}" target="${java.targetversion}" includeantruntime="false">
-			<exclude name="org/tzi/use/gui/**/*.java" />
-		</javac>
-	</target>
-
-	<target name="compile-use-gui" depends="compile-use-main">
-		<mkdir dir="${build.classes.dir}" />
-		<javac srcdir="${src.gui.dir}:${src.runtime.dir}"
-			destdir="${build.classes.dir}" deprecation="on" debug="${javac.debug}" listfiles="off"
-			classpath="${antlr.jar}:${vtd-xml.jar}:${itextpdf.jar}:${annotation.jar}"
-			source="${java.sourceversion}" target="${java.targetversion}" includeantruntime="false">
-		</javac>
-		<javac srcdir="${src.test.dir}"
-			destdir="${build.classes.dir}" deprecation="on" debug="${javac.debug}" listfiles="off"
-			classpath="${antlr.jar}:${junit.jar}:${gsbase.jar}:${vtd-xml.jar}:${itextpdf.jar}"
-			source="${java.sourceversion}" target="${java.targetversion}" includeantruntime="false">
-			<include name="org/tzi/use/gui/**/*.java" />
-		</javac>
-	</target>
-
-	<target name="compile-use-runtime" depends="compile-use-gui">
-		<mkdir dir="${build.classes.dir}" />
-		<javac srcdir="${src.runtime.dir}"
-			destdir="${build.classes.dir}" deprecation="on" debug="${javac.debug}" listfiles="off"
-			classpath="${antlr.jar}:${annotation.jar}"
-			source="${java.sourceversion}" target="${java.targetversion}" includeantruntime="false">
-		</javac>
-	</target>
-
-	<target name="setversion">
-		<replaceregexp file="${src.main.dir}/org/tzi/use/config/Options.java"
-			match='RELEASE_VERSION = ".*?"' replace='RELEASE_VERSION = "${release.version}"'/>
-	</target>
-
-	<!-- create USE jar -->
-	<target name="jar-use" depends="compile-use">
-		<mkdir dir="${build.lib.dir}"/>
-		
-		<jar jarfile="${use.jar}" basedir="${build.classes.dir}">
-			<manifest>
-				<attribute name="Main-Class" value="${use.mainClass}"/>
-				<attribute name="Class-Path" value="${use.classpath}"/>
-			</manifest>
-			<exclude name="org/tzi/use/runtime/**" />
-			<exclude name="org/tzi/use/gui/**"/>
-			<exclude name="**/*Test.class"/>
-		</jar>
-
-		<jar jarfile="${use-gui.jar}" basedir="${build.classes.dir}">
-			<include name="org/tzi/use/gui/**"/>
-			<exclude name="**/*Test.class"/>
-		</jar>
-
-		<jar jarfile="${use-runtime.jar}" basedir="${build.classes.dir}">
-			<include name="org/tzi/use/runtime/**" />
-			<exclude name="**/*Test.class" />
-		</jar>
-	</target>
-
-	<!-- check whether the native readline wrapper lib must be build -->
-	<target name="check-nativelib-needcompile" depends="init">
-		<uptodate property="nativelib.uptodate" srcfile="${readline.src.dir}/natGNUReadline.c" targetfile="${build.lib.dir}/libnatGNUReadline.so" />
-
-		<condition property="nativelib.needcompile">
-			<and>
-				<!-- no readline on windows -->
-				<not>
-					<isset property="nativelib.uptodate" />
-				</not>
-				<not>
-					<or>
-						<isset property="os.windows" />
-						<isset property="os.mac" />
-					</or>
-				</not>
-			</and>
-		</condition>
-	</target>
-
-	<!-- create native readline wrapper -->
-	<target name="create-nativelib" depends="compile-use,check-nativelib-needcompile" if="nativelib.needcompile">
-		<echo>executing javah</echo>
-		<exec executable="javah" failonerror="true">
-			<arg value="-jni"/>
-			<arg value="-classpath"/>
-			<arg value="${build.classes.dir}"/>
-			<arg value="-d"/>
-			<arg value="${build.lib.dir}"/>
-			<arg value="org.tzi.use.util.input.GNUReadline"/>
-		</exec>
-
-		<echo>executing gcc: compiling native code</echo>
-		<exec executable="gcc" failonerror="true">
-			<arg value="-fPIC"/>
-			<arg value="-Wall"/>
-			<arg value="-g"/>
-			<arg value="-O2"/>
-			<arg value="-I"/>
-			<arg value="${build.lib.dir}"/>
-			<arg value="-I"/>
-			<arg value="${java.home}/../include"/>
-			<arg value="-I"/>
-			<arg value="${java.home}/../include/linux"/>
-			<arg value="-I"/>
-			<arg value="${java.home}/../include/solaris"/>
-			<arg value="-c"/>
-			<arg value="${readline.src.dir}/natGNUReadline.c"/>
-			<arg value="-o"/>
-			<arg value="${build.lib.dir}/natGNUReadline.o"/>
-		</exec>
-		<delete file="${build.lib.dir}/org_tzi_use_util_input_GNUReadline.h"/>
-
-		<echo>executing gcc: linking shared library</echo>
-		<exec executable="gcc" failonerror="true">
-			<arg value="${build.lib.dir}/natGNUReadline.o"/>
-			<arg value="-shared"/>
-			<arg value="-lreadline"/>
-			<arg value="-lcurses"/>
-			<arg value="-o"/>
-			<arg value="${build.lib.dir}/libnatGNUReadline.so"/>
-		</exec>
-		<delete file="${build.lib.dir}/natGNUReadline.o" quiet="true"/>
-	</target>
-
-	<!-- create all jars -->
-	<target name="build" depends="jar-use" description="build everything "/>
-
-	<!-- delete the build tree -->
-	<target name="clean" description="clean build directory" >
-		<delete dir="${build.dir}"/>
-		<!-- generated grammar files -->
-		<delete verbose="yes">
-			<fileset dir="${parser.dir}" includes="**/*.tokens">
-				<present targetdir="${parser.dir}">
-					<globmapper from="*.tokens" to="*.g" />
-				</present>
-			</fileset>
-			<fileset dir="${parser.dir}" includes="**/*Parser.java">
-				<present targetdir="${parser.dir}">
-					<globmapper from="*Parser.java" to="*.g" />
-				</present>
-			</fileset>
-			<fileset dir="${parser.dir}" includes="**/*Lexer.java">
-				<present targetdir="${parser.dir}">
-					<globmapper from="*Lexer.java" to="*.g" />
-				</present>
-			</fileset>
-			<fileset dir="${parser.dir}" includes="**/*.g"/>
-		</delete>
-		<!-- jar files -->
-		<delete file="${use.jar}"/>
-		<delete file="${use-runtime.jar}"/>
-		<delete file="${use-gui.jar}"/>
-	</target>
-
-
-	<!-- delete files in the source tree that can be regenerated -->
-	<target name="maintainer-clean" depends="clean">
-		<exec executable="make" dir="${test.dir}" failonerror="true">
-			<arg value="maintainer-clean"/>
-		</exec>
-		<exec executable="make" dir="${test.dir}/state" failonerror="true">
-			<arg value="maintainer-clean"/>
-		</exec>
-		<exec executable="make" dir="${examples.dir}" failonerror="true">
-			<arg value="maintainer-clean"/>
-		</exec>
-	</target>
-
-	<!-- generate javadoc -->
-	<target name="javadoc" depends="javadoc_api, create-parser" description="generates javadoc documentation">
-		<mkdir dir="${build.javadoc.dir}/complete"/>
-		<javadoc packagenames="org.*" sourcepath="${src.main.dir}" classpath="${antlr.jar}:${junit.jar}:${combinatoricslib.jar}" destdir="${build.javadoc.dir}/complete" author="true" version="true" private="true" use="true" windowtitle="${ant.project.name} API" doctitle="${release.name}">
-			<tag name="ocl.pre" scope="constructors,methods" description="Precondition:" />
-			<bottom><![CDATA[<i>Copyright &#169; 1999-2014 University of Bremen, Mark Richters. All Rights Reserved.</i>]]></bottom>
-		</javadoc>
-	</target>
-	
-	
-	<target name="javadoc_api" depends="create-parser" description="generates javadoc API documentation">
-		<mkdir dir="${build.javadoc.dir}/api"/>
-		<javadoc packagenames="org.tzi.use.api.*" sourcepath="${src.main.dir}" classpath="${antlr.jar}:${junit.jar}:${combinatoricslib.jar}" destdir="${build.javadoc.dir}/api" author="true" version="true" private="false" use="true" windowtitle="${ant.project.name} API" doctitle="${release.name}">
-			<tag name="ocl.pre" scope="constructors,methods" description="Precondition:" />
-			<bottom><![CDATA[<i>Copyright &#169; 1999-2014 University of Bremen, Mark Richters. All Rights Reserved.</i>]]></bottom>
-		</javadoc>
-	</target>
-	
-	<!-- generate html code from the USE grammar -->
-	<target name="generate-grammar-html" depends="init" description="generates html code from the USE grammar">
-		<java classname="antlr.Tool" dir="${parser.dir}" fork="yes">
-			<classpath path="${antlr.jar}" />
-			<arg value="-html" />
-			<arg value="use.g" />
-		</java>
-	</target>
-	
-	<!-- generate diagnostic files from the USE grammar -->
-	<target name="generate-grammar-diagnostic" depends="init" description="generates diagnostic files from the USE grammar">
-		<java classname="antlr.Tool" dir="${parser.dir}" fork="yes">
-			<classpath path="${antlr.jar}"/>
-			<arg value="-diagnostic"/>
-			<arg value="use.g"/>
-		</java>
-	</target>
-	
-	<!-- run all tests -->
-	<target name="test" description="run all tests" depends="test-classcycles, test-junit, test-other" />
-	
-	<!-- run unit tests -->
-	<target name="test-junit" description="run unit tests" depends="build">
-		<junit haltonfailure="yes">
-			<jvmarg value="-Dbasedir=${basedir}"/>
-			<jvmarg value="-Duser.language=${test.lang}"/>
-			<formatter type="brief" usefile="no"/>
-			<classpath path="${antlr.jar}:${build.classes.dir}:${gsbase.jar}:${jruby.jar}:${junit.jar}:${guava.jar}"/>
-			<batchtest fork="yes">
-				<fileset dir="${src.test.dir}">
-					<include name="**/*Test.java"/>
-				</fileset>
-			</batchtest>
-		</junit>
-	</target>
-	
-	<!-- run unit tests with gui  -->
-	<target name="test-junit-swing" description="runs unit tests with gui" depends="build">
-		<java classname="junit.swingui.TestRunner" fork="yes">
-			<jvmarg value="-Dbasedir=${basedir}"/>
-			<jvmarg value="-Duser.language=${test.lang}"/>
-			<classpath path="${antlr.jar}:${build.classes.dir}:${gsbase.jar}:${junit.jar}:${jruby.jar};${guava.jar}"/>
-		</java>
-	</target>
-	
-	<!-- run other tests via make -->
-	<target name="test-other" description="run scripted tests" depends="build">
-		<exec executable="make" dir="${test.dir}" failonerror="true">
-			<arg value="clean"/>
-			<arg value="test"/>
-		</exec>
-		<exec executable="make" dir="${test.dir}/state" failonerror="true">
-			<arg value="clean"/>
-			<arg value="test"/>
-		</exec>
-		<exec executable="make" dir="${examples.dir}" failonerror="true">
-			<arg value="clean"/>
-			<arg value="test"/>
-		</exec>
-	</target>
-	
-	<!-- perform classcycle checks -->
-	<target name="check-classcycles-available">
-		<condition property="classcycleslib.available">
-			<available file="${build.libbuild.dir}/Classycle1.4.2/classycle.jar" />
-		</condition>
-	</target>
-	
-	<property name="package" value="org.tzi.use"/>
-	<target name="test-classcycles" depends="compile-use,check-classcycles-available" if="classcycleslib.available">
-		<taskdef name="classycleDependencyCheck" 
-				             classname="classycle.ant.DependencyCheckingTask" classpath="lib_build/Classycle1.4.2/classycle.jar"/>
-		
-		<classycleDependencyCheck failOnUnwantedDependencies="false"
-			                              excludingClasses="*Test,*Tests,*.All*Tests">
-			<fileset dir="${build.classes.dir}">
-				<include name="**/*.class"/>
-			</fileset>
-			show allResults
-			[gui] = ${package}.gui.*
-			[runtimeGui] = ${package}.runtime.gui.*
-			[runtime] = ${package}.runtime excluding [runtimeGui]
-			[noGui] = ${package}.* excluding [gui] [runtimeGui]
-					
-			check [noGui] independentOf [gui]
-			check [runtime] independentOf [runtimeGui]
-			check [noGui] independentOf [runtimeGui]
-	    </classycleDependencyCheck>
-	</target>
-	
-	<!-- create release -->
-	<target name="release" description="create release distribution" depends="maintainer-clean, build">
-		<!-- clean up example and test directories -->
-		<exec executable="make" dir="${test.dir}" failonerror="true">
-			<arg value="clean"/>
-		</exec>
-		<exec executable="make" dir="${test.dir}/state" failonerror="true">
-			<arg value="clean"/>
-		</exec>
-		<exec executable="make" dir="${examples.dir}" failonerror="true">
-			<arg value="clean"/>
-		</exec>
-		
-		<!-- copy top-level files -->
-		<mkdir dir="${build.release.dir}"/>
-		<copy todir="${build.release.dir}">
-			<fileset dir="${basedir}" includes=".classpath,.project,AUTHORS,build.xml,ChangeLog,COPYING,INSTALL,NEWS,README*"/>
-		</copy>
-		
-		<!-- copy bin files -->
-		<mkdir dir="${build.release.dir}/bin"/>
-		<copy todir="${build.release.dir}/bin">
-			<fileset dir="${bin.dir}"/>
-		</copy>
-		<chmod file="${build.release.dir}/bin/use" perm="a+rx" />
-
-		<!-- copy etc files -->
-		<mkdir dir="${build.release.dir}/etc"/>
-		<copy todir="${build.release.dir}/etc">
-			<fileset dir="${etc.dir}"/>
-		</copy>
-		
-		<!-- copy extension files -->
-		<mkdir dir="${build.release.dir}/oclextensions"/>
-		<copy todir="${build.release.dir}/oclextensions">
-			<fileset dir="${basedir}/oclextensions" />
-		</copy>
-		
-		<!-- copy example files -->
-		<mkdir dir="${build.release.dir}/examples"/>
-		<copy todir="${build.release.dir}/examples">
-			<fileset dir="${examples.dir}" excludes="**/*.done" />
-		</copy>
-		
-		<!-- copy image files -->
-		<mkdir dir="${build.release.dir}/images"/>
-		<copy todir="${build.release.dir}/images">
-			<fileset dir="${images.dir}" />
-		</copy>
-		
-		<!-- copy lib files -->
-		<mkdir dir="${build.release.dir}/lib"/>
-		<copy todir="${build.release.dir}/lib">
-			<fileset dir="${build.lib.dir}"/>
-		</copy>
-		
-		<!-- copy lib_build files -->
-		<mkdir dir="${build.release.dir}/lib_build"/>
-		<copy todir="${build.release.dir}/lib_build">
-			<fileset dir="${build.libbuild.dir}"/>
-		</copy>
-		
-		<!-- copy src files -->
-		<mkdir dir="${build.release.dir}/src"/>
-		<copy todir="${build.release.dir}/src">
-			<fileset dir="${src.dir}"/>
-		</copy>
-		
-		<!-- copy test files -->
-		<mkdir dir="${build.release.dir}/test"/>
-		<copy todir="${build.release.dir}/test">
-			<fileset dir="${test.dir}" />
-		</copy>
-		<chmod file="${build.release.dir}/test/mkcmd.pl" perm="a+rx" />
-		<chmod file="${build.release.dir}/test/mkout.pl" perm="a+rx" />
-		
-		<!-- create release tar file -->
-		<property name="release.tar" value="${build.release.dir}/../${release.name}.tar"/>
-		<delete file="${release.tar}"/>
-		<delete file="${release.tar}.gz"/>
-		<tar longfile="gnu" destfile="${release.tar}">
-			<tarfileset dir="${build.release.dir}/.." mode="755">
-				<include name="${release.name}/bin/use"/>
-				<include name="${release.name}/test/*.pl"/>
-			</tarfileset>
-			<tarfileset dir="${build.release.dir}/..">
-				<include name="${release.name}/**"/>
-				<exclude name="${release.name}/bin/use"/>
-				<exclude name="${release.name}/test/*.pl"/>
-			</tarfileset>
-		</tar>
-		<gzip src="${release.tar}" zipfile="${release.tar}.gz"/>
-		
-		<!-- create release zip file -->
-		<property name="release.zip" value="${build.release.dir}/../${release.name}.zip"/>
-		<delete file="${release.zip}"/>
-		<zip destfile="${release.zip}">
-			<zipfileset dir="${build.release.dir}/.." filemode="755">
-				<include name="${release.name}/bin/use"/>
-				<include name="${release.name}/test/*.pl"/>
-			</zipfileset>
-			<zipfileset dir="${build.release.dir}/..">
-				<include name="${release.name}/**"/>
-				<exclude name="${release.name}/bin/use"/>
-				<exclude name="${release.name}/test/*.pl"/>
-			</zipfileset>
-		</zip>
-		
-		<!-- cleanup -->
-		<delete file="${release.tar}"/>
-		<delete dir="${build.release.dir}"/>
-	</target>
-</project>
diff --git a/manual/USE_Documentation20070516.pdf b/manual/USE_Documentation20070516.pdf
deleted file mode 100644
index 4b8ca176..00000000
Binary files a/manual/USE_Documentation20070516.pdf and /dev/null differ
diff --git a/use-core/src/main/resources/examples/Documentation/Demo/Classdiagram/Demo-UML.eps b/use-core/src/main/resources/examples/Documentation/Demo/Classdiagram/Demo-UML.eps
deleted file mode 100644
index 9989766c..00000000
--- a/use-core/src/main/resources/examples/Documentation/Demo/Classdiagram/Demo-UML.eps
+++ /dev/null
@@ -1,183 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0
-%%Title: cls-EDP.eps
-%%Creator: fig2dev Version 3.2 Patchlevel 0-beta3
-%%CreationDate: Wed Mar  1 10:41:55 2000
-%%For: mr@dustbin (Mark Richters)
-%%Orientation: Portrait
-%%BoundingBox: 0 0 286 187
-%%Pages: 0
-%%BeginSetup
-%%EndSetup
-%%Magnification: 1.0000
-%%EndComments
-/$F2psDict 200 dict def
-$F2psDict begin
-$F2psDict /mtrx matrix put
-/col-1 {0 setgray} bind def
-/col0 {0.000 0.000 0.000 srgb} bind def
-/col1 {0.000 0.000 1.000 srgb} bind def
-/col2 {0.000 1.000 0.000 srgb} bind def
-/col3 {0.000 1.000 1.000 srgb} bind def
-/col4 {1.000 0.000 0.000 srgb} bind def
-/col5 {1.000 0.000 1.000 srgb} bind def
-/col6 {1.000 1.000 0.000 srgb} bind def
-/col7 {1.000 1.000 1.000 srgb} bind def
-/col8 {0.000 0.000 0.560 srgb} bind def
-/col9 {0.000 0.000 0.690 srgb} bind def
-/col10 {0.000 0.000 0.820 srgb} bind def
-/col11 {0.530 0.810 1.000 srgb} bind def
-/col12 {0.000 0.560 0.000 srgb} bind def
-/col13 {0.000 0.690 0.000 srgb} bind def
-/col14 {0.000 0.820 0.000 srgb} bind def
-/col15 {0.000 0.560 0.560 srgb} bind def
-/col16 {0.000 0.690 0.690 srgb} bind def
-/col17 {0.000 0.820 0.820 srgb} bind def
-/col18 {0.560 0.000 0.000 srgb} bind def
-/col19 {0.690 0.000 0.000 srgb} bind def
-/col20 {0.820 0.000 0.000 srgb} bind def
-/col21 {0.560 0.000 0.560 srgb} bind def
-/col22 {0.690 0.000 0.690 srgb} bind def
-/col23 {0.820 0.000 0.820 srgb} bind def
-/col24 {0.500 0.190 0.000 srgb} bind def
-/col25 {0.630 0.250 0.000 srgb} bind def
-/col26 {0.750 0.380 0.000 srgb} bind def
-/col27 {1.000 0.500 0.500 srgb} bind def
-/col28 {1.000 0.630 0.630 srgb} bind def
-/col29 {1.000 0.750 0.750 srgb} bind def
-/col30 {1.000 0.880 0.880 srgb} bind def
-/col31 {1.000 0.840 0.000 srgb} bind def
-
-end
-save
--41.0 228.0 translate
-1 -1 scale
-
-/cp {closepath} bind def
-/ef {eofill} bind def
-/gr {grestore} bind def
-/gs {gsave} bind def
-/sa {save} bind def
-/rs {restore} bind def
-/l {lineto} bind def
-/m {moveto} bind def
-/rm {rmoveto} bind def
-/n {newpath} bind def
-/s {stroke} bind def
-/sh {show} bind def
-/slc {setlinecap} bind def
-/slj {setlinejoin} bind def
-/slw {setlinewidth} bind def
-/srgb {setrgbcolor} bind def
-/rot {rotate} bind def
-/sc {scale} bind def
-/sd {setdash} bind def
-/ff {findfont} bind def
-/sf {setfont} bind def
-/scf {scalefont} bind def
-/sw {stringwidth} bind def
-/tr {translate} bind def
-/tnt {dup dup currentrgbcolor
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb}
-  bind def
-/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul
-  4 -2 roll mul srgb} bind def
-/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
-/$F2psEnd {$F2psEnteredState restore end} def
-%%EndProlog
-
-$F2psBegin
-10 setmiterlimit
-n -1000 4612 m -1000 -1000 l 6187 -1000 l 6187 4612 l cp clip
- 0.06299 0.06299 sc
-% Polyline
-7.500 slw
-n 2475 2925 m 3600 2925 l gs col0 s gr 
-% Polyline
-n 2475 2700 m 3600 2700 l 3600 3600 l 2475 3600 l cp gs col0 s gr 
-% Polyline
-n 2475 3375 m 3600 3375 l gs col0 s gr 
-/Helvetica-Narrow-Bold ff 180.00 scf sf
-3060 2880 m
-gs 1 -1 sc (Project) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Narrow ff 180.00 scf sf
-2520 3330 m
-gs 1 -1 sc (budget : Integer) col-1 sh gr
-/Helvetica-Narrow ff 180.00 scf sf
-2520 3105 m
-gs 1 -1 sc (name : String) col-1 sh gr
-% Polyline
-n 1215 1575 m 1215 3150 l 2475 3150 l gs col0 s gr 
-% Polyline
-n 675 900 m 1800 900 l gs col0 s gr 
-% Polyline
-n 675 1350 m 1800 1350 l gs col0 s gr 
-% Polyline
-n 675 675 m 1800 675 l 1800 1575 l 675 1575 l cp gs col0 s gr 
-% Polyline
-n 4050 900 m 5175 900 l gs col0 s gr 
-% Polyline
-n 4050 675 m 5175 675 l 5175 1800 l 4050 1800 l cp gs col0 s gr 
-% Polyline
-n 4050 1575 m 5175 1575 l gs col0 s gr 
-% Polyline
-n 3600 3150 m 4590 3150 l 4590 1800 l gs col0 s gr 
-% Polyline
-n 1800 1125 m 4050 1125 l gs col0 s gr 
-% Polyline
-n 3240 945 m 3285 990 l 3240 1035 l 3240 945 l cp gs 0.00 setgray ef gr gs col0 s gr 
-% Polyline
-n 1395 2970 m 1350 3015 l 1305 2970 l 1395 2970 l cp gs 0.00 setgray ef gr gs col0 s gr 
-% Polyline
-n 4770 2925 m 4725 2970 l 4680 2925 l 4770 2925 l cp gs 0.00 setgray ef gr gs col0 s gr 
-/Helvetica-Narrow-Bold ff 180.00 scf sf
-1260 855 m
-gs 1 -1 sc (Employee) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Narrow ff 180.00 scf sf
-1305 1800 m
-gs 1 -1 sc (*) col-1 sh gr
-/Helvetica-Narrow ff 180.00 scf sf
-720 1080 m
-gs 1 -1 sc (name : String) col-1 sh gr
-/Helvetica-Narrow ff 180.00 scf sf
-720 1305 m
-gs 1 -1 sc (salary : Integer) col-1 sh gr
-/Helvetica-Narrow-Bold ff 180.00 scf sf
-4590 855 m
-gs 1 -1 sc (Department) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Narrow ff 180.00 scf sf
-4095 1080 m
-gs 1 -1 sc (name : String) col-1 sh gr
-/Helvetica-Narrow ff 180.00 scf sf
-4095 1530 m
-gs 1 -1 sc (budget : Integer) col-1 sh gr
-/Helvetica-Narrow ff 180.00 scf sf
-4095 1305 m
-gs 1 -1 sc (location : String) col-1 sh gr
-/Helvetica-Narrow ff 180.00 scf sf
-4455 2025 m
-gs 1 -1 sc (1) col-1 sh gr
-/Helvetica-Narrow ff 180.00 scf sf
-3735 3060 m
-gs 1 -1 sc (*) col-1 sh gr
-/Helvetica-Narrow ff 180.00 scf sf
-4680 2340 m
-gs 1 -1 sc  270.0 rot (Controls) col-1 sh gr
-/Helvetica-Narrow ff 180.00 scf sf
-1305 2295 m
-gs 1 -1 sc  270.0 rot (WorksOn) col-1 sh gr
-/Helvetica-Narrow ff 180.00 scf sf
-2340 3105 m
-gs 1 -1 sc (*) col-1 sh gr
-/Helvetica-Narrow ff 180.00 scf sf
-3690 1305 m
-gs 1 -1 sc (1..*) col-1 sh gr
-/Helvetica-Narrow ff 180.00 scf sf
-1890 1350 m
-gs 1 -1 sc (*) col-1 sh gr
-/Helvetica-Narrow ff 180.00 scf sf
-2655 1035 m
-gs 1 -1 sc (WorksIn) col-1 sh gr
-$F2psEnd
-rs
diff --git a/use-core/src/main/resources/examples/Documentation/Demo/Classdiagram/Demo-UML.pdf b/use-core/src/main/resources/examples/Documentation/Demo/Classdiagram/Demo-UML.pdf
new file mode 100644
index 00000000..8fcab3df
Binary files /dev/null and b/use-core/src/main/resources/examples/Documentation/Demo/Classdiagram/Demo-UML.pdf differ
diff --git a/use-core/src/main/resources/examples/Documentation/Employee/Employee.dgm b/use-core/src/main/resources/examples/Documentation/Employee/Employee.dgm
deleted file mode 100644
index 776fcc22..00000000
--- a/use-core/src/main/resources/examples/Documentation/Employee/Employee.dgm
+++ /dev/null
@@ -1,4 +0,0 @@
-class.Company.position.x = 2000
-class.Company.position.y = 2000
-class.Person.position.x = 9000
-class.Person.position.y = 3500
diff --git a/use-core/src/main/resources/examples/Documentation/Employee/Info.txt b/use-core/src/main/resources/examples/Documentation/Employee/Info.txt
index 92755738..bea733b0 100644
--- a/use-core/src/main/resources/examples/Documentation/Employee/Info.txt
+++ b/use-core/src/main/resources/examples/Documentation/Employee/Info.txt
@@ -3,7 +3,7 @@ for them.
 
 The example corresponds to the example
 model in the section `Validating Pre- and Postconditions
-with USE´
+with USE´
 
 Employee.use:
 Corresponds to examples/monitoring/Employee.use,
@@ -23,5 +23,3 @@ after that, the raiseSalary operation with return value
 is executed
 finally the new link is destroyed by executing the
 operation fire
-
-Employee.dgm: