diff --git a/haskell/compiler/tests/demo1/input/picture.adl b/adl/tests/demo1/picture.adl
similarity index 100%
rename from haskell/compiler/tests/demo1/input/picture.adl
rename to adl/tests/demo1/picture.adl
diff --git a/haskell/compiler/tests/demo1/input/picture.adl-rs b/adl/tests/demo1/picture.adl-rs
similarity index 100%
rename from haskell/compiler/tests/demo1/input/picture.adl-rs
rename to adl/tests/demo1/picture.adl-rs
diff --git a/haskell/compiler/tests/test10/input/test.adl b/adl/tests/test10/test10.adl
similarity index 100%
rename from haskell/compiler/tests/test10/input/test.adl
rename to adl/tests/test10/test10.adl
diff --git a/haskell/compiler/tests/test11/input/test.adl b/adl/tests/test11/test11.adl
similarity index 100%
rename from haskell/compiler/tests/test11/input/test.adl
rename to adl/tests/test11/test11.adl
diff --git a/haskell/compiler/tests/test12/input/test.adl b/adl/tests/test12/test12.adl
similarity index 100%
rename from haskell/compiler/tests/test12/input/test.adl
rename to adl/tests/test12/test12.adl
diff --git a/haskell/compiler/tests/test13/input/test.adl b/adl/tests/test13/test13.adl
similarity index 100%
rename from haskell/compiler/tests/test13/input/test.adl
rename to adl/tests/test13/test13.adl
diff --git a/haskell/compiler/tests/test14/input/test.adl b/adl/tests/test14/test14.adl
similarity index 100%
rename from haskell/compiler/tests/test14/input/test.adl
rename to adl/tests/test14/test14.adl
diff --git a/haskell/compiler/tests/test15/input/test.adl b/adl/tests/test15/test15.adl
similarity index 100%
rename from haskell/compiler/tests/test15/input/test.adl
rename to adl/tests/test15/test15.adl
diff --git a/haskell/compiler/tests/test16/input/test.adl b/adl/tests/test16/test16.adl
similarity index 100%
rename from haskell/compiler/tests/test16/input/test.adl
rename to adl/tests/test16/test16.adl
diff --git a/haskell/compiler/tests/test16/input/test2.adl b/adl/tests/test16/test2.adl
similarity index 100%
rename from haskell/compiler/tests/test16/input/test2.adl
rename to adl/tests/test16/test2.adl
diff --git a/haskell/compiler/tests/test17/input/test.adl b/adl/tests/test17/test17.adl
similarity index 100%
rename from haskell/compiler/tests/test17/input/test.adl
rename to adl/tests/test17/test17.adl
diff --git a/haskell/compiler/tests/test18/input/test.adl b/adl/tests/test18/test18.adl
similarity index 100%
rename from haskell/compiler/tests/test18/input/test.adl
rename to adl/tests/test18/test18.adl
diff --git a/haskell/compiler/tests/test18/input/test.adl-rs b/adl/tests/test18/test18.adl-rs
similarity index 100%
rename from haskell/compiler/tests/test18/input/test.adl-rs
rename to adl/tests/test18/test18.adl-rs
diff --git a/haskell/compiler/tests/test19/input/test.adl b/adl/tests/test19/test19.adl
similarity index 100%
rename from haskell/compiler/tests/test19/input/test.adl
rename to adl/tests/test19/test19.adl
diff --git a/haskell/compiler/tests/test20/input/test.adl b/adl/tests/test20/test20.adl
similarity index 100%
rename from haskell/compiler/tests/test20/input/test.adl
rename to adl/tests/test20/test20.adl
diff --git a/haskell/compiler/tests/test21/input/test.adl b/adl/tests/test21/test21.adl
similarity index 100%
rename from haskell/compiler/tests/test21/input/test.adl
rename to adl/tests/test21/test21.adl
diff --git a/haskell/compiler/tests/test22/input/test22a.adl b/adl/tests/test22/test22a.adl
similarity index 100%
rename from haskell/compiler/tests/test22/input/test22a.adl
rename to adl/tests/test22/test22a.adl
diff --git a/haskell/compiler/tests/test22/input/test22b.adl b/adl/tests/test22/test22b.adl
similarity index 100%
rename from haskell/compiler/tests/test22/input/test22b.adl
rename to adl/tests/test22/test22b.adl
diff --git a/haskell/compiler/tests/test23/input/test23.adl b/adl/tests/test23/test23.adl
similarity index 100%
rename from haskell/compiler/tests/test23/input/test23.adl
rename to adl/tests/test23/test23.adl
diff --git a/haskell/compiler/tests/test24/input/test24.adl b/adl/tests/test24/test24.adl
similarity index 100%
rename from haskell/compiler/tests/test24/input/test24.adl
rename to adl/tests/test24/test24.adl
diff --git a/haskell/compiler/tests/test25/input/admin.adl b/adl/tests/test25/admin.adl
similarity index 100%
rename from haskell/compiler/tests/test25/input/admin.adl
rename to adl/tests/test25/admin.adl
diff --git a/haskell/compiler/tests/test26/input/test26.adl b/adl/tests/test26/test26.adl
similarity index 100%
rename from haskell/compiler/tests/test26/input/test26.adl
rename to adl/tests/test26/test26.adl
diff --git a/haskell/compiler/tests/test27/input/test27.adl b/adl/tests/test27/test27.adl
similarity index 100%
rename from haskell/compiler/tests/test27/input/test27.adl
rename to adl/tests/test27/test27.adl
diff --git a/haskell/compiler/tests/test27/input/test27a.adl b/adl/tests/test27/test27a.adl
similarity index 100%
rename from haskell/compiler/tests/test27/input/test27a.adl
rename to adl/tests/test27/test27a.adl
diff --git a/haskell/compiler/tests/test28/input/test28.adl b/adl/tests/test28/test28.adl
similarity index 100%
rename from haskell/compiler/tests/test28/input/test28.adl
rename to adl/tests/test28/test28.adl
diff --git a/haskell/compiler/tests/test29/input/test29.adl b/adl/tests/test29/test29.adl
similarity index 100%
rename from haskell/compiler/tests/test29/input/test29.adl
rename to adl/tests/test29/test29.adl
diff --git a/haskell/compiler/tests/test3/input/test.adl b/adl/tests/test3/test3.adl
similarity index 100%
rename from haskell/compiler/tests/test3/input/test.adl
rename to adl/tests/test3/test3.adl
diff --git a/haskell/compiler/tests/test4/input/test.adl b/adl/tests/test4/test4.adl
similarity index 100%
rename from haskell/compiler/tests/test4/input/test.adl
rename to adl/tests/test4/test4.adl
diff --git a/haskell/compiler/tests/test4/input/test.adl-cpp b/adl/tests/test4/test4.adl-cpp
similarity index 100%
rename from haskell/compiler/tests/test4/input/test.adl-cpp
rename to adl/tests/test4/test4.adl-cpp
diff --git a/haskell/compiler/tests/test4/input/test.adl-hs b/adl/tests/test4/test4.adl-hs
similarity index 100%
rename from haskell/compiler/tests/test4/input/test.adl-hs
rename to adl/tests/test4/test4.adl-hs
diff --git a/haskell/compiler/tests/test4/input/test.adl-java b/adl/tests/test4/test4.adl-java
similarity index 100%
rename from haskell/compiler/tests/test4/input/test.adl-java
rename to adl/tests/test4/test4.adl-java
diff --git a/haskell/compiler/tests/test4/input/test.adl-rs b/adl/tests/test4/test4.adl-rs
similarity index 100%
rename from haskell/compiler/tests/test4/input/test.adl-rs
rename to adl/tests/test4/test4.adl-rs
diff --git a/haskell/compiler/tests/test5/input/test.adl b/adl/tests/test5/test5.adl
similarity index 100%
rename from haskell/compiler/tests/test5/input/test.adl
rename to adl/tests/test5/test5.adl
diff --git a/haskell/compiler/tests/test5/input/test.adl-hs b/adl/tests/test5/test5.adl-hs
similarity index 100%
rename from haskell/compiler/tests/test5/input/test.adl-hs
rename to adl/tests/test5/test5.adl-hs
diff --git a/haskell/compiler/tests/test5/input/test.adl-rs b/adl/tests/test5/test5.adl-rs
similarity index 100%
rename from haskell/compiler/tests/test5/input/test.adl-rs
rename to adl/tests/test5/test5.adl-rs
diff --git a/haskell/compiler/tests/test6/input/test.adl b/adl/tests/test6/test6.adl
similarity index 100%
rename from haskell/compiler/tests/test6/input/test.adl
rename to adl/tests/test6/test6.adl
diff --git a/haskell/compiler/tests/test7/input/test.adl b/adl/tests/test7/test7.adl
similarity index 100%
rename from haskell/compiler/tests/test7/input/test.adl
rename to adl/tests/test7/test7.adl
diff --git a/haskell/compiler/tests/test8/input/test.adl b/adl/tests/test8/test8.adl
similarity index 100%
rename from haskell/compiler/tests/test8/input/test.adl
rename to adl/tests/test8/test8.adl
diff --git a/haskell/compiler/tests/test9/input/test.adl b/adl/tests/test9/test9.adl
similarity index 100%
rename from haskell/compiler/tests/test9/input/test.adl
rename to adl/tests/test9/test9.adl