diff --git a/models/mitgcm/compare-models.sh b/models/compare-models.sh
similarity index 70%
rename from models/mitgcm/compare-models.sh
rename to models/compare-models.sh
index 7a2d54a5b83f55099cdd61bd25635c041a0fc221..da0b156b62e44498f0b2b1d49d6c7023c938b7cc 100755
--- a/models/mitgcm/compare-models.sh
+++ b/models/compare-models.sh
@@ -4,34 +4,30 @@
 
 export BASE_DIR=$(cd "$(dirname "$0")"; pwd)
 
-. "${BASE_DIR}/../common-functions.rc"
+. "${BASE_DIR}/common-functions.rc"
 
-if [ -f "${BASE_DIR}/../config" ] ; then
-        . "${BASE_DIR}/../config"
+if [ -f "${BASE_DIR}/config" ] ; then
+        . "${BASE_DIR}/config"
 else
         echo "Main config file not found."
         exit 1
 fi
-if [ -f "$BASE_DIR/config" ] ; then
-        . $BASE_DIR/config
-else
-        echo "Config file not found."
-        exit 1
-fi
 
-if [ "$2" != "" ] ; then
-	export MODEL="$2"
+if [ "$1" != "" ] ; then
+	export MODEL="$1"
 else
+	echo "usage: compare-models.sh model-identifier"
 	echo "Missing model identifier"
+	exit 1
 fi
 
-export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/../logback.xml"
+export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/logback.xml"
 
 checkExecutable "Restructuring" "${RESTRUCTURING}"
 checkDirectory "Result directory" "${OPTIMIZATION_DATA}"
 
 # main
-for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}" -name '*${MODEL}*job'` ; do
+for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}" -name "*${MODEL}*job"` ; do
 	BASENAME=`basename "${JOB_DIRECTORY}"`
 	information "----------------------------------------"
 	information $BASENAME
diff --git a/models/mitgcm/compute-statistics.sh b/models/compute-statistics.sh
similarity index 90%
rename from models/mitgcm/compute-statistics.sh
rename to models/compute-statistics.sh
index eaba21357f8d7214285c794a25d9e2a9c2286d2c..75cfa2caeff04500a6ebc91bf284f7492e470f6d 100755
--- a/models/mitgcm/compute-statistics.sh
+++ b/models/compute-statistics.sh
@@ -4,7 +4,7 @@
 
 export BASE_DIR=$(cd "$(dirname "$0")"; pwd)
 
-. "${BASE_DIR}/../common-functions.rc"
+. "${BASE_DIR}/common-functions.rc"
 
 if [ "$1" != "" ] ; then
         export EXPERIMENT_NAME="$1"
@@ -13,25 +13,26 @@ else
         exit 1
 fi
 
-if [ -f "${BASE_DIR}/../config" ] ; then
-        . "${BASE_DIR}/../config"
+if [ -f "${BASE_DIR}/config" ] ; then
+        . "${BASE_DIR}/config"
 else
         echo "Main config file not found."
         exit 1
 fi
-if [ -f "$BASE_DIR/config" ] ; then
-        . $BASE_DIR/config
+if [ "$2" != "" ] ; then
+	export MODEL="$2"
 else
-        echo "Config file not found."
-        exit 1
+	echo "Missing model identifier"
 fi
 
-checkMode $2
+checkMode $3
 
-export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/../logback.xml"
+export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/logback.xml"
 
 # variables
-export MODEL_DATA_PATH="${DATA_PATH}/mitgcm/${EXPERIMENT_NAME}"
+export MODEL_DATA_PATH="${DATA_PATH}/${MODEL}/${EXPERIMENT_NAME}"
+
+checkDirectory "Model data directory" "${MODEL_DATA_PATH}"
 
 STATIC_FILE_MODEL="${MODEL_DATA_PATH}/static-plain-$MODE-file"
 STATIC_MAP_MODEL="${MODEL_DATA_PATH}/static-plain-$MODE-map"
diff --git a/models/handle-model-archives.sh b/models/handle-model-archives.sh
index 71c136fd90eb8d55a1aeec16b26706c002abe8e3..a65a88706e82f47275ff05ca228cb074cd80bedf 100755
--- a/models/handle-model-archives.sh
+++ b/models/handle-model-archives.sh
@@ -1,9 +1,13 @@
 #!/bin/bash
 
+# extract = extract optimized and original model from archives
+# finalize = pack merged models and remove extracted data from optimized and merged sources
+# compress = compress merged models
+# restore = extracted merged models
 
 export BASE_DIR=$(cd "$(dirname "$0")"; pwd)
 
