diff --git a/.output/actual/examples/asq/il/parseAssemblyFile/eigenratios/si1.il b/.output/actual/asq/il/parseAssemblyFile/eigenratios/si1.il
similarity index 98%
rename from .output/actual/examples/asq/il/parseAssemblyFile/eigenratios/si1.il
rename to .output/actual/asq/il/parseAssemblyFile/eigenratios/si1.il
index 26fd77fc..bacfb332 100644
--- a/.output/actual/examples/asq/il/parseAssemblyFile/eigenratios/si1.il
+++ b/.output/actual/asq/il/parseAssemblyFile/eigenratios/si1.il
@@ -352,7 +352,7 @@
( Variable "C" )
( Just
( Literal
- ( - 1 )
+ ( -1 )
)
)
)
@@ -388,7 +388,7 @@
( Just
( Data
( Literal
- ( - 3 )
+ ( -3 )
)
)
)
@@ -397,7 +397,7 @@
( Just
( Data
( Literal
- ( - 2 )
+ ( -2 )
)
)
)
@@ -406,7 +406,7 @@
( Just
( Data
( Literal
- ( - 1 )
+ ( -1 )
)
)
)
diff --git a/.output/actual/examples/asq/il/parseAssemblyFile/eigenratios/si2.il b/.output/actual/asq/il/parseAssemblyFile/eigenratios/si2.il
similarity index 98%
rename from .output/actual/examples/asq/il/parseAssemblyFile/eigenratios/si2.il
rename to .output/actual/asq/il/parseAssemblyFile/eigenratios/si2.il
index c5d924a1..fa805255 100644
--- a/.output/actual/examples/asq/il/parseAssemblyFile/eigenratios/si2.il
+++ b/.output/actual/asq/il/parseAssemblyFile/eigenratios/si2.il
@@ -325,7 +325,7 @@
( Variable "C" )
( Just
( Literal
- ( - 1 )
+ ( -1 )
)
)
)
@@ -355,7 +355,7 @@
( Just
( Data
( Literal
- ( - 119 )
+ ( -119 )
)
)
)
@@ -365,7 +365,7 @@
( Just
( Data
( Literal
- ( - 1 )
+ ( -1 )
)
)
)
diff --git a/.output/actual/examples/asq/il/parseAssemblyFile/esolangs/currentAddress/helloWorld.il b/.output/actual/asq/il/parseAssemblyFile/esolangs/currentAddress/helloWorld.il
similarity index 100%
rename from .output/actual/examples/asq/il/parseAssemblyFile/esolangs/currentAddress/helloWorld.il
rename to .output/actual/asq/il/parseAssemblyFile/esolangs/currentAddress/helloWorld.il
diff --git a/.output/actual/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/echo.il b/.output/actual/asq/il/parseAssemblyFile/esolangs/nextAddress/echo.il
similarity index 100%
rename from .output/actual/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/echo.il
rename to .output/actual/asq/il/parseAssemblyFile/esolangs/nextAddress/echo.il
diff --git a/.output/actual/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/helloWorld.il b/.output/actual/asq/il/parseAssemblyFile/esolangs/nextAddress/helloWorld.il
similarity index 100%
rename from .output/actual/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/helloWorld.il
rename to .output/actual/asq/il/parseAssemblyFile/esolangs/nextAddress/helloWorld.il
diff --git a/.output/actual/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/hi.il b/.output/actual/asq/il/parseAssemblyFile/esolangs/nextAddress/hi.il
similarity index 100%
rename from .output/actual/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/hi.il
rename to .output/actual/asq/il/parseAssemblyFile/esolangs/nextAddress/hi.il
diff --git a/.output/actual/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/si.il b/.output/actual/asq/il/parseAssemblyFile/esolangs/nextAddress/si.il
similarity index 100%
rename from .output/actual/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/si.il
rename to .output/actual/asq/il/parseAssemblyFile/esolangs/nextAddress/si.il
diff --git a/.output/actual/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/siout.il b/.output/actual/asq/il/parseAssemblyFile/esolangs/nextAddress/siout.il
similarity index 100%
rename from .output/actual/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/siout.il
rename to .output/actual/asq/il/parseAssemblyFile/esolangs/nextAddress/siout.il
diff --git a/.output/actual/examples/asq/sq/assembleFile/eigenratios/si1.sq b/.output/actual/asq/sq/assembleFile/eigenratios/si1.sq
similarity index 100%
rename from .output/actual/examples/asq/sq/assembleFile/eigenratios/si1.sq
rename to .output/actual/asq/sq/assembleFile/eigenratios/si1.sq
diff --git a/.output/actual/examples/asq/sq/assembleFile/eigenratios/si2.sq b/.output/actual/asq/sq/assembleFile/eigenratios/si2.sq
similarity index 100%
rename from .output/actual/examples/asq/sq/assembleFile/eigenratios/si2.sq
rename to .output/actual/asq/sq/assembleFile/eigenratios/si2.sq
diff --git a/.output/actual/examples/asq/sq/assembleFile/esolangs/currentAddress/helloWorld.sq b/.output/actual/asq/sq/assembleFile/esolangs/currentAddress/helloWorld.sq
similarity index 100%
rename from .output/actual/examples/asq/sq/assembleFile/esolangs/currentAddress/helloWorld.sq
rename to .output/actual/asq/sq/assembleFile/esolangs/currentAddress/helloWorld.sq
diff --git a/.output/actual/examples/asq/sq/assembleFile/esolangs/nextAddress/echo.sq b/.output/actual/asq/sq/assembleFile/esolangs/nextAddress/echo.sq
similarity index 100%
rename from .output/actual/examples/asq/sq/assembleFile/esolangs/nextAddress/echo.sq
rename to .output/actual/asq/sq/assembleFile/esolangs/nextAddress/echo.sq
diff --git a/.output/actual/examples/asq/sq/assembleFile/esolangs/nextAddress/factorial.sq b/.output/actual/asq/sq/assembleFile/esolangs/nextAddress/factorial.sq
similarity index 100%
rename from .output/actual/examples/asq/sq/assembleFile/esolangs/nextAddress/factorial.sq
rename to .output/actual/asq/sq/assembleFile/esolangs/nextAddress/factorial.sq
diff --git a/.output/actual/examples/asq/sq/assembleFile/esolangs/nextAddress/helloWorld.sq b/.output/actual/asq/sq/assembleFile/esolangs/nextAddress/helloWorld.sq
similarity index 100%
rename from .output/actual/examples/asq/sq/assembleFile/esolangs/nextAddress/helloWorld.sq
rename to .output/actual/asq/sq/assembleFile/esolangs/nextAddress/helloWorld.sq
diff --git a/.output/actual/examples/asq/sq/assembleFile/esolangs/nextAddress/hi.sq b/.output/actual/asq/sq/assembleFile/esolangs/nextAddress/hi.sq
similarity index 100%
rename from .output/actual/examples/asq/sq/assembleFile/esolangs/nextAddress/hi.sq
rename to .output/actual/asq/sq/assembleFile/esolangs/nextAddress/hi.sq
diff --git a/.output/actual/examples/asq/sq/assembleFile/esolangs/nextAddress/si.sq b/.output/actual/asq/sq/assembleFile/esolangs/nextAddress/si.sq
similarity index 100%
rename from .output/actual/examples/asq/sq/assembleFile/esolangs/nextAddress/si.sq
rename to .output/actual/asq/sq/assembleFile/esolangs/nextAddress/si.sq
diff --git a/.output/actual/examples/asq/sq/assembleFile/esolangs/nextAddress/siout.sq b/.output/actual/asq/sq/assembleFile/esolangs/nextAddress/siout.sq
similarity index 100%
rename from .output/actual/examples/asq/sq/assembleFile/esolangs/nextAddress/siout.sq
rename to .output/actual/asq/sq/assembleFile/esolangs/nextAddress/siout.sq
diff --git a/.output/actual/examples/eta/assembleFile/add.eta b/.output/actual/eas/eta/assembleFile/add.eta
similarity index 100%
rename from .output/actual/examples/eta/assembleFile/add.eta
rename to .output/actual/eas/eta/assembleFile/add.eta
diff --git a/.output/actual/examples/eta/assembleFile/bottles.eta b/.output/actual/eas/eta/assembleFile/bottles.eta
similarity index 100%
rename from .output/actual/examples/eta/assembleFile/bottles.eta
rename to .output/actual/eas/eta/assembleFile/bottles.eta
diff --git a/.output/actual/examples/eta/assembleFile/bottles2.eta b/.output/actual/eas/eta/assembleFile/bottles2.eta
similarity index 100%
rename from .output/actual/examples/eta/assembleFile/bottles2.eta
rename to .output/actual/eas/eta/assembleFile/bottles2.eta
diff --git a/.output/actual/examples/eta/assembleFile/bottles3.eta b/.output/actual/eas/eta/assembleFile/bottles3.eta
similarity index 100%
rename from .output/actual/examples/eta/assembleFile/bottles3.eta
rename to .output/actual/eas/eta/assembleFile/bottles3.eta
diff --git a/.output/actual/examples/eta/assembleFile/euclid.eta b/.output/actual/eas/eta/assembleFile/euclid.eta
similarity index 100%
rename from .output/actual/examples/eta/assembleFile/euclid.eta
rename to .output/actual/eas/eta/assembleFile/euclid.eta
diff --git a/.output/actual/examples/eta/assembleFile/fact.eta b/.output/actual/eas/eta/assembleFile/fact.eta
similarity index 100%
rename from .output/actual/examples/eta/assembleFile/fact.eta
rename to .output/actual/eas/eta/assembleFile/fact.eta
diff --git a/.output/actual/examples/eta/assembleFile/factN1H.eta b/.output/actual/eas/eta/assembleFile/factN1H.eta
similarity index 100%
rename from .output/actual/examples/eta/assembleFile/factN1H.eta
rename to .output/actual/eas/eta/assembleFile/factN1H.eta
diff --git a/.output/actual/examples/eta/assembleFile/function.eta b/.output/actual/eas/eta/assembleFile/function.eta
similarity index 100%
rename from .output/actual/examples/eta/assembleFile/function.eta
rename to .output/actual/eas/eta/assembleFile/function.eta
diff --git a/.output/actual/examples/eta/assembleFile/hello.eta b/.output/actual/eas/eta/assembleFile/hello.eta
similarity index 100%
rename from .output/actual/examples/eta/assembleFile/hello.eta
rename to .output/actual/eas/eta/assembleFile/hello.eta
diff --git a/.output/actual/examples/eta/assembleFile/hello2.eta b/.output/actual/eas/eta/assembleFile/hello2.eta
similarity index 100%
rename from .output/actual/examples/eta/assembleFile/hello2.eta
rename to .output/actual/eas/eta/assembleFile/hello2.eta
diff --git a/.output/actual/examples/eta/assembleFile/hello3.eta b/.output/actual/eas/eta/assembleFile/hello3.eta
similarity index 100%
rename from .output/actual/examples/eta/assembleFile/hello3.eta
rename to .output/actual/eas/eta/assembleFile/hello3.eta
diff --git a/.output/actual/examples/eta/assembleFile/hello4.eta b/.output/actual/eas/eta/assembleFile/hello4.eta
similarity index 100%
rename from .output/actual/examples/eta/assembleFile/hello4.eta
rename to .output/actual/eas/eta/assembleFile/hello4.eta
diff --git a/.output/actual/examples/eta/assembleFile/multiply.eta b/.output/actual/eas/eta/assembleFile/multiply.eta
similarity index 100%
rename from .output/actual/examples/eta/assembleFile/multiply.eta
rename to .output/actual/eas/eta/assembleFile/multiply.eta
diff --git a/.output/actual/examples/eta/assembleFile/pip.eta b/.output/actual/eas/eta/assembleFile/pip.eta
similarity index 100%
rename from .output/actual/examples/eta/assembleFile/pip.eta
rename to .output/actual/eas/eta/assembleFile/pip.eta
diff --git a/.output/actual/examples/eta/assembleFile/pip2.eta b/.output/actual/eas/eta/assembleFile/pip2.eta
similarity index 100%
rename from .output/actual/examples/eta/assembleFile/pip2.eta
rename to .output/actual/eas/eta/assembleFile/pip2.eta
diff --git a/.output/actual/examples/eta/assembleFile/reverse.eta b/.output/actual/eas/eta/assembleFile/reverse.eta
similarity index 100%
rename from .output/actual/examples/eta/assembleFile/reverse.eta
rename to .output/actual/eas/eta/assembleFile/reverse.eta
diff --git a/.output/actual/examples/eta/assembleFile/true.eta b/.output/actual/eas/eta/assembleFile/true.eta
similarity index 100%
rename from .output/actual/examples/eta/assembleFile/true.eta
rename to .output/actual/eas/eta/assembleFile/true.eta
diff --git a/.output/actual/examples/eta/assembleFile/writestr.eta b/.output/actual/eas/eta/assembleFile/writestr.eta
similarity index 100%
rename from .output/actual/examples/eta/assembleFile/writestr.eta
rename to .output/actual/eas/eta/assembleFile/writestr.eta
diff --git a/.output/actual/examples/eta/generateCode/add.eta b/.output/actual/eas/eta/generateCode/add.eta
similarity index 100%
rename from .output/actual/examples/eta/generateCode/add.eta
rename to .output/actual/eas/eta/generateCode/add.eta
diff --git a/.output/actual/examples/eta/generateCode/bottles.eta b/.output/actual/eas/eta/generateCode/bottles.eta
similarity index 100%
rename from .output/actual/examples/eta/generateCode/bottles.eta
rename to .output/actual/eas/eta/generateCode/bottles.eta
diff --git a/.output/actual/examples/eta/generateCode/euclid.eta b/.output/actual/eas/eta/generateCode/euclid.eta
similarity index 100%
rename from .output/actual/examples/eta/generateCode/euclid.eta
rename to .output/actual/eas/eta/generateCode/euclid.eta
diff --git a/.output/actual/examples/eta/generateCode/fact.eta b/.output/actual/eas/eta/generateCode/fact.eta
similarity index 100%
rename from .output/actual/examples/eta/generateCode/fact.eta
rename to .output/actual/eas/eta/generateCode/fact.eta
diff --git a/.output/actual/examples/eta/generateCode/function.eta b/.output/actual/eas/eta/generateCode/function.eta
similarity index 100%
rename from .output/actual/examples/eta/generateCode/function.eta
rename to .output/actual/eas/eta/generateCode/function.eta
diff --git a/.output/actual/examples/eta/generateCode/hello2.eta b/.output/actual/eas/eta/generateCode/hello2.eta
similarity index 100%
rename from .output/actual/examples/eta/generateCode/hello2.eta
rename to .output/actual/eas/eta/generateCode/hello2.eta
diff --git a/.output/actual/examples/eta/generateCode/hello4.eta b/.output/actual/eas/eta/generateCode/hello4.eta
similarity index 100%
rename from .output/actual/examples/eta/generateCode/hello4.eta
rename to .output/actual/eas/eta/generateCode/hello4.eta
diff --git a/.output/actual/examples/eta/generateCode/multiply.eta b/.output/actual/eas/eta/generateCode/multiply.eta
similarity index 100%
rename from .output/actual/examples/eta/generateCode/multiply.eta
rename to .output/actual/eas/eta/generateCode/multiply.eta
diff --git a/.output/actual/examples/eta/generateCode/pip.eta b/.output/actual/eas/eta/generateCode/pip.eta
similarity index 100%
rename from .output/actual/examples/eta/generateCode/pip.eta
rename to .output/actual/eas/eta/generateCode/pip.eta
diff --git a/.output/actual/examples/eta/generateCode/pip2.eta b/.output/actual/eas/eta/generateCode/pip2.eta
similarity index 100%
rename from .output/actual/examples/eta/generateCode/pip2.eta
rename to .output/actual/eas/eta/generateCode/pip2.eta
diff --git a/.output/actual/examples/eta/generateCode/readnum.eta b/.output/actual/eas/eta/generateCode/readnum.eta
similarity index 100%
rename from .output/actual/examples/eta/generateCode/readnum.eta
rename to .output/actual/eas/eta/generateCode/readnum.eta
diff --git a/.output/actual/examples/eta/generateCode/reverse.eta b/.output/actual/eas/eta/generateCode/reverse.eta
similarity index 100%
rename from .output/actual/examples/eta/generateCode/reverse.eta
rename to .output/actual/eas/eta/generateCode/reverse.eta
diff --git a/.output/actual/examples/eta/generateCode/true.eta b/.output/actual/eas/eta/generateCode/true.eta
similarity index 100%
rename from .output/actual/examples/eta/generateCode/true.eta
rename to .output/actual/eas/eta/generateCode/true.eta
diff --git a/.output/actual/examples/eta/generateCode/writenum.eta b/.output/actual/eas/eta/generateCode/writenum.eta
similarity index 100%
rename from .output/actual/examples/eta/generateCode/writenum.eta
rename to .output/actual/eas/eta/generateCode/writenum.eta
diff --git a/.output/actual/examples/eta/generateCode/writestr.eta b/.output/actual/eas/eta/generateCode/writestr.eta
similarity index 100%
rename from .output/actual/examples/eta/generateCode/writestr.eta
rename to .output/actual/eas/eta/generateCode/writestr.eta
diff --git a/.output/actual/examples/wsa/il/linkAppFile/from-eas/bottles.il b/.output/actual/wsa/il/linkAppFile/from-eas/bottles.il
similarity index 100%
rename from .output/actual/examples/wsa/il/linkAppFile/from-eas/bottles.il
rename to .output/actual/wsa/il/linkAppFile/from-eas/bottles.il
diff --git a/.output/actual/examples/wsa/il/linkAppFile/from-eas/hello.il b/.output/actual/wsa/il/linkAppFile/from-eas/hello.il
similarity index 100%
rename from .output/actual/examples/wsa/il/linkAppFile/from-eas/hello.il
rename to .output/actual/wsa/il/linkAppFile/from-eas/hello.il
diff --git a/.output/actual/examples/wsa/il/linkAppFile/from-eas/hello2.il b/.output/actual/wsa/il/linkAppFile/from-eas/hello2.il
similarity index 100%
rename from .output/actual/examples/wsa/il/linkAppFile/from-eas/hello2.il
rename to .output/actual/wsa/il/linkAppFile/from-eas/hello2.il
diff --git a/.output/actual/examples/wsa/il/linkAppFile/from-eas/hello4.il b/.output/actual/wsa/il/linkAppFile/from-eas/hello4.il
similarity index 100%
rename from .output/actual/examples/wsa/il/linkAppFile/from-eas/hello4.il
rename to .output/actual/wsa/il/linkAppFile/from-eas/hello4.il
diff --git a/.output/actual/examples/wsa/il/linkAppFile/from-eas/pip.il b/.output/actual/wsa/il/linkAppFile/from-eas/pip.il
similarity index 100%
rename from .output/actual/examples/wsa/il/linkAppFile/from-eas/pip.il
rename to .output/actual/wsa/il/linkAppFile/from-eas/pip.il
diff --git a/.output/actual/examples/wsa/il/linkAppFile/from-eas/true.il b/.output/actual/wsa/il/linkAppFile/from-eas/true.il
similarity index 100%
rename from .output/actual/examples/wsa/il/linkAppFile/from-eas/true.il
rename to .output/actual/wsa/il/linkAppFile/from-eas/true.il
diff --git a/.output/actual/examples/wsa/il/linkAppFile/original/prim.il b/.output/actual/wsa/il/linkAppFile/original/prim.il
similarity index 100%
rename from .output/actual/examples/wsa/il/linkAppFile/original/prim.il
rename to .output/actual/wsa/il/linkAppFile/original/prim.il
diff --git a/.output/actual/examples/wsa/il/linkLibFile/io.il b/.output/actual/wsa/il/linkLibFile/io.il
similarity index 100%
rename from .output/actual/examples/wsa/il/linkLibFile/io.il
rename to .output/actual/wsa/il/linkLibFile/io.il
diff --git a/.output/actual/examples/wsa/il/linkLibFile/memory.il b/.output/actual/wsa/il/linkLibFile/memory.il
similarity index 100%
rename from .output/actual/examples/wsa/il/linkLibFile/memory.il
rename to .output/actual/wsa/il/linkLibFile/memory.il
diff --git a/.output/actual/examples/wsa/il/parseAssemblyApp/from-eas/bottles.il b/.output/actual/wsa/il/parseAssemblyApp/from-eas/bottles.il
similarity index 100%
rename from .output/actual/examples/wsa/il/parseAssemblyApp/from-eas/bottles.il
rename to .output/actual/wsa/il/parseAssemblyApp/from-eas/bottles.il
diff --git a/.output/actual/examples/wsa/il/parseAssemblyApp/from-eas/hello.il b/.output/actual/wsa/il/parseAssemblyApp/from-eas/hello.il
similarity index 100%
rename from .output/actual/examples/wsa/il/parseAssemblyApp/from-eas/hello.il
rename to .output/actual/wsa/il/parseAssemblyApp/from-eas/hello.il
diff --git a/.output/actual/examples/wsa/il/parseAssemblyApp/from-eas/hello2.il b/.output/actual/wsa/il/parseAssemblyApp/from-eas/hello2.il
similarity index 100%
rename from .output/actual/examples/wsa/il/parseAssemblyApp/from-eas/hello2.il
rename to .output/actual/wsa/il/parseAssemblyApp/from-eas/hello2.il
diff --git a/.output/actual/examples/wsa/il/parseAssemblyApp/from-eas/hello4.il b/.output/actual/wsa/il/parseAssemblyApp/from-eas/hello4.il
similarity index 100%
rename from .output/actual/examples/wsa/il/parseAssemblyApp/from-eas/hello4.il
rename to .output/actual/wsa/il/parseAssemblyApp/from-eas/hello4.il
diff --git a/.output/actual/examples/wsa/il/parseAssemblyApp/from-eas/pip.il b/.output/actual/wsa/il/parseAssemblyApp/from-eas/pip.il
similarity index 100%
rename from .output/actual/examples/wsa/il/parseAssemblyApp/from-eas/pip.il
rename to .output/actual/wsa/il/parseAssemblyApp/from-eas/pip.il
diff --git a/.output/actual/examples/wsa/il/parseAssemblyApp/from-eas/true.il b/.output/actual/wsa/il/parseAssemblyApp/from-eas/true.il
similarity index 100%
rename from .output/actual/examples/wsa/il/parseAssemblyApp/from-eas/true.il
rename to .output/actual/wsa/il/parseAssemblyApp/from-eas/true.il
diff --git a/.output/actual/examples/wsa/il/parseAssemblyApp/original/prim.il b/.output/actual/wsa/il/parseAssemblyApp/original/prim.il
similarity index 100%
rename from .output/actual/examples/wsa/il/parseAssemblyApp/original/prim.il
rename to .output/actual/wsa/il/parseAssemblyApp/original/prim.il
diff --git a/.output/actual/examples/wsa/il/parseAssemblyLib/io.il b/.output/actual/wsa/il/parseAssemblyLib/io.il
similarity index 100%
rename from .output/actual/examples/wsa/il/parseAssemblyLib/io.il
rename to .output/actual/wsa/il/parseAssemblyLib/io.il
diff --git a/.output/actual/examples/wsa/il/parseAssemblyLib/memory.il b/.output/actual/wsa/il/parseAssemblyLib/memory.il
similarity index 100%
rename from .output/actual/examples/wsa/il/parseAssemblyLib/memory.il
rename to .output/actual/wsa/il/parseAssemblyLib/memory.il
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/allTrue/bottles.ws b/.output/actual/wsa/ws/assembleApp/from-eas/allTrue/bottles.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/allTrue/bottles.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/allTrue/bottles.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/allTrue/hello.ws b/.output/actual/wsa/ws/assembleApp/from-eas/allTrue/hello.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/allTrue/hello.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/allTrue/hello.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/allTrue/hello2.ws b/.output/actual/wsa/ws/assembleApp/from-eas/allTrue/hello2.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/allTrue/hello2.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/allTrue/hello2.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/allTrue/hello4.ws b/.output/actual/wsa/ws/assembleApp/from-eas/allTrue/hello4.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/allTrue/hello4.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/allTrue/hello4.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/allTrue/pip.ws b/.output/actual/wsa/ws/assembleApp/from-eas/allTrue/pip.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/allTrue/pip.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/allTrue/pip.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/allTrue/true.ws b/.output/actual/wsa/ws/assembleApp/from-eas/allTrue/true.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/allTrue/true.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/allTrue/true.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/bottles.ws b/.output/actual/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/bottles.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/bottles.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/bottles.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello.ws b/.output/actual/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello2.ws b/.output/actual/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello2.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello2.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello2.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello4.ws b/.output/actual/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello4.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello4.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello4.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/pip.ws b/.output/actual/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/pip.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/pip.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/pip.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/true.ws b/.output/actual/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/true.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/true.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/true.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/debugOptions/bottles.ws b/.output/actual/wsa/ws/assembleApp/from-eas/debugOptions/bottles.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/debugOptions/bottles.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/debugOptions/bottles.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/debugOptions/hello.ws b/.output/actual/wsa/ws/assembleApp/from-eas/debugOptions/hello.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/debugOptions/hello.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/debugOptions/hello.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/debugOptions/hello2.ws b/.output/actual/wsa/ws/assembleApp/from-eas/debugOptions/hello2.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/debugOptions/hello2.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/debugOptions/hello2.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/debugOptions/hello4.ws b/.output/actual/wsa/ws/assembleApp/from-eas/debugOptions/hello4.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/debugOptions/hello4.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/debugOptions/hello4.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/debugOptions/pip.ws b/.output/actual/wsa/ws/assembleApp/from-eas/debugOptions/pip.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/debugOptions/pip.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/debugOptions/pip.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/debugOptions/true.ws b/.output/actual/wsa/ws/assembleApp/from-eas/debugOptions/true.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/debugOptions/true.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/debugOptions/true.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/deolOptions/bottles.ws b/.output/actual/wsa/ws/assembleApp/from-eas/deolOptions/bottles.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/deolOptions/bottles.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/deolOptions/bottles.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/deolOptions/hello.ws b/.output/actual/wsa/ws/assembleApp/from-eas/deolOptions/hello.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/deolOptions/hello.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/deolOptions/hello.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/deolOptions/hello2.ws b/.output/actual/wsa/ws/assembleApp/from-eas/deolOptions/hello2.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/deolOptions/hello2.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/deolOptions/hello2.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/deolOptions/hello4.ws b/.output/actual/wsa/ws/assembleApp/from-eas/deolOptions/hello4.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/deolOptions/hello4.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/deolOptions/hello4.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/deolOptions/pip.ws b/.output/actual/wsa/ws/assembleApp/from-eas/deolOptions/pip.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/deolOptions/pip.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/deolOptions/pip.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/deolOptions/true.ws b/.output/actual/wsa/ws/assembleApp/from-eas/deolOptions/true.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/deolOptions/true.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/deolOptions/true.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/bottles.ws b/.output/actual/wsa/ws/assembleApp/from-eas/dsoiOptions/bottles.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/bottles.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/dsoiOptions/bottles.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/hello.ws b/.output/actual/wsa/ws/assembleApp/from-eas/dsoiOptions/hello.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/hello.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/dsoiOptions/hello.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/hello2.ws b/.output/actual/wsa/ws/assembleApp/from-eas/dsoiOptions/hello2.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/hello2.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/dsoiOptions/hello2.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/hello4.ws b/.output/actual/wsa/ws/assembleApp/from-eas/dsoiOptions/hello4.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/hello4.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/dsoiOptions/hello4.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/pip.ws b/.output/actual/wsa/ws/assembleApp/from-eas/dsoiOptions/pip.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/pip.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/dsoiOptions/pip.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/true.ws b/.output/actual/wsa/ws/assembleApp/from-eas/dsoiOptions/true.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/true.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/dsoiOptions/true.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/eolOptions/bottles.ws b/.output/actual/wsa/ws/assembleApp/from-eas/eolOptions/bottles.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/eolOptions/bottles.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/eolOptions/bottles.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/eolOptions/hello.ws b/.output/actual/wsa/ws/assembleApp/from-eas/eolOptions/hello.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/eolOptions/hello.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/eolOptions/hello.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/eolOptions/hello2.ws b/.output/actual/wsa/ws/assembleApp/from-eas/eolOptions/hello2.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/eolOptions/hello2.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/eolOptions/hello2.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/eolOptions/hello4.ws b/.output/actual/wsa/ws/assembleApp/from-eas/eolOptions/hello4.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/eolOptions/hello4.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/eolOptions/hello4.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/eolOptions/pip.ws b/.output/actual/wsa/ws/assembleApp/from-eas/eolOptions/pip.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/eolOptions/pip.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/eolOptions/pip.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/eolOptions/true.ws b/.output/actual/wsa/ws/assembleApp/from-eas/eolOptions/true.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/eolOptions/true.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/eolOptions/true.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/soiOptions/bottles.ws b/.output/actual/wsa/ws/assembleApp/from-eas/soiOptions/bottles.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/soiOptions/bottles.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/soiOptions/bottles.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/soiOptions/hello.ws b/.output/actual/wsa/ws/assembleApp/from-eas/soiOptions/hello.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/soiOptions/hello.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/soiOptions/hello.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/soiOptions/hello2.ws b/.output/actual/wsa/ws/assembleApp/from-eas/soiOptions/hello2.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/soiOptions/hello2.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/soiOptions/hello2.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/soiOptions/hello4.ws b/.output/actual/wsa/ws/assembleApp/from-eas/soiOptions/hello4.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/soiOptions/hello4.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/soiOptions/hello4.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/soiOptions/pip.ws b/.output/actual/wsa/ws/assembleApp/from-eas/soiOptions/pip.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/soiOptions/pip.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/soiOptions/pip.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/soiOptions/true.ws b/.output/actual/wsa/ws/assembleApp/from-eas/soiOptions/true.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/soiOptions/true.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/soiOptions/true.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/bottles.ws b/.output/actual/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/bottles.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/bottles.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/bottles.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello.ws b/.output/actual/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello2.ws b/.output/actual/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello2.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello2.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello2.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello4.ws b/.output/actual/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello4.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello4.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello4.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/pip.ws b/.output/actual/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/pip.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/pip.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/pip.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/true.ws b/.output/actual/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/true.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/true.ws
rename to .output/actual/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/true.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/original/allTrue/prim.ws b/.output/actual/wsa/ws/assembleApp/original/allTrue/prim.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/original/allTrue/prim.ws
rename to .output/actual/wsa/ws/assembleApp/original/allTrue/prim.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/original/bothTokenTypeOptions/prim.ws b/.output/actual/wsa/ws/assembleApp/original/bothTokenTypeOptions/prim.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/original/bothTokenTypeOptions/prim.ws
rename to .output/actual/wsa/ws/assembleApp/original/bothTokenTypeOptions/prim.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/original/debugOptions/prim.ws b/.output/actual/wsa/ws/assembleApp/original/debugOptions/prim.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/original/debugOptions/prim.ws
rename to .output/actual/wsa/ws/assembleApp/original/debugOptions/prim.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/original/deolOptions/prim.ws b/.output/actual/wsa/ws/assembleApp/original/deolOptions/prim.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/original/deolOptions/prim.ws
rename to .output/actual/wsa/ws/assembleApp/original/deolOptions/prim.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/original/dsoiOptions/prim.ws b/.output/actual/wsa/ws/assembleApp/original/dsoiOptions/prim.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/original/dsoiOptions/prim.ws
rename to .output/actual/wsa/ws/assembleApp/original/dsoiOptions/prim.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/original/eolOptions/prim.ws b/.output/actual/wsa/ws/assembleApp/original/eolOptions/prim.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/original/eolOptions/prim.ws
rename to .output/actual/wsa/ws/assembleApp/original/eolOptions/prim.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/original/soiOptions/prim.ws b/.output/actual/wsa/ws/assembleApp/original/soiOptions/prim.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/original/soiOptions/prim.ws
rename to .output/actual/wsa/ws/assembleApp/original/soiOptions/prim.ws
diff --git a/.output/actual/examples/wsa/ws/assembleApp/original/visibleTokenTypeOptions/prim.ws b/.output/actual/wsa/ws/assembleApp/original/visibleTokenTypeOptions/prim.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleApp/original/visibleTokenTypeOptions/prim.ws
rename to .output/actual/wsa/ws/assembleApp/original/visibleTokenTypeOptions/prim.ws
diff --git a/.output/actual/examples/wsa/ws/assembleLib/allTrue/io.ws b/.output/actual/wsa/ws/assembleLib/allTrue/io.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleLib/allTrue/io.ws
rename to .output/actual/wsa/ws/assembleLib/allTrue/io.ws
diff --git a/.output/actual/examples/wsa/ws/assembleLib/allTrue/memory.ws b/.output/actual/wsa/ws/assembleLib/allTrue/memory.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleLib/allTrue/memory.ws
rename to .output/actual/wsa/ws/assembleLib/allTrue/memory.ws
diff --git a/.output/actual/examples/wsa/ws/assembleLib/bothTokenTypeOptions/io.ws b/.output/actual/wsa/ws/assembleLib/bothTokenTypeOptions/io.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleLib/bothTokenTypeOptions/io.ws
rename to .output/actual/wsa/ws/assembleLib/bothTokenTypeOptions/io.ws
diff --git a/.output/actual/examples/wsa/ws/assembleLib/bothTokenTypeOptions/memory.ws b/.output/actual/wsa/ws/assembleLib/bothTokenTypeOptions/memory.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleLib/bothTokenTypeOptions/memory.ws
rename to .output/actual/wsa/ws/assembleLib/bothTokenTypeOptions/memory.ws
diff --git a/.output/actual/examples/wsa/ws/assembleLib/debugOptions/io.ws b/.output/actual/wsa/ws/assembleLib/debugOptions/io.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleLib/debugOptions/io.ws
rename to .output/actual/wsa/ws/assembleLib/debugOptions/io.ws
diff --git a/.output/actual/examples/wsa/ws/assembleLib/debugOptions/memory.ws b/.output/actual/wsa/ws/assembleLib/debugOptions/memory.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleLib/debugOptions/memory.ws
rename to .output/actual/wsa/ws/assembleLib/debugOptions/memory.ws
diff --git a/.output/actual/examples/wsa/ws/assembleLib/deolOptions/io.ws b/.output/actual/wsa/ws/assembleLib/deolOptions/io.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleLib/deolOptions/io.ws
rename to .output/actual/wsa/ws/assembleLib/deolOptions/io.ws
diff --git a/.output/actual/examples/wsa/ws/assembleLib/deolOptions/memory.ws b/.output/actual/wsa/ws/assembleLib/deolOptions/memory.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleLib/deolOptions/memory.ws
rename to .output/actual/wsa/ws/assembleLib/deolOptions/memory.ws
diff --git a/.output/actual/examples/wsa/ws/assembleLib/dsoiOptions/io.ws b/.output/actual/wsa/ws/assembleLib/dsoiOptions/io.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleLib/dsoiOptions/io.ws
rename to .output/actual/wsa/ws/assembleLib/dsoiOptions/io.ws
diff --git a/.output/actual/examples/wsa/ws/assembleLib/dsoiOptions/memory.ws b/.output/actual/wsa/ws/assembleLib/dsoiOptions/memory.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleLib/dsoiOptions/memory.ws
rename to .output/actual/wsa/ws/assembleLib/dsoiOptions/memory.ws
diff --git a/.output/actual/examples/wsa/ws/assembleLib/eolOptions/io.ws b/.output/actual/wsa/ws/assembleLib/eolOptions/io.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleLib/eolOptions/io.ws
rename to .output/actual/wsa/ws/assembleLib/eolOptions/io.ws
diff --git a/.output/actual/examples/wsa/ws/assembleLib/eolOptions/memory.ws b/.output/actual/wsa/ws/assembleLib/eolOptions/memory.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleLib/eolOptions/memory.ws
rename to .output/actual/wsa/ws/assembleLib/eolOptions/memory.ws
diff --git a/.output/actual/examples/wsa/ws/assembleLib/soiOptions/io.ws b/.output/actual/wsa/ws/assembleLib/soiOptions/io.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleLib/soiOptions/io.ws
rename to .output/actual/wsa/ws/assembleLib/soiOptions/io.ws
diff --git a/.output/actual/examples/wsa/ws/assembleLib/soiOptions/memory.ws b/.output/actual/wsa/ws/assembleLib/soiOptions/memory.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleLib/soiOptions/memory.ws
rename to .output/actual/wsa/ws/assembleLib/soiOptions/memory.ws
diff --git a/.output/actual/examples/wsa/ws/assembleLib/visibleTokenTypeOptions/io.ws b/.output/actual/wsa/ws/assembleLib/visibleTokenTypeOptions/io.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleLib/visibleTokenTypeOptions/io.ws
rename to .output/actual/wsa/ws/assembleLib/visibleTokenTypeOptions/io.ws
diff --git a/.output/actual/examples/wsa/ws/assembleLib/visibleTokenTypeOptions/memory.ws b/.output/actual/wsa/ws/assembleLib/visibleTokenTypeOptions/memory.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/assembleLib/visibleTokenTypeOptions/memory.ws
rename to .output/actual/wsa/ws/assembleLib/visibleTokenTypeOptions/memory.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/allTrue/io.ws b/.output/actual/wsa/ws/codeGenerator/allTrue/io.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/allTrue/io.ws
rename to .output/actual/wsa/ws/codeGenerator/allTrue/io.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/allTrue/memory.ws b/.output/actual/wsa/ws/codeGenerator/allTrue/memory.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/allTrue/memory.ws
rename to .output/actual/wsa/ws/codeGenerator/allTrue/memory.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/allTrue/prim.ws b/.output/actual/wsa/ws/codeGenerator/allTrue/prim.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/allTrue/prim.ws
rename to .output/actual/wsa/ws/codeGenerator/allTrue/prim.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/bothTokenTypeOptions/io.ws b/.output/actual/wsa/ws/codeGenerator/bothTokenTypeOptions/io.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/bothTokenTypeOptions/io.ws
rename to .output/actual/wsa/ws/codeGenerator/bothTokenTypeOptions/io.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/bothTokenTypeOptions/memory.ws b/.output/actual/wsa/ws/codeGenerator/bothTokenTypeOptions/memory.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/bothTokenTypeOptions/memory.ws
rename to .output/actual/wsa/ws/codeGenerator/bothTokenTypeOptions/memory.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/bothTokenTypeOptions/prim.ws b/.output/actual/wsa/ws/codeGenerator/bothTokenTypeOptions/prim.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/bothTokenTypeOptions/prim.ws
rename to .output/actual/wsa/ws/codeGenerator/bothTokenTypeOptions/prim.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/debugOptions/io.ws b/.output/actual/wsa/ws/codeGenerator/debugOptions/io.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/debugOptions/io.ws
rename to .output/actual/wsa/ws/codeGenerator/debugOptions/io.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/debugOptions/memory.ws b/.output/actual/wsa/ws/codeGenerator/debugOptions/memory.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/debugOptions/memory.ws
rename to .output/actual/wsa/ws/codeGenerator/debugOptions/memory.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/debugOptions/prim.ws b/.output/actual/wsa/ws/codeGenerator/debugOptions/prim.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/debugOptions/prim.ws
rename to .output/actual/wsa/ws/codeGenerator/debugOptions/prim.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/deolOptions/io.ws b/.output/actual/wsa/ws/codeGenerator/deolOptions/io.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/deolOptions/io.ws
rename to .output/actual/wsa/ws/codeGenerator/deolOptions/io.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/deolOptions/memory.ws b/.output/actual/wsa/ws/codeGenerator/deolOptions/memory.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/deolOptions/memory.ws
rename to .output/actual/wsa/ws/codeGenerator/deolOptions/memory.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/deolOptions/prim.ws b/.output/actual/wsa/ws/codeGenerator/deolOptions/prim.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/deolOptions/prim.ws
rename to .output/actual/wsa/ws/codeGenerator/deolOptions/prim.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/dsoiOptions/io.ws b/.output/actual/wsa/ws/codeGenerator/dsoiOptions/io.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/dsoiOptions/io.ws
rename to .output/actual/wsa/ws/codeGenerator/dsoiOptions/io.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/dsoiOptions/memory.ws b/.output/actual/wsa/ws/codeGenerator/dsoiOptions/memory.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/dsoiOptions/memory.ws
rename to .output/actual/wsa/ws/codeGenerator/dsoiOptions/memory.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/dsoiOptions/prim.ws b/.output/actual/wsa/ws/codeGenerator/dsoiOptions/prim.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/dsoiOptions/prim.ws
rename to .output/actual/wsa/ws/codeGenerator/dsoiOptions/prim.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/eolOptions/io.ws b/.output/actual/wsa/ws/codeGenerator/eolOptions/io.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/eolOptions/io.ws
rename to .output/actual/wsa/ws/codeGenerator/eolOptions/io.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/eolOptions/memory.ws b/.output/actual/wsa/ws/codeGenerator/eolOptions/memory.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/eolOptions/memory.ws
rename to .output/actual/wsa/ws/codeGenerator/eolOptions/memory.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/eolOptions/prim.ws b/.output/actual/wsa/ws/codeGenerator/eolOptions/prim.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/eolOptions/prim.ws
rename to .output/actual/wsa/ws/codeGenerator/eolOptions/prim.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/soiOptions/io.ws b/.output/actual/wsa/ws/codeGenerator/soiOptions/io.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/soiOptions/io.ws
rename to .output/actual/wsa/ws/codeGenerator/soiOptions/io.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/soiOptions/memory.ws b/.output/actual/wsa/ws/codeGenerator/soiOptions/memory.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/soiOptions/memory.ws
rename to .output/actual/wsa/ws/codeGenerator/soiOptions/memory.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/soiOptions/prim.ws b/.output/actual/wsa/ws/codeGenerator/soiOptions/prim.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/soiOptions/prim.ws
rename to .output/actual/wsa/ws/codeGenerator/soiOptions/prim.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/visibleTokenTypeOptions/io.ws b/.output/actual/wsa/ws/codeGenerator/visibleTokenTypeOptions/io.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/visibleTokenTypeOptions/io.ws
rename to .output/actual/wsa/ws/codeGenerator/visibleTokenTypeOptions/io.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/visibleTokenTypeOptions/memory.ws b/.output/actual/wsa/ws/codeGenerator/visibleTokenTypeOptions/memory.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/visibleTokenTypeOptions/memory.ws
rename to .output/actual/wsa/ws/codeGenerator/visibleTokenTypeOptions/memory.ws
diff --git a/.output/actual/examples/wsa/ws/codeGenerator/visibleTokenTypeOptions/prim.ws b/.output/actual/wsa/ws/codeGenerator/visibleTokenTypeOptions/prim.ws
similarity index 100%
rename from .output/actual/examples/wsa/ws/codeGenerator/visibleTokenTypeOptions/prim.ws
rename to .output/actual/wsa/ws/codeGenerator/visibleTokenTypeOptions/prim.ws
diff --git a/.output/golden/examples/asq/il/parseAssemblyFile/eigenratios/si1.il b/.output/golden/asq/il/parseAssemblyFile/eigenratios/si1.il
similarity index 98%
rename from .output/golden/examples/asq/il/parseAssemblyFile/eigenratios/si1.il
rename to .output/golden/asq/il/parseAssemblyFile/eigenratios/si1.il
index 26fd77fc..bacfb332 100644
--- a/.output/golden/examples/asq/il/parseAssemblyFile/eigenratios/si1.il
+++ b/.output/golden/asq/il/parseAssemblyFile/eigenratios/si1.il
@@ -352,7 +352,7 @@
( Variable "C" )
( Just
( Literal
- ( - 1 )
+ ( -1 )
)
)
)
@@ -388,7 +388,7 @@
( Just
( Data
( Literal
- ( - 3 )
+ ( -3 )
)
)
)
@@ -397,7 +397,7 @@
( Just
( Data
( Literal
- ( - 2 )
+ ( -2 )
)
)
)
@@ -406,7 +406,7 @@
( Just
( Data
( Literal
- ( - 1 )
+ ( -1 )
)
)
)
diff --git a/.output/golden/examples/asq/il/parseAssemblyFile/eigenratios/si2.il b/.output/golden/asq/il/parseAssemblyFile/eigenratios/si2.il
similarity index 98%
rename from .output/golden/examples/asq/il/parseAssemblyFile/eigenratios/si2.il
rename to .output/golden/asq/il/parseAssemblyFile/eigenratios/si2.il
index c5d924a1..fa805255 100644
--- a/.output/golden/examples/asq/il/parseAssemblyFile/eigenratios/si2.il
+++ b/.output/golden/asq/il/parseAssemblyFile/eigenratios/si2.il
@@ -325,7 +325,7 @@
( Variable "C" )
( Just
( Literal
- ( - 1 )
+ ( -1 )
)
)
)
@@ -355,7 +355,7 @@
( Just
( Data
( Literal
- ( - 119 )
+ ( -119 )
)
)
)
@@ -365,7 +365,7 @@
( Just
( Data
( Literal
- ( - 1 )
+ ( -1 )
)
)
)
diff --git a/.output/golden/examples/asq/il/parseAssemblyFile/esolangs/currentAddress/helloWorld.il b/.output/golden/asq/il/parseAssemblyFile/esolangs/currentAddress/helloWorld.il
similarity index 100%
rename from .output/golden/examples/asq/il/parseAssemblyFile/esolangs/currentAddress/helloWorld.il
rename to .output/golden/asq/il/parseAssemblyFile/esolangs/currentAddress/helloWorld.il
diff --git a/.output/golden/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/echo.il b/.output/golden/asq/il/parseAssemblyFile/esolangs/nextAddress/echo.il
similarity index 100%
rename from .output/golden/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/echo.il
rename to .output/golden/asq/il/parseAssemblyFile/esolangs/nextAddress/echo.il
diff --git a/.output/golden/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/helloWorld.il b/.output/golden/asq/il/parseAssemblyFile/esolangs/nextAddress/helloWorld.il
similarity index 100%
rename from .output/golden/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/helloWorld.il
rename to .output/golden/asq/il/parseAssemblyFile/esolangs/nextAddress/helloWorld.il
diff --git a/.output/golden/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/hi.il b/.output/golden/asq/il/parseAssemblyFile/esolangs/nextAddress/hi.il
similarity index 100%
rename from .output/golden/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/hi.il
rename to .output/golden/asq/il/parseAssemblyFile/esolangs/nextAddress/hi.il
diff --git a/.output/golden/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/si.il b/.output/golden/asq/il/parseAssemblyFile/esolangs/nextAddress/si.il
similarity index 100%
rename from .output/golden/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/si.il
rename to .output/golden/asq/il/parseAssemblyFile/esolangs/nextAddress/si.il
diff --git a/.output/golden/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/siout.il b/.output/golden/asq/il/parseAssemblyFile/esolangs/nextAddress/siout.il
similarity index 100%
rename from .output/golden/examples/asq/il/parseAssemblyFile/esolangs/nextAddress/siout.il
rename to .output/golden/asq/il/parseAssemblyFile/esolangs/nextAddress/siout.il
diff --git a/.output/golden/examples/asq/sq/assembleFile/eigenratios/si1.sq b/.output/golden/asq/sq/assembleFile/eigenratios/si1.sq
similarity index 100%
rename from .output/golden/examples/asq/sq/assembleFile/eigenratios/si1.sq
rename to .output/golden/asq/sq/assembleFile/eigenratios/si1.sq
diff --git a/.output/golden/examples/asq/sq/assembleFile/eigenratios/si2.sq b/.output/golden/asq/sq/assembleFile/eigenratios/si2.sq
similarity index 100%
rename from .output/golden/examples/asq/sq/assembleFile/eigenratios/si2.sq
rename to .output/golden/asq/sq/assembleFile/eigenratios/si2.sq
diff --git a/.output/golden/examples/asq/sq/assembleFile/esolangs/currentAddress/helloWorld.sq b/.output/golden/asq/sq/assembleFile/esolangs/currentAddress/helloWorld.sq
similarity index 100%
rename from .output/golden/examples/asq/sq/assembleFile/esolangs/currentAddress/helloWorld.sq
rename to .output/golden/asq/sq/assembleFile/esolangs/currentAddress/helloWorld.sq
diff --git a/.output/golden/examples/asq/sq/assembleFile/esolangs/nextAddress/echo.sq b/.output/golden/asq/sq/assembleFile/esolangs/nextAddress/echo.sq
similarity index 100%
rename from .output/golden/examples/asq/sq/assembleFile/esolangs/nextAddress/echo.sq
rename to .output/golden/asq/sq/assembleFile/esolangs/nextAddress/echo.sq
diff --git a/.output/golden/examples/asq/sq/assembleFile/esolangs/nextAddress/factorial.sq b/.output/golden/asq/sq/assembleFile/esolangs/nextAddress/factorial.sq
similarity index 100%
rename from .output/golden/examples/asq/sq/assembleFile/esolangs/nextAddress/factorial.sq
rename to .output/golden/asq/sq/assembleFile/esolangs/nextAddress/factorial.sq
diff --git a/.output/golden/examples/asq/sq/assembleFile/esolangs/nextAddress/helloWorld.sq b/.output/golden/asq/sq/assembleFile/esolangs/nextAddress/helloWorld.sq
similarity index 100%
rename from .output/golden/examples/asq/sq/assembleFile/esolangs/nextAddress/helloWorld.sq
rename to .output/golden/asq/sq/assembleFile/esolangs/nextAddress/helloWorld.sq
diff --git a/.output/golden/examples/asq/sq/assembleFile/esolangs/nextAddress/hi.sq b/.output/golden/asq/sq/assembleFile/esolangs/nextAddress/hi.sq
similarity index 100%
rename from .output/golden/examples/asq/sq/assembleFile/esolangs/nextAddress/hi.sq
rename to .output/golden/asq/sq/assembleFile/esolangs/nextAddress/hi.sq
diff --git a/.output/golden/examples/asq/sq/assembleFile/esolangs/nextAddress/si.sq b/.output/golden/asq/sq/assembleFile/esolangs/nextAddress/si.sq
similarity index 100%
rename from .output/golden/examples/asq/sq/assembleFile/esolangs/nextAddress/si.sq
rename to .output/golden/asq/sq/assembleFile/esolangs/nextAddress/si.sq
diff --git a/.output/golden/examples/asq/sq/assembleFile/esolangs/nextAddress/siout.sq b/.output/golden/asq/sq/assembleFile/esolangs/nextAddress/siout.sq
similarity index 100%
rename from .output/golden/examples/asq/sq/assembleFile/esolangs/nextAddress/siout.sq
rename to .output/golden/asq/sq/assembleFile/esolangs/nextAddress/siout.sq
diff --git a/.output/golden/examples/eta/assembleFile/add.eta b/.output/golden/eas/eta/assembleFile/add.eta
similarity index 100%
rename from .output/golden/examples/eta/assembleFile/add.eta
rename to .output/golden/eas/eta/assembleFile/add.eta
diff --git a/.output/golden/examples/eta/assembleFile/bottles.eta b/.output/golden/eas/eta/assembleFile/bottles.eta
similarity index 100%
rename from .output/golden/examples/eta/assembleFile/bottles.eta
rename to .output/golden/eas/eta/assembleFile/bottles.eta
diff --git a/.output/golden/examples/eta/assembleFile/bottles2.eta b/.output/golden/eas/eta/assembleFile/bottles2.eta
similarity index 100%
rename from .output/golden/examples/eta/assembleFile/bottles2.eta
rename to .output/golden/eas/eta/assembleFile/bottles2.eta
diff --git a/.output/golden/examples/eta/assembleFile/bottles3.eta b/.output/golden/eas/eta/assembleFile/bottles3.eta
similarity index 100%
rename from .output/golden/examples/eta/assembleFile/bottles3.eta
rename to .output/golden/eas/eta/assembleFile/bottles3.eta
diff --git a/.output/golden/examples/eta/assembleFile/euclid.eta b/.output/golden/eas/eta/assembleFile/euclid.eta
similarity index 100%
rename from .output/golden/examples/eta/assembleFile/euclid.eta
rename to .output/golden/eas/eta/assembleFile/euclid.eta
diff --git a/.output/golden/examples/eta/assembleFile/fact.eta b/.output/golden/eas/eta/assembleFile/fact.eta
similarity index 100%
rename from .output/golden/examples/eta/assembleFile/fact.eta
rename to .output/golden/eas/eta/assembleFile/fact.eta
diff --git a/.output/golden/examples/eta/assembleFile/factN1H.eta b/.output/golden/eas/eta/assembleFile/factN1H.eta
similarity index 100%
rename from .output/golden/examples/eta/assembleFile/factN1H.eta
rename to .output/golden/eas/eta/assembleFile/factN1H.eta
diff --git a/.output/golden/examples/eta/assembleFile/function.eta b/.output/golden/eas/eta/assembleFile/function.eta
similarity index 100%
rename from .output/golden/examples/eta/assembleFile/function.eta
rename to .output/golden/eas/eta/assembleFile/function.eta
diff --git a/.output/golden/examples/eta/assembleFile/hello.eta b/.output/golden/eas/eta/assembleFile/hello.eta
similarity index 100%
rename from .output/golden/examples/eta/assembleFile/hello.eta
rename to .output/golden/eas/eta/assembleFile/hello.eta
diff --git a/.output/golden/examples/eta/assembleFile/hello2.eta b/.output/golden/eas/eta/assembleFile/hello2.eta
similarity index 100%
rename from .output/golden/examples/eta/assembleFile/hello2.eta
rename to .output/golden/eas/eta/assembleFile/hello2.eta
diff --git a/.output/golden/examples/eta/assembleFile/hello3.eta b/.output/golden/eas/eta/assembleFile/hello3.eta
similarity index 100%
rename from .output/golden/examples/eta/assembleFile/hello3.eta
rename to .output/golden/eas/eta/assembleFile/hello3.eta
diff --git a/.output/golden/examples/eta/assembleFile/hello4.eta b/.output/golden/eas/eta/assembleFile/hello4.eta
similarity index 100%
rename from .output/golden/examples/eta/assembleFile/hello4.eta
rename to .output/golden/eas/eta/assembleFile/hello4.eta
diff --git a/.output/golden/examples/eta/assembleFile/multiply.eta b/.output/golden/eas/eta/assembleFile/multiply.eta
similarity index 100%
rename from .output/golden/examples/eta/assembleFile/multiply.eta
rename to .output/golden/eas/eta/assembleFile/multiply.eta
diff --git a/.output/golden/examples/eta/assembleFile/pip.eta b/.output/golden/eas/eta/assembleFile/pip.eta
similarity index 100%
rename from .output/golden/examples/eta/assembleFile/pip.eta
rename to .output/golden/eas/eta/assembleFile/pip.eta
diff --git a/.output/golden/examples/eta/assembleFile/pip2.eta b/.output/golden/eas/eta/assembleFile/pip2.eta
similarity index 100%
rename from .output/golden/examples/eta/assembleFile/pip2.eta
rename to .output/golden/eas/eta/assembleFile/pip2.eta
diff --git a/.output/golden/examples/eta/assembleFile/reverse.eta b/.output/golden/eas/eta/assembleFile/reverse.eta
similarity index 100%
rename from .output/golden/examples/eta/assembleFile/reverse.eta
rename to .output/golden/eas/eta/assembleFile/reverse.eta
diff --git a/.output/golden/examples/eta/assembleFile/true.eta b/.output/golden/eas/eta/assembleFile/true.eta
similarity index 100%
rename from .output/golden/examples/eta/assembleFile/true.eta
rename to .output/golden/eas/eta/assembleFile/true.eta
diff --git a/.output/golden/examples/eta/assembleFile/writestr.eta b/.output/golden/eas/eta/assembleFile/writestr.eta
similarity index 100%
rename from .output/golden/examples/eta/assembleFile/writestr.eta
rename to .output/golden/eas/eta/assembleFile/writestr.eta
diff --git a/.output/golden/examples/eta/generateCode/add.eta b/.output/golden/eas/eta/generateCode/add.eta
similarity index 100%
rename from .output/golden/examples/eta/generateCode/add.eta
rename to .output/golden/eas/eta/generateCode/add.eta
diff --git a/.output/golden/examples/eta/generateCode/bottles.eta b/.output/golden/eas/eta/generateCode/bottles.eta
similarity index 100%
rename from .output/golden/examples/eta/generateCode/bottles.eta
rename to .output/golden/eas/eta/generateCode/bottles.eta
diff --git a/.output/golden/examples/eta/generateCode/euclid.eta b/.output/golden/eas/eta/generateCode/euclid.eta
similarity index 100%
rename from .output/golden/examples/eta/generateCode/euclid.eta
rename to .output/golden/eas/eta/generateCode/euclid.eta
diff --git a/.output/golden/examples/eta/generateCode/fact.eta b/.output/golden/eas/eta/generateCode/fact.eta
similarity index 100%
rename from .output/golden/examples/eta/generateCode/fact.eta
rename to .output/golden/eas/eta/generateCode/fact.eta
diff --git a/.output/golden/examples/eta/generateCode/function.eta b/.output/golden/eas/eta/generateCode/function.eta
similarity index 100%
rename from .output/golden/examples/eta/generateCode/function.eta
rename to .output/golden/eas/eta/generateCode/function.eta
diff --git a/.output/golden/examples/eta/generateCode/hello2.eta b/.output/golden/eas/eta/generateCode/hello2.eta
similarity index 100%
rename from .output/golden/examples/eta/generateCode/hello2.eta
rename to .output/golden/eas/eta/generateCode/hello2.eta
diff --git a/.output/golden/examples/eta/generateCode/hello4.eta b/.output/golden/eas/eta/generateCode/hello4.eta
similarity index 100%
rename from .output/golden/examples/eta/generateCode/hello4.eta
rename to .output/golden/eas/eta/generateCode/hello4.eta
diff --git a/.output/golden/examples/eta/generateCode/multiply.eta b/.output/golden/eas/eta/generateCode/multiply.eta
similarity index 100%
rename from .output/golden/examples/eta/generateCode/multiply.eta
rename to .output/golden/eas/eta/generateCode/multiply.eta
diff --git a/.output/golden/examples/eta/generateCode/pip.eta b/.output/golden/eas/eta/generateCode/pip.eta
similarity index 100%
rename from .output/golden/examples/eta/generateCode/pip.eta
rename to .output/golden/eas/eta/generateCode/pip.eta
diff --git a/.output/golden/examples/eta/generateCode/pip2.eta b/.output/golden/eas/eta/generateCode/pip2.eta
similarity index 100%
rename from .output/golden/examples/eta/generateCode/pip2.eta
rename to .output/golden/eas/eta/generateCode/pip2.eta
diff --git a/.output/golden/examples/eta/generateCode/readnum.eta b/.output/golden/eas/eta/generateCode/readnum.eta
similarity index 100%
rename from .output/golden/examples/eta/generateCode/readnum.eta
rename to .output/golden/eas/eta/generateCode/readnum.eta
diff --git a/.output/golden/examples/eta/generateCode/reverse.eta b/.output/golden/eas/eta/generateCode/reverse.eta
similarity index 100%
rename from .output/golden/examples/eta/generateCode/reverse.eta
rename to .output/golden/eas/eta/generateCode/reverse.eta
diff --git a/.output/golden/examples/eta/generateCode/true.eta b/.output/golden/eas/eta/generateCode/true.eta
similarity index 100%
rename from .output/golden/examples/eta/generateCode/true.eta
rename to .output/golden/eas/eta/generateCode/true.eta
diff --git a/.output/golden/examples/eta/generateCode/writenum.eta b/.output/golden/eas/eta/generateCode/writenum.eta
similarity index 100%
rename from .output/golden/examples/eta/generateCode/writenum.eta
rename to .output/golden/eas/eta/generateCode/writenum.eta
diff --git a/.output/golden/examples/eta/generateCode/writestr.eta b/.output/golden/eas/eta/generateCode/writestr.eta
similarity index 100%
rename from .output/golden/examples/eta/generateCode/writestr.eta
rename to .output/golden/eas/eta/generateCode/writestr.eta
diff --git a/.output/golden/examples/wsa/il/linkAppFile/from-eas/bottles.il b/.output/golden/wsa/il/linkAppFile/from-eas/bottles.il
similarity index 100%
rename from .output/golden/examples/wsa/il/linkAppFile/from-eas/bottles.il
rename to .output/golden/wsa/il/linkAppFile/from-eas/bottles.il
diff --git a/.output/golden/examples/wsa/il/linkAppFile/from-eas/hello.il b/.output/golden/wsa/il/linkAppFile/from-eas/hello.il
similarity index 100%
rename from .output/golden/examples/wsa/il/linkAppFile/from-eas/hello.il
rename to .output/golden/wsa/il/linkAppFile/from-eas/hello.il
diff --git a/.output/golden/examples/wsa/il/linkAppFile/from-eas/hello2.il b/.output/golden/wsa/il/linkAppFile/from-eas/hello2.il
similarity index 100%
rename from .output/golden/examples/wsa/il/linkAppFile/from-eas/hello2.il
rename to .output/golden/wsa/il/linkAppFile/from-eas/hello2.il
diff --git a/.output/golden/examples/wsa/il/linkAppFile/from-eas/hello4.il b/.output/golden/wsa/il/linkAppFile/from-eas/hello4.il
similarity index 100%
rename from .output/golden/examples/wsa/il/linkAppFile/from-eas/hello4.il
rename to .output/golden/wsa/il/linkAppFile/from-eas/hello4.il
diff --git a/.output/golden/examples/wsa/il/linkAppFile/from-eas/pip.il b/.output/golden/wsa/il/linkAppFile/from-eas/pip.il
similarity index 100%
rename from .output/golden/examples/wsa/il/linkAppFile/from-eas/pip.il
rename to .output/golden/wsa/il/linkAppFile/from-eas/pip.il
diff --git a/.output/golden/examples/wsa/il/linkAppFile/from-eas/true.il b/.output/golden/wsa/il/linkAppFile/from-eas/true.il
similarity index 100%
rename from .output/golden/examples/wsa/il/linkAppFile/from-eas/true.il
rename to .output/golden/wsa/il/linkAppFile/from-eas/true.il
diff --git a/.output/golden/examples/wsa/il/linkAppFile/original/prim.il b/.output/golden/wsa/il/linkAppFile/original/prim.il
similarity index 100%
rename from .output/golden/examples/wsa/il/linkAppFile/original/prim.il
rename to .output/golden/wsa/il/linkAppFile/original/prim.il
diff --git a/.output/golden/examples/wsa/il/linkLibFile/io.il b/.output/golden/wsa/il/linkLibFile/io.il
similarity index 100%
rename from .output/golden/examples/wsa/il/linkLibFile/io.il
rename to .output/golden/wsa/il/linkLibFile/io.il
diff --git a/.output/golden/examples/wsa/il/linkLibFile/memory.il b/.output/golden/wsa/il/linkLibFile/memory.il
similarity index 100%
rename from .output/golden/examples/wsa/il/linkLibFile/memory.il
rename to .output/golden/wsa/il/linkLibFile/memory.il
diff --git a/.output/golden/examples/wsa/il/parseAssemblyApp/from-eas/bottles.il b/.output/golden/wsa/il/parseAssemblyApp/from-eas/bottles.il
similarity index 100%
rename from .output/golden/examples/wsa/il/parseAssemblyApp/from-eas/bottles.il
rename to .output/golden/wsa/il/parseAssemblyApp/from-eas/bottles.il
diff --git a/.output/golden/examples/wsa/il/parseAssemblyApp/from-eas/hello.il b/.output/golden/wsa/il/parseAssemblyApp/from-eas/hello.il
similarity index 100%
rename from .output/golden/examples/wsa/il/parseAssemblyApp/from-eas/hello.il
rename to .output/golden/wsa/il/parseAssemblyApp/from-eas/hello.il
diff --git a/.output/golden/examples/wsa/il/parseAssemblyApp/from-eas/hello2.il b/.output/golden/wsa/il/parseAssemblyApp/from-eas/hello2.il
similarity index 100%
rename from .output/golden/examples/wsa/il/parseAssemblyApp/from-eas/hello2.il
rename to .output/golden/wsa/il/parseAssemblyApp/from-eas/hello2.il
diff --git a/.output/golden/examples/wsa/il/parseAssemblyApp/from-eas/hello4.il b/.output/golden/wsa/il/parseAssemblyApp/from-eas/hello4.il
similarity index 100%
rename from .output/golden/examples/wsa/il/parseAssemblyApp/from-eas/hello4.il
rename to .output/golden/wsa/il/parseAssemblyApp/from-eas/hello4.il
diff --git a/.output/golden/examples/wsa/il/parseAssemblyApp/from-eas/pip.il b/.output/golden/wsa/il/parseAssemblyApp/from-eas/pip.il
similarity index 100%
rename from .output/golden/examples/wsa/il/parseAssemblyApp/from-eas/pip.il
rename to .output/golden/wsa/il/parseAssemblyApp/from-eas/pip.il
diff --git a/.output/golden/examples/wsa/il/parseAssemblyApp/from-eas/true.il b/.output/golden/wsa/il/parseAssemblyApp/from-eas/true.il
similarity index 100%
rename from .output/golden/examples/wsa/il/parseAssemblyApp/from-eas/true.il
rename to .output/golden/wsa/il/parseAssemblyApp/from-eas/true.il
diff --git a/.output/golden/examples/wsa/il/parseAssemblyApp/original/prim.il b/.output/golden/wsa/il/parseAssemblyApp/original/prim.il
similarity index 100%
rename from .output/golden/examples/wsa/il/parseAssemblyApp/original/prim.il
rename to .output/golden/wsa/il/parseAssemblyApp/original/prim.il
diff --git a/.output/golden/examples/wsa/il/parseAssemblyLib/io.il b/.output/golden/wsa/il/parseAssemblyLib/io.il
similarity index 100%
rename from .output/golden/examples/wsa/il/parseAssemblyLib/io.il
rename to .output/golden/wsa/il/parseAssemblyLib/io.il
diff --git a/.output/golden/examples/wsa/il/parseAssemblyLib/memory.il b/.output/golden/wsa/il/parseAssemblyLib/memory.il
similarity index 100%
rename from .output/golden/examples/wsa/il/parseAssemblyLib/memory.il
rename to .output/golden/wsa/il/parseAssemblyLib/memory.il
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/allTrue/bottles.ws b/.output/golden/wsa/ws/assembleApp/from-eas/allTrue/bottles.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/allTrue/bottles.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/allTrue/bottles.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/allTrue/hello.ws b/.output/golden/wsa/ws/assembleApp/from-eas/allTrue/hello.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/allTrue/hello.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/allTrue/hello.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/allTrue/hello2.ws b/.output/golden/wsa/ws/assembleApp/from-eas/allTrue/hello2.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/allTrue/hello2.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/allTrue/hello2.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/allTrue/hello4.ws b/.output/golden/wsa/ws/assembleApp/from-eas/allTrue/hello4.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/allTrue/hello4.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/allTrue/hello4.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/allTrue/pip.ws b/.output/golden/wsa/ws/assembleApp/from-eas/allTrue/pip.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/allTrue/pip.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/allTrue/pip.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/allTrue/true.ws b/.output/golden/wsa/ws/assembleApp/from-eas/allTrue/true.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/allTrue/true.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/allTrue/true.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/bottles.ws b/.output/golden/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/bottles.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/bottles.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/bottles.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello.ws b/.output/golden/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello2.ws b/.output/golden/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello2.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello2.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello2.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello4.ws b/.output/golden/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello4.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello4.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/hello4.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/pip.ws b/.output/golden/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/pip.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/pip.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/pip.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/true.ws b/.output/golden/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/true.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/true.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/bothTokenTypeOptions/true.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/debugOptions/bottles.ws b/.output/golden/wsa/ws/assembleApp/from-eas/debugOptions/bottles.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/debugOptions/bottles.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/debugOptions/bottles.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/debugOptions/hello.ws b/.output/golden/wsa/ws/assembleApp/from-eas/debugOptions/hello.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/debugOptions/hello.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/debugOptions/hello.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/debugOptions/hello2.ws b/.output/golden/wsa/ws/assembleApp/from-eas/debugOptions/hello2.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/debugOptions/hello2.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/debugOptions/hello2.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/debugOptions/hello4.ws b/.output/golden/wsa/ws/assembleApp/from-eas/debugOptions/hello4.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/debugOptions/hello4.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/debugOptions/hello4.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/debugOptions/pip.ws b/.output/golden/wsa/ws/assembleApp/from-eas/debugOptions/pip.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/debugOptions/pip.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/debugOptions/pip.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/debugOptions/true.ws b/.output/golden/wsa/ws/assembleApp/from-eas/debugOptions/true.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/debugOptions/true.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/debugOptions/true.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/deolOptions/bottles.ws b/.output/golden/wsa/ws/assembleApp/from-eas/deolOptions/bottles.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/deolOptions/bottles.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/deolOptions/bottles.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/deolOptions/hello.ws b/.output/golden/wsa/ws/assembleApp/from-eas/deolOptions/hello.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/deolOptions/hello.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/deolOptions/hello.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/deolOptions/hello2.ws b/.output/golden/wsa/ws/assembleApp/from-eas/deolOptions/hello2.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/deolOptions/hello2.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/deolOptions/hello2.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/deolOptions/hello4.ws b/.output/golden/wsa/ws/assembleApp/from-eas/deolOptions/hello4.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/deolOptions/hello4.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/deolOptions/hello4.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/deolOptions/pip.ws b/.output/golden/wsa/ws/assembleApp/from-eas/deolOptions/pip.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/deolOptions/pip.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/deolOptions/pip.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/deolOptions/true.ws b/.output/golden/wsa/ws/assembleApp/from-eas/deolOptions/true.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/deolOptions/true.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/deolOptions/true.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/bottles.ws b/.output/golden/wsa/ws/assembleApp/from-eas/dsoiOptions/bottles.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/bottles.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/dsoiOptions/bottles.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/hello.ws b/.output/golden/wsa/ws/assembleApp/from-eas/dsoiOptions/hello.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/hello.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/dsoiOptions/hello.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/hello2.ws b/.output/golden/wsa/ws/assembleApp/from-eas/dsoiOptions/hello2.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/hello2.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/dsoiOptions/hello2.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/hello4.ws b/.output/golden/wsa/ws/assembleApp/from-eas/dsoiOptions/hello4.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/hello4.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/dsoiOptions/hello4.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/pip.ws b/.output/golden/wsa/ws/assembleApp/from-eas/dsoiOptions/pip.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/pip.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/dsoiOptions/pip.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/true.ws b/.output/golden/wsa/ws/assembleApp/from-eas/dsoiOptions/true.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/dsoiOptions/true.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/dsoiOptions/true.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/eolOptions/bottles.ws b/.output/golden/wsa/ws/assembleApp/from-eas/eolOptions/bottles.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/eolOptions/bottles.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/eolOptions/bottles.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/eolOptions/hello.ws b/.output/golden/wsa/ws/assembleApp/from-eas/eolOptions/hello.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/eolOptions/hello.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/eolOptions/hello.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/eolOptions/hello2.ws b/.output/golden/wsa/ws/assembleApp/from-eas/eolOptions/hello2.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/eolOptions/hello2.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/eolOptions/hello2.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/eolOptions/hello4.ws b/.output/golden/wsa/ws/assembleApp/from-eas/eolOptions/hello4.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/eolOptions/hello4.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/eolOptions/hello4.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/eolOptions/pip.ws b/.output/golden/wsa/ws/assembleApp/from-eas/eolOptions/pip.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/eolOptions/pip.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/eolOptions/pip.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/eolOptions/true.ws b/.output/golden/wsa/ws/assembleApp/from-eas/eolOptions/true.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/eolOptions/true.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/eolOptions/true.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/soiOptions/bottles.ws b/.output/golden/wsa/ws/assembleApp/from-eas/soiOptions/bottles.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/soiOptions/bottles.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/soiOptions/bottles.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/soiOptions/hello.ws b/.output/golden/wsa/ws/assembleApp/from-eas/soiOptions/hello.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/soiOptions/hello.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/soiOptions/hello.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/soiOptions/hello2.ws b/.output/golden/wsa/ws/assembleApp/from-eas/soiOptions/hello2.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/soiOptions/hello2.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/soiOptions/hello2.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/soiOptions/hello4.ws b/.output/golden/wsa/ws/assembleApp/from-eas/soiOptions/hello4.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/soiOptions/hello4.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/soiOptions/hello4.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/soiOptions/pip.ws b/.output/golden/wsa/ws/assembleApp/from-eas/soiOptions/pip.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/soiOptions/pip.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/soiOptions/pip.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/soiOptions/true.ws b/.output/golden/wsa/ws/assembleApp/from-eas/soiOptions/true.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/soiOptions/true.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/soiOptions/true.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/bottles.ws b/.output/golden/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/bottles.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/bottles.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/bottles.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello.ws b/.output/golden/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello2.ws b/.output/golden/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello2.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello2.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello2.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello4.ws b/.output/golden/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello4.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello4.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/hello4.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/pip.ws b/.output/golden/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/pip.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/pip.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/pip.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/true.ws b/.output/golden/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/true.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/true.ws
rename to .output/golden/wsa/ws/assembleApp/from-eas/visibleTokenTypeOptions/true.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/original/allTrue/prim.ws b/.output/golden/wsa/ws/assembleApp/original/allTrue/prim.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/original/allTrue/prim.ws
rename to .output/golden/wsa/ws/assembleApp/original/allTrue/prim.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/original/bothTokenTypeOptions/prim.ws b/.output/golden/wsa/ws/assembleApp/original/bothTokenTypeOptions/prim.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/original/bothTokenTypeOptions/prim.ws
rename to .output/golden/wsa/ws/assembleApp/original/bothTokenTypeOptions/prim.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/original/debugOptions/prim.ws b/.output/golden/wsa/ws/assembleApp/original/debugOptions/prim.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/original/debugOptions/prim.ws
rename to .output/golden/wsa/ws/assembleApp/original/debugOptions/prim.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/original/deolOptions/prim.ws b/.output/golden/wsa/ws/assembleApp/original/deolOptions/prim.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/original/deolOptions/prim.ws
rename to .output/golden/wsa/ws/assembleApp/original/deolOptions/prim.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/original/dsoiOptions/prim.ws b/.output/golden/wsa/ws/assembleApp/original/dsoiOptions/prim.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/original/dsoiOptions/prim.ws
rename to .output/golden/wsa/ws/assembleApp/original/dsoiOptions/prim.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/original/eolOptions/prim.ws b/.output/golden/wsa/ws/assembleApp/original/eolOptions/prim.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/original/eolOptions/prim.ws
rename to .output/golden/wsa/ws/assembleApp/original/eolOptions/prim.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/original/soiOptions/prim.ws b/.output/golden/wsa/ws/assembleApp/original/soiOptions/prim.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/original/soiOptions/prim.ws
rename to .output/golden/wsa/ws/assembleApp/original/soiOptions/prim.ws
diff --git a/.output/golden/examples/wsa/ws/assembleApp/original/visibleTokenTypeOptions/prim.ws b/.output/golden/wsa/ws/assembleApp/original/visibleTokenTypeOptions/prim.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleApp/original/visibleTokenTypeOptions/prim.ws
rename to .output/golden/wsa/ws/assembleApp/original/visibleTokenTypeOptions/prim.ws
diff --git a/.output/golden/examples/wsa/ws/assembleLib/allTrue/io.ws b/.output/golden/wsa/ws/assembleLib/allTrue/io.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleLib/allTrue/io.ws
rename to .output/golden/wsa/ws/assembleLib/allTrue/io.ws
diff --git a/.output/golden/examples/wsa/ws/assembleLib/allTrue/memory.ws b/.output/golden/wsa/ws/assembleLib/allTrue/memory.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleLib/allTrue/memory.ws
rename to .output/golden/wsa/ws/assembleLib/allTrue/memory.ws
diff --git a/.output/golden/examples/wsa/ws/assembleLib/bothTokenTypeOptions/io.ws b/.output/golden/wsa/ws/assembleLib/bothTokenTypeOptions/io.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleLib/bothTokenTypeOptions/io.ws
rename to .output/golden/wsa/ws/assembleLib/bothTokenTypeOptions/io.ws
diff --git a/.output/golden/examples/wsa/ws/assembleLib/bothTokenTypeOptions/memory.ws b/.output/golden/wsa/ws/assembleLib/bothTokenTypeOptions/memory.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleLib/bothTokenTypeOptions/memory.ws
rename to .output/golden/wsa/ws/assembleLib/bothTokenTypeOptions/memory.ws
diff --git a/.output/golden/examples/wsa/ws/assembleLib/debugOptions/io.ws b/.output/golden/wsa/ws/assembleLib/debugOptions/io.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleLib/debugOptions/io.ws
rename to .output/golden/wsa/ws/assembleLib/debugOptions/io.ws
diff --git a/.output/golden/examples/wsa/ws/assembleLib/debugOptions/memory.ws b/.output/golden/wsa/ws/assembleLib/debugOptions/memory.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleLib/debugOptions/memory.ws
rename to .output/golden/wsa/ws/assembleLib/debugOptions/memory.ws
diff --git a/.output/golden/examples/wsa/ws/assembleLib/deolOptions/io.ws b/.output/golden/wsa/ws/assembleLib/deolOptions/io.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleLib/deolOptions/io.ws
rename to .output/golden/wsa/ws/assembleLib/deolOptions/io.ws
diff --git a/.output/golden/examples/wsa/ws/assembleLib/deolOptions/memory.ws b/.output/golden/wsa/ws/assembleLib/deolOptions/memory.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleLib/deolOptions/memory.ws
rename to .output/golden/wsa/ws/assembleLib/deolOptions/memory.ws
diff --git a/.output/golden/examples/wsa/ws/assembleLib/dsoiOptions/io.ws b/.output/golden/wsa/ws/assembleLib/dsoiOptions/io.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleLib/dsoiOptions/io.ws
rename to .output/golden/wsa/ws/assembleLib/dsoiOptions/io.ws
diff --git a/.output/golden/examples/wsa/ws/assembleLib/dsoiOptions/memory.ws b/.output/golden/wsa/ws/assembleLib/dsoiOptions/memory.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleLib/dsoiOptions/memory.ws
rename to .output/golden/wsa/ws/assembleLib/dsoiOptions/memory.ws
diff --git a/.output/golden/examples/wsa/ws/assembleLib/eolOptions/io.ws b/.output/golden/wsa/ws/assembleLib/eolOptions/io.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleLib/eolOptions/io.ws
rename to .output/golden/wsa/ws/assembleLib/eolOptions/io.ws
diff --git a/.output/golden/examples/wsa/ws/assembleLib/eolOptions/memory.ws b/.output/golden/wsa/ws/assembleLib/eolOptions/memory.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleLib/eolOptions/memory.ws
rename to .output/golden/wsa/ws/assembleLib/eolOptions/memory.ws
diff --git a/.output/golden/examples/wsa/ws/assembleLib/soiOptions/io.ws b/.output/golden/wsa/ws/assembleLib/soiOptions/io.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleLib/soiOptions/io.ws
rename to .output/golden/wsa/ws/assembleLib/soiOptions/io.ws
diff --git a/.output/golden/examples/wsa/ws/assembleLib/soiOptions/memory.ws b/.output/golden/wsa/ws/assembleLib/soiOptions/memory.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleLib/soiOptions/memory.ws
rename to .output/golden/wsa/ws/assembleLib/soiOptions/memory.ws
diff --git a/.output/golden/examples/wsa/ws/assembleLib/visibleTokenTypeOptions/io.ws b/.output/golden/wsa/ws/assembleLib/visibleTokenTypeOptions/io.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleLib/visibleTokenTypeOptions/io.ws
rename to .output/golden/wsa/ws/assembleLib/visibleTokenTypeOptions/io.ws
diff --git a/.output/golden/examples/wsa/ws/assembleLib/visibleTokenTypeOptions/memory.ws b/.output/golden/wsa/ws/assembleLib/visibleTokenTypeOptions/memory.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/assembleLib/visibleTokenTypeOptions/memory.ws
rename to .output/golden/wsa/ws/assembleLib/visibleTokenTypeOptions/memory.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/allTrue/io.ws b/.output/golden/wsa/ws/codeGenerator/allTrue/io.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/allTrue/io.ws
rename to .output/golden/wsa/ws/codeGenerator/allTrue/io.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/allTrue/memory.ws b/.output/golden/wsa/ws/codeGenerator/allTrue/memory.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/allTrue/memory.ws
rename to .output/golden/wsa/ws/codeGenerator/allTrue/memory.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/allTrue/prim.ws b/.output/golden/wsa/ws/codeGenerator/allTrue/prim.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/allTrue/prim.ws
rename to .output/golden/wsa/ws/codeGenerator/allTrue/prim.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/bothTokenTypeOptions/io.ws b/.output/golden/wsa/ws/codeGenerator/bothTokenTypeOptions/io.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/bothTokenTypeOptions/io.ws
rename to .output/golden/wsa/ws/codeGenerator/bothTokenTypeOptions/io.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/bothTokenTypeOptions/memory.ws b/.output/golden/wsa/ws/codeGenerator/bothTokenTypeOptions/memory.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/bothTokenTypeOptions/memory.ws
rename to .output/golden/wsa/ws/codeGenerator/bothTokenTypeOptions/memory.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/bothTokenTypeOptions/prim.ws b/.output/golden/wsa/ws/codeGenerator/bothTokenTypeOptions/prim.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/bothTokenTypeOptions/prim.ws
rename to .output/golden/wsa/ws/codeGenerator/bothTokenTypeOptions/prim.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/debugOptions/io.ws b/.output/golden/wsa/ws/codeGenerator/debugOptions/io.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/debugOptions/io.ws
rename to .output/golden/wsa/ws/codeGenerator/debugOptions/io.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/debugOptions/memory.ws b/.output/golden/wsa/ws/codeGenerator/debugOptions/memory.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/debugOptions/memory.ws
rename to .output/golden/wsa/ws/codeGenerator/debugOptions/memory.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/debugOptions/prim.ws b/.output/golden/wsa/ws/codeGenerator/debugOptions/prim.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/debugOptions/prim.ws
rename to .output/golden/wsa/ws/codeGenerator/debugOptions/prim.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/deolOptions/io.ws b/.output/golden/wsa/ws/codeGenerator/deolOptions/io.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/deolOptions/io.ws
rename to .output/golden/wsa/ws/codeGenerator/deolOptions/io.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/deolOptions/memory.ws b/.output/golden/wsa/ws/codeGenerator/deolOptions/memory.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/deolOptions/memory.ws
rename to .output/golden/wsa/ws/codeGenerator/deolOptions/memory.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/deolOptions/prim.ws b/.output/golden/wsa/ws/codeGenerator/deolOptions/prim.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/deolOptions/prim.ws
rename to .output/golden/wsa/ws/codeGenerator/deolOptions/prim.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/dsoiOptions/io.ws b/.output/golden/wsa/ws/codeGenerator/dsoiOptions/io.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/dsoiOptions/io.ws
rename to .output/golden/wsa/ws/codeGenerator/dsoiOptions/io.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/dsoiOptions/memory.ws b/.output/golden/wsa/ws/codeGenerator/dsoiOptions/memory.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/dsoiOptions/memory.ws
rename to .output/golden/wsa/ws/codeGenerator/dsoiOptions/memory.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/dsoiOptions/prim.ws b/.output/golden/wsa/ws/codeGenerator/dsoiOptions/prim.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/dsoiOptions/prim.ws
rename to .output/golden/wsa/ws/codeGenerator/dsoiOptions/prim.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/eolOptions/io.ws b/.output/golden/wsa/ws/codeGenerator/eolOptions/io.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/eolOptions/io.ws
rename to .output/golden/wsa/ws/codeGenerator/eolOptions/io.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/eolOptions/memory.ws b/.output/golden/wsa/ws/codeGenerator/eolOptions/memory.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/eolOptions/memory.ws
rename to .output/golden/wsa/ws/codeGenerator/eolOptions/memory.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/eolOptions/prim.ws b/.output/golden/wsa/ws/codeGenerator/eolOptions/prim.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/eolOptions/prim.ws
rename to .output/golden/wsa/ws/codeGenerator/eolOptions/prim.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/soiOptions/io.ws b/.output/golden/wsa/ws/codeGenerator/soiOptions/io.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/soiOptions/io.ws
rename to .output/golden/wsa/ws/codeGenerator/soiOptions/io.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/soiOptions/memory.ws b/.output/golden/wsa/ws/codeGenerator/soiOptions/memory.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/soiOptions/memory.ws
rename to .output/golden/wsa/ws/codeGenerator/soiOptions/memory.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/soiOptions/prim.ws b/.output/golden/wsa/ws/codeGenerator/soiOptions/prim.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/soiOptions/prim.ws
rename to .output/golden/wsa/ws/codeGenerator/soiOptions/prim.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/visibleTokenTypeOptions/io.ws b/.output/golden/wsa/ws/codeGenerator/visibleTokenTypeOptions/io.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/visibleTokenTypeOptions/io.ws
rename to .output/golden/wsa/ws/codeGenerator/visibleTokenTypeOptions/io.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/visibleTokenTypeOptions/memory.ws b/.output/golden/wsa/ws/codeGenerator/visibleTokenTypeOptions/memory.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/visibleTokenTypeOptions/memory.ws
rename to .output/golden/wsa/ws/codeGenerator/visibleTokenTypeOptions/memory.ws
diff --git a/.output/golden/examples/wsa/ws/codeGenerator/visibleTokenTypeOptions/prim.ws b/.output/golden/wsa/ws/codeGenerator/visibleTokenTypeOptions/prim.ws
similarity index 100%
rename from .output/golden/examples/wsa/ws/codeGenerator/visibleTokenTypeOptions/prim.ws
rename to .output/golden/wsa/ws/codeGenerator/visibleTokenTypeOptions/prim.ws
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 1882ce4a..3427df32 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,5 +1,9 @@
# 📅 Revision history for HelPA
+## 0.4.3.0 -- 2022-04-04
+
+* Update common
+
## 0.4.2.0 -- 2022-01-07
* Add `Logger` based on Writer
diff --git a/docs/reports/stan.html b/docs/reports/stan.html
index 19eff60c..99900e04 100644
--- a/docs/reports/stan.html
+++ b/docs/reports/stan.html
@@ -1,5 +1,5 @@
-
Stan Report
Stan Report
This is the Haskell Static Analysis report generated by Stan
Stan Info
In this section, you can find the general information about the used Stan tool, compile-time and run-time environment variables and settings, including build information, system data and execution configurations.
Stan Version
Version
0.0.1.0
Git Revision
UNKNOWN
Release Date
UNKNOWN
System Info
Operating System
linux
Architecture
x86_64
Compiler
ghc
Compiler Version
8.10
Environment
Environment Variables
STAN_USE_DEFAULT_CONFIG=True
TOML configuration files
/home/kamil-adam/git/helvm/helpa/.stan.toml
CLI arguments
-s --hide-solution report
Project Info
Information about the analysed project
Project name
helpa
Cabal Files
helpa.cabal
HIE Files Directory
.hie
Files Number
89
Analysis Info
Summary stats from the static analysis
Modules
89
LoC
4602
Extensions
33
SafeHaskell Extensions
0
Available inspections
44
Checked inspections
44
Found Observations
0
Ignored Observations
0
Static Analysis Summary
Here you can find the overall conclusion based on the various metadata and gathered information during the work of Stan on this project.
Project health: 100%
This number was calculated based on the total number of used inspections and the number of triggered inspections in the project. The calculated number also defines the overall project health status.
The project is healthy
Excellent work! Stan haven't found any vulnerabilities in the code.
Congratulations! Your project has zero vulnerabilities!
Stan carefully run all configured inspection and found 0 observations and vulnerabilities to the project.
Observations
Based on the analysis results, Stan found different vulnerabilities distributed among the analysed files. In Stan terminology, we call such vulnerability as Observation. Below you can see the more detailed information about each observation, and find the possible ways to fix them for your project.
Configurations
This section describes the final Stan configuration that was used on the project and explains how this result was assembled. Stan runtime settings have many parts, and each of them can come from different configuration sources. Stan is using Environment variables, TOML configuration file and CLI arguments to get the final results. If some option is specified through the multiple sources, the most prioritized one is used.
Action
Filter
Scope
Configuration Process Information
Information and warnings that were gathered during the configuration assemble process. This helps to understand how different parts of the configurations were retrieved.
No TOML value is specified for key: check
No CLI option specified for: checks
configChecks is set through the source: TOML
No TOML value is specified for key: remove
No CLI option specified for: remove
configRemoved is set through the source: TOML
No TOML value is specified for key: ignore
No CLI option specified for: ignore
configIgnored is set through the source: TOML
Report Explained
Inspections
List of Inspections used for analysing the project
Inspection STAN-0001
Partial: base/head
Usage of partial function 'head' for lists
Warning
Partial
List
Possible solutions
Replace list with 'NonEmpty' from 'Data.List.NonEmpty'
Use explicit pattern-matching over lists
Inspection STAN-0002
Partial: base/tail
Usage of partial function 'tail' for lists
Warning
Partial
List
Possible solutions
Replace list with 'NonEmpty' from 'Data.List.NonEmpty'
Use explicit pattern-matching over lists
Inspection STAN-0003
Partial: base/init
Usage of partial function 'init' for lists
Warning
Partial
List
Possible solutions
Replace list with 'NonEmpty' from 'Data.List.NonEmpty'
Use explicit pattern-matching over lists
Inspection STAN-0004
Partial: base/last
Usage of partial function 'last' for lists
Warning
Partial
List
Possible solutions
Replace list with 'NonEmpty' from 'Data.List.NonEmpty'
Use explicit pattern-matching over lists
Inspection STAN-0005
Partial: base/!!
Usage of partial function '!!' for lists
Warning
Partial
List
Inspection STAN-0006
Partial: base/cycle
Usage of partial function 'cycle' for lists
Warning
Partial
List
Possible solutions
Replace list with 'NonEmpty' from 'Data.List.NonEmpty'
Use explicit pattern-matching over lists
Inspection STAN-0007
Partial: base/genericIndex
Usage of partial function 'genericIndex' for lists
Warning
Partial
List
Inspection STAN-0008
Partial: base/fromJust
Usage of partial function 'fromJust' for 'Maybe'
Warning
Partial
Possible solutions
Use explicit pattern-matching over Maybe
Use one of the standard functions: 'maybe', 'fromMaybe'
Inspection STAN-0009
Partial: base/read
Usage of partial function 'read' for parsing 'String'
Warning
Partial
Possible solutions
Use 'readMaybe' or 'readEither' to handle failed parsing
Inspection STAN-0010
Partial: base/succ
Usage of partial function 'succ' for enumerable types
Warning
Partial
Possible solutions
Use '(+ 1)' for integral types (but be aware of arithmetic overflow)
{Extra dependency} Use 'next' from 'Relude.Extra.Enum' in 'relude'
Inspection STAN-0011
Partial: base/pred
Usage of partial function 'pred' for enumerable types
Warning
Partial
Possible solutions
Use '(- 1)' for integral types (but be aware of arithmetic overflow)
{Extra dependency} Use 'prev' from 'Relude.Extra.Enum' in 'relude'
Inspection STAN-0012
Partial: base/toEnum
Usage of partial function 'toEnum' for enumerable types
Warning
Partial
Possible solutions
{Extra dependency} Use 'safeToEnum' from 'Relude.Extra.Enum' in 'relude'
Inspection STAN-0013
Partial: base/maximum
Usage of partial function 'maximum' for
Warning
Partial
Inspection STAN-0014
Partial: base/minimum
Usage of partial function 'minimum' for
Warning
Partial
Inspection STAN-0015
Partial: base/maximumBy
Usage of partial function 'maximumBy' for
Warning
Partial
Inspection STAN-0016
Partial: base/minimumBy
Usage of partial function 'minimumBy' for
Warning
Partial
Inspection STAN-0017
Partial: base/foldl1
Usage of partial function 'foldl1' for
Warning
Partial
Inspection STAN-0018
Partial: base/foldl1'
Usage of partial function 'foldl1'' for lists
Warning
Partial
List
Possible solutions
Replace list with 'NonEmpty' from 'Data.List.NonEmpty'
Use explicit pattern-matching over lists
Inspection STAN-0019
Partial: base/foldr1
Usage of partial function 'foldr1' for
Warning
Partial
Inspection STAN-0020
Partial: base/fromList
Usage of partial function 'fromList' for
Warning
Partial
Inspection STAN-0021
Partial: base/fromInteger
Usage of partial function 'fromInteger' for
Warning
Partial
Inspection STAN-0101
Infinite: base/reverse
Usage of the 'reverse' function that hangs on infinite lists
PotentialBug
Infinite
List
Possible solutions
Don't use 'reverse' if you expect your function to work with infinite lists
{Extra dependency} Use the 'slist' library for fast and safe functions on infinite lists
Inspection STAN-0102
Infinite: base/isSuffixOf
Usage of the 'isSuffixOf' function that hangs on infinite lists
PotentialBug
Infinite
List
Possible solutions
Don't use 'isSuffixOf' if you expect your function to work with infinite lists
{Extra dependency} Use the 'slist' library for fast and safe functions on infinite lists
Inspection STAN-0103
Infinite: base/length
Usage of the 'length' function that hangs on infinite lists
PotentialBug
Infinite
List
Possible solutions
Don't use 'length' if you expect your function to work with infinite lists
{Extra dependency} Use the 'slist' library for fast and safe functions on infinite lists
Inspection STAN-0104
Infinite: base/genericLength
Usage of the 'genericLength' function that hangs on infinite lists
PotentialBug
Infinite
List
Possible solutions
Don't use 'genericLength' if you expect your function to work with infinite lists
{Extra dependency} Use the 'slist' library for fast and safe functions on infinite lists
Inspection STAN-0105
Infinite: base/sum
Usage of the 'sum' function that hangs on infinite lists
PotentialBug
Infinite
List
Possible solutions
Don't use 'sum' if you expect your function to work with infinite lists
{Extra dependency} Use the 'slist' library for fast and safe functions on infinite lists
Inspection STAN-0106
Infinite: base/product
Usage of the 'product' function that hangs on infinite lists
PotentialBug
Infinite
List
Possible solutions
Don't use 'product' if you expect your function to work with infinite lists
{Extra dependency} Use the 'slist' library for fast and safe functions on infinite lists