diff --git a/examples/HSM2NHSM/HStateMachine.xmi b/examples/HSM2NHSM/HStateMachine.xmi
index 4bd4456..8b91eb2 100644
--- a/examples/HSM2NHSM/HStateMachine.xmi
+++ b/examples/HSM2NHSM/HStateMachine.xmi
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
-<hsm:StateMachine
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:hsm="HSM"
-    xsi:schemaLocation="HSM HSM.ecore#HSM">
-  <states name="Child"
-      owner="//@states.2"/>
+<hsm:StateMachine xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:hsm="HSM" xsi:schemaLocation="HSM HSM.ecore#HSM">
+  <states xsi:type="hsm:CompositeState" name="A"/>
+  <states name="Child" owner="//@states.0"/>
   <states name="B"/>
-  <states xsi:type="hsm:CompositeState"
-      name="A"/>
-  <transitions
-      source="//@states.0"
-      target="//@states.1"/>
 </hsm:StateMachine>
diff --git a/examples/HSM2NHSM/HStateMachineN.xmi b/examples/HSM2NHSM/HStateMachineN.xmi
index 170dbd4..558583a 100644
--- a/examples/HSM2NHSM/HStateMachineN.xmi
+++ b/examples/HSM2NHSM/HStateMachineN.xmi
@@ -7,9 +7,6 @@
     xsi:schemaLocation="HSM HSM.ecore#HSM">
   <states name="A"/>
   <states name="B"/>
-  <transitions
-      source="//@states.1"
-      target="//@states.0"/>
   <transitions
       source="//@states.0"
       target="//@states.1"/>