-. "${BASE_DIR}/../common-functions.rc"
+. "${BASE_DIR}/common-functions.rc"
 
 if [ -f "$BASE_DIR/config" ] ; then
         . $BASE_DIR/config
@@ -16,22 +20,37 @@ export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/logback.xml"
 
 checkDirectory "Result directory" "${OPTIMIZATION_DATA}"
 
-for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}" -name '*job'` ; do
-	BASENAME=`basename $JOB_DIRECTORY`
-	information "----------------------------------------"
-	information $BASENAME
-	information "----------------------------------------"
-
-	export JOB_DIRECTORY
+if [ "$1" == "" ] ; then
+	error "Missing action: extract, compress"
+	information "Usage: handle-model-archives.sh <extract|compress> [JOB_NAME_FRAGMENT]"
+	exit 1
+else
+	ACTION="$1"
+	if [ "${ACTION}" == "extract" ] ; then
+		information "extract"
+	elif [ "${ACTION}" == "finalize" ] ; then
+		information "finalize"
+	elif [ "${ACTION}" == "compress" ] ; then
+		information "compress"
+	elif [ "${ACTION}" == "restore" ] ; then
+		information "restore"
+	else
+		warn "Unknown action ${ACTION}"
+		exit 1
+	fi
+fi
 
-	checkDirectory "job directory" "${JOB_DIRECTORY}"
+if [ "$2" == "" ] ; then
+	MODEL=""
+else
+	MODEL="$2"
+fi
 
+function extract() {
 	export ORIGINAL_ARCHIVE="${JOB_DIRECTORY}/optimized-models.tar.xz"
 	export OPTIMIZED_ARCHIVE="${JOB_DIRECTORY}/original-model.tar.xz"
 	export COMBINED_ARCHIVE="${JOB_DIRECTORY}/kieker-repositories.tar.xz"
 
-	cd "${JOB_DIRECTORY}"
-
 	if [ -f "${ORIGINAL_ARCHIVE}" ] && [ -f "${OPTIMIZED_ARCHIVE}" ] ; then
 		tar -xpf "${ORIGINAL_ARCHIVE}"
 		tar -xpf "${OPTIMIZED_ARCHIVE}"
@@ -47,6 +66,68 @@ for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}" -name '*job'` ; do
 	else
 		warning "No data."
 	fi
