diff --git a/Domain/FSM/fsm/SC_DC.fsm b/Domain/FSM/fsm/SC_DC.fsm
deleted file mode 100644
index 19a877b6..00000000
--- a/Domain/FSM/fsm/SC_DC.fsm
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE qfsmproject SYSTEM 'qfsm.dtd'>
-<qfsmproject version="0.54" author="Qfsm">
-  <machine nummooreout="0" transfontitalic="0" draw_it="1" statefontsize="8" transfont="Helvetica" statefontitalic="0" author="capocchi" description="Finite State Machine to model the simple and double clic problem." version="0.1" name="FSM_SC_DC" arrowtype="1" numbits="2" statefontweight="50" statefont="Helvetica" numin="0" transfontsize="8" transfontweight="50" type="2" numout="0" initialstate="0">
-    <outputnames_moore></outputnames_moore>
-    <inputnames></inputnames>
-    <outputnames></outputnames>
-    <itransition ypos="107" endx="78" xpos="18" endy="107"/>
-    <state pencolor="0" exit_actions="" radius="40" description="" finalstate="0" entry_actions="" moore_outputs="" ypos="107" code="0" xpos="118" linewidth="1">On</state>
-    <state pencolor="0" exit_actions="" radius="40" description="" finalstate="0" entry_actions="" moore_outputs="" ypos="107" code="1" xpos="548" linewidth="1">Off</state>
-    <state pencolor="0" exit_actions="" radius="40" description="" finalstate="0" entry_actions="" moore_outputs="" ypos="324" code="2" xpos="305" linewidth="1">DC</state>
-    <transition c1x="274.9841814660031" c2y="124.8435980477433" c1y="122.5323550745231" description="" straight="1" type="2" ypos="120.2211121013029" endx="513.4488439640627" xpos="155.7518502169733" endy="127.1548410209635" c2x="394.2165127150329">
-      <from>0</from>
-      <to>1</to>
-      <inputs default="0" any="0" invert="0">OFF</inputs>
-      <outputs>OFF</outputs>
-    </transition>
-    <transition c1x="55.72893824183663" c2y="13.40048584525005" c1y="4.421664726361428" description="" straight="1" type="2" ypos="68.59999999999999" endx="134.1033464491136" xpos="106.8" endy="70.38467215577853" c2x="193.094147241944">
-      <from>0</from>
-      <to>0</to>
-      <inputs default="0" any="0" invert="0">ON</inputs>
-      <outputs></outputs>
-    </transition>
-    <transition c1x="193.1302207491063" c2y="237.9963425029528" c1y="185.7854480280748" description="" straight="1" type="2" ypos="133.5745535531968" endx="283.5979167526262" xpos="147.8963727473464" endy="290.2072369778309" c2x="238.3640687508662">
-      <from>0</from>
-      <to>2</to>
-      <inputs default="0" any="0" invert="0">DC</inputs>
-      <outputs>DC</outputs>
-    </transition>
-    <transition c1x="390.9693203038069" c2y="88.99823222485283" c1y="91.38856006177497" description="" straight="1" type="2" ypos="93.77888789869712" endx="152.411661345367" xpos="510.2481497830268" endy="86.60790438793069" c2x="271.6904908245869">
-      <from>1</from>
-      <to>0</to>
-      <inputs default="0" any="0" invert="0">ON</inputs>
-      <outputs>ON</outputs>
-    </transition>
-    <transition c1x="480.9482424080637" c2y="9.954403224895572" c1y="7.480847050267684" description="" straight="1" type="2" ypos="69.17253602780534" endx="562.3540031377437" xpos="534.9968092595581" endy="69.66419153250268" c2x="618.5843619122808">
-      <from>1</from>
-      <to>1</to>
-      <inputs default="0" any="0" invert="0">OFF</inputs>
-      <outputs></outputs>
-    </transition>
-    <transition c1x="450.6881865572717" c2y="235.3821879561259" c1y="181.1585656658813" description="" straight="1" type="2" ypos="126.9349433756367" endx="325.4215501662175" xpos="513.3215047527988" endy="289.6058102463706" c2x="388.0548683617445">
-      <from>1</from>
-      <to>2</to>
-      <inputs default="0" any="0" invert="0">DC</inputs>
-      <outputs>DC</outputs>
-    </transition>
-    <transition c1x="408.067755591199" c2y="441.8717497571369" c1y="385.4576094344132" description="" straight="1" type="2" ypos="352.6797967525772" endx="307.9247031830044" xpos="332.8831357316723" endy="363.8929330996271" c2x="282.4999864624285">
-      <from>2</from>
-      <to>2</to>
-      <inputs default="0" any="0" invert="0">DC</inputs>
-      <outputs></outputs>
-    </transition>
-    <transition c1x="214.0861011468298" c2y="202.5757922425297" c1y="262.955624992166" description="" straight="0" type="2" ypos="316.933437488249" endx="123.6568542494924" xpos="265.6291517202446" endy="146.5979797464467" c2x="175.1999048229072">
-      <from>2</from>
-      <to>0</to>
-      <inputs default="0" any="0" invert="0">ON</inputs>
-      <outputs>ON</outputs>
-    </transition>
-    <transition c1x="409.5475203593209" c2y="201.7950989585625" c1y="257.0158325025308" description="" straight="1" type="2" ypos="312.2365660464991" endx="542.1802403802068" xpos="343.231160348878" endy="146.5743654145941" c2x="475.8638803697638">
-      <from>2</from>
-      <to>1</to>
-      <inputs default="0" any="0" invert="0">OFF</inputs>
-      <outputs>OFF</outputs>
-    </transition>
-  </machine>
-</qfsmproject>
diff --git a/Domain/FSM/fsm/SC_DC_e1_e2.fsm b/Domain/FSM/fsm/SC_DC_e1_e2.fsm
deleted file mode 100644
index 2d81851e..00000000
--- a/Domain/FSM/fsm/SC_DC_e1_e2.fsm
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE qfsmproject SYSTEM 'qfsm.dtd'>
-<qfsmproject version="0.54" author="Qfsm">
-  <machine nummooreout="0" transfontitalic="0" draw_it="1" statefontsize="8" transfont="Helvetica" statefontitalic="0" author="capocchi" description="Finite State Machine to model the simple and double clic problem with e1 and e2 as events" version="0.1" name="FSM_e1_e2" arrowtype="1" numbits="2" statefontweight="50" statefont="Helvetica" numin="0" transfontsize="8" transfontweight="50" type="2" numout="0" initialstate="0">
-    <outputnames_moore></outputnames_moore>
-    <inputnames></inputnames>
-    <outputnames></outputnames>
-    <itransition ypos="103" endx="120" xpos="60" endy="103"/>
-    <state pencolor="0" exit_actions="" radius="40" description="" finalstate="0" entry_actions="" moore_outputs="" ypos="103" code="0" xpos="160" linewidth="1">ON</state>
-    <state pencolor="0" exit_actions="" radius="40" description="" finalstate="0" entry_actions="" moore_outputs="" ypos="112" code="1" xpos="503" linewidth="1">OFF</state>
-    <state pencolor="0" exit_actions="" radius="40" description="" finalstate="0" entry_actions="" moore_outputs="" ypos="288" code="2" xpos="496" linewidth="1">DC_ON</state>
-    <state pencolor="0" exit_actions="" radius="40" description="" finalstate="0" entry_actions="" moore_outputs="" ypos="273" code="3" xpos="142" linewidth="1">DC_OFF</state>
-    <transition c1x="289.3407087357664" c2y="94.72026183821762" c1y="97.2860812107086" description="" straight="1" type="2" ypos="99.85190058319958" endx="468.2702743150217" xpos="199.8759259461388" endy="92.15444246572665" c2x="378.805491525394">
-      <from>0</from>
-      <to>1</to>
-      <inputs default="0" any="0" invert="0">e1</inputs>
-      <outputs>off</outputs>
-    </transition>
-    <transition c1x="278.2884917569862" c2y="132.4636020404552" c1y="133.9065227062914" description="" straight="1" type="2" ypos="135.3494433721276" endx="467.8117394569549" xpos="183.5268679070018" endy="131.020681374619" c2x="373.0501156069706">
-      <from>0</from>
-      <to>1</to>
-      <inputs default="0" any="0" invert="0">e2</inputs>
-      <outputs>off</outputs>
-    </transition>
-    <transition c1x="152.286497880503" c2y="202.9821006373691" c1y="172.9089144480386" description="" straight="1" type="2" ypos="142.8357282587081" endx="144.1023533249106" xpos="156.3785701582993" endy="233.0552868266996" c2x="148.1944256027068">
-      <from>0</from>
-      <to>3</to>
-      <inputs default="0" any="0" invert="0">e1e2</inputs>
-      <outputs>dc_off</outputs>
-    </transition>
-    <transition c1x="504.1449978766609" c2y="216.1152052049318" c1y="183.9986923124975" description="" straight="1" type="2" ypos="151.8821794200633" endx="500.2992737192037" xpos="506.0678599553895" endy="248.231718097366" c2x="502.2221357979323">
-      <from>1</from>
-      <to>2</to>
-      <inputs default="0" any="0" invert="0">e1e2</inputs>
-      <outputs>dc_on</outputs>
-    </transition>
-    <transition c1x="374.0394588296801" c2y="116.8678120469647" c1y="113.259465584453" description="" straight="1" type="2" ypos="109.6511191219412" endx="195.9803263430399" xpos="463.0690250730002" endy="120.4761585094765" c2x="285.00989258636">
-      <from>1</from>
-      <to>0</to>
-      <inputs default="0" any="0" invert="0">e2</inputs>
-      <outputs>on</outputs>
-    </transition>
-    <transition c1x="387.2878186086782" c2y="77.004752178074" c1y="76.51221291751705" description="" straight="1" type="2" ypos="76.01967365696009" endx="190.8157728449876" xpos="485.5238414905235" endy="77.49729143863095" c2x="289.0517957268329">
-      <from>1</from>
-      <to>0</to>
-      <inputs default="0" any="0" invert="0">e1</inputs>
-      <outputs>on</outputs>
-    </transition>
-    <transition c1x="364.0759022707186" c2y="288.3120468813329" c1y="290.3646539621634" description="" straight="1" type="2" ypos="292.4172610429939" endx="179.7384055860453" xpos="456.2446506130552" endy="286.2594398005024" c2x="271.9071539283819">
-      <from>2</from>
-      <to>3</to>
-      <inputs default="0" any="0" invert="0">e1e2</inputs>
-      <outputs>dc_off</outputs>
-    </transition>
-    <transition c1x="475.7172251777648" c2y="178.3234974048033" c1y="215.8532229927791" description="" straight="1" type="2" ypos="253.3829485807549" endx="475.2345771766307" xpos="475.9585491783318" endy="140.7937718168274" c2x="475.4759011771977">
-      <from>2</from>
-      <to>1</to>
-      <inputs default="0" any="0" invert="0">e2</inputs>
-      <outputs>off</outputs>
-    </transition>
-    <transition c1x="528.9427649877159" c2y="177.2127595026578" c1y="219.1759912565517" description="" straight="1" type="2" ypos="261.1392230104456" endx="535.5493388482694" xpos="525.6394780574393" endy="135.2495277487639" c2x="532.2460519179928">
-      <from>2</from>
-      <to>1</to>
-      <inputs default="0" any="0" invert="0">e1</inputs>
-      <outputs>off</outputs>
-    </transition>
-    <transition c1x="275.0499345506153" c2y="266.8392658098626" c1y="266.8784892198525" description="" straight="1" type="2" ypos="266.9177126298424" endx="462.0800678397965" xpos="181.5348679060247" endy="266.8000423998728" c2x="368.5650011952059">
-      <from>3</from>
-      <to>2</to>
-      <inputs default="0" any="0" invert="0">e1e2</inputs>
-      <outputs>dc_on</outputs>
-    </transition>
-    <transition c1x="119.6850437934983" c2y="166.6297254170081" c1y="205.0357458302374" description="" straight="1" type="2" ypos="243.4417662434668" endx="128.9554399953494" xpos="115.0498456925727" endy="128.2237050037786" c2x="124.3202418944238">
-      <from>3</from>
-      <to>0</to>
-      <inputs default="0" any="0" invert="0">e1</inputs>
-      <outputs>on</outputs>
-    </transition>
-    <transition c1x="174.3728249979557" c2y="172.8258069764941" c1y="209.0044749379259" description="" straight="1" type="2" ypos="245.1831428993578" endx="181.6303036525399" xpos="170.7440856706636" endy="136.6471390150622" c2x="178.0015643252478">
-      <from>3</from>
-      <to>0</to>
-      <inputs default="0" any="0" invert="0">e2</inputs>
-      <outputs>on</outputs>
-    </transition>
-  </machine>
-</qfsmproject>
diff --git a/Domain/FSM/scxml/FSM.xml b/Domain/FSM/scxml/FSM.xml
deleted file mode 100644
index db4fe30e..00000000
--- a/Domain/FSM/scxml/FSM.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" initialstate="On">
-
-<!-- This file was generated by				-->
-<!-- Qfsm Version 0.54					-->
-<!-- (C) Stefan Duffner, Rainer Strobel			-->
-
-  <state id="On">
-    <transition event="0" target="Off" >
-      <send event="0" />
-    </transition>
-  </state>
-  <state id="Off">
-    <transition event="1" target="On" >
-      <send event="1" />
-    </transition>
-  </state>
-</scxml>
diff --git a/Domain/FSM/scxml/FSM_SC_DC.xml b/Domain/FSM/scxml/FSM_SC_DC.xml
deleted file mode 100644
index efedb26f..00000000
--- a/Domain/FSM/scxml/FSM_SC_DC.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" initialstate="On">
-
-<!-- This file was generated by				-->
-<!-- Qfsm Version 0.54					-->
-<!-- (C) Stefan Duffner, Rainer Strobel			-->
-
-  <state id="On">
-    <transition event="OFF" target="Off" >
-      <send event="OFF" />
-    </transition>
-    <transition event="ON" target="On" >
-    </transition>
-    <transition event="DC" target="DC" >
-      <send event="DC" />
-    </transition>
-  </state>
-  <state id="Off">
-    <transition event="ON" target="On" >
-      <send event="ON" />
-    </transition>
-    <transition event="OFF" target="Off" >
-    </transition>
-    <transition event="DC" target="DC" >
-      <send event="DC" />
-    </transition>
-  </state>
-  <state id="DC">
-    <transition event="OFF" target="Off" >
-      <send event="OFF" />
-    </transition>
-	<transition event="ON" target="On" >
-      <send event="ON" />
-    </transition>
-    <transition event="DC" target="DC" >
-    </transition>
-  </state>
-</scxml>