diff --git a/examples/regexp/Melichar2-94.i0.xml b/examples/regexp/Melichar2-94.i0.xml
deleted file mode 100644
index 9b49842f5a42deab8c73e499c230118d75fdbb85..0000000000000000000000000000000000000000
--- a/examples/regexp/Melichar2-94.i0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<regexp>
-	<concatenation>
-		<symbol>0</symbol>
-		<iteration>
-			<alternation>
-				<symbol>0</symbol>
-				<symbol>1</symbol>
-			</alternation>
-		</iteration>
-		<symbol>1</symbol>
-	</concatenation>
-</regexp>
diff --git a/examples/regexp/Melichar2-94.i1.xml b/examples/regexp/Melichar2-94.i1.xml
deleted file mode 100644
index 5157b30dbb094a3a08976754480dd0c78ee0da0e..0000000000000000000000000000000000000000
--- a/examples/regexp/Melichar2-94.i1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<regexp>
-	<concatenation>
-		<symbol>1</symbol>
-		<iteration>
-			<alternation>
-				<symbol>0</symbol>
-				<symbol>1</symbol>
-			</alternation>
-		</iteration>
-		<symbol>1</symbol>
-	</concatenation>
-</regexp>
diff --git a/examples/regexp/Melichar2-94.xml b/examples/regexp/Melichar2-94.xml
deleted file mode 100644
index 040b76e66d8b0816885e815a23a1823e58de5717..0000000000000000000000000000000000000000
--- a/examples/regexp/Melichar2-94.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<regexp>
-	<concatenation>
-		<iteration>
-			<alternation>
-				<symbol>0</symbol>
-				<symbol>1</symbol>
-			</alternation>
-		</iteration>
-		<symbol>1</symbol>
-	</concatenation>
-</regexp>
diff --git a/examples/regexp/oppa-4-13.d0.xml b/examples/regexp/oppa-4-13.d0.xml
deleted file mode 100644
index 3b620f56281a379d4ad30da847eea20652b3eee4..0000000000000000000000000000000000000000
--- a/examples/regexp/oppa-4-13.d0.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<regexp>
-	<alternation>
-		<concatenation>
-			<symbol>1</symbol>
-			<symbol>0</symbol>
-		</concatenation>
-		<concatenation>
-			<iteration>
-				<symbol>0</symbol>
-			</iteration>
-			<symbol>1</symbol>
-		</concatenation>
-		<epsilon></epsilon>
-	</alternation>
-</regexp>
diff --git a/examples/regexp/oppa-4-13.d00.xml b/examples/regexp/oppa-4-13.d00.xml
deleted file mode 100644
index 18e9b91b6ec39acc7cf9a13d50ca2ddafb2ae4da..0000000000000000000000000000000000000000
--- a/examples/regexp/oppa-4-13.d00.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<regexp>
-	<concatenation>
-		<iteration>
-			<symbol>0</symbol>
-		</iteration>
-		<symbol>1</symbol>
-	</concatenation>
-</regexp>
diff --git a/examples/regexp/oppa-4-13.xml b/examples/regexp/oppa-4-13.xml
deleted file mode 100644
index 43c4bd61ba33fcefae862aafea728314c2c1464c..0000000000000000000000000000000000000000
--- a/examples/regexp/oppa-4-13.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<regexp>
-<alternation>
-	<concatenation>
-		<symbol>0</symbol>
-		<symbol>1</symbol>
-		<symbol>0</symbol>
-	</concatenation>
-	<concatenation>
-		<symbol>1</symbol>
-		<symbol>0</symbol>
-		<symbol>1</symbol>
-	</concatenation>
-	<concatenation>
-		<iteration>
-			<symbol>0</symbol>
-		</iteration>
-		<symbol>1</symbol>
-	</concatenation>
-	<concatenation>
-		<iteration>
-			<symbol>1</symbol>
-		</iteration>
-		<symbol>0</symbol>
-	</concatenation>
-</alternation>
-</regexp>
diff --git a/examples/regexp/oppa-4-14.d1.xml b/examples/regexp/oppa-4-14.d1.xml
deleted file mode 100644
index ae5c5c2d3446b17100fd797d61230b1faab41fe6..0000000000000000000000000000000000000000
--- a/examples/regexp/oppa-4-14.d1.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<regexp>
-	<concatenation>
-		<iteration>
-			<symbol>0</symbol>
-		</iteration>
-		<iteration>
-			<alternation>
-				<concatenation>
-					<symbol>0</symbol>
-					<iteration>
-						<symbol>1</symbol>
-					</iteration>
-					<symbol>0</symbol>
-				</concatenation>
-				<concatenation>
-					<symbol>1</symbol>
-					<iteration>
-						<symbol>0</symbol>
-					</iteration>
-				</concatenation>
-			</alternation>
-		</iteration>
-	</concatenation>
-</regexp>
diff --git a/examples/regexp/oppa-4-14.d10.xml b/examples/regexp/oppa-4-14.d10.xml
deleted file mode 100644
index 5632a3f9f7d87a4d0adf2cfddb779e6ee3049c66..0000000000000000000000000000000000000000
--- a/examples/regexp/oppa-4-14.d10.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<regexp>
-	<concatenation>
-		<alternation>
-			<iteration>
-				<symbol>0</symbol>
-			</iteration>
-			<concatenation>
-				<iteration>
-					<symbol>1</symbol>
-				</iteration>
-				<symbol>0</symbol>
-			</concatenation>
-		</alternation>
-		<iteration>
-			<alternation>
-				<concatenation>
-					<symbol>0</symbol>
-					<iteration>
-						<symbol>1</symbol>
-					</iteration>
-					<symbol>0</symbol>
-				</concatenation>
-				<concatenation>
-					<symbol>1</symbol>
-					<iteration>
-						<symbol>0</symbol>
-					</iteration>
-				</concatenation>
-			</alternation>
-		</iteration>
-	</concatenation>
-</regexp>
diff --git a/examples/regexp/oppa-4-14.xml b/examples/regexp/oppa-4-14.xml
deleted file mode 100644
index e1abbba00a48ae5860146bbdf31e8fa6c6a87eaa..0000000000000000000000000000000000000000
--- a/examples/regexp/oppa-4-14.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<regexp>
-<iteration>
-	<alternation>
-		<concatenation>
-			<symbol>0</symbol>
-			<iteration>
-				<symbol>1</symbol>
-			</iteration>
-			<symbol>0</symbol>
-		</concatenation>
-		<concatenation>
-			<symbol>1</symbol>
-			<iteration>
-				<symbol>0</symbol>
-			</iteration>
-		</concatenation>
-	</alternation>
-</iteration>
-</regexp>
diff --git a/examples/regexp/oppa-4-15.d100.xml b/examples/regexp/oppa-4-15.d100.xml
deleted file mode 100644
index 943d2fae462d5e66129e9d561f2f9ed50cfdf6a1..0000000000000000000000000000000000000000
--- a/examples/regexp/oppa-4-15.d100.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<regexp>
-	<alternation>
-		<concatenation>
-			<iteration>
-				<symbol>0</symbol>
-			</iteration>
-			<iteration>
-				<symbol>1</symbol>
-			</iteration>
-			<symbol>0</symbol>
-		</concatenation>
-		<epsilon></epsilon>
-	</alternation>
-</regexp>
diff --git a/examples/regexp/oppa-4-15.xml b/examples/regexp/oppa-4-15.xml
deleted file mode 100644
index 4d730256773653476e2d50142247b27b3293a182..0000000000000000000000000000000000000000
--- a/examples/regexp/oppa-4-15.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<regexp>
-<concatenation>
-	<symbol>1</symbol>
-	<iteration>
-		<symbol>0</symbol>
-	</iteration>
-	<iteration>
-		<symbol>1</symbol>
-	</iteration>
-	<symbol>0</symbol>
-</concatenation>
-</regexp>
diff --git a/examples/regexp/oppa-4-16.i1.xml b/examples/regexp/oppa-4-16.i1.xml
deleted file mode 100644
index 2b841de38596845b8874a6b44b27d9cf089c0286..0000000000000000000000000000000000000000
--- a/examples/regexp/oppa-4-16.i1.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<regexp>
-	<alternation>
-		<concatenation>
-			<symbol>1</symbol>
-			<symbol>0</symbol>
-			<symbol>1</symbol>
-			<symbol>0</symbol>
-		</concatenation>
-		<concatenation>
-			<symbol>1</symbol>
-			<symbol>1</symbol>
-			<symbol>0</symbol>
-			<symbol>1</symbol>
-		</concatenation>
-	</alternation>
-</regexp>
diff --git a/examples/regexp/oppa-4-16.xml b/examples/regexp/oppa-4-16.xml
deleted file mode 100644
index 968da499b3fe5cae6f7c3b0200c4ed5ef5025973..0000000000000000000000000000000000000000
--- a/examples/regexp/oppa-4-16.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<regexp>
-	<alternation>
-		<concatenation>
-			<symbol>0</symbol>
-			<symbol>1</symbol>
-			<symbol>0</symbol>
-		</concatenation>
-		<concatenation>
-			<symbol>1</symbol>
-			<symbol>0</symbol>
-			<symbol>1</symbol>
-		</concatenation>
-	</alternation>
-</regexp>
diff --git a/examples/regexp/regexp.xml b/examples/regexp/regexp.xml
deleted file mode 100644
index c33f89cb530ed6b70c959ebfd282fcfc9d12f48e..0000000000000000000000000000000000000000
--- a/examples/regexp/regexp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<regexp>
-	<concatenation>
-		<symbol>0</symbol>
-		<iteration>
-			<symbol>1</symbol>
-		</iteration>
-		<alternation>
-			<symbol>11</symbol>
-			<symbol>10</symbol>
-		</alternation>
-	</concatenation>
-</regexp>
diff --git a/examples/regexp/regexp2.xml b/examples/regexp/regexp2.xml
deleted file mode 100644
index 5f1a2f789679131f73d7d97498958de7cef8a801..0000000000000000000000000000000000000000
--- a/examples/regexp/regexp2.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<regexp>
-	<concatenation>
-		<symbol>0</symbol>
-		<symbol>1</symbol>
-		<iteration>
-			<alternation>
-					<symbol>0</symbol>
-					<symbol>1</symbol>
-			</alternation>
-		</iteration>
-
-		<alternation>
-				<iteration>
-					<symbol>11</symbol>
-				</iteration>
-				<iteration>
-					<symbol>10</symbol>
-				</iteration>
-		</alternation>
-	</concatenation>
-</regexp>
diff --git a/examples/regexp/regexp4.xml b/examples/regexp/regexp4.xml
deleted file mode 100644
index 573947d53594c361f465f0486dd5cb68b3b113c9..0000000000000000000000000000000000000000
--- a/examples/regexp/regexp4.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<regexp>
-	<concatenation>
-		<symbol>0</symbol>
-		<symbol>1</symbol>
-		<iteration>
-			<alternation>
-					<symbol>0</symbol>
-					<symbol>1</symbol>
-			</alternation>
-		</iteration>
-
-		<alternation>
-				<iteration>
-					<empty></empty>
-				</iteration>
-				<iteration>
-					<concatenation>
-						<epsilon></epsilon>
-						<symbol>0</symbol>
-					</concatenation>
-				</iteration>
-		</alternation>
-	</concatenation>
-</regexp>
diff --git a/examples2/regexp/Melichar2-94.i0.xml b/examples2/regexp/Melichar2-94.i0.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f2c4ec198f49bc67312efffff98420fab784c4f0
--- /dev/null
+++ b/examples2/regexp/Melichar2-94.i0.xml
@@ -0,0 +1,16 @@
+<unboundedRegexp>
+	<alphabet>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</alphabet>
+	<concatenation>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<iteration>
+			<alternation>
+				<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+				<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+			</alternation>
+		</iteration>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</concatenation>
+</unboundedRegexp>
diff --git a/examples2/regexp/Melichar2-94.i1.xml b/examples2/regexp/Melichar2-94.i1.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1fa54da20066adc9c6e3ce49cbfe6e7d01e097df
--- /dev/null
+++ b/examples2/regexp/Melichar2-94.i1.xml
@@ -0,0 +1,16 @@
+<unboundedRegexp>
+	<alphabet>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</alphabet>
+	<concatenation>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+		<iteration>
+			<alternation>
+				<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+				<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+			</alternation>
+		</iteration>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</concatenation>
+</unboundedRegexp>
diff --git a/examples2/regexp/Melichar2-94.xml b/examples2/regexp/Melichar2-94.xml
new file mode 100644
index 0000000000000000000000000000000000000000..731f2a4709d433f4bd3b4cbf5ac37df3de724364
--- /dev/null
+++ b/examples2/regexp/Melichar2-94.xml
@@ -0,0 +1,15 @@
+<unboundedRegexp>
+	<alphabet>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</alphabet>
+	<concatenation>
+		<iteration>
+			<alternation>
+				<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+				<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+			</alternation>
+		</iteration>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</concatenation>
+</unboundedRegexp>
diff --git a/examples2/regexp/regexp.xml b/examples2/regexp/regexp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b7e34b3c518e8fc1852b8f03d5786e7075a08c4e
--- /dev/null
+++ b/examples2/regexp/regexp.xml
@@ -0,0 +1,16 @@
+<unboundedRegexp>
+	<alphabet>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</alphabet>
+	<concatenation>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<iteration>
+			<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+		</iteration>
+		<alternation>
+			<LabeledSymbol><PrimitiveLabel><Integer>11</Integer></PrimitiveLabel></LabeledSymbol>
+			<LabeledSymbol><PrimitiveLabel><Integer>10</Integer></PrimitiveLabel></LabeledSymbol>
+		</alternation>
+	</concatenation>
+</regexp>
diff --git a/examples2/regexp/regexp2.xml b/examples2/regexp/regexp2.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1593a027d26998d8ce2f549f49a0bcde7c50f814
--- /dev/null
+++ b/examples2/regexp/regexp2.xml
@@ -0,0 +1,24 @@
+<unboundedRegexp>
+	<alphabet>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</alphabet>
+	<concatenation>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+		<iteration>
+			<alternation>
+				<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+				<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+			</alternation>
+		</iteration>
+		<alternation>
+			<iteration>
+				<LabeledSymbol><PrimitiveLabel><Integer>11</Integer></PrimitiveLabel></LabeledSymbol>
+			</iteration>
+			<iteration>
+				<LabeledSymbol><PrimitiveLabel><Integer>10</Integer></PrimitiveLabel></LabeledSymbol>
+			</iteration>
+		</alternation>
+	</concatenation>
+</regexp>
diff --git a/examples/regexp/regexp3.xml b/examples2/regexp/regexp3.xml
similarity index 56%
rename from examples/regexp/regexp3.xml
rename to examples2/regexp/regexp3.xml
index 9bc9b5335b8f1174b3418311488bb7cfcdece86f..ec2de6c97aa2e375f62af23ae01fbe70b7670645 100644
--- a/examples/regexp/regexp3.xml
+++ b/examples2/regexp/regexp3.xml
@@ -1,4 +1,11 @@
 <regexp>