+}
+
+function restore() {
+	export MERGED_MODEL_ARCHIVE="${JOB_DIRECTORY}/merged-models.tar.xz"
+	tar -xpf "${MERGED_MODEL_ARCHIVE}"
+	mv "${JOB_DIRECTORY}/merged-models/"* "${JOB_DIRECTORY}"
+	rmdir merged-models
+	# xmi and yaml files
+	export MODIFICATIONS_ARCHIVE="${JOB_DIRECTORY}/modifications.tar.xz"
+	tar -xpf "${MODIFICATIONS_ARCHIVE}"
+	mv modifications/* .
+	rmdir modifications
+}
+
+function compress() {
+	export MERGED_MODEL_ARCHIVE="${JOB_DIRECTORY}/merged-models.tar.xz"
+	mkdir -p "${JOB_DIRECTORY}/merged-models"
+	mv "${JOB_DIRECTORY}/"merge-optimized-* "${JOB_DIRECTORY}/merged-models"
+	tar -cJf "${MERGED_MODEL_ARCHIVE}" merged-models
+	rm -rf "${JOB_DIRECTORY}/merged-models"
+	# compress csv xmi yaml files
+	export MODIFICATIONS_ARCHIVE="${JOB_DIRECTORY}/modifications.tar.xz"
+	mkdir -p "${JOB_DIRECTORY}/modifications"
+	mv "${JOB_DIRECTORY}/"original-model-optimized-*.* modifications
+	tar -cJf "${MODIFICATIONS_ARCHIVE}" modifications
+	rm -rf "${JOB_DIRECTORY}/modifications"
+}
+
+function finalize() {
+	compress
+	for J in "${JOB_DIRECTORY}/optimized-"* ; do
+		if [ -d "$J" ] ; then
+			rm -rf "$J"
+        	fi
+	done
+}
+
+for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}" -name "*${MODEL}*job"` ; do
+	BASENAME=`basename $JOB_DIRECTORY`
+	information "----------------------------------------"
+	information $BASENAME $MODE
+	information "----------------------------------------"
+
+	export JOB_DIRECTORY
+
+	checkDirectory "job directory" "${JOB_DIRECTORY}"
+
+	export WORK_DIRECTORY=`pwd`
+
+	cd "${JOB_DIRECTORY}"
+
+	if [ "${ACTION}" == "extract" ] ; then
+		extract
+	elif [ "${ACTION}" == "compress" ] ; then
+		compress
+	elif [ "${ACTION}" == "restore" ] ; then
+		restore
+	elif [ "${ACTION}" == "finalize" ] ; then
+		finalize
+	fi
+
+	cd "${WORK_DIRECTORY}"
 done
 
 
diff --git a/models/make-tables-and-images.sh b/models/make-tables-and-images.sh
index 68e39cf0db58e0ba7493530b2b6950d6bd960a28..eb10594b7988fda122245a5f5fbea6fd8e87e1fe 100755
--- a/models/make-tables-and-images.sh
+++ b/models/make-tables-and-images.sh
@@ -51,8 +51,8 @@ for LINE in `cat "${JOB_FILE}"` ; do
 			${MKTABLE} -i "${MERGE_MODEL}.csv" -o "${MERGE_MODEL}"
 			LAST_PWD=`pwd`
 			cd "${MERGE_MODEL}"
-			pdflatex full.tex
-			pdflatex compact.tex
+			#pdflatex full.tex
+			#pdflatex compact.tex
 			cd $LAST_PWD
 			#${MVIS} -c allen num-of-calls op-coupling module-coupling -g dot-op dot-component -i "${MERGE_MODEL}" -o "${MERGE_MODEL}" -m add-nodes -s "all-color:$LEFT:$RIGHT"
 			#${BASE_DIR}/dotPic-single-fileConverter.sh "${MERGE_MODEL}/original-model-optimized-$OPT-component.dot" pdf &
diff --git a/models/mitgcm/prepare-models-for-inspection.sh b/models/mitgcm/prepare-models-for-inspection.sh
deleted file mode 100755
index f7c58fd75873f4c8615431a64efc0c9141c3f584..0000000000000000000000000000000000000000
--- a/models/mitgcm/prepare-models-for-inspection.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-
-export BASE_DIR=$(cd "$(dirname "$0")"; pwd)
-
-. "${BASE_DIR}/../common-functions.rc"
-
-if [ -f "${BASE_DIR}/../config" ] ; then
-        . "${BASE_DIR}/../config"
-else
-        echo "Main config file not found."
-        exit 1
-fi
-if [ -f "$BASE_DIR/config" ] ; then
-        . $BASE_DIR/config
-else
-        echo "Config file not found."
-        exit 1
-fi
-
-export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/../logback.xml"
-
-checkExecutable "Merge model" "${MOP}"
-checkExecutable "Relabel" "${RELABEL}"
-checkDirectory "Result directory" "${OPTIMIZATION_DATA}"
-
-export MOP_LOG="${BASE_DIR}/mop.log"
-
-rm -f "${MOP_LOG}"
-touch "${MOP_LOG}"
-
-# main
-for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}" -name '*mitgcm*job'` ; do
-	BASENAME=`basename "${JOB_DIRECTORY}"`
-	information "----------------------------------------"
-	information $BASENAME
-	information "----------------------------------------"
-
-	export JOB_DIRECTORY
-
-	checkDirectory "job directory" "${JOB_DIRECTORY}"
-
-	export MODEL_ID=`echo "$BASENAME" | sed 's/^jss-jobs-[0-9]*-//g' | sed 's/\.job$//g'`
-
-	NAME=`echo "${MODEL_ID}" | cut -d"_" -f2-4`
-	MODEL=`echo "${MODEL_ID}" | cut -d"_" -f1`
-	MODE=`echo "${MODEL_ID}" | cut -d"_" -f5`
-	FORM=`echo "${MODEL_ID}" | cut -d"_" -f6`
-
-	information "  name $NAME"
-	information "  model $MODEL"
-	information "  mode $MODE"
-
-	cd "${JOB_DIRECTORY}"
-
-	if [ -f "med-output.csv" ] ; then
-		cat "${BASE_DIR}/template.project" | sed "s/NAME/$NAME-original/g" > "original-model/.project"
-
-		for J in `tail -n +2 "med-output.csv" | sed 's/;/\t/g' | awk '{ print $3","$1","$2 }' | sed 's/^\([0-9],\)/00\1/'  | sed 's/^\([0-9]\{2\},\)/0\1/' | sort` ; do
-			ORIGINAL=`echo "$J" | cut -d, -f2 | sed 's/"//g'`
-			OPTIMIZED=`echo "$J" | cut -d, -f3 | sed 's/"//g'`
-			STEPS=`echo "$J" | cut -d, -f1`
-
-			echo "$ORIGINAL -> $OPTIMIZED in $STEPS"
-
-			if [ -d "$OPTIMIZED" ] ; then
-				cat "${BASE_DIR}/template.project" | sed "s/NAME/${MODEL_ID}-$OPTIMIZED/g" > "$OPTIMIZED/.project"
-
-				rm -rf "merge-${OPTIMIZED}"
-				mkdir "merge-${OPTIMIZED}"
-
-				"${MOP}" -e "${MODEL_ID}-${OPTIMIZED}-merged" -i "original-model" "${OPTIMIZED}" -o "merge-${OPTIMIZED}" -s all merge >> "${MOP_LOG}" 2>&1
-			else
-				warning "Missing $OPTIMIZED model"
-			fi
-		done
-	else
-		error "Missing MED output for job $BASENAME"
-	fi
-done
-
-# end
diff --git a/models/mitgcm/run-architecture-analysis.sh b/models/mitgcm/run-architecture-analysis.sh
deleted file mode 100755
index a3d6a1f229dedc78e76bf53aeca8bcb1a5f0a9d2..0000000000000000000000000000000000000000
--- a/models/mitgcm/run-architecture-analysis.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-export BASE_DIR=$(cd "$(dirname "$0")"; pwd)
-
-. "${BASE_DIR}/../common-functions.rc"
-
-if [ "$1" != "" ] ; then
-        export EXPERIMENT_NAME="$1"
-else
-        echo "Missing experiment name"
-        exit 1
-fi
-
-if [ -f "${BASE_DIR}/../config" ] ; then
-        . "${BASE_DIR}/../config"
-else
-        echo "Main config file not found."
-        exit 1
-fi
-if [ -f "$BASE_DIR/config" ] ; then
-        . $BASE_DIR/config
-else
-        echo "Config file not found."
-        exit 1
-fi
-
-export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/../logback.xml"
-
-information "++++++++++++++++++++++++++++++++++++++"
-information "Configuration ${EXPERIMENT_NAME}"
-information "++++++++++++++++++++++++++++++++++++++"
-
-"${BASE_DIR}/run-static-code-processing.sh" "${EXPERIMENT_NAME}"
-"${BASE_DIR}/run-static-analysis.sh" "${EXPERIMENT_NAME}" call
-"${BASE_DIR}/run-static-analysis.sh" "${EXPERIMENT_NAME}" dataflow
-"${BASE_DIR}/run-static-analysis.sh" "${EXPERIMENT_NAME}" both
-
-"${BASE_DIR}/run-dynamic-observation.sh" "${EXPERIMENT_NAME}"
-"${BASE_DIR}/run-dynamic-analysis.sh" "${EXPERIMENT_NAME}"
-
-for I in call dataflow both ; do
-	"${BASE_DIR}/combine-models.sh" "${EXPERIMENT_NAME}" "$I"
-	"${BASE_DIR}/compute-statistics.sh" "${EXPERIMENT_NAME}" "$I"
-done
-
-information "++++++++++++++++++++++++++++++++++++++"
-information "Done ${EXPERIMENT_NAME}"
-information "++++++++++++++++++++++++++++++++++++++"
-
-# end
diff --git a/models/uvic/prepare-models-for-inspection.sh b/models/prepare-models-for-inspection.sh
similarity index 56%
rename from models/uvic/prepare-models-for-inspection.sh
rename to models/prepare-models-for-inspection.sh
index 978c535631cceffd08c64bd5d910ab805b91b340..14ff518f33eceabb457eb39b101513b51f3fad98 100755
--- a/models/uvic/prepare-models-for-inspection.sh
+++ b/models/prepare-models-for-inspection.sh
@@ -2,22 +2,22 @@
 
 export BASE_DIR=$(cd "$(dirname "$0")"; pwd)
 
-. "${BASE_DIR}/../common-functions.rc"
+. "${BASE_DIR}/common-functions.rc"
 
-if [ -f "${BASE_DIR}/../config" ] ; then
-        . "${BASE_DIR}/../config"
+if [ -f "${BASE_DIR}/config" ] ; then
+        . "${BASE_DIR}/config"
 else
         echo "Main config file not found."
         exit 1
 fi
-if [ -f "$BASE_DIR/config" ] ; then
-        . $BASE_DIR/config
+
+if [ "$1" != "" ] ; then
+	export MODEL="$1"
 else
-        echo "Config file not found."
-        exit 1
+	echo "Missing model identifier"
 fi
 
-export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/../logback.xml"
+export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/logback.xml"
 
 checkExecutable "Merge model" "${MOP}"
 checkExecutable "Relabel" "${RELABEL}"
@@ -29,7 +29,8 @@ rm -f "${MOP_LOG}"
 touch "${MOP_LOG}"
 
 # main
-for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}" -name '*uvic*job'` ; do
+COUNT=0
+for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}" -name "*${MODEL}*job"` ; do
 	BASENAME=`basename "${JOB_DIRECTORY}"`
 	information "----------------------------------------"
 	information $BASENAME
@@ -41,26 +42,17 @@ for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}" -name '*uvic*job'` ; do
 
 	export MODEL_ID=`echo "$BASENAME" | sed 's/^jss-jobs-[0-9]*-//g' | sed 's/\.job$//g'`
 
-	NAME="2.9"
-	MODEL=`echo "${MODEL_ID}" | cut -d"_" -f1`
-	MODE=`echo "${MODEL_ID}" | cut -d"_" -f2`
-	FORM=`echo "${MODEL_ID}" | cut -d"_" -f3 | sed 's/-\w*$//g'`
-
-	information "  name $NAME"
-	information "  model $MODEL"
-	information "  mode $MODE"
-
 	cd "${JOB_DIRECTORY}"
 
 	if [ -f "med-output.csv" ] ; then
-		cat "${BASE_DIR}/template.project" | sed "s/NAME/$NAME-original/g" > "original-model/.project"
+		cat "${BASE_DIR}/template.project" | sed "s/NAME/${MODEL_ID}-original/g" > "original-model/.project"
 
-		for J in `tail -n +2 "med-output.csv" | sed 's/;/\t/g' | awk '{ print $3","$1","$2 }' | sed 's/^\([0-9],\)/00\1/'  | sed 's/^\([0-9]\{2\},\)/0\1/' | sort` ; do
+		for J in `tail -n +2 "med-output.csv" | sed 's/;/\t/g' | awk '{ print $3,$1,$2 }' | sed 's/,//g' | awk '{ print $1","$2","$3 }'` ; do
 			ORIGINAL=`echo "$J" | cut -d, -f2 | sed 's/"//g'`
 			OPTIMIZED=`echo "$J" | cut -d, -f3 | sed 's/"//g'`
 			STEPS=`echo "$J" | cut -d, -f1`
 
-			echo "$ORIGINAL -> $OPTIMIZED in $STEPS"
+			information "$ORIGINAL -> $OPTIMIZED in $STEPS steps"
 
 			if [ -d "$OPTIMIZED" ] ; then
 				cat "${BASE_DIR}/template.project" | sed "s/NAME/${MODEL_ID}-$OPTIMIZED/g" > "$OPTIMIZED/.project"
@@ -68,7 +60,13 @@ for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}" -name '*uvic*job'` ; do
 				rm -rf "merge-${OPTIMIZED}"
 				mkdir "merge-${OPTIMIZED}"
 
-				"${MOP}" -e "${MODEL_ID}-${OPTIMIZED}-merged" -i "original-model" "${OPTIMIZED}" -o "merge-${OPTIMIZED}" -s all merge >> "${MOP_LOG}" 2>&1
+				if [ "$COUNT" -lt 8 ] ; then
+					"${MOP}" -e "${MODEL_ID}-${OPTIMIZED}-merged" -i "original-model" "${OPTIMIZED}" -o "merge-${OPTIMIZED}" -s all nearest-merge >> "${MOP_LOG}" 2>&1 &
+					COUNT=`expr $COUNT + 1`
+				else
+					"${MOP}" -e "${MODEL_ID}-${OPTIMIZED}-merged" -i "original-model" "${OPTIMIZED}" -o "merge-${OPTIMIZED}" -s all nearest-merge >> "${MOP_LOG}" 2>&1
+					COUNT=0
+				fi
 			else
 				warning "Missing $OPTIMIZED model"
 			fi
diff --git a/models/run-architecture-analysis.sh b/models/run-architecture-analysis.sh
new file mode 100755
index 0000000000000000000000000000000000000000..954156847e57b7b3a4095f491b441ff04c9a0ebe
--- /dev/null
+++ b/models/run-architecture-analysis.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+export BASE_DIR=$(cd "$(dirname "$0")"; pwd)
+
+. "${BASE_DIR}/common-functions.rc"
+
+if [ "$1" != "" ] ; then
+        export EXPERIMENT_NAME="$1"
+else
+        echo "Missing experiment name"
+        exit 1
+fi
+
+if [ -f "${BASE_DIR}/config" ] ; then
+        . "${BASE_DIR}/config"
+else
+        echo "Main config file not found."
+        exit 1
+fi
+
+if [ "$2" != "" ] ; then
+	export MODEL="$2"
+else
+	echo "Missing model identifier"
+fi
+
+export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/logback.xml"
+
+information "++++++++++++++++++++++++++++++++++++++"
+information "Configuration ${EXPERIMENT_NAME}"
+information "++++++++++++++++++++++++++++++++++++++"
+
+"${BASE_DIR}/$MODEL/run-static-code-processing.sh" "${EXPERIMENT_NAME}"
+"${BASE_DIR}/$MODEL/run-static-analysis.sh" "${EXPERIMENT_NAME}" call
+"${BASE_DIR}/$MODEL/run-static-analysis.sh" "${EXPERIMENT_NAME}" dataflow
+"${BASE_DIR}/$MODEL/run-static-analysis.sh" "${EXPERIMENT_NAME}" both
+
+"${BASE_DIR}/$MODEL/run-dynamic-observation.sh" "${EXPERIMENT_NAME}"
+"${BASE_DIR}/$MODEL/run-dynamic-analysis.sh" "${EXPERIMENT_NAME}"
+
+for I in call dataflow both ; do
+	"${BASE_DIR}/combine-models.sh" "${EXPERIMENT_NAME}" "$MODEL" "$I"
+	"${BASE_DIR}/compute-statistics.sh" "${EXPERIMENT_NAME}" "$MODEL" "$I"
+done
+
+information "++++++++++++++++++++++++++++++++++++++"
+information "Done ${EXPERIMENT_NAME}"
+information "++++++++++++++++++++++++++++++++++++++"
+
+# end
diff --git a/models/mitgcm/template.project b/models/template.project
similarity index 100%
rename from models/mitgcm/template.project
rename to models/template.project
diff --git a/models/uvic/compare-models.sh b/models/uvic/compare-models.sh
deleted file mode 100755
index 7a2d54a5b83f55099cdd61bd25635c041a0fc221..0000000000000000000000000000000000000000
--- a/models/uvic/compare-models.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-# compare original models with optimized models.
-
-export BASE_DIR=$(cd "$(dirname "$0")"; pwd)
-
-. "${BASE_DIR}/../common-functions.rc"
-
-if [ -f "${BASE_DIR}/../config" ] ; then
-        . "${BASE_DIR}/../config"
-else
-        echo "Main config file not found."
-        exit 1
-fi
-if [ -f "$BASE_DIR/config" ] ; then
-        . $BASE_DIR/config
-else
-        echo "Config file not found."
-        exit 1
-fi
-
-if [ "$2" != "" ] ; then
-	export MODEL="$2"
-else
-	echo "Missing model identifier"
-fi
-
-export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/../logback.xml"
-
-checkExecutable "Restructuring" "${RESTRUCTURING}"
-checkDirectory "Result directory" "${OPTIMIZATION_DATA}"
-
-# main
-for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}" -name '*${MODEL}*job'` ; do
-	BASENAME=`basename "${JOB_DIRECTORY}"`
-	information "----------------------------------------"
-	information $BASENAME
-	information "----------------------------------------"
-
-	export JOB_DIRECTORY
-
-	checkDirectory "job directory" "${JOB_DIRECTORY}"
-
-	ORIGINAL="${JOB_DIRECTORY}/original-model"
-
-	if [ -d "${ORIGINAL}" ] ; then
-		LIST=""
-
-		for J in "${JOB_DIRECTORY}/optimized-"* ; do
-			if [ -d "$J" ] ; then
-				LIST="$LIST $J"
-			fi
-		done
-		"${RESTRUCTURING}" -i "${ORIGINAL}" $LIST -o "${JOB_DIRECTORY}" -e compare -s kuhn
-		for K in $LIST ; do
-			OPTIMIZED=`basename $K`
-		        "${DELTA}" -i "${JOB_DIRECTORY}/original-model-${OPTIMIZED}.xmi" -o "${JOB_DIRECTORY}/original-model-${OPTIMIZED}"
-		done
-	fi
-done
-
-# end
diff --git a/models/uvic/compute-statistics.sh b/models/uvic/compute-statistics.sh
deleted file mode 100755
index 859d5b3d94924f80355f422c9b8125c9d49b3f2e..0000000000000000000000000000000000000000
--- a/models/uvic/compute-statistics.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/bash
-
-export BASE_DIR=$(cd "$(dirname "$0")"; pwd)
-
-. "${BASE_DIR}/../common-functions.rc"
-
-if [ "$1" != "" ] ; then
-        export EXPERIMENT_NAME="$1"
-else
-        echo "Missing experiment name"
-        exit 1
-fi
-
-if [ -f "${BASE_DIR}/../config" ] ; then
-        . "${BASE_DIR}/../config"
-else
-        echo "Main config file not found."
-        exit 1
-fi
-if [ -f "$BASE_DIR/config" ] ; then
-        . $BASE_DIR/config
-else
-        echo "Config file not found."
-        exit 1
-fi
-
-checkMode $2
-
-export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/../logback.xml"
-
-# variables
-export MODEL_DATA_PATH="${DATA_PATH}/uvic"
-
-STATIC_FILE_MODEL="${MODEL_DATA_PATH}/static-plain-$MODE-file"
-STATIC_MAP_MODEL="${MODEL_DATA_PATH}/static-plain-$MODE-map"
-STATIC_2_LEVEL_MODEL="${MODEL_DATA_PATH}/static-plain-$MODE-2-level"
-
-IFACE_STATIC_FILE_MODEL="${MODEL_DATA_PATH}/static-iface-$MODE-file"
-IFACE_STATIC_MAP_MODEL="${MODEL_DATA_PATH}/static-iface-$MODE-map"
-IFACE_STATIC_2_LEVEL_MODEL="${MODEL_DATA_PATH}/static-iface-$MODE-2-level"
-
-DYNAMIC_FILE_MODEL="${MODEL_DATA_PATH}/dynamic-plain-file"
-DYNAMIC_MAP_MODEL="${MODEL_DATA_PATH}/dynamic-plain-map"
-DYNAMIC_2_LEVEL_MODEL="${MODEL_DATA_PATH}/dynamic-plain-2-level"
-
-IFACE_DYNAMIC_FILE_MODEL="${MODEL_DATA_PATH}/dynamic-iface-file"
-IFACE_DYNAMIC_MAP_MODEL="${MODEL_DATA_PATH}/dynamic-iface-map"
-IFACE_DYNAMIC_2_LEVEL_MODEL="${MODEL_DATA_PATH}/dynamic-iface-2-level"
-
-COMBINED_FILE_MODEL="${MODEL_DATA_PATH}/combined-plain-$MODE-file"
-COMBINED_MAP_MODEL="${MODEL_DATA_PATH}/combined-plain-$MODE-map"
-COMBINED_2_LEVEL_MODEL="${MODEL_DATA_PATH}/combined-plain-$MODE-2-level"
-
-IFACE_COMBINED_FILE_MODEL="${MODEL_DATA_PATH}/combined-iface-$MODE-file"
-IFACE_COMBINED_MAP_MODEL="${MODEL_DATA_PATH}/combined-iface-$MODE-map"
-IFACE_COMBINED_2_LEVEL_MODEL="${MODEL_DATA_PATH}/combined-iface-$MODE-2-level"
-
-
-
-# check tools
-checkExecutable "Model visualizations" "${MVIS}"
-
-# check inputs
-checkDirectory "Static file model" "${STATIC_FILE_MODEL}"
-checkDirectory "Static map model" "${STATIC_MAP_MODEL}"
-checkDirectory "Static 2-level model" "${STATIC_2_LEVEL_MODEL}"
-
-checkDirectory "Static iface file model" "${IFACE_STATIC_FILE_MODEL}"
-checkDirectory "Static iface map model" "${IFACE_STATIC_MAP_MODEL}"
-checkDirectory "Static iface 2-level model" "${IFACE_STATIC_2_LEVEL_MODEL}"
-
-checkDirectory "Dynamic file model" "${DYNAMIC_FILE_MODEL}"
-checkDirectory "Dynamic map model" "${DYNAMIC_MAP_MODEL}"
-checkDirectory "Dynamic 2-level model" "${DYNAMIC_2_LEVEL_MODEL}"
-
-checkDirectory "Dynamic iface file model" "${IFACE_DYNAMIC_FILE_MODEL}"
-checkDirectory "Dynamic iface map model" "${IFACE_DYNAMIC_MAP_MODEL}"
-checkDirectory "Dynamic iface 2-level model" "${IFACE_DYNAMIC_2_LEVEL_MODEL}"
-
-checkDirectory "Combined file model" "${COMBINED_FILE_MODEL}"
-checkDirectory "Combined map model" "${COMBINED_MAP_MODEL}"
-checkDirectory "Combined 2-level model" "${COMBINED_2_LEVEL_MODEL}"
-
-checkDirectory "Combined iface file model" "${IFACE_COMBINED_FILE_MODEL}"
-checkDirectory "Combined iface map model" "${IFACE_COMBINED_MAP_MODEL}"
-checkDirectory "Combined iface 2-level model" "${IFACE_COMBINED_2_LEVEL_MODEL}"
-
-# check outputs
-
-
-# run
-TEMPFILE=`mktemp`
-cat << EOF > $TEMPFILE
-${DYNAMIC_FILE_MODEL}
-${DYNAMIC_MAP_MODEL}
-${DYNAMIC_2_LEVEL_MODEL}
-${IFACE_DYNAMIC_FILE_MODEL}
-${IFACE_DYNAMIC_MAP_MODEL}
-${IFACE_DYNAMIC_2_LEVEL_MODEL}
-${STATIC_FILE_MODEL}
-${STATIC_MAP_MODEL}
-${STATIC_2_LEVEL_MODEL}
-${IFACE_STATIC_FILE_MODEL}
-${IFACE_STATIC_MAP_MODEL}
-${IFACE_STATIC_2_LEVEL_MODEL}
-${COMBINED_FILE_MODEL}
-${COMBINED_MAP_MODEL}
-${COMBINED_2_LEVEL_MODEL}
-${IFACE_COMBINED_FILE_MODEL}
-${IFACE_COMBINED_MAP_MODEL}
-${IFACE_COMBINED_2_LEVEL_MODEL}
-EOF
-
-export JAVA_OPTS="-Dlogback.configurationFile=​${BASE_DIR}/logback.groovy"
-export MVIS_OPTS="-Dlogback.configurationFile=${BASE_DIR}/logback.xml"
-
-information "Compute file level statistics"
-IFS=$'\n'
-for I in `cat $TEMPFILE` ; do
-	"${MVIS}" -i "$I" -o "$I" -s all -g dot-op dot-component -c allen num-of-calls op-coupling module-coupling -m add-nodes
-done
-
-# end
diff --git a/models/uvic/run-architecture-analysis.sh b/models/uvic/run-architecture-analysis.sh
deleted file mode 100755
index a3d6a1f229dedc78e76bf53aeca8bcb1a5f0a9d2..0000000000000000000000000000000000000000
--- a/models/uvic/run-architecture-analysis.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-export BASE_DIR=$(cd "$(dirname "$0")"; pwd)
-
-. "${BASE_DIR}/../common-functions.rc"
-
-if [ "$1" != "" ] ; then
-        export EXPERIMENT_NAME="$1"
-else
-        echo "Missing experiment name"
-        exit 1
-fi
-
-if [ -f "${BASE_DIR}/../config" ] ; then
-        . "${BASE_DIR}/../config"
-else
-        echo "Main config file not found."
-        exit 1
-fi
-if [ -f "$BASE_DIR/config" ] ; then
-        . $BASE_DIR/config
-else
-        echo "Config file not found."
-        exit 1
-fi
-
-export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/../logback.xml"
-
-information "++++++++++++++++++++++++++++++++++++++"
-information "Configuration ${EXPERIMENT_NAME}"
-information "++++++++++++++++++++++++++++++++++++++"
-
-"${BASE_DIR}/run-static-code-processing.sh" "${EXPERIMENT_NAME}"
-"${BASE_DIR}/run-static-analysis.sh" "${EXPERIMENT_NAME}" call
-"${BASE_DIR}/run-static-analysis.sh" "${EXPERIMENT_NAME}" dataflow
-"${BASE_DIR}/run-static-analysis.sh" "${EXPERIMENT_NAME}" both
-
-"${BASE_DIR}/run-dynamic-observation.sh" "${EXPERIMENT_NAME}"
-"${BASE_DIR}/run-dynamic-analysis.sh" "${EXPERIMENT_NAME}"
-
-for I in call dataflow both ; do
-	"${BASE_DIR}/combine-models.sh" "${EXPERIMENT_NAME}" "$I"
-	"${BASE_DIR}/compute-statistics.sh" "${EXPERIMENT_NAME}" "$I"
-done
-
-information "++++++++++++++++++++++++++++++++++++++"
-information "Done ${EXPERIMENT_NAME}"
-information "++++++++++++++++++++++++++++++++++++++"
-
-# end
diff --git a/models/uvic/template.project b/models/uvic/template.project
deleted file mode 100644
index 70515e9af510d3fcd3cd99d791b0d0a04cd7e8e2..0000000000000000000000000000000000000000
--- a/models/uvic/template.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>NAME</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>