diff --git a/examples/HSM2NHSM/NHSM.ecore b/examples/HSM2NHSM/NHSM.ecore
deleted file mode 100644
index 0ef4f69..0000000
--- a/examples/HSM2NHSM/NHSM.ecore
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmi:id="NHSM" name="NHSM" nsURI="NHSM" nsPrefix="nhsm">
-  <eClassifiers xsi:type="ecore:EClass" name="StateMachine">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="states" upperBound="-1"
-        eType="#//State" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="transitions" upperBound="-1"
-        eType="#//Transition" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="State">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Transition">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="source" lowerBound="1"
-        eType="#//State"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
-        eType="#//State"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/examples/HSM2NHSM/NHStateMachine.xmi b/examples/HSM2NHSM/NHStateMachine.xmi
deleted file mode 100644
index da7b5e2..0000000
--- a/examples/HSM2NHSM/NHStateMachine.xmi
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<nhsm:StateMachine
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:nhsm="NHSM"
-    xsi:schemaLocation="NHSM NHSM.ecore#NHSM">
-  <states name="A"/>
-  <states name="B"/>
-  <transitions
-      source="//@states.0"
-      target="//@states.1"/>
-  <transitions
-      source="//@states.1"
-      target="//@states.0"/>
-</nhsm:StateMachine>
diff --git a/examples/HSM2NHSM/check.sh b/examples/HSM2NHSM/check.sh
deleted file mode 100755
index 55fb279..0000000
--- a/examples/HSM2NHSM/check.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp "../../bin/:../../lib/*" pt.uminho.haslab.echo.Echo check HSM2NHSM.qvtr hm HSM.ecore HStateMachine.xmi HSM.ecore HStateMachineN.xmi
\ No newline at end of file
diff --git a/examples/HSM2NHSM/enforce.sh b/examples/HSM2NHSM/enforce.sh
deleted file mode 100755
index ec86d11..0000000
--- a/examples/HSM2NHSM/enforce.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp "../../bin/:../../lib/*" pt.uminho.haslab.echo.Echo enforce HSM2NHSM.qvtr hm HSM.ecore HStateMachine.xmi HSM.ecore HStateMachineN.xmi
\ No newline at end of file
diff --git a/examples/NonTopEnforce/TwoLayerMM.ecore b/examples/NonTopEnforce/TwoLayerMM.ecore
deleted file mode 100644
index a760eff..0000000
--- a/examples/NonTopEnforce/TwoLayerMM.ecore
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmi:id="HSM" name="TwoLayerMM" nsURI="TwoLayerMM" nsPrefix="twolayer">
-  <eClassifiers xsi:type="ecore:EClass" name="MEtop">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1">
-      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="child" upperBound="-1" eType="//MEchild"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MEchild">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1">
-      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Container">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="metops" upperBound="-1" eType="//MEtop" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mechildren" upperBound="-1" eType="//MEchild" containment="true"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/examples/NonTopEnforce/enforce.sh b/examples/NonTopEnforce/enforce.sh
deleted file mode 100644
index cf09f1d..0000000
--- a/examples/NonTopEnforce/enforce.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp "../../bin/:../../lib/*" pt.uminho.haslab.echo.Echo enforce NonTopEnforce.qvtr m2 TwoLayerMM.ecore m1.xmi TwoLayerMM.ecore m2.xmi
\ No newline at end of file
diff --git a/examples/UML2RDBMS/2PersistentPackage.xmi b/examples/UML2RDBMS/2PersistentPackage.xmi
deleted file mode 100644
index a2a6528..0000000
--- a/examples/UML2RDBMS/2PersistentPackage.xmi
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<uml:Package
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:uml="UML"
-    xsi:schemaLocation="UML UML.ecore#UML"
-    name="Company">
-  <classes name="Person"
-      persistent="true">
-    <attributes
-        name="Age"/>
-    <attributes
-        name="Name"/>
-  </classes>
-  <classes name="Employee"
-      persistent="true"
-      super="//@classes.0">
-    <attributes
-        name="Project"/>
-  </classes>
-</uml:Package>
diff --git a/examples/UML2RDBMS/2PersistentScheme.xmi b/examples/UML2RDBMS/2PersistentScheme.xmi
deleted file mode 100644
index d16c2c3..0000000
--- a/examples/UML2RDBMS/2PersistentScheme.xmi
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<rdbms:Scheme
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:rdbms="RDBMS"
-    xsi:schemaLocation="RDBMS RDBMS.ecore#RDBMS"
-    name="Company">
-  <tables name="Employee">
-    <columns
-        name="Name"/>
-    <columns
-        name="Age"/>
-    <columns
-        name="Project"/>
-  </tables>
-  <tables name="Person">
-    <columns
-        name="Name"/>
-    <columns
-        name="Age"/>
-    <columns
-        name="New"/>
-  </tables>
-</rdbms:Scheme>
diff --git a/examples/UML2RDBMS/PackageEmpty.xmi b/examples/UML2RDBMS/PackageEmpty.xmi
deleted file mode 100644
index 20595b8..0000000
--- a/examples/UML2RDBMS/PackageEmpty.xmi
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<uml:Package
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:uml="UML"
-    xsi:schemaLocation="UML UML.ecore#UML"
-    name="Company"/>
diff --git a/examples/UML2RDBMS/PackageExample.xmi b/examples/UML2RDBMS/PackageExample.xmi
deleted file mode 100644
index 640c0d0..0000000
--- a/examples/UML2RDBMS/PackageExample.xmi
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<uml:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="UML" xsi:schemaLocation="UML UML.ecore#UML" name="Company">
-  <classes name="Person" sub="//@classes.1">
-    <attributes name="Age"/>
-    <attributes name="Name"/>
-  </classes>
-  <classes name="Employee" persistent="true" super="//@classes.0">
-    <attributes name="Project"/>
-    <attributes name="New"/>
-  </classes>
-</uml:Package>
diff --git a/examples/UML2RDBMS/SchemeExample.xmi b/examples/UML2RDBMS/SchemeExample.xmi
deleted file mode 100644
index 1fe5f25..0000000
--- a/examples/UML2RDBMS/SchemeExample.xmi
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<rdbms:Scheme
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:rdbms="RDBMS"
-    xsi:schemaLocation="RDBMS RDBMS.ecore#RDBMS"
-    name="Company">
-  <tables name="Employee">
-    <columns
-        name="Name"/>
-    <columns
-        name="Age"/>
-    <columns
-        name="Project"/>
-    <columns
-        name="New"/>
-  </tables>
-</rdbms:Scheme>
diff --git a/examples/UML2RDBMS/check.sh b/examples/UML2RDBMS/check.sh
deleted file mode 100755
index aaa1e84..0000000
--- a/examples/UML2RDBMS/check.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp "../../bin/:../../lib/*" pt.uminho.haslab.echo.Echo check UML2RDBMS.qvtr uml UML.ecore PackageExample.xmi RDBMS.ecore SchemeExample.xmi
\ No newline at end of file
diff --git a/examples/UML2RDBMS/enforce b/examples/UML2RDBMS/enforce
index d37f7b6..9ae2d26 100755
--- a/examples/UML2RDBMS/enforce
+++ b/examples/UML2RDBMS/enforce
@@ -1 +1 @@
-java -jar ../../echo.jar -enforce uml -q UML2RDBMS.qvtr -m UML.ecore RDBMS.ecore -i 1PersistentPackage.xmi 1PersistentScheme.xmi
\ No newline at end of file
+java -jar ../../echo.jar -enforce hm -q HSM2NHSM.qvtr -m HSM.ecore -i HStateMachine.xmi HStateMachineN.xmi
\ No newline at end of file
diff --git a/examples/UML2RDBMS/enforce.sh b/examples/UML2RDBMS/enforce.sh
deleted file mode 100755
index b007c8b..0000000
--- a/examples/UML2RDBMS/enforce.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp "../../bin/:../../lib/*" pt.uminho.haslab.echo.Echo enforce UML2RDBMS.qvtr uml UML.ecore PackageExample.xmi RDBMS.ecore SchemeExample.xmi
\ No newline at end of file
diff --git a/examples/UML2RDBMS/run.sh b/examples/UML2RDBMS/run.sh
deleted file mode 100644
index 1948f33..0000000
--- a/examples/UML2RDBMS/run.sh
+++ /dev/null
@@ -1 +0,0 @@
-java -cp "../../bin/:../../lib/*" pt.uminho.haslab.echo.Echo enforce UML2RDBMS.qvtr UML UML.ecore PackageExample.xmi RDBMS.ecore SchemeExample.xmi
\ No newline at end of file