+	<alphabet>
+		<LabeledSymbol><PrimitiveLabel><String>We</String></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><String>have</String></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><String>to</String></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><String>go</String></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><String>deeper</String></PrimitiveLabel></LabeledSymbol>
+	</alphabet>
 	<iteration>
 		<iteration>
 			<iteration>
diff --git a/examples2/regexp/regexp4.xml b/examples2/regexp/regexp4.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3cb65a3158b24b2cd9c93cd38afb4530c5d46e13
--- /dev/null
+++ b/examples2/regexp/regexp4.xml
@@ -0,0 +1,27 @@
+<unboundedRegexp>
+	<alphabet>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</alphabet>
+	<concatenation>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+		<iteration>
+			<alternation>
+				<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+				<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+			</alternation>
+		</iteration>
+		<alternation>
+			<iteration>
+				<empty></empty>
+			</iteration>
+			<iteration>
+				<concatenation>
+					<epsilon></epsilon>
+					<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+				</concatenation>
+			</iteration>
+		</alternation>
+	</concatenation>
+</regexp>
diff --git a/examples2/regexp/unbounded-aag.oppa.4.13.xml b/examples2/regexp/unbounded-aag.oppa.4.13.xml
deleted file mode 100644
index 31cf67fecc5e87cbeb137c00388c1d3e8dcd6127..0000000000000000000000000000000000000000
--- a/examples2/regexp/unbounded-aag.oppa.4.13.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<unboundedRegexp>
-    <alphabet>
-        <LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
-        <LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
-    </alphabet>
-    <alternation>
-        <concatenation>
-            <LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
-            <LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
-            <LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
-        </concatenation>
-        <concatenation>
-            <LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
-            <LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
-            <LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
-        </concatenation>
-        <concatenation>
-            <iteration>
-                <LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
-            </iteration>
-            <LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
-        </concatenation>
-        <concatenation>
-            <iteration>
-                <LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
-            </iteration>
-            <LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
-        </concatenation>
-    </alternation>
-</unboundedRegexp>
diff --git a/examples2/regexp/unbounded-aag.oppa.4.14.xml b/examples2/regexp/unbounded-aag.oppa.4.14.xml
deleted file mode 100644
index cc5b84bd170190451be6862545662604e689411c..0000000000000000000000000000000000000000
--- a/examples2/regexp/unbounded-aag.oppa.4.14.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<unboundedRegexp>
-    <alphabet>
-        <LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
-        <LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
-    </alphabet>
-    <iteration>
-        <alternation>
-            <concatenation>
-                <LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
-                <iteration>
-                    <LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
-                </iteration>
-                <LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
-            </concatenation>
-            <concatenation>
-                <LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
-                <iteration>
-                    <LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
-                </iteration>
-            </concatenation>
-        </alternation>
-    </iteration>
-</unboundedRegexp>
diff --git a/examples2/regexp/unbounded-aag.oppa.4.15.xml b/examples2/regexp/unbounded-aag.oppa.4.15.xml
deleted file mode 100644
index 5d0a217eca8c4a228ed77ce3deff0ba8399ea964..0000000000000000000000000000000000000000
--- a/examples2/regexp/unbounded-aag.oppa.4.15.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<unboundedRegexp>
-    <alphabet>
-        <LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
-        <LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
-    </alphabet>
-    <concatenation>
-        <LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
-        <iteration>
-            <LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
-        </iteration>
-        <iteration>
-            <LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
-        </iteration>
-        <LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
-    </concatenation>
-</unboundedRegexp>
diff --git a/examples2/regexp/unbounded.oppa.4.13.d0.xml b/examples2/regexp/unbounded.oppa.4.13.d0.xml
new file mode 100644
index 0000000000000000000000000000000000000000..da1209071608ce5069f84f3e816be91c8324f84a
--- /dev/null
+++ b/examples2/regexp/unbounded.oppa.4.13.d0.xml
@@ -0,0 +1,19 @@
+<unboundedRegexp>
+	<alphabet>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</alphabet>
+	<alternation>
+		<concatenation>
+			<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+			<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		</concatenation>
+		<concatenation>
+			<iteration>
+				<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+			</iteration>
+			<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+		</concatenation>
+		<epsilon></epsilon>
+	</alternation>
+</unboundedRegexp>
diff --git a/examples2/regexp/unbounded.oppa.4.13.d00.xml b/examples2/regexp/unbounded.oppa.4.13.d00.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3d9e8870681fb7215c6d8c0fb5d40947eb7e391d
--- /dev/null
+++ b/examples2/regexp/unbounded.oppa.4.13.d00.xml
@@ -0,0 +1,14 @@
+<unboundedRegexp>
+	<alphabet>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</alphabet>
+	<alternation>
+		<concatenation>
+			<iteration>
+				<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+			</iteration>
+			<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+		</concatenation>
+	</alternation>
+</unboundedRegexp>
diff --git a/examples2/regexp/unbounded.oppa.4.13.xml b/examples2/regexp/unbounded.oppa.4.13.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e23336c11daa1bf1222e552de4a4607a6ff083d8
--- /dev/null
+++ b/examples2/regexp/unbounded.oppa.4.13.xml
@@ -0,0 +1,30 @@
+<unboundedRegexp>
+	<alphabet>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</alphabet>
+	<alternation>
+		<concatenation>
+			<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+			<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+			<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		</concatenation>
+		<concatenation>
+			<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+			<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+			<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+		</concatenation>
+		<concatenation>
+			<iteration>
+				<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+			</iteration>
+			<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+		</concatenation>
+		<concatenation>
+			<iteration>
+				<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+			</iteration>
+			<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		</concatenation>
+	</alternation>
+</unboundedRegexp>
diff --git a/examples2/regexp/unbounded.oppa.4.14.d1.xml b/examples2/regexp/unbounded.oppa.4.14.d1.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ce3e635c23500e5791b70ad7548b0f3f13e10111
--- /dev/null
+++ b/examples2/regexp/unbounded.oppa.4.14.d1.xml
@@ -0,0 +1,28 @@
+<unboundedRegexp>
+	<alphabet>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</alphabet>
+	<concatenation>
+		<iteration>
+			<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		</iteration>
+		<iteration>
+			<alternation>
+				<concatenation>
+					<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+					<iteration>
+						<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+					</iteration>
+					<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+				</concatenation>
+				<concatenation>
+					<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+					<iteration>
+						<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+					</iteration>
+				</concatenation>
+			</alternation>
+		</iteration>
+	</concatenation>
+</unboundedRegexp>
diff --git a/examples2/regexp/unbounded.oppa.4.14.d10.xml b/examples2/regexp/unbounded.oppa.4.14.d10.xml
new file mode 100644
index 0000000000000000000000000000000000000000..16f580c1e643ce1042e8155f79a3b24c2af0fb82
--- /dev/null
+++ b/examples2/regexp/unbounded.oppa.4.14.d10.xml
@@ -0,0 +1,36 @@
+<unboundedRegexp>
+	<alphabet>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</alphabet>
+	<concatenation>
+		<alternation>
+			<iteration>
+				<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+			</iteration>
+			<concatenation>
+				<iteration>
+					<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+				</iteration>
+				<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+			</concatenation>
+		</alternation>
+		<iteration>
+			<alternation>
+				<concatenation>
+					<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+					<iteration>
+						<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+					</iteration>
+					<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+				</concatenation>
+				<concatenation>
+					<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+					<iteration>
+						<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+					</iteration>
+				</concatenation>
+			</alternation>
+		</iteration>
+	</concatenation>
+</unboundedRegexp>
diff --git a/examples2/regexp/unbounded.oppa.4.14.xml b/examples2/regexp/unbounded.oppa.4.14.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dfa486ca6f448f07e7288d765c40d8408f9329a0
--- /dev/null
+++ b/examples2/regexp/unbounded.oppa.4.14.xml
@@ -0,0 +1,23 @@
+<unboundedRegexp>
+	<alphabet>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</alphabet>
+	<iteration>
+		<alternation>
+			<concatenation>
+				<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+				<iteration>
+					<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+				</iteration>
+				<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+			</concatenation>
+			<concatenation>
+				<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+				<iteration>
+					<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+				</iteration>
+			</concatenation>
+		</alternation>
+	</iteration>
+</unboundedRegexp>
diff --git a/examples2/regexp/unbounded.oppa.4.15.d100.xml b/examples2/regexp/unbounded.oppa.4.15.d100.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8fdd212000ee879703b3933b0ca22564afc989ca
--- /dev/null
+++ b/examples2/regexp/unbounded.oppa.4.15.d100.xml
@@ -0,0 +1,18 @@
+<unboundedRegexp>
+	<alphabet>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</alphabet>
+	<alternation>
+		<concatenation>
+			<iteration>
+				<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+			</iteration>
+			<iteration>
+				<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+			</iteration>
+			<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		</concatenation>
+		<epsilon></epsilon>
+	</alternation>
+</unboundedRegexp>
diff --git a/examples2/regexp/unbounded.oppa.4.15.xml b/examples2/regexp/unbounded.oppa.4.15.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9bfc08f3190d96173840b6b35ecb369f401eb3b8
--- /dev/null
+++ b/examples2/regexp/unbounded.oppa.4.15.xml
@@ -0,0 +1,16 @@
+<unboundedRegexp>
+	<alphabet>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</alphabet>
+	<concatenation>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+		<iteration>
+			<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		</iteration>
+		<iteration>
+			<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+		</iteration>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+	</concatenation>
+</unboundedRegexp>
diff --git a/examples2/regexp/unbounded.oppa.4.16.i1.xml b/examples2/regexp/unbounded.oppa.4.16.i1.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7140d14893a2b7fefbe9b5983ab1e1825553ed83
--- /dev/null
+++ b/examples2/regexp/unbounded.oppa.4.16.i1.xml
@@ -0,0 +1,20 @@
+<unboundedRegexp>
+	<alphabet>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</alphabet>
+	<alternation>
+		<concatenation>
+			<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+			<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+			<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+			<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		</concatenation>
+		<concatenation>
+			<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+			<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+			<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+			<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+		</concatenation>
+	</alternation>
+</unboundedRegexp>
diff --git a/examples2/regexp/unbounded.oppa.4.16.xml b/examples2/regexp/unbounded.oppa.4.16.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c7fe8d6a6bdad99c6a4c0d9de78f900c78e3851f
--- /dev/null
+++ b/examples2/regexp/unbounded.oppa.4.16.xml
@@ -0,0 +1,18 @@
+<unboundedRegexp>
+	<alphabet>
+		<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+	</alphabet>
+	<alternation>
+		<concatenation>
+			<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+			<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+			<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+		</concatenation>
+		<concatenation>
+			<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+			<LabeledSymbol><PrimitiveLabel><Integer>0</Integer></PrimitiveLabel></LabeledSymbol>
+			<LabeledSymbol><PrimitiveLabel><Integer>1</Integer></PrimitiveLabel></LabeledSymbol>
+		</concatenation>
+	</alternation>
+</unboundedRegexp>