diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 0e96a5e..fca7218 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -169,12 +169,12 @@ jobs: - name: initial cabal.project for sdist run: | touch cabal.project - echo "packages: $GITHUB_WORKSPACE/source/laborations" >> cabal.project - echo "packages: $GITHUB_WORKSPACE/source/laborations/lab1/testsuite" >> cabal.project - echo "packages: $GITHUB_WORKSPACE/source/laborations/lab2/testsuite" >> cabal.project - echo "packages: $GITHUB_WORKSPACE/source/laborations/lab2/haskell" >> cabal.project - echo "packages: $GITHUB_WORKSPACE/source/laborations/lab3/haskell" >> cabal.project - echo "packages: $GITHUB_WORKSPACE/source/laborations/lab4/haskell" >> cabal.project + echo "packages: $GITHUB_WORKSPACE/source/labs" >> cabal.project + echo "packages: $GITHUB_WORKSPACE/source/labs/lab1/testsuite" >> cabal.project + echo "packages: $GITHUB_WORKSPACE/source/labs/lab2/testsuite" >> cabal.project + echo "packages: $GITHUB_WORKSPACE/source/labs/lab2/haskell" >> cabal.project + echo "packages: $GITHUB_WORKSPACE/source/labs/lab3/haskell" >> cabal.project + echo "packages: $GITHUB_WORKSPACE/source/labs/lab4/haskell" >> cabal.project cat cabal.project - name: sdist run: | diff --git a/.gitignore b/.gitignore index 51c0262..bca5e2b 100644 --- a/.gitignore +++ b/.gitignore @@ -59,53 +59,53 @@ CVS/ /2014-index.txt /exams.tgz -/laborations/old-lab3/ -/laborations/old-lab4/ -/laborations/old-2015-mini/ - -/laborations/mini/miniJS.zip - -/laborations/test-*.*.* -/laborations/lab?/*/test-*.*.* -/laborations/lab?/java/cmm/ - -/laborations/lab1/testscript/lab1-test-dir/ -/laborations/lab1/testscript/progs-test-lab1 -/laborations/lab1/testscript/plt-test-lab1 - -/laborations/lab1/testsuite/lab1-test-dir/ -/laborations/lab1/testsuite/lab1-test-dir#/ -/laborations/lab1/testsuite/progs-test-lab1 -/laborations/lab1/testsuite/good/fractal.pgm -/laborations/lab1/testsuite/good/fractal.ppm - -/laborations/lab2/agda/lab2 -/laborations/lab2/agda/lab2.cabal -/laborations/lab2/haskell/lab2 -/laborations/lab2/java/lab2 - -/laborations/lab2/testsuite/good/**/*.j -/laborations/lab2/testsuite/good/*.cc.tmp.cpp -/laborations/lab2/testsuite/bad/*.cc.tmp.cpp -/laborations/lab2/testsuite/progs-test-lab2 -/laborations/lab2/testsuite/plt-test-lab2 - -/laborations/lab3/java/lab3 -/laborations/lab3/haskell/lab3 - -/laborations/lab3/testsuite/*.j -/laborations/lab3/testsuite/dir-for-path-test/one-more-dir/simple.j -/laborations/lab3/testsuite/progs-test-lab3-jvm-verify -/laborations/lab3/testsuite/progs-test-lab3 -/laborations/lab3/testsuite/plt-test-lab3 - -/laborations/lab4/haskell/Fun/ -/laborations/lab4/haskell/lab4 -/laborations/lab4/java/fun/ -/laborations/lab4/java/Fun/ -/laborations/lab4/java/lab4 - -/laborations/lab4/testsuite.tgz -/laborations/lab4/testsuite/progs-test-lab4 -/laborations/lab4/testsuite/plt-test-lab4 -/laborations/lab4/testsuite/good/*.golden +/labs/old-lab3/ +/labs/old-lab4/ +/labs/old-2015-mini/ + +/labs/mini/miniJS.zip + +/labs/test-*.*.* +/labs/lab?/*/test-*.*.* +/labs/lab?/java/cmm/ + +/labs/lab1/testscript/lab1-test-dir/ +/labs/lab1/testscript/progs-test-lab1 +/labs/lab1/testscript/plt-test-lab1 + +/labs/lab1/testsuite/lab1-test-dir/ +/labs/lab1/testsuite/lab1-test-dir#/ +/labs/lab1/testsuite/progs-test-lab1 +/labs/lab1/testsuite/good/fractal.pgm +/labs/lab1/testsuite/good/fractal.ppm + +/labs/lab2/agda/lab2 +/labs/lab2/agda/lab2.cabal +/labs/lab2/haskell/lab2 +/labs/lab2/java/lab2 + +/labs/lab2/testsuite/good/**/*.j +/labs/lab2/testsuite/good/*.cc.tmp.cpp +/labs/lab2/testsuite/bad/*.cc.tmp.cpp +/labs/lab2/testsuite/progs-test-lab2 +/labs/lab2/testsuite/plt-test-lab2 + +/labs/lab3/java/lab3 +/labs/lab3/haskell/lab3 + +/labs/lab3/testsuite/*.j +/labs/lab3/testsuite/dir-for-path-test/one-more-dir/simple.j +/labs/lab3/testsuite/progs-test-lab3-jvm-verify +/labs/lab3/testsuite/progs-test-lab3 +/labs/lab3/testsuite/plt-test-lab3 + +/labs/lab4/haskell/Fun/ +/labs/lab4/haskell/lab4 +/labs/lab4/java/fun/ +/labs/lab4/java/Fun/ +/labs/lab4/java/lab4 + +/labs/lab4/testsuite.tgz +/labs/lab4/testsuite/progs-test-lab4 +/labs/lab4/testsuite/plt-test-lab4 +/labs/lab4/testsuite/good/*.golden diff --git a/2017-index.txt b/2017-index.txt index fbc5f54..50be728 100644 --- a/2017-index.txt +++ b/2017-index.txt @@ -61,10 +61,10 @@ Google group: http://groups.google.com/group/plt-2017 [example exam exams/exam-plt-2017-3.pdf]. : //2017-12-05// - [Lab 4 laborations/lab4/lab4.html] is online. + [Lab 4 labs/lab4/lab4.html] is online. : //2017-11-23// - [Lab 3 laborations/lab3/lab3.html] is online. + [Lab 3 labs/lab3/lab3.html] is online. : //2017-11-23// The code from today's "Hands-on for lab 2" session has been posted in the plt-2017 group. @@ -73,7 +73,7 @@ Google group: http://groups.google.com/group/plt-2017 The schedule has been updated (see below). : //2017-11-18// - Change in text for [Lab 2 laborations/lab2/lab2.html]: + Change in text for [Lab 2 labs/lab2/lab2.html]: The ``return`` statement can also return a void value. (If you stick to the old text and disallow this, it is also fine, but it makes more sense to allow it.) @@ -82,7 +82,7 @@ Google group: http://groups.google.com/group/plt-2017 Deadline is 2017-11-30. : //2017-11-14// - [Lab 2 laborations/lab2/lab2.html] is online. + [Lab 2 labs/lab2/lab2.html] is online. % : //2017-11-07// % No lecture on Thursday, 9th November! @@ -90,7 +90,7 @@ Google group: http://groups.google.com/group/plt-2017 % Lab session will take place! % % : //2017-10-31// -% [Lab 1 laborations/lab1/lab1.html] is online. +% [Lab 1 labs/lab1/lab1.html] is online. % Result of [live coding live-2017-10-31.zip] in lecture (has errors!). % % : //2017-10-26// @@ -111,29 +111,29 @@ Slides follow closely the plt book. | Tue 07/11 | 13-15 | Formal languages and parsing | [LL parser code LL-parsing.zip] | Thu 09/11 | 10-16 | [DATE-IT 2017 fair https://www.date-it.se/] | No class! | %| Thu 09/11 | 13-15 | Theory of lexing | [slides plt-book/ipl-book/slides/3-slides-ipl-book.pdf], plt 3, dragon 3,4 -| //Mon 13/11// | //23// | //Lab 1 deadline// | [lab1 PM laborations/lab1/lab1.html] | +| //Mon 13/11// | //23// | //Lab 1 deadline// | [lab1 PM labs/lab1/lab1.html] | | Tue 14/11 | 13-15 | Theory of lexing, LR parsing | [slides plt-book/ipl-book/slides/3-slides-ipl-book.pdf], plt 3, dragon 3,4 %| Tue 14/11 | 13-15 | Interpreting | [slides plt-book/ipl-book/slides/5-slides-ipl-book.pdf], plt 5 | Thu 16/11 | 13-15 | Interpreting | [slides plt-book/ipl-book/slides/5-slides-ipl-book.pdf], plt 5 %| Thu 16/11 | 13-15 | Type checking | [slides plt-book/ipl-book/slides/4-slides-ipl-book.pdf], plt 4, dragon 5,6 | Tue 21/11 | 13-15 | Type checking | [slides plt-book/ipl-book/slides/4-slides-ipl-book.pdf], plt 4, dragon 5,6 -%| Tue 21/11 | 13-14 | Hands-on with Lab 2 (Haskell) | [lab2 PM laborations/lab2/lab2.html] +%| Tue 21/11 | 13-14 | Hands-on with Lab 2 (Haskell) | [lab2 PM labs/lab2/lab2.html] %| Tue 21/11 | 14-15 | Hands-on with Lab 2 (Java) | | -| Thu 23/11 | 13-14 | Hands-on with Lab 2 (Haskell) | [lab2 PM laborations/lab2/lab2.html] +| Thu 23/11 | 13-14 | Hands-on with Lab 2 (Haskell) | [lab2 PM labs/lab2/lab2.html] | Thu 23/11 | 14-15 | Hands-on with Lab 2 (Java) | | %| Thu 23/11 | 13-15 | Code generation | [slides plt-book/ipl-book/slides/6-slides-ipl-book.pdf], plt 6, dragon 6,7 | //Mon 27/11// | //23// | //Lab 2 deadline// | | | Tue 28/11 | 13-15 | Code generation | [slides plt-book/ipl-book/slides/6-slides-ipl-book.pdf], plt 6, dragon 6,7 % | Tue 28/11 | 13-14 | Hands-on with Lab 3 (Haskell) | | -% % [lab3 PM laborations/lab3/lab3.html] +% % [lab3 PM labs/lab3/lab3.html] % | Tue 28/11 | 14-15 | Hands-on with Lab 3 (Java) | | -| Thu 30/11 | 13-14 | Hands-on with Lab 3 (Haskell) | [lab3 PM laborations/lab3/lab3.html] +| Thu 30/11 | 13-14 | Hands-on with Lab 3 (Haskell) | [lab3 PM labs/lab3/lab3.html] | Thu 30/11 | 14-15 | Hands-on with Lab 3 (Java) | | % | Thu 30/11 | 13-15 | Functional programming languages | [slides plt-book/ipl-book/slides/7-slides-ipl-book.pdf], plt 7, dragon 6.5,7.3 | Tue 05/12 | 13-15 | Functional programming languages | [slides plt-book/ipl-book/slides/7-slides-ipl-book.pdf], plt 7, dragon 6.5,7.3 % %| Tue 05/12 | 13-15 | The language design space | [slides plt-book/ipl-book/slides/8-slides-ipl-book.pdf], plt 8, dragon 1. % | Tue 05/12 | 13-15 | Type inference and polymorphism | plt 7.7-9 -| Thu 07/12 | 13-15 | Hands-on with Lab 4 | [lab4 PM laborations/lab4/lab4.html] +| Thu 07/12 | 13-15 | Hands-on with Lab 4 | [lab4 PM labs/lab4/lab4.html] | //Mon 11/12// | //23// | //Lab 3 deadline// | | | Tue 12/12 | 13-15 | Type inference. A taste of dependent types | Agda demo [Verified compilation ./JVM.agda] | %| Tue 12/12 | 13-15 | Dependent types (Agda) | | @@ -222,7 +222,7 @@ If you are not yet member of the group, you have to This is necessary to identify you as a participant of the course. -=Laboration times and supervision= +=Lab times and supervision= Lab supervision take place in [ED3354 http://maps.chalmers.se/#45ea04d0-4a90-4a18-9842-55599dbbb093]. @@ -236,33 +236,33 @@ The lab rooms and supervision are available from Tue 31 October till Fri 15 December 2017. **Attendance in these classes is optional**. -Normally, each student should attend **at most one** supervised laboration time each week. +Normally, each student should attend **at most one** supervised lab time each week. Since attendance is not compulsory, there may be room for more times. But, if there is lack of room, those who attend their first supervision of the week have priority to get a place and supervisor help. -=Laborations= +=Labs= -There will be four laborations, written individually or in +There will be four labs, written individually or in pairs. You have to pass the labs to pass the course. However, the course grade is determined solely by the exam. % - Lab 1 - parser (deadline 14/11) -- [Lab 1 - parser laborations/lab1/lab1.html] (deadline 13/11) +- [Lab 1 - parser labs/lab1/lab1.html] (deadline 13/11) % - Lab 2 - type checker and interpreter (deadline 27/11) -- [Lab 2 - type checker and interpreter laborations/lab2/lab2.html] (deadline 27/11) +- [Lab 2 - type checker and interpreter labs/lab2/lab2.html] (deadline 27/11) % - Lab 3 - code generator (deadline 11/12) -- [Lab 3 - code generator laborations/lab3/lab3.html] (deadline 11/12) +- [Lab 3 - code generator labs/lab3/lab3.html] (deadline 11/12) % - Lab 4 - functional language interpreter (deadline 05/01 2018) -- [Lab 4 - functional language interpreter laborations/lab4/lab4.html] (deadline 05/01 2018) +- [Lab 4 - functional language interpreter labs/lab4/lab4.html] (deadline 05/01 2018) The labs are quite substantial, so please set aside at least 30 full working hours before the deadline. Reporting is done via [Fire https://plt-lp2-17.frs.cse.chalmers.se/]. Before reporting, you must run your program through a test suite. -% such as the one for [lab 1 laborations/lab1/testsuite/]. +% such as the one for [lab 1 labs/lab1/testsuite/]. % **Final deadline is Saturday 21 March** for all returned and corrected labs. % No labs will be graded after this deadline. diff --git a/2018-index.txt b/2018-index.txt index 4cad708..d53a5e2 100644 --- a/2018-index.txt +++ b/2018-index.txt @@ -67,10 +67,10 @@ Google group: http://groups.google.com/group/plt-2018 on verified compilation. : //2018-12-16// - [Lab 4 stubs laborations/lab4/lab4.html#section3] for Haskell and Java are now available. + [Lab 4 stubs labs/lab4/lab4.html#section3] for Haskell and Java are now available. : //2018-12-09// - [Lab 4 laborations/lab4/lab4.html] is online. + [Lab 4 labs/lab4/lab4.html] is online. : //2018-12-05// **Guest lecture** by [Thorsten Berger http://www.cse.chalmers.se/~bergert/] @@ -80,14 +80,14 @@ Google group: http://groups.google.com/group/plt-2018 //2018-12-10//: [Slides available http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf] : //2018-12-04// - [Lab 3 laborations/lab3/lab3.html] is online. + [Lab 3 labs/lab3/lab3.html] is online. : //2018-11-27// The code from today's "Hands-on for lab 2" session has been posted in the plt-2018 group. : //2018-11-20// - [Lab 2 laborations/lab2/lab2.html] is online. + [Lab 2 labs/lab2/lab2.html] is online. % : //2017-11-07// % No lecture on Thursday, 9th November! @@ -127,29 +127,29 @@ Slides follow closely the plt book. %[LL parser code LL-parsing.zip] %| Thu 15/11 | 10-16 | [DATE-IT 2017 fair https://www.date-it.se/] | No class! | | Thu 15/11 | 13-15 | Theory of lexing | [slides plt-book/ipl-book/slides/3-slides-ipl-book.pdf], plt 3, dragon 3,4 -| //Mon 19/11// | //23// | //Lab 1 deadline// | [lab1 PM laborations/lab1/lab1.html] | +| //Mon 19/11// | //23// | //Lab 1 deadline// | [lab1 PM labs/lab1/lab1.html] | %| Tue 20/11 | 13-15 | Theory of lexing, LR parsing | [slides plt-book/ipl-book/slides/3-slides-ipl-book.pdf], plt 3, dragon 3,4 | Tue 20/11 | 13-15 | Interpreting | [slides plt-book/ipl-book/slides/5-slides-ipl-book.pdf], plt 5 %| Thu 22/11 | 13-15 | Interpreting | [slides plt-book/ipl-book/slides/5-slides-ipl-book.pdf], plt 5 | Thu 22/11 | 13-15 | Type checking | [slides plt-book/ipl-book/slides/4-slides-ipl-book.pdf], plt 4, dragon 5,6 %| Tue 27/11 | 13-15 | Type checking | [slides plt-book/ipl-book/slides/4-slides-ipl-book.pdf], plt 4, dragon 5,6 -| Tue 27/11 | 13-14 | Hands-on with Lab 2 (Haskell) | [lab2 PM laborations/lab2/lab2.html] +| Tue 27/11 | 13-14 | Hands-on with Lab 2 (Haskell) | [lab2 PM labs/lab2/lab2.html] | Tue 27/11 | 14-15 | Hands-on with Lab 2 (Java) | | -%| Thu 29/11 | 13-14 | Hands-on with Lab 2 (Haskell) | [lab2 PM laborations/lab2/lab2.html] +%| Thu 29/11 | 13-14 | Hands-on with Lab 2 (Haskell) | [lab2 PM labs/lab2/lab2.html] %| Thu 29/11 | 14-15 | Hands-on with Lab 2 (Java) | | | Thu 29/11 | 13-15 | Code generation | [slides plt-book/ipl-book/slides/6-slides-ipl-book.pdf], plt 6, dragon 6,7 | //Mon 03/12// | //23// | //Lab 2 deadline// | | %| Tue 04/12 | 13-15 | Code generation | [slides plt-book/ipl-book/slides/6-slides-ipl-book.pdf], plt 6, dragon 6,7 -| Tue 04/12 | 13-14 | Hands-on with Lab 3 (Haskell) | [lab3 PM laborations/lab3/lab3.html] +| Tue 04/12 | 13-14 | Hands-on with Lab 3 (Haskell) | [lab3 PM labs/lab3/lab3.html] | Tue 04/12 | 14-15 | Hands-on with Lab 3 (Java) | | -%| Thu 06/12 | 13-14 | Hands-on with Lab 3 (Haskell) | [lab3 PM laborations/lab3/lab3.html] +%| Thu 06/12 | 13-14 | Hands-on with Lab 3 (Haskell) | [lab3 PM labs/lab3/lab3.html] %| Thu 06/12 | 14-15 | Hands-on with Lab 3 (Java) | | | Thu 06/12 | 13-15 | [Domain-specific languages http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf] | Guest lecture by [Thorsten Berger http://www.cse.chalmers.se/~bergert/] %| Thu 06/12 | 13-15 | Functional programming languages | [slides plt-book/ipl-book/slides/7-slides-ipl-book.pdf], plt 7, dragon 6.5,7.3 | Tue 11/12 | 13-15 | Functional programming languages | [slides plt-book/ipl-book/slides/7-slides-ipl-book.pdf], plt 7, dragon 6.5,7.3 % %| Tue 11/12 | 13-15 | The language design space | [slides plt-book/ipl-book/slides/8-slides-ipl-book.pdf], plt 8, dragon 1. % | Tue 11/12 | 13-15 | Type inference and polymorphism | plt 7.7-9 -| Thu 13/12 | 13-15 | Hands-on with Lab 4 | [lab4 PM laborations/lab4/lab4.html] +| Thu 13/12 | 13-15 | Hands-on with Lab 4 | [lab4 PM labs/lab4/lab4.html] | //Mon 17/12// | //23// | //Lab 3 deadline// | | %| Tue 18/12 | 13-15 | Type inference. A taste of dependent types | Agda demo [Verified compilation ./JVM.agda] | | Tue 18/12 | 13-15 | Dependent types (Agda) | Live coding [start live/2018/lec13-live-start.agda] and [finish live/2018/lec13-live-finish.agda] | @@ -232,7 +232,7 @@ If you are not yet member of the group, you have to This is necessary to identify you as a participant of the course. Please also indicate whether you are GU or Chalmers student. -=Laboration times and supervision= +=Lab times and supervision= Lab supervision take place in [ED3354 http://maps.chalmers.se/#45ea04d0-4a90-4a18-9842-55599dbbb093]. @@ -246,27 +246,27 @@ The lab rooms and supervision are available from Thu 08 November till Fri 21 December 2018. **Attendance in these classes is optional**. -Normally, each student should attend **at most one** supervised laboration time each week. +Normally, each student should attend **at most one** supervised lab time each week. Since attendance is not compulsory, there may be room for more times. But, if there is lack of room, those who attend their first supervision of the week have priority to get a place and supervisor help. -=Laborations= +=Labs= -There will be four laborations, written in pairs. +There will be four labs, written in pairs. (Individual solutions are accepted per exception, please contact the course responsible.) You have to pass the labs to pass the course. However, the course grade is determined solely by the exam. % - Lab 1 - parser (deadline 19/11) -- [Lab 1 - parser laborations/lab1/lab1.html] (deadline 19/11) +- [Lab 1 - parser labs/lab1/lab1.html] (deadline 19/11) % - Lab 2 - type checker and interpreter (deadline 03/12) -- [Lab 2 - type checker and interpreter laborations/lab2/lab2.html] (deadline 03/12) +- [Lab 2 - type checker and interpreter labs/lab2/lab2.html] (deadline 03/12) % - Lab 3 - code generator (deadline 17/12) -- [Lab 3 - code generator laborations/lab3/lab3.html] (deadline 17/12) +- [Lab 3 - code generator labs/lab3/lab3.html] (deadline 17/12) % - Lab 4 - functional language interpreter (deadline 10/01/2019) -- [Lab 4 - functional language interpreter laborations/lab4/lab4.html] (deadline 10/01/2019) +- [Lab 4 - functional language interpreter labs/lab4/lab4.html] (deadline 10/01/2019) The labs are quite substantial, so please set aside at least 30 full working hours (4 full working days) before the deadline. diff --git a/2019-index.txt b/2019-index.txt index db83b51..ba853cd 100644 --- a/2019-index.txt +++ b/2019-index.txt @@ -89,13 +89,13 @@ http://www.cse.chalmers.se/edu/course/DAT151/ on verified compilation. % : //2019-12-16// -% [Lab 4 stubs laborations/lab4/index.html#section3] for Haskell and Java are now available. +% [Lab 4 stubs labs/lab4/index.html#section3] for Haskell and Java are now available. : //2019-12-12// A bug that caused some test (e.g. the tests in the subtyping directory) to not run has been fixed in the lab 3 test suite. Please re-download the test suite. : //2019-12-12// - [Lab 4 laborations/lab4/index.html] is online. + [Lab 4 labs/lab4/index.html] is online. % : //2019-12-05// % **Guest lecture** by [Thorsten Berger http://www.cse.chalmers.se/~bergert/] @@ -112,14 +112,14 @@ http://www.cse.chalmers.se/edu/course/DAT151/ (Note: should compile, but does not run!) : //2019-11-29// - [Lab 3 laborations/lab3/index.html] is online. + [Lab 3 labs/lab3/index.html] is online. : //2019-11-26// The code from today's "Hands-on for lab 2" session is [online live/2019/live-7-lab2.zip] (Haskell and Java). % : //2019-11-20// -% [Lab 2 laborations/lab2/index.html] is online. +% [Lab 2 labs/lab2/index.html] is online. : //2019-11-22// For lab2, we clarified in the lab text that there is no need to type annotate the code during type checking. Annotations will become relevant first in lab3. @@ -142,12 +142,12 @@ http://www.cse.chalmers.se/edu/course/DAT151/ : //2019-11-07// - [MiniJS laborations/mini/index.html] implementation in Haskell and Java. + [MiniJS labs/mini/index.html] implementation in Haskell and Java. : //2019-11-02// First published version of this page. - [Lab 1 laborations/lab1/index.html] and - [Lab 2 laborations/lab2/index.html] descriptions online. + [Lab 1 labs/lab1/index.html] and + [Lab 2 labs/lab2/index.html] descriptions online. Labs are done in groups of 2. Please look for a lab partner. @@ -165,7 +165,7 @@ Slides follow closely the plt book. || Date | Time | Title | Material || -| Tue 05/11 | 13-15 | PL Design, Compilation Phases, [MiniJS laborations/mini/index.html] | [slides plt-book/ipl-book/slides/1-slides-ipl-book.pdf], plt 1, dragon 1, live coding [start live/2019/live-1-mini-start.zip] [lecture live/2019/live-1-as-far-as-we-got.zip] [finish live/2019/live-1-mini-finish.zip] +| Tue 05/11 | 13-15 | PL Design, Compilation Phases, [MiniJS labs/mini/index.html] | [slides plt-book/ipl-book/slides/1-slides-ipl-book.pdf], plt 1, dragon 1, live coding [start live/2019/live-1-mini-start.zip] [lecture live/2019/live-1-as-far-as-we-got.zip] [finish live/2019/live-1-mini-finish.zip] %, [live coding live/2018/lec1-happy-live-2018.zip] | Thu 07/11 | 13-15 | Grammars / BNFC / Hands-on with Lab 1 | [slides plt-book/ipl-book/slides/2-slides-ipl-book.pdf], plt 2, dragon 2.8.2,4.1-4.3 % [code live-2-bnfc.zip] @@ -173,29 +173,29 @@ Slides follow closely the plt book. %[LL parser code LL-parsing.zip] %| Thu 14/11 | 10-16 | [DATE-IT 2017 fair https://www.date-it.se/] | No class! | | Thu 14/11 | 13-15 | Theory of lexing | [slides plt-book/ipl-book/slides/3-slides-ipl-book.pdf], plt 3, dragon 3,4 -| //Mon 18/11// | //23// | //Lab 1 deadline// | [lab1 PM laborations/lab1/index.html] | +| //Mon 18/11// | //23// | //Lab 1 deadline// | [lab1 PM labs/lab1/index.html] | %| Tue 19/11 | 13-15 | Theory of lexing, LR parsing | [slides plt-book/ipl-book/slides/3-slides-ipl-book.pdf], plt 3, dragon 3,4 | Tue 19/11 | 13-15 | Interpreting | [slides plt-book/ipl-book/slides/5-slides-ipl-book.pdf], plt 5 %| Thu 21/11 | 13-15 | Interpreting | [slides plt-book/ipl-book/slides/5-slides-ipl-book.pdf], plt 5 | Thu 21/11 | 13-15 | Type checking | [slides plt-book/ipl-book/slides/4-slides-ipl-book.pdf], plt 4, dragon 5,6 %| Tue 26/11 | 13-15 | Type checking | [slides plt-book/ipl-book/slides/4-slides-ipl-book.pdf], plt 4, dragon 5,6 -| Tue 26/11 | 13-14 | Hands-on with Lab 2 (Haskell) | [lab2 PM laborations/lab2/index.html] [Monads https://homepages.inf.ed.ac.uk/wadler/papers/marktoberdorf/baastad.pdf] | +| Tue 26/11 | 13-14 | Hands-on with Lab 2 (Haskell) | [lab2 PM labs/lab2/index.html] [Monads https://homepages.inf.ed.ac.uk/wadler/papers/marktoberdorf/baastad.pdf] | | Tue 26/11 | 14-15 | Hands-on with Lab 2 (Java) | [live coding live/2019/live-7-lab2.zip] | -%| Thu 28/11 | 13-14 | Hands-on with Lab 2 (Haskell) | [lab2 PM laborations/lab2/index.html] +%| Thu 28/11 | 13-14 | Hands-on with Lab 2 (Haskell) | [lab2 PM labs/lab2/index.html] %| Thu 28/11 | 14-15 | Hands-on with Lab 2 (Java) | | | Thu 28/11 | 13-15 | Code generation | [slides plt-book/ipl-book/slides/6-slides-ipl-book.pdf], plt 6, dragon 6,7 | //Mon 02/12// | //23// | //Lab 2 deadline// | | %| Tue 03/12 | 13-15 | Code generation | [slides plt-book/ipl-book/slides/6-slides-ipl-book.pdf], plt 6, dragon 6,7 -| Tue 03/12 | 13-14 | Hands-on with Lab 3 (Haskell) | [lab3 PM laborations/lab3/index.html] +| Tue 03/12 | 13-14 | Hands-on with Lab 3 (Haskell) | [lab3 PM labs/lab3/index.html] | Tue 03/12 | 14-15 | Hands-on with Lab 3 (Java) | [live coding live/2019/live-9-lab3.zip] | -%| Thu 05/12 | 13-14 | Hands-on with Lab 3 (Haskell) | [lab3 PM laborations/lab3/index.html] +%| Thu 05/12 | 13-14 | Hands-on with Lab 3 (Haskell) | [lab3 PM labs/lab3/index.html] %| Thu 05/12 | 14-15 | Hands-on with Lab 3 (Java) | | %| Thu 05/12 | 13-15 | [Domain-specific languages http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf] | Guest lecture by [Thorsten Berger http://www.cse.chalmers.se/~bergert/] | Thu 05/12 | 13-15 | Functional programming languages | [slides plt-book/ipl-book/slides/7-slides-ipl-book.pdf], plt 7, dragon 6.5,7.3 %| Tue 10/12 | 13-15 | Functional programming languages | [slides plt-book/ipl-book/slides/7-slides-ipl-book.pdf], plt 7, dragon 6.5,7.3 % %| Tue 10/12 | 13-15 | The language design space | [slides plt-book/ipl-book/slides/8-slides-ipl-book.pdf], plt 8, dragon 1. | Tue 10/12 | 13-15 | Type inference and polymorphism | plt 7.7-9 -| Thu 12/12 | 13-15 | Hands-on with Lab 4 | [lab4 PM laborations/lab4/index.html] +| Thu 12/12 | 13-15 | Hands-on with Lab 4 | [lab4 PM labs/lab4/index.html] | //Mon 16/12// | //23// | //Lab 3 deadline// | | %| Tue 17/12 | 13-15 | Type inference. A taste of dependent types | Agda demo [Verified compilation ./JVM.agda] | | Tue 17/12 | 13-15 | Dependent types (Agda) | Live coding [start live/2019/live-13-JVM-start.agda] and [finish live/2019/live-13-JVM-finish.agda] | @@ -287,7 +287,7 @@ You are also welcome to answer questions by others. % This is necessary to identify you as a participant of the course. % Please also indicate whether you are GU or Chalmers student. -=Laboration times and supervision= +=Lab times and supervision= Lab supervision take place in [ED3354 http://maps.chalmers.se/#45ea04d0-4a90-4a18-9842-55599dbbb093]. @@ -301,27 +301,27 @@ The lab rooms and supervision are available from Thu 07 November till Fri 20 December 2019. **Attendance in these classes is optional**. -Normally, each student should attend **at most one** supervised laboration time each week. +Normally, each student should attend **at most one** supervised lab time each week. Since attendance is not compulsory, there may be room for more times. But, if there is lack of room, those who attend their first supervision of the week have priority to get a place and supervisor help. -=Laborations= +=Labs= -There will be four laborations, written in pairs. +There will be four labs, written in pairs. (Individual solutions are accepted per exception, please contact the course responsible.) You have to pass the labs to pass the course. However, the course grade is determined solely by the exam. % - Lab 1 - parser (deadline 18/11) -- [Lab 1 - parser laborations/lab1/index.html] (deadline 18/11) +- [Lab 1 - parser labs/lab1/index.html] (deadline 18/11) % - Lab 2 - type checker and interpreter (deadline 02/12) -- [Lab 2 - type checker and interpreter laborations/lab2/index.html] (deadline 02/12) +- [Lab 2 - type checker and interpreter labs/lab2/index.html] (deadline 02/12) % - Lab 3 - code generator (deadline 16/12) -- [Lab 3 - code generator laborations/lab3/index.html] (deadline 16/12) +- [Lab 3 - code generator labs/lab3/index.html] (deadline 16/12) % - Lab 4 - functional language interpreter (deadline 09/01/2020) -- [Lab 4 - functional language interpreter laborations/lab4/index.html] (deadline 09/01/2020) +- [Lab 4 - functional language interpreter labs/lab4/index.html] (deadline 09/01/2020) The labs are quite substantial, so please set aside at least 30 full working hours (4 full working days) before the deadline. It is recommended to start at least 10 days before the deadline. diff --git a/Makefile b/Makefile index 86dcba4..bea717d 100644 --- a/Makefile +++ b/Makefile @@ -16,13 +16,13 @@ ship : # scp $< abela@remote12.chalmers.se:/chalmers/groups/edu2009/www/www.cse.chalmers.se/year/2019/course/DAT151/ labs-www : - make -C laborations index.html + make -C labs index.html lab% : - make -C laborations/$@ + make -C labs/$@ mini : - make -C laborations/mini + make -C labs/mini ipl-book : make -C plt-book/ipl-book @@ -58,7 +58,7 @@ exams.tgz : exams/*.pdf exams/*.txt exams/*.html exams/*.jpg .PHONY : test test : - make -C laborations test + make -C labs test ## Cleaning @@ -68,6 +68,6 @@ clean_index : rm -f index.html clean_% : - make clean -C laborations/$* + make clean -C labs/$* # EOF diff --git a/cabal.project b/cabal.project index 14c61cd..89be833 100644 --- a/cabal.project +++ b/cabal.project @@ -1,11 +1,11 @@ packages: - laborations + labs - laborations/lab1/testsuite - laborations/lab2/testsuite - -- laborations/lab3/testsuite - -- laborations/lab4/testsuite + labs/lab1/testsuite + labs/lab2/testsuite + -- labs/lab3/testsuite + -- labs/lab4/testsuite - laborations/lab2/haskell - laborations/lab3/haskell - laborations/lab4/haskell + labs/lab2/haskell + labs/lab3/haskell + labs/lab4/haskell diff --git a/index.txt b/index.txt index c82231b..4144135 100644 --- a/index.txt +++ b/index.txt @@ -131,7 +131,7 @@ Winter Term 2023 (LP2) % % on verified compilation. % % % : //2019-12-16// -% % % [Lab 4 stubs laborations/lab4/index.html#section3] for Haskell and Java are now available. +% % % [Lab 4 stubs labs/lab4/index.html#section3] for Haskell and Java are now available. % % : //2019-12-12// % % A bug that caused some test (e.g. the tests in the subtyping directory) to not run has been fixed in the lab 3 test suite. Please re-download the test suite. @@ -143,10 +143,10 @@ Winter Term 2023 (LP2) % A [script notes/monads.md] about the implementation of the interpreter in Haskell. This completes and extends the hints given in the plt book, and contains a tutorial on monads and monad transformers. % : //2020-11-20// -% [Lab 4 laborations/lab4/index.html] description is online. +% [Lab 4 labs/lab4/index.html] description is online. % : //2020-11-20// -% The [testsuite runner laborations/lab2/testsuite/progs-test-lab2.hs] for lab2 +% The [testsuite runner labs/lab2/testsuite/progs-test-lab2.hs] for lab2 % has been relaxed to look for ``TYPE ERROR`` and ``INTERPRETER ERROR`` % anywhere in ``stdout`` and ``stderr``. @@ -165,7 +165,7 @@ Winter Term 2023 (LP2) % % (Note: should compile, but does not run!) % : //2020-11-17// -% [Lab 3 laborations/lab3/index.html] description is online. +% [Lab 3 labs/lab3/index.html] description is online. % % : //2022-11-24// % The deadline for lab 2 has been extended to Wed 30 Nov 2022 midnight. @@ -178,7 +178,7 @@ Winter Term 2023 (LP2) % to incorporate the changes made in the lecture. % : //2020-11-13// -% [Lab 2 laborations/lab2/index.html] description is online. +% [Lab 2 labs/lab2/index.html] description is online. % It differs from the 2019 version in that an //annotating// type checker is needed. @@ -203,7 +203,7 @@ Winter Term 2023 (LP2) % % : //2019-11-07// -% % [MiniJS laborations/mini/index.html] implementation in Haskell and Java. +% % [MiniJS labs/mini/index.html] implementation in Haskell and Java. % : //2022-11-17// % Tuesday lectures on 2 dates, 2022-11-23 (next week) and 2022-12-14 (final Tuesday lecture) @@ -221,7 +221,7 @@ Winter Term 2023 (LP2) % On-campus attendance is recommended though, for a better lecture experience and better interaction. % : //2020-11-02// -% [Lab 1 laborations/lab1/index.html] description is online. +% [Lab 1 labs/lab1/index.html] description is online. % Labs are done in groups of 2. Please look for a lab partner. @@ -261,7 +261,7 @@ Slides follow closely the plt book. | Tue 31/10 | 13-15 | PL Design, Compilation Phases | [slides plt-book/ipl-book/slides/1-slides-ipl-book.pdf], plt 1, dragon 1 % , live coding [start live/2023/live-1-Calc-bnfc-start.zip] %, live coding [Calc live/2023/live-1-Calc-bnfc.zip] -% , [MiniJS laborations/mini/index.html] +% , [MiniJS labs/mini/index.html] %, live coding [start live/2019/live-1-mini-start.zip] [lecture live/2019/live-1-as-far-as-we-got.zip] [finish live/2019/live-1-mini-finish.zip] %, [live coding live/2018/lec1-happy-live-2018.zip] | Thu 02/11 | 13-15 **[SB-H5 https://maps.chalmers.se/#f85ee0cd-e87b-403f-acf9-bd30f6b3339d]** | Grammars / BNFC / Hands-on with Lab 1 | [slides plt-book/ipl-book/slides/2-slides-ipl-book.pdf], plt 2, dragon 2.8.2,4.1-4.3, [git notes/git-primer.md] @@ -272,29 +272,29 @@ Slides follow closely the plt book. %| Thu 09/11 | 10-16 | [DATE-IT 2017 fair https://www.date-it.se/] | No class! | | Thu 09/11 | 13-15 | Theory of lexing | [slides plt-book/ipl-book/slides/3-slides-ipl-book.pdf], plt 3, dragon 3,4 | //Mon 13/11// | //23// | //Lab 1 deadline// | | -%[lab1 PM laborations/lab1/index.html] | +%[lab1 PM labs/lab1/index.html] | %| Tue 14/11 | 13-15 | Theory of lexing, LR parsing | [slides plt-book/ipl-book/slides/3-slides-ipl-book.pdf], plt 3, dragon 3,4 | Tue 14/11 | 13-15 * | Type checking | [slides plt-book/ipl-book/slides/4-slides-ipl-book.pdf], plt 4, dragon 5,6, [script notes/type-checking.html] [prime.c notes/prime.c] | | Thu 16/11 | 13-15 | Interpreting | [slides plt-book/ipl-book/slides/5-slides-ipl-book.pdf], plt 5, [script notes/interpreter.html] | | Tue 21/11 | 13-14 | Hands-on with Lab 2 (Haskell) //(lecture: ??)// | [live coding live/2023/live-7-lab2-haskell.zip] | -%[lab2 PM laborations/lab2/index.html] [script notes/monads.html] [Monads https://homepages.inf.ed.ac.uk/wadler/papers/marktoberdorf/baastad.pdf] | +%[lab2 PM labs/lab2/index.html] [script notes/monads.html] [Monads https://homepages.inf.ed.ac.uk/wadler/papers/marktoberdorf/baastad.pdf] | | Tue 21/11 | 14-15 | Hands-on with Lab 2 (Java) //(lecture: ??)// | [live coding live/2023/live-7-lab2-java.zip] | %[live coding live/2019/live-7-lab2.zip] | %| Thu 23/11 | 13-14 | Hands-on with Lab 2 (Haskell) | | -%[lab2 PM laborations/lab2/index.html] +%[lab2 PM labs/lab2/index.html] %| Thu 23/11 | 14-15 **[SB-H1 https://maps.chalmers.se/#56936c80-6cb7-4a3e-be43-4c6458006683]** | Hands-on with Lab 2 (Java) | | | Thu 23/11 | 13-15 **[SB-H1 https://maps.chalmers.se/#56936c80-6cb7-4a3e-be43-4c6458006683]** | Code generation //(lecture: ??)// | [slides plt-book/ipl-book/slides/6-slides-ipl-book.pdf], plt 6, dragon 6,7, [notes notes/compilation.html], [prime.c notes/prime.c], [prime.j notes/prime.j] | //Mon 27/11// | //23// | //Lab 2 deadline// | | -%[lab2 PM laborations/lab2/index.html] | +%[lab2 PM labs/lab2/index.html] | %| Tue 28/11 | 13-15 | Code generation | [slides plt-book/ipl-book/slides/6-slides-ipl-book.pdf], plt 6, dragon 6,7, [script notes/compilation.html] | Tue 28/11 | 13-14 | Hands-on with Lab 3 (Haskell) | | %[live code (diff) live/2023/live-9-lab3-haskell.diff] | -%[lab3 PM laborations/lab3/index.html] +%[lab3 PM labs/lab3/index.html] | Tue 28/11 | 14-15 | Hands-on with Lab 3 (Java) | | %[live code (diff) live/2023/live-9-lab3-java.diff] | %[live coding live/2019/live-9-lab3.zip] | %| Thu 30/11 | 13-14 | Hands-on with Lab 3 (Haskell) | | -%[lab3 PM laborations/lab3/index.html] +%[lab3 PM labs/lab3/index.html] %| Thu 30/11 | 14-15 | Hands-on with Lab 3 (Java) | | %| Thu 30/11 | 13-15 | [Domain-specific languages http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf] | Guest lecture by [Thorsten Berger http://www.cse.chalmers.se/~bergert/] | Thu 30/11 | 13-15 | Functional programming languages | [slides plt-book/ipl-book/slides/7-slides-ipl-book.pdf], plt 7, dragon 6.5,7.3, [script notes/cbn-cbv.html] @@ -307,7 +307,7 @@ Slides follow closely the plt book. | Thu 07/12 | 14-15 | Hands-on with Lab 4 (Java) | | %diff [start live/2023/live-12-lab4-java-start.diff] [live live/2023/live-12-lab4-java-finish.diff] | %live code [start live/2020/hands-on-4-java-start.tgz] [finish live/2020/hands-on-4-java-finish.tgz] | -%[lab4 PM laborations/lab4/index.html] +%[lab4 PM labs/lab4/index.html] %| //Mon 11/12// | //23// | //Lab 3 deadline// | | | Tue 12/12 | 13-15 | Type inference. A taste of dependent types | Agda demo [Verified compilation ./JVM.agda] | %| Tue 12/12 | 13-15 | Dependent types (Agda) [video https://chalmers.instructure.com/courses/21130/external_tools/29] | "Live" coding [start live/2020/JVM-start.agda] | @@ -422,7 +422,7 @@ You are also welcome to answer questions by others. % This is necessary to identify you as a participant of the course. % Please also indicate whether you are GU or Chalmers student. -=Laboration times and supervision= +=Lab times and supervision= % Lab supervision workflow: Start a Zoom meeting and invite your group partner to join. To ask for help, sign up on the [Waglys digital waiting list https://www.waglys.com/bonlYD] with your 10-digit Zoom ID (as "6435657890" from "https://chalmers.zoom.us/j/6435657890"), so that the TAs know where to find you. Please make sure your meeting does **not** require password to get in. A TA will join your Zoom meeting as soon as it's your turn. @@ -450,7 +450,7 @@ except for Fri 03 Nov which is a half-day. %Tue 17th, Wed 18th, Jan 24th, Jan 25th. % **Attendance in these classes is optional**. -% Normally, each student should attend **at most one** supervised laboration time each week. +% Normally, each student should attend **at most one** supervised lab time each week. % Since attendance is not compulsory, there may be room for more % times. But, if there is lack of room, those who attend their first % supervision of the week have priority to get a place and supervisor help. @@ -473,18 +473,18 @@ If you have difficulties finding a partner, please use Slack channel ``#lab-part -=Laborations= +=Labs= You have to pass the labs to pass the course. However, the course grade is determined solely by the exam. - Lab 1 - parser (deadline 13/11) -% - [Lab 1 - parser laborations/lab1/index.html] (deadline 13/11) +% - [Lab 1 - parser labs/lab1/index.html] (deadline 13/11) - Lab 2 - type checker and interpreter (deadline 27/11) -% - [Lab 2 - type checker and interpreter laborations/lab2/index.html] (deadline 27/11) +% - [Lab 2 - type checker and interpreter labs/lab2/index.html] (deadline 27/11) - Lab 3 - code generator (deadline 13/12) -% - [Lab 3 - code generator laborations/lab3/index.html] (deadline 13/12) +% - [Lab 3 - code generator labs/lab3/index.html] (deadline 13/12) - Lab 4 - functional language interpreter (deadline 08/01/2024) -% - [Lab 4 - functional language interpreter laborations/lab4/index.html] (deadline 08/01/2024) +% - [Lab 4 - functional language interpreter labs/lab4/index.html] (deadline 08/01/2024) The labs are quite substantial, so please set aside at least 30 full working hours (4 full working days) before the deadline. It is recommended to start at least 10 days before the deadline. diff --git a/laborations/1 b/labs/1 similarity index 100% rename from laborations/1 rename to labs/1 diff --git a/laborations/2 b/labs/2 similarity index 100% rename from laborations/2 rename to labs/2 diff --git a/laborations/3 b/labs/3 similarity index 100% rename from laborations/3 rename to labs/3 diff --git a/laborations/4 b/labs/4 similarity index 100% rename from laborations/4 rename to labs/4 diff --git a/laborations/JavaLabRunner.hs b/labs/JavaLabRunner.hs similarity index 100% rename from laborations/JavaLabRunner.hs rename to labs/JavaLabRunner.hs diff --git a/laborations/Makefile b/labs/Makefile similarity index 92% rename from laborations/Makefile rename to labs/Makefile index 257ff9e..6cffe98 100644 --- a/laborations/Makefile +++ b/labs/Makefile @@ -1,4 +1,4 @@ -# Andreas, 2020-11-03 Makefile for laborations +# Andreas, 2020-11-03 Makefile for labs # # Distribute goals to the lab% subdirectories diff --git a/laborations/cabal.project b/labs/cabal.project similarity index 100% rename from laborations/cabal.project rename to labs/cabal.project diff --git a/laborations/index.txt b/labs/index.txt similarity index 100% rename from laborations/index.txt rename to labs/index.txt diff --git a/laborations/lab1/2019-index.txt b/labs/lab1/2019-index.txt similarity index 100% rename from laborations/lab1/2019-index.txt rename to labs/lab1/2019-index.txt diff --git a/laborations/lab1/Makefile b/labs/lab1/Makefile similarity index 100% rename from laborations/lab1/Makefile rename to labs/lab1/Makefile diff --git a/laborations/lab1/index.txt b/labs/lab1/index.txt similarity index 100% rename from laborations/lab1/index.txt rename to labs/lab1/index.txt diff --git a/laborations/lab1/testsuite/.gitignore b/labs/lab1/testsuite/.gitignore similarity index 100% rename from laborations/lab1/testsuite/.gitignore rename to labs/lab1/testsuite/.gitignore diff --git a/laborations/lab1/testsuite/Makefile b/labs/lab1/testsuite/Makefile similarity index 100% rename from laborations/lab1/testsuite/Makefile rename to labs/lab1/testsuite/Makefile diff --git a/laborations/lab1/testsuite/Makefile-test b/labs/lab1/testsuite/Makefile-test similarity index 100% rename from laborations/lab1/testsuite/Makefile-test rename to labs/lab1/testsuite/Makefile-test diff --git a/laborations/lab1/testsuite/bad/bad001.cc b/labs/lab1/testsuite/bad/bad001.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad001.cc rename to labs/lab1/testsuite/bad/bad001.cc diff --git a/laborations/lab1/testsuite/bad/bad002.cc b/labs/lab1/testsuite/bad/bad002.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad002.cc rename to labs/lab1/testsuite/bad/bad002.cc diff --git a/laborations/lab1/testsuite/bad/bad003.cc b/labs/lab1/testsuite/bad/bad003.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad003.cc rename to labs/lab1/testsuite/bad/bad003.cc diff --git a/laborations/lab1/testsuite/bad/bad004.cc b/labs/lab1/testsuite/bad/bad004.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad004.cc rename to labs/lab1/testsuite/bad/bad004.cc diff --git a/laborations/lab1/testsuite/bad/bad005.cc b/labs/lab1/testsuite/bad/bad005.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad005.cc rename to labs/lab1/testsuite/bad/bad005.cc diff --git a/laborations/lab1/testsuite/bad/bad006.cc b/labs/lab1/testsuite/bad/bad006.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad006.cc rename to labs/lab1/testsuite/bad/bad006.cc diff --git a/laborations/lab1/testsuite/bad/bad007.cc b/labs/lab1/testsuite/bad/bad007.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad007.cc rename to labs/lab1/testsuite/bad/bad007.cc diff --git a/laborations/lab1/testsuite/bad/bad008.cc b/labs/lab1/testsuite/bad/bad008.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad008.cc rename to labs/lab1/testsuite/bad/bad008.cc diff --git a/laborations/lab1/testsuite/bad/bad009.cc b/labs/lab1/testsuite/bad/bad009.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad009.cc rename to labs/lab1/testsuite/bad/bad009.cc diff --git a/laborations/lab1/testsuite/bad/bad010.cc b/labs/lab1/testsuite/bad/bad010.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad010.cc rename to labs/lab1/testsuite/bad/bad010.cc diff --git a/laborations/lab1/testsuite/bad/bad011.cc b/labs/lab1/testsuite/bad/bad011.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad011.cc rename to labs/lab1/testsuite/bad/bad011.cc diff --git a/laborations/lab1/testsuite/bad/bad012.cc b/labs/lab1/testsuite/bad/bad012.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad012.cc rename to labs/lab1/testsuite/bad/bad012.cc diff --git a/laborations/lab1/testsuite/bad/bad013.cc b/labs/lab1/testsuite/bad/bad013.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad013.cc rename to labs/lab1/testsuite/bad/bad013.cc diff --git a/laborations/lab1/testsuite/bad/bad014.cc b/labs/lab1/testsuite/bad/bad014.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad014.cc rename to labs/lab1/testsuite/bad/bad014.cc diff --git a/laborations/lab1/testsuite/bad/bad015.cc b/labs/lab1/testsuite/bad/bad015.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad015.cc rename to labs/lab1/testsuite/bad/bad015.cc diff --git a/laborations/lab1/testsuite/bad/bad016.cc b/labs/lab1/testsuite/bad/bad016.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad016.cc rename to labs/lab1/testsuite/bad/bad016.cc diff --git a/laborations/lab1/testsuite/bad/bad017.cc b/labs/lab1/testsuite/bad/bad017.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad017.cc rename to labs/lab1/testsuite/bad/bad017.cc diff --git a/laborations/lab1/testsuite/bad/bad018.cc b/labs/lab1/testsuite/bad/bad018.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad018.cc rename to labs/lab1/testsuite/bad/bad018.cc diff --git a/laborations/lab1/testsuite/bad/bad019.cc b/labs/lab1/testsuite/bad/bad019.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad019.cc rename to labs/lab1/testsuite/bad/bad019.cc diff --git a/laborations/lab1/testsuite/bad/bad026.cc b/labs/lab1/testsuite/bad/bad026.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad026.cc rename to labs/lab1/testsuite/bad/bad026.cc diff --git a/laborations/lab1/testsuite/bad/bad027.cc b/labs/lab1/testsuite/bad/bad027.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad027.cc rename to labs/lab1/testsuite/bad/bad027.cc diff --git a/laborations/lab1/testsuite/bad/bad029.cc b/labs/lab1/testsuite/bad/bad029.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad029.cc rename to labs/lab1/testsuite/bad/bad029.cc diff --git a/laborations/lab1/testsuite/bad/bad030.cc b/labs/lab1/testsuite/bad/bad030.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad030.cc rename to labs/lab1/testsuite/bad/bad030.cc diff --git a/laborations/lab1/testsuite/bad/bad031.cc b/labs/lab1/testsuite/bad/bad031.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad031.cc rename to labs/lab1/testsuite/bad/bad031.cc diff --git a/laborations/lab1/testsuite/bad/bad032.cc b/labs/lab1/testsuite/bad/bad032.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad032.cc rename to labs/lab1/testsuite/bad/bad032.cc diff --git a/laborations/lab1/testsuite/bad/bad033.cc b/labs/lab1/testsuite/bad/bad033.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad033.cc rename to labs/lab1/testsuite/bad/bad033.cc diff --git a/laborations/lab1/testsuite/bad/bad034.cc b/labs/lab1/testsuite/bad/bad034.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad034.cc rename to labs/lab1/testsuite/bad/bad034.cc diff --git a/laborations/lab1/testsuite/bad/bad035.cc b/labs/lab1/testsuite/bad/bad035.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad035.cc rename to labs/lab1/testsuite/bad/bad035.cc diff --git a/laborations/lab1/testsuite/bad/bad036.cc b/labs/lab1/testsuite/bad/bad036.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad036.cc rename to labs/lab1/testsuite/bad/bad036.cc diff --git a/laborations/lab1/testsuite/bad/bad037.cc b/labs/lab1/testsuite/bad/bad037.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad037.cc rename to labs/lab1/testsuite/bad/bad037.cc diff --git a/laborations/lab1/testsuite/bad/bad038.cc b/labs/lab1/testsuite/bad/bad038.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad038.cc rename to labs/lab1/testsuite/bad/bad038.cc diff --git a/laborations/lab1/testsuite/bad/bad039.cc b/labs/lab1/testsuite/bad/bad039.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad039.cc rename to labs/lab1/testsuite/bad/bad039.cc diff --git a/laborations/lab1/testsuite/bad/bad040.cc b/labs/lab1/testsuite/bad/bad040.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad040.cc rename to labs/lab1/testsuite/bad/bad040.cc diff --git a/laborations/lab1/testsuite/bad/bad041.cc b/labs/lab1/testsuite/bad/bad041.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad041.cc rename to labs/lab1/testsuite/bad/bad041.cc diff --git a/laborations/lab1/testsuite/bad/bad042.cc b/labs/lab1/testsuite/bad/bad042.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad042.cc rename to labs/lab1/testsuite/bad/bad042.cc diff --git a/laborations/lab1/testsuite/bad/bad043.cc b/labs/lab1/testsuite/bad/bad043.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad043.cc rename to labs/lab1/testsuite/bad/bad043.cc diff --git a/laborations/lab1/testsuite/bad/bad044.cc b/labs/lab1/testsuite/bad/bad044.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad044.cc rename to labs/lab1/testsuite/bad/bad044.cc diff --git a/laborations/lab1/testsuite/bad/bad045.cc b/labs/lab1/testsuite/bad/bad045.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad045.cc rename to labs/lab1/testsuite/bad/bad045.cc diff --git a/laborations/lab1/testsuite/bad/bad046.cc b/labs/lab1/testsuite/bad/bad046.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad046.cc rename to labs/lab1/testsuite/bad/bad046.cc diff --git a/laborations/lab1/testsuite/bad/bad047.cc b/labs/lab1/testsuite/bad/bad047.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad047.cc rename to labs/lab1/testsuite/bad/bad047.cc diff --git a/laborations/lab1/testsuite/bad/bad048.cc b/labs/lab1/testsuite/bad/bad048.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad048.cc rename to labs/lab1/testsuite/bad/bad048.cc diff --git a/laborations/lab1/testsuite/bad/bad049.cc b/labs/lab1/testsuite/bad/bad049.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad049.cc rename to labs/lab1/testsuite/bad/bad049.cc diff --git a/laborations/lab1/testsuite/bad/bad050.cc b/labs/lab1/testsuite/bad/bad050.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad050.cc rename to labs/lab1/testsuite/bad/bad050.cc diff --git a/laborations/lab1/testsuite/bad/bad052.cc b/labs/lab1/testsuite/bad/bad052.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad052.cc rename to labs/lab1/testsuite/bad/bad052.cc diff --git a/laborations/lab1/testsuite/bad/bad053.cc b/labs/lab1/testsuite/bad/bad053.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad053.cc rename to labs/lab1/testsuite/bad/bad053.cc diff --git a/laborations/lab1/testsuite/bad/bad058.cc b/labs/lab1/testsuite/bad/bad058.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad058.cc rename to labs/lab1/testsuite/bad/bad058.cc diff --git a/laborations/lab1/testsuite/bad/bad059.cc b/labs/lab1/testsuite/bad/bad059.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad059.cc rename to labs/lab1/testsuite/bad/bad059.cc diff --git a/laborations/lab1/testsuite/bad/bad060.cc b/labs/lab1/testsuite/bad/bad060.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad060.cc rename to labs/lab1/testsuite/bad/bad060.cc diff --git a/laborations/lab1/testsuite/bad/bad061.cc b/labs/lab1/testsuite/bad/bad061.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad061.cc rename to labs/lab1/testsuite/bad/bad061.cc diff --git a/laborations/lab1/testsuite/bad/bad062.cc b/labs/lab1/testsuite/bad/bad062.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad062.cc rename to labs/lab1/testsuite/bad/bad062.cc diff --git a/laborations/lab1/testsuite/bad/bad063.cc b/labs/lab1/testsuite/bad/bad063.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad063.cc rename to labs/lab1/testsuite/bad/bad063.cc diff --git a/laborations/lab1/testsuite/bad/bad064.cc b/labs/lab1/testsuite/bad/bad064.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad064.cc rename to labs/lab1/testsuite/bad/bad064.cc diff --git a/laborations/lab1/testsuite/bad/bad065.cc b/labs/lab1/testsuite/bad/bad065.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad065.cc rename to labs/lab1/testsuite/bad/bad065.cc diff --git a/laborations/lab1/testsuite/bad/bad066.cc b/labs/lab1/testsuite/bad/bad066.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad066.cc rename to labs/lab1/testsuite/bad/bad066.cc diff --git a/laborations/lab1/testsuite/bad/bad067.cc b/labs/lab1/testsuite/bad/bad067.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad067.cc rename to labs/lab1/testsuite/bad/bad067.cc diff --git a/laborations/lab1/testsuite/bad/bad072.cc b/labs/lab1/testsuite/bad/bad072.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad072.cc rename to labs/lab1/testsuite/bad/bad072.cc diff --git a/laborations/lab1/testsuite/bad/bad073.cc b/labs/lab1/testsuite/bad/bad073.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad073.cc rename to labs/lab1/testsuite/bad/bad073.cc diff --git a/laborations/lab1/testsuite/bad/bad074.cc b/labs/lab1/testsuite/bad/bad074.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad074.cc rename to labs/lab1/testsuite/bad/bad074.cc diff --git a/laborations/lab1/testsuite/bad/bad075.cc b/labs/lab1/testsuite/bad/bad075.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad075.cc rename to labs/lab1/testsuite/bad/bad075.cc diff --git a/laborations/lab1/testsuite/bad/bad076.cc b/labs/lab1/testsuite/bad/bad076.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad076.cc rename to labs/lab1/testsuite/bad/bad076.cc diff --git a/laborations/lab1/testsuite/bad/bad077.cc b/labs/lab1/testsuite/bad/bad077.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad077.cc rename to labs/lab1/testsuite/bad/bad077.cc diff --git a/laborations/lab1/testsuite/bad/bad078.cc b/labs/lab1/testsuite/bad/bad078.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad078.cc rename to labs/lab1/testsuite/bad/bad078.cc diff --git a/laborations/lab1/testsuite/bad/bad079.cc b/labs/lab1/testsuite/bad/bad079.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad079.cc rename to labs/lab1/testsuite/bad/bad079.cc diff --git a/laborations/lab1/testsuite/bad/bad080.cc b/labs/lab1/testsuite/bad/bad080.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad080.cc rename to labs/lab1/testsuite/bad/bad080.cc diff --git a/laborations/lab1/testsuite/bad/bad081.cc b/labs/lab1/testsuite/bad/bad081.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad081.cc rename to labs/lab1/testsuite/bad/bad081.cc diff --git a/laborations/lab1/testsuite/bad/bad082.cc b/labs/lab1/testsuite/bad/bad082.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad082.cc rename to labs/lab1/testsuite/bad/bad082.cc diff --git a/laborations/lab1/testsuite/bad/bad083.cc b/labs/lab1/testsuite/bad/bad083.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad083.cc rename to labs/lab1/testsuite/bad/bad083.cc diff --git a/laborations/lab1/testsuite/bad/bad084.cc b/labs/lab1/testsuite/bad/bad084.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad084.cc rename to labs/lab1/testsuite/bad/bad084.cc diff --git a/laborations/lab1/testsuite/bad/bad085.cc b/labs/lab1/testsuite/bad/bad085.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad085.cc rename to labs/lab1/testsuite/bad/bad085.cc diff --git a/laborations/lab1/testsuite/bad/bad086.cc b/labs/lab1/testsuite/bad/bad086.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad086.cc rename to labs/lab1/testsuite/bad/bad086.cc diff --git a/laborations/lab1/testsuite/bad/bad087.cc b/labs/lab1/testsuite/bad/bad087.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad087.cc rename to labs/lab1/testsuite/bad/bad087.cc diff --git a/laborations/lab1/testsuite/bad/bad088.cc b/labs/lab1/testsuite/bad/bad088.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad088.cc rename to labs/lab1/testsuite/bad/bad088.cc diff --git a/laborations/lab1/testsuite/bad/bad089.cc b/labs/lab1/testsuite/bad/bad089.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad089.cc rename to labs/lab1/testsuite/bad/bad089.cc diff --git a/laborations/lab1/testsuite/bad/bad090.cc b/labs/lab1/testsuite/bad/bad090.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad090.cc rename to labs/lab1/testsuite/bad/bad090.cc diff --git a/laborations/lab1/testsuite/bad/bad091.cc b/labs/lab1/testsuite/bad/bad091.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad091.cc rename to labs/lab1/testsuite/bad/bad091.cc diff --git a/laborations/lab1/testsuite/bad/bad092.cc b/labs/lab1/testsuite/bad/bad092.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad092.cc rename to labs/lab1/testsuite/bad/bad092.cc diff --git a/laborations/lab1/testsuite/bad/bad093.cc b/labs/lab1/testsuite/bad/bad093.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad093.cc rename to labs/lab1/testsuite/bad/bad093.cc diff --git a/laborations/lab1/testsuite/bad/bad094.cc b/labs/lab1/testsuite/bad/bad094.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad094.cc rename to labs/lab1/testsuite/bad/bad094.cc diff --git a/laborations/lab1/testsuite/bad/bad095.cc b/labs/lab1/testsuite/bad/bad095.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad095.cc rename to labs/lab1/testsuite/bad/bad095.cc diff --git a/laborations/lab1/testsuite/bad/bad096.cc b/labs/lab1/testsuite/bad/bad096.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad096.cc rename to labs/lab1/testsuite/bad/bad096.cc diff --git a/laborations/lab1/testsuite/bad/bad097.cc b/labs/lab1/testsuite/bad/bad097.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad097.cc rename to labs/lab1/testsuite/bad/bad097.cc diff --git a/laborations/lab1/testsuite/bad/bad098.cc b/labs/lab1/testsuite/bad/bad098.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad098.cc rename to labs/lab1/testsuite/bad/bad098.cc diff --git a/laborations/lab1/testsuite/bad/bad099.cc b/labs/lab1/testsuite/bad/bad099.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad099.cc rename to labs/lab1/testsuite/bad/bad099.cc diff --git a/laborations/lab1/testsuite/bad/bad100.cc b/labs/lab1/testsuite/bad/bad100.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad100.cc rename to labs/lab1/testsuite/bad/bad100.cc diff --git a/laborations/lab1/testsuite/bad/bad101.cc b/labs/lab1/testsuite/bad/bad101.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad101.cc rename to labs/lab1/testsuite/bad/bad101.cc diff --git a/laborations/lab1/testsuite/bad/bad102.cc b/labs/lab1/testsuite/bad/bad102.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad102.cc rename to labs/lab1/testsuite/bad/bad102.cc diff --git a/laborations/lab1/testsuite/bad/bad103.cc b/labs/lab1/testsuite/bad/bad103.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad103.cc rename to labs/lab1/testsuite/bad/bad103.cc diff --git a/laborations/lab1/testsuite/bad/bad104.cc b/labs/lab1/testsuite/bad/bad104.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad104.cc rename to labs/lab1/testsuite/bad/bad104.cc diff --git a/laborations/lab1/testsuite/bad/bad105.cc b/labs/lab1/testsuite/bad/bad105.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad105.cc rename to labs/lab1/testsuite/bad/bad105.cc diff --git a/laborations/lab1/testsuite/bad/bad106.cc b/labs/lab1/testsuite/bad/bad106.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad106.cc rename to labs/lab1/testsuite/bad/bad106.cc diff --git a/laborations/lab1/testsuite/bad/bad107.cc b/labs/lab1/testsuite/bad/bad107.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad107.cc rename to labs/lab1/testsuite/bad/bad107.cc diff --git a/laborations/lab1/testsuite/bad/bad108.cc b/labs/lab1/testsuite/bad/bad108.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad108.cc rename to labs/lab1/testsuite/bad/bad108.cc diff --git a/laborations/lab1/testsuite/bad/bad109.cc b/labs/lab1/testsuite/bad/bad109.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad109.cc rename to labs/lab1/testsuite/bad/bad109.cc diff --git a/laborations/lab1/testsuite/bad/bad110.cc b/labs/lab1/testsuite/bad/bad110.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad110.cc rename to labs/lab1/testsuite/bad/bad110.cc diff --git a/laborations/lab1/testsuite/bad/bad111.cc b/labs/lab1/testsuite/bad/bad111.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad111.cc rename to labs/lab1/testsuite/bad/bad111.cc diff --git a/laborations/lab1/testsuite/bad/bad112.cc b/labs/lab1/testsuite/bad/bad112.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad112.cc rename to labs/lab1/testsuite/bad/bad112.cc diff --git a/laborations/lab1/testsuite/bad/bad113.cc b/labs/lab1/testsuite/bad/bad113.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad113.cc rename to labs/lab1/testsuite/bad/bad113.cc diff --git a/laborations/lab1/testsuite/bad/bad114.cc b/labs/lab1/testsuite/bad/bad114.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad114.cc rename to labs/lab1/testsuite/bad/bad114.cc diff --git a/laborations/lab1/testsuite/bad/bad115.cc b/labs/lab1/testsuite/bad/bad115.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad115.cc rename to labs/lab1/testsuite/bad/bad115.cc diff --git a/laborations/lab1/testsuite/bad/bad116.cc b/labs/lab1/testsuite/bad/bad116.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad116.cc rename to labs/lab1/testsuite/bad/bad116.cc diff --git a/laborations/lab1/testsuite/bad/bad117.cc b/labs/lab1/testsuite/bad/bad117.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad117.cc rename to labs/lab1/testsuite/bad/bad117.cc diff --git a/laborations/lab1/testsuite/bad/bad118.cc b/labs/lab1/testsuite/bad/bad118.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad118.cc rename to labs/lab1/testsuite/bad/bad118.cc diff --git a/laborations/lab1/testsuite/bad/bad119.cc b/labs/lab1/testsuite/bad/bad119.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad119.cc rename to labs/lab1/testsuite/bad/bad119.cc diff --git a/laborations/lab1/testsuite/bad/bad120.cc b/labs/lab1/testsuite/bad/bad120.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad120.cc rename to labs/lab1/testsuite/bad/bad120.cc diff --git a/laborations/lab1/testsuite/bad/bad121.cc b/labs/lab1/testsuite/bad/bad121.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad121.cc rename to labs/lab1/testsuite/bad/bad121.cc diff --git a/laborations/lab1/testsuite/bad/bad122.cc b/labs/lab1/testsuite/bad/bad122.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad122.cc rename to labs/lab1/testsuite/bad/bad122.cc diff --git a/laborations/lab1/testsuite/bad/bad123.cc b/labs/lab1/testsuite/bad/bad123.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad123.cc rename to labs/lab1/testsuite/bad/bad123.cc diff --git a/laborations/lab1/testsuite/bad/bad124.cc b/labs/lab1/testsuite/bad/bad124.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad124.cc rename to labs/lab1/testsuite/bad/bad124.cc diff --git a/laborations/lab1/testsuite/bad/bad125.cc b/labs/lab1/testsuite/bad/bad125.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad125.cc rename to labs/lab1/testsuite/bad/bad125.cc diff --git a/laborations/lab1/testsuite/bad/bad126.cc b/labs/lab1/testsuite/bad/bad126.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad126.cc rename to labs/lab1/testsuite/bad/bad126.cc diff --git a/laborations/lab1/testsuite/bad/bad127.cc b/labs/lab1/testsuite/bad/bad127.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad127.cc rename to labs/lab1/testsuite/bad/bad127.cc diff --git a/laborations/lab1/testsuite/bad/bad129.cc b/labs/lab1/testsuite/bad/bad129.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad129.cc rename to labs/lab1/testsuite/bad/bad129.cc diff --git a/laborations/lab1/testsuite/bad/bad130.cc b/labs/lab1/testsuite/bad/bad130.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad130.cc rename to labs/lab1/testsuite/bad/bad130.cc diff --git a/laborations/lab1/testsuite/bad/bad132.cc b/labs/lab1/testsuite/bad/bad132.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad132.cc rename to labs/lab1/testsuite/bad/bad132.cc diff --git a/laborations/lab1/testsuite/bad/bad133.cc b/labs/lab1/testsuite/bad/bad133.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad133.cc rename to labs/lab1/testsuite/bad/bad133.cc diff --git a/laborations/lab1/testsuite/bad/bad134.cc b/labs/lab1/testsuite/bad/bad134.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad134.cc rename to labs/lab1/testsuite/bad/bad134.cc diff --git a/laborations/lab1/testsuite/bad/bad135.cc b/labs/lab1/testsuite/bad/bad135.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad135.cc rename to labs/lab1/testsuite/bad/bad135.cc diff --git a/laborations/lab1/testsuite/bad/bad136.cc b/labs/lab1/testsuite/bad/bad136.cc similarity index 100% rename from laborations/lab1/testsuite/bad/bad136.cc rename to labs/lab1/testsuite/bad/bad136.cc diff --git a/laborations/lab1/testsuite/bad/decl-fun-paren.cc b/labs/lab1/testsuite/bad/decl-fun-paren.cc similarity index 100% rename from laborations/lab1/testsuite/bad/decl-fun-paren.cc rename to labs/lab1/testsuite/bad/decl-fun-paren.cc diff --git a/laborations/lab1/testsuite/bad/decl-paren.cc b/labs/lab1/testsuite/bad/decl-paren.cc similarity index 100% rename from laborations/lab1/testsuite/bad/decl-paren.cc rename to labs/lab1/testsuite/bad/decl-paren.cc diff --git a/laborations/lab1/testsuite/bad/decl-trailing-comma-in-main.cc b/labs/lab1/testsuite/bad/decl-trailing-comma-in-main.cc similarity index 100% rename from laborations/lab1/testsuite/bad/decl-trailing-comma-in-main.cc rename to labs/lab1/testsuite/bad/decl-trailing-comma-in-main.cc diff --git a/laborations/lab1/testsuite/bad/decl-trailing-comma.cc b/labs/lab1/testsuite/bad/decl-trailing-comma.cc similarity index 100% rename from laborations/lab1/testsuite/bad/decl-trailing-comma.cc rename to labs/lab1/testsuite/bad/decl-trailing-comma.cc diff --git a/laborations/lab1/testsuite/bad/main-empty.cc b/labs/lab1/testsuite/bad/main-empty.cc similarity index 100% rename from laborations/lab1/testsuite/bad/main-empty.cc rename to labs/lab1/testsuite/bad/main-empty.cc diff --git a/laborations/lab1/testsuite/bad/numbers.cc b/labs/lab1/testsuite/bad/numbers.cc similarity index 100% rename from laborations/lab1/testsuite/bad/numbers.cc rename to labs/lab1/testsuite/bad/numbers.cc diff --git a/laborations/lab1/testsuite/build-tarball.sh b/labs/lab1/testsuite/build-tarball.sh similarity index 100% rename from laborations/lab1/testsuite/build-tarball.sh rename to labs/lab1/testsuite/build-tarball.sh diff --git a/laborations/lab1/testsuite/cabal.project b/labs/lab1/testsuite/cabal.project similarity index 100% rename from laborations/lab1/testsuite/cabal.project rename to labs/lab1/testsuite/cabal.project diff --git a/laborations/lab1/testsuite/good-CMM/1-definitions.cc b/labs/lab1/testsuite/good-CMM/1-definitions.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/1-definitions.cc rename to labs/lab1/testsuite/good-CMM/1-definitions.cc diff --git a/laborations/lab1/testsuite/good-CMM/2-statements.cc b/labs/lab1/testsuite/good-CMM/2-statements.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/2-statements.cc rename to labs/lab1/testsuite/good-CMM/2-statements.cc diff --git a/laborations/lab1/testsuite/good-CMM/3-mandelbrot.cc b/labs/lab1/testsuite/good-CMM/3-mandelbrot.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/3-mandelbrot.cc rename to labs/lab1/testsuite/good-CMM/3-mandelbrot.cc diff --git a/laborations/lab1/testsuite/good-CMM/Makefile b/labs/lab1/testsuite/good-CMM/Makefile similarity index 100% rename from laborations/lab1/testsuite/good-CMM/Makefile rename to labs/lab1/testsuite/good-CMM/Makefile diff --git a/laborations/lab1/testsuite/good-CMM/arg_mutation_ass.cc b/labs/lab1/testsuite/good-CMM/arg_mutation_ass.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/arg_mutation_ass.cc rename to labs/lab1/testsuite/good-CMM/arg_mutation_ass.cc diff --git a/laborations/lab1/testsuite/good-CMM/arg_mutation_id.cc b/labs/lab1/testsuite/good-CMM/arg_mutation_id.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/arg_mutation_id.cc rename to labs/lab1/testsuite/good-CMM/arg_mutation_id.cc diff --git a/laborations/lab1/testsuite/good-CMM/arg_mutation_pdec.cc b/labs/lab1/testsuite/good-CMM/arg_mutation_pdec.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/arg_mutation_pdec.cc rename to labs/lab1/testsuite/good-CMM/arg_mutation_pdec.cc diff --git a/laborations/lab1/testsuite/good-CMM/arg_mutation_pinc.cc b/labs/lab1/testsuite/good-CMM/arg_mutation_pinc.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/arg_mutation_pinc.cc rename to labs/lab1/testsuite/good-CMM/arg_mutation_pinc.cc diff --git a/laborations/lab1/testsuite/good-CMM/args_many.cc b/labs/lab1/testsuite/good-CMM/args_many.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/args_many.cc rename to labs/lab1/testsuite/good-CMM/args_many.cc diff --git a/laborations/lab1/testsuite/good-CMM/args_many_empty.cc b/labs/lab1/testsuite/good-CMM/args_many_empty.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/args_many_empty.cc rename to labs/lab1/testsuite/good-CMM/args_many_empty.cc diff --git a/laborations/lab1/testsuite/good-CMM/ass_in_arith.cc b/labs/lab1/testsuite/good-CMM/ass_in_arith.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/ass_in_arith.cc rename to labs/lab1/testsuite/good-CMM/ass_in_arith.cc diff --git a/laborations/lab1/testsuite/good-CMM/ass_in_block.cc b/labs/lab1/testsuite/good-CMM/ass_in_block.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/ass_in_block.cc rename to labs/lab1/testsuite/good-CMM/ass_in_block.cc diff --git a/laborations/lab1/testsuite/good-CMM/ass_in_body.cc b/labs/lab1/testsuite/good-CMM/ass_in_body.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/ass_in_body.cc rename to labs/lab1/testsuite/good-CMM/ass_in_body.cc diff --git a/laborations/lab1/testsuite/good-CMM/ass_in_cmp.cc b/labs/lab1/testsuite/good-CMM/ass_in_cmp.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/ass_in_cmp.cc rename to labs/lab1/testsuite/good-CMM/ass_in_cmp.cc diff --git a/laborations/lab1/testsuite/good-CMM/ass_in_else.cc b/labs/lab1/testsuite/good-CMM/ass_in_else.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/ass_in_else.cc rename to labs/lab1/testsuite/good-CMM/ass_in_else.cc diff --git a/laborations/lab1/testsuite/good-CMM/ass_in_if.cc b/labs/lab1/testsuite/good-CMM/ass_in_if.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/ass_in_if.cc rename to labs/lab1/testsuite/good-CMM/ass_in_if.cc diff --git a/laborations/lab1/testsuite/good-CMM/ass_in_while.cc b/labs/lab1/testsuite/good-CMM/ass_in_while.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/ass_in_while.cc rename to labs/lab1/testsuite/good-CMM/ass_in_while.cc diff --git a/laborations/lab1/testsuite/good-CMM/ass_many.cc b/labs/lab1/testsuite/good-CMM/ass_many.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/ass_many.cc rename to labs/lab1/testsuite/good-CMM/ass_many.cc diff --git a/laborations/lab1/testsuite/good-CMM/ass_var_to_var.cc b/labs/lab1/testsuite/good-CMM/ass_var_to_var.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/ass_var_to_var.cc rename to labs/lab1/testsuite/good-CMM/ass_var_to_var.cc diff --git a/laborations/lab1/testsuite/good-CMM/bind_function_arguments_lazily.cc b/labs/lab1/testsuite/good-CMM/bind_function_arguments_lazily.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/bind_function_arguments_lazily.cc rename to labs/lab1/testsuite/good-CMM/bind_function_arguments_lazily.cc diff --git a/laborations/lab1/testsuite/good-CMM/bool_return.cc b/labs/lab1/testsuite/good-CMM/bool_return.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/bool_return.cc rename to labs/lab1/testsuite/good-CMM/bool_return.cc diff --git a/laborations/lab1/testsuite/good-CMM/boolean.cc b/labs/lab1/testsuite/good-CMM/boolean.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/boolean.cc rename to labs/lab1/testsuite/good-CMM/boolean.cc diff --git a/laborations/lab1/testsuite/good-CMM/branch_value_leaks.cc b/labs/lab1/testsuite/good-CMM/branch_value_leaks.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/branch_value_leaks.cc rename to labs/lab1/testsuite/good-CMM/branch_value_leaks.cc diff --git a/laborations/lab1/testsuite/good-CMM/cmp.cc b/labs/lab1/testsuite/good-CMM/cmp.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/cmp.cc rename to labs/lab1/testsuite/good-CMM/cmp.cc diff --git a/laborations/lab1/testsuite/good-CMM/cmp_bool.cc b/labs/lab1/testsuite/good-CMM/cmp_bool.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/cmp_bool.cc rename to labs/lab1/testsuite/good-CMM/cmp_bool.cc diff --git a/laborations/lab1/testsuite/good-CMM/core005.cc b/labs/lab1/testsuite/good-CMM/core005.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/core005.cc rename to labs/lab1/testsuite/good-CMM/core005.cc diff --git a/laborations/lab1/testsuite/good-CMM/core006.cc b/labs/lab1/testsuite/good-CMM/core006.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/core006.cc rename to labs/lab1/testsuite/good-CMM/core006.cc diff --git a/laborations/lab1/testsuite/good-CMM/core007.cc b/labs/lab1/testsuite/good-CMM/core007.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/core007.cc rename to labs/lab1/testsuite/good-CMM/core007.cc diff --git a/laborations/lab1/testsuite/good-CMM/core009.cc b/labs/lab1/testsuite/good-CMM/core009.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/core009.cc rename to labs/lab1/testsuite/good-CMM/core009.cc diff --git a/laborations/lab1/testsuite/good-CMM/core012.cc b/labs/lab1/testsuite/good-CMM/core012.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/core012.cc rename to labs/lab1/testsuite/good-CMM/core012.cc diff --git a/laborations/lab1/testsuite/good-CMM/core013.cc b/labs/lab1/testsuite/good-CMM/core013.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/core013.cc rename to labs/lab1/testsuite/good-CMM/core013.cc diff --git a/laborations/lab1/testsuite/good-CMM/core015.cc b/labs/lab1/testsuite/good-CMM/core015.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/core015.cc rename to labs/lab1/testsuite/good-CMM/core015.cc diff --git a/laborations/lab1/testsuite/good-CMM/core016.cc b/labs/lab1/testsuite/good-CMM/core016.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/core016.cc rename to labs/lab1/testsuite/good-CMM/core016.cc diff --git a/laborations/lab1/testsuite/good-CMM/core017.cc b/labs/lab1/testsuite/good-CMM/core017.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/core017.cc rename to labs/lab1/testsuite/good-CMM/core017.cc diff --git a/laborations/lab1/testsuite/good-CMM/core019.cc b/labs/lab1/testsuite/good-CMM/core019.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/core019.cc rename to labs/lab1/testsuite/good-CMM/core019.cc diff --git a/laborations/lab1/testsuite/good-CMM/core102.cc b/labs/lab1/testsuite/good-CMM/core102.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/core102.cc rename to labs/lab1/testsuite/good-CMM/core102.cc diff --git a/laborations/lab1/testsuite/good-CMM/core103.cc b/labs/lab1/testsuite/good-CMM/core103.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/core103.cc rename to labs/lab1/testsuite/good-CMM/core103.cc diff --git a/laborations/lab1/testsuite/good-CMM/core105.cc b/labs/lab1/testsuite/good-CMM/core105.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/core105.cc rename to labs/lab1/testsuite/good-CMM/core105.cc diff --git a/laborations/lab1/testsuite/good-CMM/core108.cc b/labs/lab1/testsuite/good-CMM/core108.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/core108.cc rename to labs/lab1/testsuite/good-CMM/core108.cc diff --git a/laborations/lab1/testsuite/good-CMM/core109.cc b/labs/lab1/testsuite/good-CMM/core109.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/core109.cc rename to labs/lab1/testsuite/good-CMM/core109.cc diff --git a/laborations/lab1/testsuite/good-CMM/core110.cc b/labs/lab1/testsuite/good-CMM/core110.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/core110.cc rename to labs/lab1/testsuite/good-CMM/core110.cc diff --git a/laborations/lab1/testsuite/good-CMM/core111.cc b/labs/lab1/testsuite/good-CMM/core111.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/core111.cc rename to labs/lab1/testsuite/good-CMM/core111.cc diff --git a/laborations/lab1/testsuite/good-CMM/core113.cc b/labs/lab1/testsuite/good-CMM/core113.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/core113.cc rename to labs/lab1/testsuite/good-CMM/core113.cc diff --git a/laborations/lab1/testsuite/good-CMM/decr_in_fun.cc b/labs/lab1/testsuite/good-CMM/decr_in_fun.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/decr_in_fun.cc rename to labs/lab1/testsuite/good-CMM/decr_in_fun.cc diff --git a/laborations/lab1/testsuite/good-CMM/decr_in_if.cc b/labs/lab1/testsuite/good-CMM/decr_in_if.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/decr_in_if.cc rename to labs/lab1/testsuite/good-CMM/decr_in_if.cc diff --git a/laborations/lab1/testsuite/good-CMM/div.cc b/labs/lab1/testsuite/good-CMM/div.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/div.cc rename to labs/lab1/testsuite/good-CMM/div.cc diff --git a/laborations/lab1/testsuite/good-CMM/do_nothing.cc b/labs/lab1/testsuite/good-CMM/do_nothing.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/do_nothing.cc rename to labs/lab1/testsuite/good-CMM/do_nothing.cc diff --git a/laborations/lab1/testsuite/good-CMM/double__cmp.cc b/labs/lab1/testsuite/good-CMM/double__cmp.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/double__cmp.cc rename to labs/lab1/testsuite/good-CMM/double__cmp.cc diff --git a/laborations/lab1/testsuite/good-CMM/double__core012.cc b/labs/lab1/testsuite/good-CMM/double__core012.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/double__core012.cc rename to labs/lab1/testsuite/good-CMM/double__core012.cc diff --git a/laborations/lab1/testsuite/good-CMM/double__inc_dec.cc b/labs/lab1/testsuite/good-CMM/double__inc_dec.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/double__inc_dec.cc rename to labs/lab1/testsuite/good-CMM/double__inc_dec.cc diff --git a/laborations/lab1/testsuite/good-CMM/double__postdecrement.cc b/labs/lab1/testsuite/good-CMM/double__postdecrement.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/double__postdecrement.cc rename to labs/lab1/testsuite/good-CMM/double__postdecrement.cc diff --git a/laborations/lab1/testsuite/good-CMM/double__postincrement.cc b/labs/lab1/testsuite/good-CMM/double__postincrement.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/double__postincrement.cc rename to labs/lab1/testsuite/good-CMM/double__postincrement.cc diff --git a/laborations/lab1/testsuite/good-CMM/double__predecrement.cc b/labs/lab1/testsuite/good-CMM/double__predecrement.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/double__predecrement.cc rename to labs/lab1/testsuite/good-CMM/double__predecrement.cc diff --git a/laborations/lab1/testsuite/good-CMM/double__preincrement.cc b/labs/lab1/testsuite/good-CMM/double__preincrement.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/double__preincrement.cc rename to labs/lab1/testsuite/good-CMM/double__preincrement.cc diff --git a/laborations/lab1/testsuite/good-CMM/double__small_program_fac.cc b/labs/lab1/testsuite/good-CMM/double__small_program_fac.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/double__small_program_fac.cc rename to labs/lab1/testsuite/good-CMM/double__small_program_fac.cc diff --git a/laborations/lab1/testsuite/good-CMM/eval_order.cc b/labs/lab1/testsuite/good-CMM/eval_order.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/eval_order.cc rename to labs/lab1/testsuite/good-CMM/eval_order.cc diff --git a/laborations/lab1/testsuite/good-CMM/fibonacci.cc b/labs/lab1/testsuite/good-CMM/fibonacci.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/fibonacci.cc rename to labs/lab1/testsuite/good-CMM/fibonacci.cc diff --git a/laborations/lab1/testsuite/good-CMM/fun_app_two_parameters.cc b/labs/lab1/testsuite/good-CMM/fun_app_two_parameters.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/fun_app_two_parameters.cc rename to labs/lab1/testsuite/good-CMM/fun_app_two_parameters.cc diff --git a/laborations/lab1/testsuite/good-CMM/good01.cc b/labs/lab1/testsuite/good-CMM/good01.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/good01.cc rename to labs/lab1/testsuite/good-CMM/good01.cc diff --git a/laborations/lab1/testsuite/good-CMM/good03.cc b/labs/lab1/testsuite/good-CMM/good03.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/good03.cc rename to labs/lab1/testsuite/good-CMM/good03.cc diff --git a/laborations/lab1/testsuite/good-CMM/good05.cc b/labs/lab1/testsuite/good-CMM/good05.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/good05.cc rename to labs/lab1/testsuite/good-CMM/good05.cc diff --git a/laborations/lab1/testsuite/good-CMM/good07.cc b/labs/lab1/testsuite/good-CMM/good07.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/good07.cc rename to labs/lab1/testsuite/good-CMM/good07.cc diff --git a/laborations/lab1/testsuite/good-CMM/good09.cc b/labs/lab1/testsuite/good-CMM/good09.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/good09.cc rename to labs/lab1/testsuite/good-CMM/good09.cc diff --git a/laborations/lab1/testsuite/good-CMM/good11.cc b/labs/lab1/testsuite/good-CMM/good11.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/good11.cc rename to labs/lab1/testsuite/good-CMM/good11.cc diff --git a/laborations/lab1/testsuite/good-CMM/good13.cc b/labs/lab1/testsuite/good-CMM/good13.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/good13.cc rename to labs/lab1/testsuite/good-CMM/good13.cc diff --git a/laborations/lab1/testsuite/good-CMM/good15.cc b/labs/lab1/testsuite/good-CMM/good15.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/good15.cc rename to labs/lab1/testsuite/good-CMM/good15.cc diff --git a/laborations/lab1/testsuite/good-CMM/good17.cc b/labs/lab1/testsuite/good-CMM/good17.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/good17.cc rename to labs/lab1/testsuite/good-CMM/good17.cc diff --git a/laborations/lab1/testsuite/good-CMM/if_state_propagation.cc b/labs/lab1/testsuite/good-CMM/if_state_propagation.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/if_state_propagation.cc rename to labs/lab1/testsuite/good-CMM/if_state_propagation.cc diff --git a/laborations/lab1/testsuite/good-CMM/ineq_inclusive.cc b/labs/lab1/testsuite/good-CMM/ineq_inclusive.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/ineq_inclusive.cc rename to labs/lab1/testsuite/good-CMM/ineq_inclusive.cc diff --git a/laborations/lab1/testsuite/good-CMM/large_const.cc b/labs/lab1/testsuite/good-CMM/large_const.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/large_const.cc rename to labs/lab1/testsuite/good-CMM/large_const.cc diff --git a/laborations/lab1/testsuite/good-CMM/large_program_fac.cc b/labs/lab1/testsuite/good-CMM/large_program_fac.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/large_program_fac.cc rename to labs/lab1/testsuite/good-CMM/large_program_fac.cc diff --git a/laborations/lab1/testsuite/good-CMM/large_program_fac.h b/labs/lab1/testsuite/good-CMM/large_program_fac.h similarity index 100% rename from laborations/lab1/testsuite/good-CMM/large_program_fac.h rename to labs/lab1/testsuite/good-CMM/large_program_fac.h diff --git a/laborations/lab1/testsuite/good-CMM/postdecrement.cc b/labs/lab1/testsuite/good-CMM/postdecrement.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/postdecrement.cc rename to labs/lab1/testsuite/good-CMM/postdecrement.cc diff --git a/laborations/lab1/testsuite/good-CMM/postincrement.cc b/labs/lab1/testsuite/good-CMM/postincrement.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/postincrement.cc rename to labs/lab1/testsuite/good-CMM/postincrement.cc diff --git a/laborations/lab1/testsuite/good-CMM/predecrement.cc b/labs/lab1/testsuite/good-CMM/predecrement.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/predecrement.cc rename to labs/lab1/testsuite/good-CMM/predecrement.cc diff --git a/laborations/lab1/testsuite/good-CMM/preincrement.cc b/labs/lab1/testsuite/good-CMM/preincrement.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/preincrement.cc rename to labs/lab1/testsuite/good-CMM/preincrement.cc diff --git a/laborations/lab1/testsuite/good-CMM/redeclare_after_block.cc b/labs/lab1/testsuite/good-CMM/redeclare_after_block.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/redeclare_after_block.cc rename to labs/lab1/testsuite/good-CMM/redeclare_after_block.cc diff --git a/laborations/lab1/testsuite/good-CMM/redeclare_after_if.cc b/labs/lab1/testsuite/good-CMM/redeclare_after_if.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/redeclare_after_if.cc rename to labs/lab1/testsuite/good-CMM/redeclare_after_if.cc diff --git a/laborations/lab1/testsuite/good-CMM/redeclare_after_while.cc b/labs/lab1/testsuite/good-CMM/redeclare_after_while.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/redeclare_after_while.cc rename to labs/lab1/testsuite/good-CMM/redeclare_after_while.cc diff --git a/laborations/lab1/testsuite/good-CMM/redeclare_in_block.cc b/labs/lab1/testsuite/good-CMM/redeclare_in_block.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/redeclare_in_block.cc rename to labs/lab1/testsuite/good-CMM/redeclare_in_block.cc diff --git a/laborations/lab1/testsuite/good-CMM/redeclare_in_else.cc b/labs/lab1/testsuite/good-CMM/redeclare_in_else.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/redeclare_in_else.cc rename to labs/lab1/testsuite/good-CMM/redeclare_in_else.cc diff --git a/laborations/lab1/testsuite/good-CMM/redeclare_in_if.cc b/labs/lab1/testsuite/good-CMM/redeclare_in_if.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/redeclare_in_if.cc rename to labs/lab1/testsuite/good-CMM/redeclare_in_if.cc diff --git a/laborations/lab1/testsuite/good-CMM/redeclare_in_while.cc b/labs/lab1/testsuite/good-CMM/redeclare_in_while.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/redeclare_in_while.cc rename to labs/lab1/testsuite/good-CMM/redeclare_in_while.cc diff --git a/laborations/lab1/testsuite/good-CMM/return_complex.cc b/labs/lab1/testsuite/good-CMM/return_complex.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/return_complex.cc rename to labs/lab1/testsuite/good-CMM/return_complex.cc diff --git a/laborations/lab1/testsuite/good-CMM/return_fun_val.cc b/labs/lab1/testsuite/good-CMM/return_fun_val.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/return_fun_val.cc rename to labs/lab1/testsuite/good-CMM/return_fun_val.cc diff --git a/laborations/lab1/testsuite/good-CMM/return_in_block.cc b/labs/lab1/testsuite/good-CMM/return_in_block.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/return_in_block.cc rename to labs/lab1/testsuite/good-CMM/return_in_block.cc diff --git a/laborations/lab1/testsuite/good-CMM/return_in_block_block.cc b/labs/lab1/testsuite/good-CMM/return_in_block_block.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/return_in_block_block.cc rename to labs/lab1/testsuite/good-CMM/return_in_block_block.cc diff --git a/laborations/lab1/testsuite/good-CMM/return_in_if_left.cc b/labs/lab1/testsuite/good-CMM/return_in_if_left.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/return_in_if_left.cc rename to labs/lab1/testsuite/good-CMM/return_in_if_left.cc diff --git a/laborations/lab1/testsuite/good-CMM/return_in_if_right.cc b/labs/lab1/testsuite/good-CMM/return_in_if_right.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/return_in_if_right.cc rename to labs/lab1/testsuite/good-CMM/return_in_if_right.cc diff --git a/laborations/lab1/testsuite/good-CMM/return_in_while.cc b/labs/lab1/testsuite/good-CMM/return_in_while.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/return_in_while.cc rename to labs/lab1/testsuite/good-CMM/return_in_while.cc diff --git a/laborations/lab1/testsuite/good-CMM/returns_many.cc b/labs/lab1/testsuite/good-CMM/returns_many.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/returns_many.cc rename to labs/lab1/testsuite/good-CMM/returns_many.cc diff --git a/laborations/lab1/testsuite/good-CMM/scopes.cc b/labs/lab1/testsuite/good-CMM/scopes.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/scopes.cc rename to labs/lab1/testsuite/good-CMM/scopes.cc diff --git a/laborations/lab1/testsuite/good-CMM/scopes_different_type_in_branches.cc b/labs/lab1/testsuite/good-CMM/scopes_different_type_in_branches.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/scopes_different_type_in_branches.cc rename to labs/lab1/testsuite/good-CMM/scopes_different_type_in_branches.cc diff --git a/laborations/lab1/testsuite/good-CMM/scopes_if_leakage.cc b/labs/lab1/testsuite/good-CMM/scopes_if_leakage.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/scopes_if_leakage.cc rename to labs/lab1/testsuite/good-CMM/scopes_if_leakage.cc diff --git a/laborations/lab1/testsuite/good-CMM/scopes_reuse_name.cc b/labs/lab1/testsuite/good-CMM/scopes_reuse_name.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/scopes_reuse_name.cc rename to labs/lab1/testsuite/good-CMM/scopes_reuse_name.cc diff --git a/laborations/lab1/testsuite/good-CMM/scopes_while_leakage.cc b/labs/lab1/testsuite/good-CMM/scopes_while_leakage.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/scopes_while_leakage.cc rename to labs/lab1/testsuite/good-CMM/scopes_while_leakage.cc diff --git a/laborations/lab1/testsuite/good-CMM/separate_namespaces.cc b/labs/lab1/testsuite/good-CMM/separate_namespaces.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/separate_namespaces.cc rename to labs/lab1/testsuite/good-CMM/separate_namespaces.cc diff --git a/laborations/lab1/testsuite/good-CMM/small_program_fac.cc b/labs/lab1/testsuite/good-CMM/small_program_fac.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/small_program_fac.cc rename to labs/lab1/testsuite/good-CMM/small_program_fac.cc diff --git a/laborations/lab1/testsuite/good-CMM/state_propagation.cc b/labs/lab1/testsuite/good-CMM/state_propagation.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/state_propagation.cc rename to labs/lab1/testsuite/good-CMM/state_propagation.cc diff --git a/laborations/lab1/testsuite/good-CMM/var_mutation_ass_ass.cc b/labs/lab1/testsuite/good-CMM/var_mutation_ass_ass.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/var_mutation_ass_ass.cc rename to labs/lab1/testsuite/good-CMM/var_mutation_ass_ass.cc diff --git a/laborations/lab1/testsuite/good-CMM/var_mutation_ass_id.cc b/labs/lab1/testsuite/good-CMM/var_mutation_ass_id.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/var_mutation_ass_id.cc rename to labs/lab1/testsuite/good-CMM/var_mutation_ass_id.cc diff --git a/laborations/lab1/testsuite/good-CMM/var_mutation_ass_pdec.cc b/labs/lab1/testsuite/good-CMM/var_mutation_ass_pdec.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/var_mutation_ass_pdec.cc rename to labs/lab1/testsuite/good-CMM/var_mutation_ass_pdec.cc diff --git a/laborations/lab1/testsuite/good-CMM/var_mutation_ass_pinc.cc b/labs/lab1/testsuite/good-CMM/var_mutation_ass_pinc.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/var_mutation_ass_pinc.cc rename to labs/lab1/testsuite/good-CMM/var_mutation_ass_pinc.cc diff --git a/laborations/lab1/testsuite/good-CMM/var_mutation_init_ass.cc b/labs/lab1/testsuite/good-CMM/var_mutation_init_ass.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/var_mutation_init_ass.cc rename to labs/lab1/testsuite/good-CMM/var_mutation_init_ass.cc diff --git a/laborations/lab1/testsuite/good-CMM/var_mutation_init_id.cc b/labs/lab1/testsuite/good-CMM/var_mutation_init_id.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/var_mutation_init_id.cc rename to labs/lab1/testsuite/good-CMM/var_mutation_init_id.cc diff --git a/laborations/lab1/testsuite/good-CMM/var_mutation_init_pdec.cc b/labs/lab1/testsuite/good-CMM/var_mutation_init_pdec.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/var_mutation_init_pdec.cc rename to labs/lab1/testsuite/good-CMM/var_mutation_init_pdec.cc diff --git a/laborations/lab1/testsuite/good-CMM/var_mutation_init_pinc.cc b/labs/lab1/testsuite/good-CMM/var_mutation_init_pinc.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/var_mutation_init_pinc.cc rename to labs/lab1/testsuite/good-CMM/var_mutation_init_pinc.cc diff --git a/laborations/lab1/testsuite/good-CMM/void_call_return_empty.cc b/labs/lab1/testsuite/good-CMM/void_call_return_empty.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/void_call_return_empty.cc rename to labs/lab1/testsuite/good-CMM/void_call_return_empty.cc diff --git a/laborations/lab1/testsuite/good-CMM/void_expr_as_stmt.cc b/labs/lab1/testsuite/good-CMM/void_expr_as_stmt.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/void_expr_as_stmt.cc rename to labs/lab1/testsuite/good-CMM/void_expr_as_stmt.cc diff --git a/laborations/lab1/testsuite/good-CMM/void_return_empty.cc b/labs/lab1/testsuite/good-CMM/void_return_empty.cc similarity index 100% rename from laborations/lab1/testsuite/good-CMM/void_return_empty.cc rename to labs/lab1/testsuite/good-CMM/void_return_empty.cc diff --git a/laborations/lab1/testsuite/good/1-hello.cc b/labs/lab1/testsuite/good/1-hello.cc similarity index 100% rename from laborations/lab1/testsuite/good/1-hello.cc rename to labs/lab1/testsuite/good/1-hello.cc diff --git a/laborations/lab1/testsuite/good/2-greet.cc b/labs/lab1/testsuite/good/2-greet.cc similarity index 100% rename from laborations/lab1/testsuite/good/2-greet.cc rename to labs/lab1/testsuite/good/2-greet.cc diff --git a/laborations/lab1/testsuite/good/3-med.cc b/labs/lab1/testsuite/good/3-med.cc similarity index 100% rename from laborations/lab1/testsuite/good/3-med.cc rename to labs/lab1/testsuite/good/3-med.cc diff --git a/laborations/lab1/testsuite/good/4-grade.cc b/labs/lab1/testsuite/good/4-grade.cc similarity index 100% rename from laborations/lab1/testsuite/good/4-grade.cc rename to labs/lab1/testsuite/good/4-grade.cc diff --git a/laborations/lab1/testsuite/good/5-palin.cc b/labs/lab1/testsuite/good/5-palin.cc similarity index 100% rename from laborations/lab1/testsuite/good/5-palin.cc rename to labs/lab1/testsuite/good/5-palin.cc diff --git a/laborations/lab1/testsuite/good/6-grammar.cc b/labs/lab1/testsuite/good/6-grammar.cc similarity index 100% rename from laborations/lab1/testsuite/good/6-grammar.cc rename to labs/lab1/testsuite/good/6-grammar.cc diff --git a/laborations/lab1/testsuite/good/const-ref.cc b/labs/lab1/testsuite/good/const-ref.cc similarity index 100% rename from laborations/lab1/testsuite/good/const-ref.cc rename to labs/lab1/testsuite/good/const-ref.cc diff --git a/laborations/lab1/testsuite/good/const.cc b/labs/lab1/testsuite/good/const.cc similarity index 100% rename from laborations/lab1/testsuite/good/const.cc rename to labs/lab1/testsuite/good/const.cc diff --git a/laborations/lab1/testsuite/good/decl-mult.cc b/labs/lab1/testsuite/good/decl-mult.cc similarity index 100% rename from laborations/lab1/testsuite/good/decl-mult.cc rename to labs/lab1/testsuite/good/decl-mult.cc diff --git a/laborations/lab1/testsuite/good/evil.cc b/labs/lab1/testsuite/good/evil.cc similarity index 100% rename from laborations/lab1/testsuite/good/evil.cc rename to labs/lab1/testsuite/good/evil.cc diff --git a/laborations/lab1/testsuite/good/for-const.cc b/labs/lab1/testsuite/good/for-const.cc similarity index 100% rename from laborations/lab1/testsuite/good/for-const.cc rename to labs/lab1/testsuite/good/for-const.cc diff --git a/laborations/lab1/testsuite/good/good001-typedef-qualid.cc b/labs/lab1/testsuite/good/good001-typedef-qualid.cc similarity index 100% rename from laborations/lab1/testsuite/good/good001-typedef-qualid.cc rename to labs/lab1/testsuite/good/good001-typedef-qualid.cc diff --git a/laborations/lab1/testsuite/good/good002-decl-int-ref.cc b/labs/lab1/testsuite/good/good002-decl-int-ref.cc similarity index 100% rename from laborations/lab1/testsuite/good/good002-decl-int-ref.cc rename to labs/lab1/testsuite/good/good002-decl-int-ref.cc diff --git a/laborations/lab1/testsuite/good/good003-decl-several.cc b/labs/lab1/testsuite/good/good003-decl-several.cc similarity index 100% rename from laborations/lab1/testsuite/good/good003-decl-several.cc rename to labs/lab1/testsuite/good/good003-decl-several.cc diff --git a/laborations/lab1/testsuite/good/good004-decl-qualid-init.cc b/labs/lab1/testsuite/good/good004-decl-qualid-init.cc similarity index 100% rename from laborations/lab1/testsuite/good/good004-decl-qualid-init.cc rename to labs/lab1/testsuite/good/good004-decl-qualid-init.cc diff --git a/laborations/lab1/testsuite/good/good005-non-nested-comments-was-structs.cc b/labs/lab1/testsuite/good/good005-non-nested-comments-was-structs.cc similarity index 100% rename from laborations/lab1/testsuite/good/good005-non-nested-comments-was-structs.cc rename to labs/lab1/testsuite/good/good005-non-nested-comments-was-structs.cc diff --git a/laborations/lab1/testsuite/good/good006-fun-decls.cc b/labs/lab1/testsuite/good/good006-fun-decls.cc similarity index 100% rename from laborations/lab1/testsuite/good/good006-fun-decls.cc rename to labs/lab1/testsuite/good/good006-fun-decls.cc diff --git a/laborations/lab1/testsuite/good/good007-using.cc b/labs/lab1/testsuite/good/good007-using.cc similarity index 100% rename from laborations/lab1/testsuite/good/good007-using.cc rename to labs/lab1/testsuite/good/good007-using.cc diff --git a/laborations/lab1/testsuite/good/good010-main-only-decls.cc b/labs/lab1/testsuite/good/good010-main-only-decls.cc similarity index 100% rename from laborations/lab1/testsuite/good/good010-main-only-decls.cc rename to labs/lab1/testsuite/good/good010-main-only-decls.cc diff --git a/laborations/lab1/testsuite/good/good011-literals.cc b/labs/lab1/testsuite/good/good011-literals.cc similarity index 100% rename from laborations/lab1/testsuite/good/good011-literals.cc rename to labs/lab1/testsuite/good/good011-literals.cc diff --git a/laborations/lab1/testsuite/good/good012-double-scientific.cc b/labs/lab1/testsuite/good/good012-double-scientific.cc similarity index 100% rename from laborations/lab1/testsuite/good/good012-double-scientific.cc rename to labs/lab1/testsuite/good/good012-double-scientific.cc diff --git a/laborations/lab1/testsuite/good/good013-member.cc b/labs/lab1/testsuite/good/good013-member.cc similarity index 100% rename from laborations/lab1/testsuite/good/good013-member.cc rename to labs/lab1/testsuite/good/good013-member.cc diff --git a/laborations/lab1/testsuite/good/good014-if-and-if-expr.cc b/labs/lab1/testsuite/good/good014-if-and-if-expr.cc similarity index 100% rename from laborations/lab1/testsuite/good/good014-if-and-if-expr.cc rename to labs/lab1/testsuite/good/good014-if-and-if-expr.cc diff --git a/laborations/lab1/testsuite/good/good015-if-while-return-no-block.cc b/labs/lab1/testsuite/good/good015-if-while-return-no-block.cc similarity index 100% rename from laborations/lab1/testsuite/good/good015-if-while-return-no-block.cc rename to labs/lab1/testsuite/good/good015-if-while-return-no-block.cc diff --git a/laborations/lab1/testsuite/good/good016-fun-call-condition-and-while-do-while.cc b/labs/lab1/testsuite/good/good016-fun-call-condition-and-while-do-while.cc similarity index 100% rename from laborations/lab1/testsuite/good/good016-fun-call-condition-and-while-do-while.cc rename to labs/lab1/testsuite/good/good016-fun-call-condition-and-while-do-while.cc diff --git a/laborations/lab1/testsuite/good/good017-modulo-for.cc b/labs/lab1/testsuite/good/good017-modulo-for.cc similarity index 100% rename from laborations/lab1/testsuite/good/good017-modulo-for.cc rename to labs/lab1/testsuite/good/good017-modulo-for.cc diff --git a/laborations/lab1/testsuite/good/good018-if-else-stm-vs-block.cc b/labs/lab1/testsuite/good/good018-if-else-stm-vs-block.cc similarity index 100% rename from laborations/lab1/testsuite/good/good018-if-else-stm-vs-block.cc rename to labs/lab1/testsuite/good/good018-if-else-stm-vs-block.cc diff --git a/laborations/lab1/testsuite/good/good019-dangling-else.cc b/labs/lab1/testsuite/good/good019-dangling-else.cc similarity index 100% rename from laborations/lab1/testsuite/good/good019-dangling-else.cc rename to labs/lab1/testsuite/good/good019-dangling-else.cc diff --git a/laborations/lab1/testsuite/good/good020-if-expr.cc b/labs/lab1/testsuite/good/good020-if-expr.cc similarity index 100% rename from laborations/lab1/testsuite/good/good020-if-expr.cc rename to labs/lab1/testsuite/good/good020-if-expr.cc diff --git a/laborations/lab1/testsuite/good/good021-vector-is-identifier.cc b/labs/lab1/testsuite/good/good021-vector-is-identifier.cc similarity index 100% rename from laborations/lab1/testsuite/good/good021-vector-is-identifier.cc rename to labs/lab1/testsuite/good/good021-vector-is-identifier.cc diff --git a/laborations/lab1/testsuite/good/good022-map-is-identifier.cc b/labs/lab1/testsuite/good/good022-map-is-identifier.cc similarity index 100% rename from laborations/lab1/testsuite/good/good022-map-is-identifier.cc rename to labs/lab1/testsuite/good/good022-map-is-identifier.cc diff --git a/laborations/lab1/testsuite/good/good023-assignment-expr.cc b/labs/lab1/testsuite/good/good023-assignment-expr.cc similarity index 100% rename from laborations/lab1/testsuite/good/good023-assignment-expr.cc rename to labs/lab1/testsuite/good/good023-assignment-expr.cc diff --git a/laborations/lab1/testsuite/good/good024-do-while.cc b/labs/lab1/testsuite/good/good024-do-while.cc similarity index 100% rename from laborations/lab1/testsuite/good/good024-do-while.cc rename to labs/lab1/testsuite/good/good024-do-while.cc diff --git a/laborations/lab1/testsuite/good/good025-qualid-concat-literal.cc b/labs/lab1/testsuite/good/good025-qualid-concat-literal.cc similarity index 100% rename from laborations/lab1/testsuite/good/good025-qualid-concat-literal.cc rename to labs/lab1/testsuite/good/good025-qualid-concat-literal.cc diff --git a/laborations/lab1/testsuite/good/good026-qualid-expression.cc b/labs/lab1/testsuite/good/good026-qualid-expression.cc similarity index 100% rename from laborations/lab1/testsuite/good/good026-qualid-expression.cc rename to labs/lab1/testsuite/good/good026-qualid-expression.cc diff --git a/laborations/lab1/testsuite/good/good027-fun-no-args-no-body.cc b/labs/lab1/testsuite/good/good027-fun-no-args-no-body.cc similarity index 100% rename from laborations/lab1/testsuite/good/good027-fun-no-args-no-body.cc rename to labs/lab1/testsuite/good/good027-fun-no-args-no-body.cc diff --git a/laborations/lab1/testsuite/good/good028-if-expr-precedence.cc b/labs/lab1/testsuite/good/good028-if-expr-precedence.cc similarity index 100% rename from laborations/lab1/testsuite/good/good028-if-expr-precedence.cc rename to labs/lab1/testsuite/good/good028-if-expr-precedence.cc diff --git a/laborations/lab1/testsuite/good/good029-do-if-while.cc b/labs/lab1/testsuite/good/good029-do-if-while.cc similarity index 100% rename from laborations/lab1/testsuite/good/good029-do-if-while.cc rename to labs/lab1/testsuite/good/good029-do-if-while.cc diff --git a/laborations/lab1/testsuite/good/good030-do-empty-while.cc b/labs/lab1/testsuite/good/good030-do-empty-while.cc similarity index 100% rename from laborations/lab1/testsuite/good/good030-do-empty-while.cc rename to labs/lab1/testsuite/good/good030-do-empty-while.cc diff --git a/laborations/lab1/testsuite/good/good031-identifier-comment.cc b/labs/lab1/testsuite/good/good031-identifier-comment.cc similarity index 100% rename from laborations/lab1/testsuite/good/good031-identifier-comment.cc rename to labs/lab1/testsuite/good/good031-identifier-comment.cc diff --git a/laborations/lab1/testsuite/good/good032-return-funcall.cc b/labs/lab1/testsuite/good/good032-return-funcall.cc similarity index 100% rename from laborations/lab1/testsuite/good/good032-return-funcall.cc rename to labs/lab1/testsuite/good/good032-return-funcall.cc diff --git a/laborations/lab1/testsuite/good/incr-decr.cc b/labs/lab1/testsuite/good/incr-decr.cc similarity index 100% rename from laborations/lab1/testsuite/good/incr-decr.cc rename to labs/lab1/testsuite/good/incr-decr.cc diff --git a/laborations/lab1/testsuite/good/throw.cc b/labs/lab1/testsuite/good/throw.cc similarity index 100% rename from laborations/lab1/testsuite/good/throw.cc rename to labs/lab1/testsuite/good/throw.cc diff --git a/laborations/lab1/testsuite/good/typedef-const.cc b/labs/lab1/testsuite/good/typedef-const.cc similarity index 100% rename from laborations/lab1/testsuite/good/typedef-const.cc rename to labs/lab1/testsuite/good/typedef-const.cc diff --git a/laborations/lab1/testsuite/good/typedef-simple.cc b/labs/lab1/testsuite/good/typedef-simple.cc similarity index 100% rename from laborations/lab1/testsuite/good/typedef-simple.cc rename to labs/lab1/testsuite/good/typedef-simple.cc diff --git a/laborations/lab1/testsuite/good/using-simple.cc b/labs/lab1/testsuite/good/using-simple.cc similarity index 100% rename from laborations/lab1/testsuite/good/using-simple.cc rename to labs/lab1/testsuite/good/using-simple.cc diff --git a/laborations/lab1/testsuite/index.txt b/labs/lab1/testsuite/index.txt similarity index 100% rename from laborations/lab1/testsuite/index.txt rename to labs/lab1/testsuite/index.txt diff --git a/laborations/lab1/testsuite/plt-test-lab1.cabal b/labs/lab1/testsuite/plt-test-lab1.cabal similarity index 100% rename from laborations/lab1/testsuite/plt-test-lab1.cabal rename to labs/lab1/testsuite/plt-test-lab1.cabal diff --git a/laborations/lab1/testsuite/plt-test-lab1.hs b/labs/lab1/testsuite/plt-test-lab1.hs similarity index 100% rename from laborations/lab1/testsuite/plt-test-lab1.hs rename to labs/lab1/testsuite/plt-test-lab1.hs diff --git a/laborations/lab1/testsuite/run-test-cabal.sh b/labs/lab1/testsuite/run-test-cabal.sh similarity index 100% rename from laborations/lab1/testsuite/run-test-cabal.sh rename to labs/lab1/testsuite/run-test-cabal.sh diff --git a/laborations/lab1/testsuite/run-test-ghc.sh b/labs/lab1/testsuite/run-test-ghc.sh similarity index 100% rename from laborations/lab1/testsuite/run-test-ghc.sh rename to labs/lab1/testsuite/run-test-ghc.sh diff --git a/laborations/lab1/testsuite/run-test-stack.sh b/labs/lab1/testsuite/run-test-stack.sh similarity index 100% rename from laborations/lab1/testsuite/run-test-stack.sh rename to labs/lab1/testsuite/run-test-stack.sh diff --git a/laborations/lab1/testsuite/stack.yaml b/labs/lab1/testsuite/stack.yaml similarity index 100% rename from laborations/lab1/testsuite/stack.yaml rename to labs/lab1/testsuite/stack.yaml diff --git a/laborations/lab2/CMM.cf b/labs/lab2/CMM.cf similarity index 100% rename from laborations/lab2/CMM.cf rename to labs/lab2/CMM.cf diff --git a/laborations/lab2/Makefile b/labs/lab2/Makefile similarity index 100% rename from laborations/lab2/Makefile rename to labs/lab2/Makefile diff --git a/laborations/lab2/agda/CMM.cf b/labs/lab2/agda/CMM.cf similarity index 100% rename from laborations/lab2/agda/CMM.cf rename to labs/lab2/agda/CMM.cf diff --git a/laborations/lab2/agda/Makefile b/labs/lab2/agda/Makefile similarity index 100% rename from laborations/lab2/agda/Makefile rename to labs/lab2/agda/Makefile diff --git a/laborations/lab2/agda/cabal.project b/labs/lab2/agda/cabal.project similarity index 100% rename from laborations/lab2/agda/cabal.project rename to labs/lab2/agda/cabal.project diff --git a/laborations/lab2/agda/lab2.agda-lib b/labs/lab2/agda/lab2.agda-lib similarity index 100% rename from laborations/lab2/agda/lab2.agda-lib rename to labs/lab2/agda/lab2.agda-lib diff --git a/laborations/lab2/agda/package.yaml b/labs/lab2/agda/package.yaml similarity index 100% rename from laborations/lab2/agda/package.yaml rename to labs/lab2/agda/package.yaml diff --git a/laborations/lab2/agda/src/Interpreter.agda b/labs/lab2/agda/src/Interpreter.agda similarity index 100% rename from laborations/lab2/agda/src/Interpreter.agda rename to labs/lab2/agda/src/Interpreter.agda diff --git a/laborations/lab2/agda/src/Library.agda b/labs/lab2/agda/src/Library.agda similarity index 100% rename from laborations/lab2/agda/src/Library.agda rename to labs/lab2/agda/src/Library.agda diff --git a/laborations/lab2/agda/src/TypeChecker.agda b/labs/lab2/agda/src/TypeChecker.agda similarity index 100% rename from laborations/lab2/agda/src/TypeChecker.agda rename to labs/lab2/agda/src/TypeChecker.agda diff --git a/laborations/lab2/agda/src/TypedSyntax.agda b/labs/lab2/agda/src/TypedSyntax.agda similarity index 100% rename from laborations/lab2/agda/src/TypedSyntax.agda rename to labs/lab2/agda/src/TypedSyntax.agda diff --git a/laborations/lab2/agda/src/lab2.agda b/labs/lab2/agda/src/lab2.agda similarity index 100% rename from laborations/lab2/agda/src/lab2.agda rename to labs/lab2/agda/src/lab2.agda diff --git a/laborations/lab2/agda/stack.yaml b/labs/lab2/agda/stack.yaml similarity index 100% rename from laborations/lab2/agda/stack.yaml rename to labs/lab2/agda/stack.yaml diff --git a/laborations/lab2/haskell/CMM.cf b/labs/lab2/haskell/CMM.cf similarity index 100% rename from laborations/lab2/haskell/CMM.cf rename to labs/lab2/haskell/CMM.cf diff --git a/laborations/lab2/haskell/Interpreter.hs b/labs/lab2/haskell/Interpreter.hs similarity index 100% rename from laborations/lab2/haskell/Interpreter.hs rename to labs/lab2/haskell/Interpreter.hs diff --git a/laborations/lab2/haskell/Makefile b/labs/lab2/haskell/Makefile similarity index 100% rename from laborations/lab2/haskell/Makefile rename to labs/lab2/haskell/Makefile diff --git a/laborations/lab2/haskell/Setup.hs b/labs/lab2/haskell/Setup.hs similarity index 100% rename from laborations/lab2/haskell/Setup.hs rename to labs/lab2/haskell/Setup.hs diff --git a/laborations/lab2/haskell/TypeChecker.hs b/labs/lab2/haskell/TypeChecker.hs similarity index 100% rename from laborations/lab2/haskell/TypeChecker.hs rename to labs/lab2/haskell/TypeChecker.hs diff --git a/laborations/lab2/haskell/cabal.project b/labs/lab2/haskell/cabal.project similarity index 100% rename from laborations/lab2/haskell/cabal.project rename to labs/lab2/haskell/cabal.project diff --git a/laborations/lab2/haskell/lab2.cabal b/labs/lab2/haskell/lab2.cabal similarity index 100% rename from laborations/lab2/haskell/lab2.cabal rename to labs/lab2/haskell/lab2.cabal diff --git a/laborations/lab2/haskell/lab2.hs b/labs/lab2/haskell/lab2.hs similarity index 100% rename from laborations/lab2/haskell/lab2.hs rename to labs/lab2/haskell/lab2.hs diff --git a/laborations/lab2/haskell/stack.yaml b/labs/lab2/haskell/stack.yaml similarity index 100% rename from laborations/lab2/haskell/stack.yaml rename to labs/lab2/haskell/stack.yaml diff --git a/laborations/lab2/haskell/test.mk b/labs/lab2/haskell/test.mk similarity index 100% rename from laborations/lab2/haskell/test.mk rename to labs/lab2/haskell/test.mk diff --git a/laborations/lab2/index.txt b/labs/lab2/index.txt similarity index 99% rename from laborations/lab2/index.txt rename to labs/lab2/index.txt index 369b286..5114e57 100644 --- a/laborations/lab2/index.txt +++ b/labs/lab2/index.txt @@ -33,7 +33,7 @@ tree created by the parser should then be processed further by a program using the skeleton generated by BNFC. The fragment of C++ covered is smaller than in -[Laboration 1 ../lab1/lab1.html], and does not really include any +[Lab 1 ../lab1/lab1.html], and does not really include any C++ specific features not available in C. You can use the grammar [CMM.cf ./CMM.cf], also explained in the PLT book, Chapter 2. diff --git a/laborations/lab2/java/Interpreter.java b/labs/lab2/java/Interpreter.java similarity index 100% rename from laborations/lab2/java/Interpreter.java rename to labs/lab2/java/Interpreter.java diff --git a/laborations/lab2/java/Makefile b/labs/lab2/java/Makefile similarity index 100% rename from laborations/lab2/java/Makefile rename to labs/lab2/java/Makefile diff --git a/laborations/lab2/java/TypeChecker.java b/labs/lab2/java/TypeChecker.java similarity index 100% rename from laborations/lab2/java/TypeChecker.java rename to labs/lab2/java/TypeChecker.java diff --git a/laborations/lab2/java/TypeException.java b/labs/lab2/java/TypeException.java similarity index 100% rename from laborations/lab2/java/TypeException.java rename to labs/lab2/java/TypeException.java diff --git a/laborations/lab2/java/cmm.cf b/labs/lab2/java/cmm.cf similarity index 100% rename from laborations/lab2/java/cmm.cf rename to labs/lab2/java/cmm.cf diff --git a/laborations/lab2/java/lab2.bat b/labs/lab2/java/lab2.bat similarity index 100% rename from laborations/lab2/java/lab2.bat rename to labs/lab2/java/lab2.bat diff --git a/laborations/lab2/java/lab2.hs b/labs/lab2/java/lab2.hs similarity index 100% rename from laborations/lab2/java/lab2.hs rename to labs/lab2/java/lab2.hs diff --git a/laborations/lab2/java/lab2.java b/labs/lab2/java/lab2.java similarity index 100% rename from laborations/lab2/java/lab2.java rename to labs/lab2/java/lab2.java diff --git a/laborations/lab2/java/lab2.sh b/labs/lab2/java/lab2.sh similarity index 100% rename from laborations/lab2/java/lab2.sh rename to labs/lab2/java/lab2.sh diff --git a/laborations/lab2/testsuite/Makefile b/labs/lab2/testsuite/Makefile similarity index 100% rename from laborations/lab2/testsuite/Makefile rename to labs/lab2/testsuite/Makefile diff --git a/laborations/lab2/testsuite/Makefile-test b/labs/lab2/testsuite/Makefile-test similarity index 100% rename from laborations/lab2/testsuite/Makefile-test rename to labs/lab2/testsuite/Makefile-test diff --git a/laborations/lab2/testsuite/bad-runtime/uninit_bool.cc b/labs/lab2/testsuite/bad-runtime/uninit_bool.cc similarity index 100% rename from laborations/lab2/testsuite/bad-runtime/uninit_bool.cc rename to labs/lab2/testsuite/bad-runtime/uninit_bool.cc diff --git a/laborations/lab2/testsuite/bad-runtime/uninit_int.cc b/labs/lab2/testsuite/bad-runtime/uninit_int.cc similarity index 100% rename from laborations/lab2/testsuite/bad-runtime/uninit_int.cc rename to labs/lab2/testsuite/bad-runtime/uninit_int.cc diff --git a/laborations/lab2/testsuite/bad-runtime/uninit_int_init.cc b/labs/lab2/testsuite/bad-runtime/uninit_int_init.cc similarity index 100% rename from laborations/lab2/testsuite/bad-runtime/uninit_int_init.cc rename to labs/lab2/testsuite/bad-runtime/uninit_int_init.cc diff --git a/laborations/lab2/testsuite/bad-runtime/uninit_while.cc b/labs/lab2/testsuite/bad-runtime/uninit_while.cc similarity index 100% rename from laborations/lab2/testsuite/bad-runtime/uninit_while.cc rename to labs/lab2/testsuite/bad-runtime/uninit_while.cc diff --git a/laborations/lab2/testsuite/bad/arith_ass_bool_div_int.cc b/labs/lab2/testsuite/bad/arith_ass_bool_div_int.cc similarity index 100% rename from laborations/lab2/testsuite/bad/arith_ass_bool_div_int.cc rename to labs/lab2/testsuite/bad/arith_ass_bool_div_int.cc diff --git a/laborations/lab2/testsuite/bad/arith_ass_int_min_bool.cc b/labs/lab2/testsuite/bad/arith_ass_int_min_bool.cc similarity index 100% rename from laborations/lab2/testsuite/bad/arith_ass_int_min_bool.cc rename to labs/lab2/testsuite/bad/arith_ass_int_min_bool.cc diff --git a/laborations/lab2/testsuite/bad/arith_if_bool_min_bool.cc b/labs/lab2/testsuite/bad/arith_if_bool_min_bool.cc similarity index 100% rename from laborations/lab2/testsuite/bad/arith_if_bool_min_bool.cc rename to labs/lab2/testsuite/bad/arith_if_bool_min_bool.cc diff --git a/laborations/lab2/testsuite/bad/arith_return_bool_div_int.cc b/labs/lab2/testsuite/bad/arith_return_bool_div_int.cc similarity index 100% rename from laborations/lab2/testsuite/bad/arith_return_bool_div_int.cc rename to labs/lab2/testsuite/bad/arith_return_bool_div_int.cc diff --git a/laborations/lab2/testsuite/bad/arith_return_bool_min_int.cc b/labs/lab2/testsuite/bad/arith_return_bool_min_int.cc similarity index 100% rename from laborations/lab2/testsuite/bad/arith_return_bool_min_int.cc rename to labs/lab2/testsuite/bad/arith_return_bool_min_int.cc diff --git a/laborations/lab2/testsuite/bad/arith_return_int_minus_bool.cc b/labs/lab2/testsuite/bad/arith_return_int_minus_bool.cc similarity index 100% rename from laborations/lab2/testsuite/bad/arith_return_int_minus_bool.cc rename to labs/lab2/testsuite/bad/arith_return_int_minus_bool.cc diff --git a/laborations/lab2/testsuite/bad/arith_return_int_mult_bool.cc b/labs/lab2/testsuite/bad/arith_return_int_mult_bool.cc similarity index 100% rename from laborations/lab2/testsuite/bad/arith_return_int_mult_bool.cc rename to labs/lab2/testsuite/bad/arith_return_int_mult_bool.cc diff --git a/laborations/lab2/testsuite/bad/ass_bool_int_parameter.cc b/labs/lab2/testsuite/bad/ass_bool_int_parameter.cc similarity index 100% rename from laborations/lab2/testsuite/bad/ass_bool_int_parameter.cc rename to labs/lab2/testsuite/bad/ass_bool_int_parameter.cc diff --git a/laborations/lab2/testsuite/bad/ass_int_bool.cc b/labs/lab2/testsuite/bad/ass_int_bool.cc similarity index 100% rename from laborations/lab2/testsuite/bad/ass_int_bool.cc rename to labs/lab2/testsuite/bad/ass_int_bool.cc diff --git a/laborations/lab2/testsuite/bad/ass_int_double.cc b/labs/lab2/testsuite/bad/ass_int_double.cc similarity index 100% rename from laborations/lab2/testsuite/bad/ass_int_double.cc rename to labs/lab2/testsuite/bad/ass_int_double.cc diff --git a/laborations/lab2/testsuite/bad/ass_int_double_split.cc b/labs/lab2/testsuite/bad/ass_int_double_split.cc similarity index 100% rename from laborations/lab2/testsuite/bad/ass_int_double_split.cc rename to labs/lab2/testsuite/bad/ass_int_double_split.cc diff --git a/laborations/lab2/testsuite/bad/cmp_ass_bool_or_int.cc b/labs/lab2/testsuite/bad/cmp_ass_bool_or_int.cc similarity index 100% rename from laborations/lab2/testsuite/bad/cmp_ass_bool_or_int.cc rename to labs/lab2/testsuite/bad/cmp_ass_bool_or_int.cc diff --git a/laborations/lab2/testsuite/bad/cmp_if_bool_gt_bool.cc b/labs/lab2/testsuite/bad/cmp_if_bool_gt_bool.cc similarity index 100% rename from laborations/lab2/testsuite/bad/cmp_if_bool_gt_bool.cc rename to labs/lab2/testsuite/bad/cmp_if_bool_gt_bool.cc diff --git a/laborations/lab2/testsuite/bad/cmp_if_bool_lt_bool.cc b/labs/lab2/testsuite/bad/cmp_if_bool_lt_bool.cc similarity index 100% rename from laborations/lab2/testsuite/bad/cmp_if_bool_lt_bool.cc rename to labs/lab2/testsuite/bad/cmp_if_bool_lt_bool.cc diff --git a/laborations/lab2/testsuite/bad/cmp_if_double_gt_bool.cc b/labs/lab2/testsuite/bad/cmp_if_double_gt_bool.cc similarity index 100% rename from laborations/lab2/testsuite/bad/cmp_if_double_gt_bool.cc rename to labs/lab2/testsuite/bad/cmp_if_double_gt_bool.cc diff --git a/laborations/lab2/testsuite/bad/cmp_if_double_lt_bool.cc b/labs/lab2/testsuite/bad/cmp_if_double_lt_bool.cc similarity index 100% rename from laborations/lab2/testsuite/bad/cmp_if_double_lt_bool.cc rename to labs/lab2/testsuite/bad/cmp_if_double_lt_bool.cc diff --git a/laborations/lab2/testsuite/bad/cmp_if_int_eq_bool.cc b/labs/lab2/testsuite/bad/cmp_if_int_eq_bool.cc similarity index 100% rename from laborations/lab2/testsuite/bad/cmp_if_int_eq_bool.cc rename to labs/lab2/testsuite/bad/cmp_if_int_eq_bool.cc diff --git a/laborations/lab2/testsuite/bad/cmp_if_int_neq_bool.cc b/labs/lab2/testsuite/bad/cmp_if_int_neq_bool.cc similarity index 100% rename from laborations/lab2/testsuite/bad/cmp_if_int_neq_bool.cc rename to labs/lab2/testsuite/bad/cmp_if_int_neq_bool.cc diff --git a/laborations/lab2/testsuite/bad/cmp_while_double_eq_bool.cc b/labs/lab2/testsuite/bad/cmp_while_double_eq_bool.cc similarity index 100% rename from laborations/lab2/testsuite/bad/cmp_while_double_eq_bool.cc rename to labs/lab2/testsuite/bad/cmp_while_double_eq_bool.cc diff --git a/laborations/lab2/testsuite/bad/dec_post_incorrect_type.cc b/labs/lab2/testsuite/bad/dec_post_incorrect_type.cc similarity index 100% rename from laborations/lab2/testsuite/bad/dec_post_incorrect_type.cc rename to labs/lab2/testsuite/bad/dec_post_incorrect_type.cc diff --git a/laborations/lab2/testsuite/bad/dec_pre_incorrect_type.cc b/labs/lab2/testsuite/bad/dec_pre_incorrect_type.cc similarity index 100% rename from laborations/lab2/testsuite/bad/dec_pre_incorrect_type.cc rename to labs/lab2/testsuite/bad/dec_pre_incorrect_type.cc diff --git a/laborations/lab2/testsuite/bad/decl_cleanup_block.cc b/labs/lab2/testsuite/bad/decl_cleanup_block.cc similarity index 100% rename from laborations/lab2/testsuite/bad/decl_cleanup_block.cc rename to labs/lab2/testsuite/bad/decl_cleanup_block.cc diff --git a/laborations/lab2/testsuite/bad/decl_cleanup_block_2.cc b/labs/lab2/testsuite/bad/decl_cleanup_block_2.cc similarity index 100% rename from laborations/lab2/testsuite/bad/decl_cleanup_block_2.cc rename to labs/lab2/testsuite/bad/decl_cleanup_block_2.cc diff --git a/laborations/lab2/testsuite/bad/decl_cleanup_if_left.cc b/labs/lab2/testsuite/bad/decl_cleanup_if_left.cc similarity index 100% rename from laborations/lab2/testsuite/bad/decl_cleanup_if_left.cc rename to labs/lab2/testsuite/bad/decl_cleanup_if_left.cc diff --git a/laborations/lab2/testsuite/bad/decl_cleanup_if_right.cc b/labs/lab2/testsuite/bad/decl_cleanup_if_right.cc similarity index 100% rename from laborations/lab2/testsuite/bad/decl_cleanup_if_right.cc rename to labs/lab2/testsuite/bad/decl_cleanup_if_right.cc diff --git a/laborations/lab2/testsuite/bad/decl_cleanup_while.cc b/labs/lab2/testsuite/bad/decl_cleanup_while.cc similarity index 100% rename from laborations/lab2/testsuite/bad/decl_cleanup_while.cc rename to labs/lab2/testsuite/bad/decl_cleanup_while.cc diff --git a/laborations/lab2/testsuite/bad/decl_if_branch_leakage.cc b/labs/lab2/testsuite/bad/decl_if_branch_leakage.cc similarity index 100% rename from laborations/lab2/testsuite/bad/decl_if_branch_leakage.cc rename to labs/lab2/testsuite/bad/decl_if_branch_leakage.cc diff --git a/laborations/lab2/testsuite/bad/empty.cc b/labs/lab2/testsuite/bad/empty.cc similarity index 100% rename from laborations/lab2/testsuite/bad/empty.cc rename to labs/lab2/testsuite/bad/empty.cc diff --git a/laborations/lab2/testsuite/bad/fun_app_0_instead_of_1.cc b/labs/lab2/testsuite/bad/fun_app_0_instead_of_1.cc similarity index 100% rename from laborations/lab2/testsuite/bad/fun_app_0_instead_of_1.cc rename to labs/lab2/testsuite/bad/fun_app_0_instead_of_1.cc diff --git a/laborations/lab2/testsuite/bad/fun_app_1_instead_of_2.cc b/labs/lab2/testsuite/bad/fun_app_1_instead_of_2.cc similarity index 100% rename from laborations/lab2/testsuite/bad/fun_app_1_instead_of_2.cc rename to labs/lab2/testsuite/bad/fun_app_1_instead_of_2.cc diff --git a/laborations/lab2/testsuite/bad/fun_app_2_instead_of_1.cc b/labs/lab2/testsuite/bad/fun_app_2_instead_of_1.cc similarity index 100% rename from laborations/lab2/testsuite/bad/fun_app_2_instead_of_1.cc rename to labs/lab2/testsuite/bad/fun_app_2_instead_of_1.cc diff --git a/laborations/lab2/testsuite/bad/fun_app_2_instead_of_1_built_in.cc b/labs/lab2/testsuite/bad/fun_app_2_instead_of_1_built_in.cc similarity index 100% rename from laborations/lab2/testsuite/bad/fun_app_2_instead_of_1_built_in.cc rename to labs/lab2/testsuite/bad/fun_app_2_instead_of_1_built_in.cc diff --git a/laborations/lab2/testsuite/bad/fun_app_incorrect_type.cc b/labs/lab2/testsuite/bad/fun_app_incorrect_type.cc similarity index 100% rename from laborations/lab2/testsuite/bad/fun_app_incorrect_type.cc rename to labs/lab2/testsuite/bad/fun_app_incorrect_type.cc diff --git a/laborations/lab2/testsuite/bad/fun_app_incorrect_type2.cc b/labs/lab2/testsuite/bad/fun_app_incorrect_type2.cc similarity index 100% rename from laborations/lab2/testsuite/bad/fun_app_incorrect_type2.cc rename to labs/lab2/testsuite/bad/fun_app_incorrect_type2.cc diff --git a/laborations/lab2/testsuite/bad/fun_overload.cc b/labs/lab2/testsuite/bad/fun_overload.cc similarity index 100% rename from laborations/lab2/testsuite/bad/fun_overload.cc rename to labs/lab2/testsuite/bad/fun_overload.cc diff --git a/laborations/lab2/testsuite/bad/if_double.cc b/labs/lab2/testsuite/bad/if_double.cc similarity index 100% rename from laborations/lab2/testsuite/bad/if_double.cc rename to labs/lab2/testsuite/bad/if_double.cc diff --git a/laborations/lab2/testsuite/bad/inc_post_incorrect_type.cc b/labs/lab2/testsuite/bad/inc_post_incorrect_type.cc similarity index 100% rename from laborations/lab2/testsuite/bad/inc_post_incorrect_type.cc rename to labs/lab2/testsuite/bad/inc_post_incorrect_type.cc diff --git a/laborations/lab2/testsuite/bad/inc_pre_incorrect_type.cc b/labs/lab2/testsuite/bad/inc_pre_incorrect_type.cc similarity index 100% rename from laborations/lab2/testsuite/bad/inc_pre_incorrect_type.cc rename to labs/lab2/testsuite/bad/inc_pre_incorrect_type.cc diff --git a/laborations/lab2/testsuite/bad/main_1_parameter.cc b/labs/lab2/testsuite/bad/main_1_parameter.cc similarity index 100% rename from laborations/lab2/testsuite/bad/main_1_parameter.cc rename to labs/lab2/testsuite/bad/main_1_parameter.cc diff --git a/laborations/lab2/testsuite/bad/main_return_void.cc b/labs/lab2/testsuite/bad/main_return_void.cc similarity index 100% rename from laborations/lab2/testsuite/bad/main_return_void.cc rename to labs/lab2/testsuite/bad/main_return_void.cc diff --git a/laborations/lab2/testsuite/bad/no_main.cc b/labs/lab2/testsuite/bad/no_main.cc similarity index 100% rename from laborations/lab2/testsuite/bad/no_main.cc rename to labs/lab2/testsuite/bad/no_main.cc diff --git a/laborations/lab2/testsuite/bad/redecl_fun.cc b/labs/lab2/testsuite/bad/redecl_fun.cc similarity index 100% rename from laborations/lab2/testsuite/bad/redecl_fun.cc rename to labs/lab2/testsuite/bad/redecl_fun.cc diff --git a/laborations/lab2/testsuite/bad/redecl_fun_built_in.cc b/labs/lab2/testsuite/bad/redecl_fun_built_in.cc similarity index 100% rename from laborations/lab2/testsuite/bad/redecl_fun_built_in.cc rename to labs/lab2/testsuite/bad/redecl_fun_built_in.cc diff --git a/laborations/lab2/testsuite/bad/redecl_parameter.cc b/labs/lab2/testsuite/bad/redecl_parameter.cc similarity index 100% rename from laborations/lab2/testsuite/bad/redecl_parameter.cc rename to labs/lab2/testsuite/bad/redecl_parameter.cc diff --git a/laborations/lab2/testsuite/bad/redecl_var.cc b/labs/lab2/testsuite/bad/redecl_var.cc similarity index 100% rename from laborations/lab2/testsuite/bad/redecl_var.cc rename to labs/lab2/testsuite/bad/redecl_var.cc diff --git a/laborations/lab2/testsuite/bad/redecl_var_after_block.cc b/labs/lab2/testsuite/bad/redecl_var_after_block.cc similarity index 100% rename from laborations/lab2/testsuite/bad/redecl_var_after_block.cc rename to labs/lab2/testsuite/bad/redecl_var_after_block.cc diff --git a/laborations/lab2/testsuite/bad/redecl_var_after_block_2.cc b/labs/lab2/testsuite/bad/redecl_var_after_block_2.cc similarity index 100% rename from laborations/lab2/testsuite/bad/redecl_var_after_block_2.cc rename to labs/lab2/testsuite/bad/redecl_var_after_block_2.cc diff --git a/laborations/lab2/testsuite/bad/redecl_var_after_block_3.cc b/labs/lab2/testsuite/bad/redecl_var_after_block_3.cc similarity index 100% rename from laborations/lab2/testsuite/bad/redecl_var_after_block_3.cc rename to labs/lab2/testsuite/bad/redecl_var_after_block_3.cc diff --git a/laborations/lab2/testsuite/bad/redecl_var_after_block_4.cc b/labs/lab2/testsuite/bad/redecl_var_after_block_4.cc similarity index 100% rename from laborations/lab2/testsuite/bad/redecl_var_after_block_4.cc rename to labs/lab2/testsuite/bad/redecl_var_after_block_4.cc diff --git a/laborations/lab2/testsuite/bad/redecl_var_and_parameter.cc b/labs/lab2/testsuite/bad/redecl_var_and_parameter.cc similarity index 100% rename from laborations/lab2/testsuite/bad/redecl_var_and_parameter.cc rename to labs/lab2/testsuite/bad/redecl_var_and_parameter.cc diff --git a/laborations/lab2/testsuite/bad/redecl_var_different_type.cc b/labs/lab2/testsuite/bad/redecl_var_different_type.cc similarity index 100% rename from laborations/lab2/testsuite/bad/redecl_var_different_type.cc rename to labs/lab2/testsuite/bad/redecl_var_different_type.cc diff --git a/laborations/lab2/testsuite/bad/redecl_var_in_one_stmt.cc b/labs/lab2/testsuite/bad/redecl_var_in_one_stmt.cc similarity index 100% rename from laborations/lab2/testsuite/bad/redecl_var_in_one_stmt.cc rename to labs/lab2/testsuite/bad/redecl_var_in_one_stmt.cc diff --git a/laborations/lab2/testsuite/bad/return_block_int_bool.cc b/labs/lab2/testsuite/bad/return_block_int_bool.cc similarity index 100% rename from laborations/lab2/testsuite/bad/return_block_int_bool.cc rename to labs/lab2/testsuite/bad/return_block_int_bool.cc diff --git a/laborations/lab2/testsuite/bad/return_check_all.cc b/labs/lab2/testsuite/bad/return_check_all.cc similarity index 100% rename from laborations/lab2/testsuite/bad/return_check_all.cc rename to labs/lab2/testsuite/bad/return_check_all.cc diff --git a/laborations/lab2/testsuite/bad/return_check_all2.cc b/labs/lab2/testsuite/bad/return_check_all2.cc similarity index 100% rename from laborations/lab2/testsuite/bad/return_check_all2.cc rename to labs/lab2/testsuite/bad/return_check_all2.cc diff --git a/laborations/lab2/testsuite/bad/return_if_both_int_bool.cc b/labs/lab2/testsuite/bad/return_if_both_int_bool.cc similarity index 100% rename from laborations/lab2/testsuite/bad/return_if_both_int_bool.cc rename to labs/lab2/testsuite/bad/return_if_both_int_bool.cc diff --git a/laborations/lab2/testsuite/bad/return_if_left_int_double.cc b/labs/lab2/testsuite/bad/return_if_left_int_double.cc similarity index 100% rename from laborations/lab2/testsuite/bad/return_if_left_int_double.cc rename to labs/lab2/testsuite/bad/return_if_left_int_double.cc diff --git a/laborations/lab2/testsuite/bad/return_void_int.cc b/labs/lab2/testsuite/bad/return_void_int.cc similarity index 100% rename from laborations/lab2/testsuite/bad/return_void_int.cc rename to labs/lab2/testsuite/bad/return_void_int.cc diff --git a/laborations/lab2/testsuite/bad/scopes_same_name.cc b/labs/lab2/testsuite/bad/scopes_same_name.cc similarity index 100% rename from laborations/lab2/testsuite/bad/scopes_same_name.cc rename to labs/lab2/testsuite/bad/scopes_same_name.cc diff --git a/laborations/lab2/testsuite/bad/undecl_fun.cc b/labs/lab2/testsuite/bad/undecl_fun.cc similarity index 100% rename from laborations/lab2/testsuite/bad/undecl_fun.cc rename to labs/lab2/testsuite/bad/undecl_fun.cc diff --git a/laborations/lab2/testsuite/bad/undecl_fun_cleanup_between_fun.cc b/labs/lab2/testsuite/bad/undecl_fun_cleanup_between_fun.cc similarity index 100% rename from laborations/lab2/testsuite/bad/undecl_fun_cleanup_between_fun.cc rename to labs/lab2/testsuite/bad/undecl_fun_cleanup_between_fun.cc diff --git a/laborations/lab2/testsuite/bad/undecl_var.cc b/labs/lab2/testsuite/bad/undecl_var.cc similarity index 100% rename from laborations/lab2/testsuite/bad/undecl_var.cc rename to labs/lab2/testsuite/bad/undecl_var.cc diff --git a/laborations/lab2/testsuite/bad/undecl_var_ass.cc b/labs/lab2/testsuite/bad/undecl_var_ass.cc similarity index 100% rename from laborations/lab2/testsuite/bad/undecl_var_ass.cc rename to labs/lab2/testsuite/bad/undecl_var_ass.cc diff --git a/laborations/lab2/testsuite/bad/undecl_var_return.cc b/labs/lab2/testsuite/bad/undecl_var_return.cc similarity index 100% rename from laborations/lab2/testsuite/bad/undecl_var_return.cc rename to labs/lab2/testsuite/bad/undecl_var_return.cc diff --git a/laborations/lab2/testsuite/bad/void_argument.cc b/labs/lab2/testsuite/bad/void_argument.cc similarity index 100% rename from laborations/lab2/testsuite/bad/void_argument.cc rename to labs/lab2/testsuite/bad/void_argument.cc diff --git a/laborations/lab2/testsuite/bad/void_var.cc b/labs/lab2/testsuite/bad/void_var.cc similarity index 100% rename from laborations/lab2/testsuite/bad/void_var.cc rename to labs/lab2/testsuite/bad/void_var.cc diff --git a/laborations/lab2/testsuite/bad/while_double.cc b/labs/lab2/testsuite/bad/while_double.cc similarity index 100% rename from laborations/lab2/testsuite/bad/while_double.cc rename to labs/lab2/testsuite/bad/while_double.cc diff --git a/laborations/lab2/testsuite/bad/while_int.cc b/labs/lab2/testsuite/bad/while_int.cc similarity index 100% rename from laborations/lab2/testsuite/bad/while_int.cc rename to labs/lab2/testsuite/bad/while_int.cc diff --git a/laborations/lab2/testsuite/build-tarball.sh b/labs/lab2/testsuite/build-tarball.sh similarity index 100% rename from laborations/lab2/testsuite/build-tarball.sh rename to labs/lab2/testsuite/build-tarball.sh diff --git a/laborations/lab2/testsuite/cabal.project b/labs/lab2/testsuite/cabal.project similarity index 100% rename from laborations/lab2/testsuite/cabal.project rename to labs/lab2/testsuite/cabal.project diff --git a/laborations/lab2/testsuite/good/arg_mutation_ass.cc b/labs/lab2/testsuite/good/arg_mutation_ass.cc similarity index 100% rename from laborations/lab2/testsuite/good/arg_mutation_ass.cc rename to labs/lab2/testsuite/good/arg_mutation_ass.cc diff --git a/laborations/lab2/testsuite/good/arg_mutation_ass.cc.output b/labs/lab2/testsuite/good/arg_mutation_ass.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/arg_mutation_ass.cc.output rename to labs/lab2/testsuite/good/arg_mutation_ass.cc.output diff --git a/laborations/lab2/testsuite/good/arg_mutation_id.cc b/labs/lab2/testsuite/good/arg_mutation_id.cc similarity index 100% rename from laborations/lab2/testsuite/good/arg_mutation_id.cc rename to labs/lab2/testsuite/good/arg_mutation_id.cc diff --git a/laborations/lab2/testsuite/good/arg_mutation_id.cc.output b/labs/lab2/testsuite/good/arg_mutation_id.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/arg_mutation_id.cc.output rename to labs/lab2/testsuite/good/arg_mutation_id.cc.output diff --git a/laborations/lab2/testsuite/good/arg_mutation_pdec.cc b/labs/lab2/testsuite/good/arg_mutation_pdec.cc similarity index 100% rename from laborations/lab2/testsuite/good/arg_mutation_pdec.cc rename to labs/lab2/testsuite/good/arg_mutation_pdec.cc diff --git a/laborations/lab2/testsuite/good/arg_mutation_pdec.cc.output b/labs/lab2/testsuite/good/arg_mutation_pdec.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/arg_mutation_pdec.cc.output rename to labs/lab2/testsuite/good/arg_mutation_pdec.cc.output diff --git a/laborations/lab2/testsuite/good/arg_mutation_pinc.cc b/labs/lab2/testsuite/good/arg_mutation_pinc.cc similarity index 100% rename from laborations/lab2/testsuite/good/arg_mutation_pinc.cc rename to labs/lab2/testsuite/good/arg_mutation_pinc.cc diff --git a/laborations/lab2/testsuite/good/arg_mutation_pinc.cc.output b/labs/lab2/testsuite/good/arg_mutation_pinc.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/arg_mutation_pinc.cc.output rename to labs/lab2/testsuite/good/arg_mutation_pinc.cc.output diff --git a/laborations/lab2/testsuite/good/args_many.cc b/labs/lab2/testsuite/good/args_many.cc similarity index 100% rename from laborations/lab2/testsuite/good/args_many.cc rename to labs/lab2/testsuite/good/args_many.cc diff --git a/laborations/lab2/testsuite/good/args_many.cc.output b/labs/lab2/testsuite/good/args_many.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/args_many.cc.output rename to labs/lab2/testsuite/good/args_many.cc.output diff --git a/laborations/lab2/testsuite/good/args_many_empty.cc b/labs/lab2/testsuite/good/args_many_empty.cc similarity index 100% rename from laborations/lab2/testsuite/good/args_many_empty.cc rename to labs/lab2/testsuite/good/args_many_empty.cc diff --git a/laborations/lab2/testsuite/good/ass_in_arith.cc b/labs/lab2/testsuite/good/ass_in_arith.cc similarity index 100% rename from laborations/lab2/testsuite/good/ass_in_arith.cc rename to labs/lab2/testsuite/good/ass_in_arith.cc diff --git a/laborations/lab2/testsuite/good/ass_in_arith.cc.output b/labs/lab2/testsuite/good/ass_in_arith.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/ass_in_arith.cc.output rename to labs/lab2/testsuite/good/ass_in_arith.cc.output diff --git a/laborations/lab2/testsuite/good/ass_in_block.cc b/labs/lab2/testsuite/good/ass_in_block.cc similarity index 100% rename from laborations/lab2/testsuite/good/ass_in_block.cc rename to labs/lab2/testsuite/good/ass_in_block.cc diff --git a/laborations/lab2/testsuite/good/ass_in_block.cc.output b/labs/lab2/testsuite/good/ass_in_block.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/ass_in_block.cc.output rename to labs/lab2/testsuite/good/ass_in_block.cc.output diff --git a/laborations/lab2/testsuite/good/ass_in_body.cc b/labs/lab2/testsuite/good/ass_in_body.cc similarity index 100% rename from laborations/lab2/testsuite/good/ass_in_body.cc rename to labs/lab2/testsuite/good/ass_in_body.cc diff --git a/laborations/lab2/testsuite/good/ass_in_body.cc.output b/labs/lab2/testsuite/good/ass_in_body.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/ass_in_body.cc.output rename to labs/lab2/testsuite/good/ass_in_body.cc.output diff --git a/laborations/lab2/testsuite/good/ass_in_cmp.cc b/labs/lab2/testsuite/good/ass_in_cmp.cc similarity index 100% rename from laborations/lab2/testsuite/good/ass_in_cmp.cc rename to labs/lab2/testsuite/good/ass_in_cmp.cc diff --git a/laborations/lab2/testsuite/good/ass_in_cmp.cc.output b/labs/lab2/testsuite/good/ass_in_cmp.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/ass_in_cmp.cc.output rename to labs/lab2/testsuite/good/ass_in_cmp.cc.output diff --git a/laborations/lab2/testsuite/good/ass_in_else.cc b/labs/lab2/testsuite/good/ass_in_else.cc similarity index 100% rename from laborations/lab2/testsuite/good/ass_in_else.cc rename to labs/lab2/testsuite/good/ass_in_else.cc diff --git a/laborations/lab2/testsuite/good/ass_in_else.cc.output b/labs/lab2/testsuite/good/ass_in_else.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/ass_in_else.cc.output rename to labs/lab2/testsuite/good/ass_in_else.cc.output diff --git a/laborations/lab2/testsuite/good/ass_in_if.cc b/labs/lab2/testsuite/good/ass_in_if.cc similarity index 100% rename from laborations/lab2/testsuite/good/ass_in_if.cc rename to labs/lab2/testsuite/good/ass_in_if.cc diff --git a/laborations/lab2/testsuite/good/ass_in_if.cc.output b/labs/lab2/testsuite/good/ass_in_if.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/ass_in_if.cc.output rename to labs/lab2/testsuite/good/ass_in_if.cc.output diff --git a/laborations/lab2/testsuite/good/ass_in_while.cc b/labs/lab2/testsuite/good/ass_in_while.cc similarity index 100% rename from laborations/lab2/testsuite/good/ass_in_while.cc rename to labs/lab2/testsuite/good/ass_in_while.cc diff --git a/laborations/lab2/testsuite/good/ass_in_while.cc.output b/labs/lab2/testsuite/good/ass_in_while.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/ass_in_while.cc.output rename to labs/lab2/testsuite/good/ass_in_while.cc.output diff --git a/laborations/lab2/testsuite/good/ass_many.cc b/labs/lab2/testsuite/good/ass_many.cc similarity index 100% rename from laborations/lab2/testsuite/good/ass_many.cc rename to labs/lab2/testsuite/good/ass_many.cc diff --git a/laborations/lab2/testsuite/good/ass_many.cc.output b/labs/lab2/testsuite/good/ass_many.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/ass_many.cc.output rename to labs/lab2/testsuite/good/ass_many.cc.output diff --git a/laborations/lab2/testsuite/good/ass_var_to_var.cc b/labs/lab2/testsuite/good/ass_var_to_var.cc similarity index 100% rename from laborations/lab2/testsuite/good/ass_var_to_var.cc rename to labs/lab2/testsuite/good/ass_var_to_var.cc diff --git a/laborations/lab2/testsuite/good/bind_function_arguments_lazily.cc b/labs/lab2/testsuite/good/bind_function_arguments_lazily.cc similarity index 100% rename from laborations/lab2/testsuite/good/bind_function_arguments_lazily.cc rename to labs/lab2/testsuite/good/bind_function_arguments_lazily.cc diff --git a/laborations/lab2/testsuite/good/bind_function_arguments_lazily.cc.output b/labs/lab2/testsuite/good/bind_function_arguments_lazily.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/bind_function_arguments_lazily.cc.output rename to labs/lab2/testsuite/good/bind_function_arguments_lazily.cc.output diff --git a/laborations/lab2/testsuite/good/bool_return.cc b/labs/lab2/testsuite/good/bool_return.cc similarity index 100% rename from laborations/lab2/testsuite/good/bool_return.cc rename to labs/lab2/testsuite/good/bool_return.cc diff --git a/laborations/lab2/testsuite/good/bool_return.cc.output b/labs/lab2/testsuite/good/bool_return.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/bool_return.cc.output rename to labs/lab2/testsuite/good/bool_return.cc.output diff --git a/laborations/lab2/testsuite/good/boolean.cc b/labs/lab2/testsuite/good/boolean.cc similarity index 100% rename from laborations/lab2/testsuite/good/boolean.cc rename to labs/lab2/testsuite/good/boolean.cc diff --git a/laborations/lab2/testsuite/good/boolean.cc.output b/labs/lab2/testsuite/good/boolean.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/boolean.cc.output rename to labs/lab2/testsuite/good/boolean.cc.output diff --git a/laborations/lab2/testsuite/good/branch_value_leaks.cc b/labs/lab2/testsuite/good/branch_value_leaks.cc similarity index 100% rename from laborations/lab2/testsuite/good/branch_value_leaks.cc rename to labs/lab2/testsuite/good/branch_value_leaks.cc diff --git a/laborations/lab2/testsuite/good/cmp.cc b/labs/lab2/testsuite/good/cmp.cc similarity index 100% rename from laborations/lab2/testsuite/good/cmp.cc rename to labs/lab2/testsuite/good/cmp.cc diff --git a/laborations/lab2/testsuite/good/cmp.cc.output b/labs/lab2/testsuite/good/cmp.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/cmp.cc.output rename to labs/lab2/testsuite/good/cmp.cc.output diff --git a/laborations/lab2/testsuite/good/cmp_bool.cc b/labs/lab2/testsuite/good/cmp_bool.cc similarity index 100% rename from laborations/lab2/testsuite/good/cmp_bool.cc rename to labs/lab2/testsuite/good/cmp_bool.cc diff --git a/laborations/lab2/testsuite/good/cmp_bool.cc.output b/labs/lab2/testsuite/good/cmp_bool.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/cmp_bool.cc.output rename to labs/lab2/testsuite/good/cmp_bool.cc.output diff --git a/laborations/lab2/testsuite/good/core005.cc b/labs/lab2/testsuite/good/core005.cc similarity index 100% rename from laborations/lab2/testsuite/good/core005.cc rename to labs/lab2/testsuite/good/core005.cc diff --git a/laborations/lab2/testsuite/good/core005.cc.output b/labs/lab2/testsuite/good/core005.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/core005.cc.output rename to labs/lab2/testsuite/good/core005.cc.output diff --git a/laborations/lab2/testsuite/good/core006.cc b/labs/lab2/testsuite/good/core006.cc similarity index 100% rename from laborations/lab2/testsuite/good/core006.cc rename to labs/lab2/testsuite/good/core006.cc diff --git a/laborations/lab2/testsuite/good/core006.cc.output b/labs/lab2/testsuite/good/core006.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/core006.cc.output rename to labs/lab2/testsuite/good/core006.cc.output diff --git a/laborations/lab2/testsuite/good/core007.cc b/labs/lab2/testsuite/good/core007.cc similarity index 100% rename from laborations/lab2/testsuite/good/core007.cc rename to labs/lab2/testsuite/good/core007.cc diff --git a/laborations/lab2/testsuite/good/core007.cc.output b/labs/lab2/testsuite/good/core007.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/core007.cc.output rename to labs/lab2/testsuite/good/core007.cc.output diff --git a/laborations/lab2/testsuite/good/core009.cc b/labs/lab2/testsuite/good/core009.cc similarity index 100% rename from laborations/lab2/testsuite/good/core009.cc rename to labs/lab2/testsuite/good/core009.cc diff --git a/laborations/lab2/testsuite/good/core009.cc.output b/labs/lab2/testsuite/good/core009.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/core009.cc.output rename to labs/lab2/testsuite/good/core009.cc.output diff --git a/laborations/lab2/testsuite/good/core012.cc b/labs/lab2/testsuite/good/core012.cc similarity index 100% rename from laborations/lab2/testsuite/good/core012.cc rename to labs/lab2/testsuite/good/core012.cc diff --git a/laborations/lab2/testsuite/good/core012.cc.output b/labs/lab2/testsuite/good/core012.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/core012.cc.output rename to labs/lab2/testsuite/good/core012.cc.output diff --git a/laborations/lab2/testsuite/good/core013.cc b/labs/lab2/testsuite/good/core013.cc similarity index 100% rename from laborations/lab2/testsuite/good/core013.cc rename to labs/lab2/testsuite/good/core013.cc diff --git a/laborations/lab2/testsuite/good/core013.cc.output b/labs/lab2/testsuite/good/core013.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/core013.cc.output rename to labs/lab2/testsuite/good/core013.cc.output diff --git a/laborations/lab2/testsuite/good/core015.cc b/labs/lab2/testsuite/good/core015.cc similarity index 100% rename from laborations/lab2/testsuite/good/core015.cc rename to labs/lab2/testsuite/good/core015.cc diff --git a/laborations/lab2/testsuite/good/core015.cc.output b/labs/lab2/testsuite/good/core015.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/core015.cc.output rename to labs/lab2/testsuite/good/core015.cc.output diff --git a/laborations/lab2/testsuite/good/core016.cc b/labs/lab2/testsuite/good/core016.cc similarity index 100% rename from laborations/lab2/testsuite/good/core016.cc rename to labs/lab2/testsuite/good/core016.cc diff --git a/laborations/lab2/testsuite/good/core016.cc.output b/labs/lab2/testsuite/good/core016.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/core016.cc.output rename to labs/lab2/testsuite/good/core016.cc.output diff --git a/laborations/lab2/testsuite/good/core017.cc b/labs/lab2/testsuite/good/core017.cc similarity index 100% rename from laborations/lab2/testsuite/good/core017.cc rename to labs/lab2/testsuite/good/core017.cc diff --git a/laborations/lab2/testsuite/good/core017.cc.output b/labs/lab2/testsuite/good/core017.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/core017.cc.output rename to labs/lab2/testsuite/good/core017.cc.output diff --git a/laborations/lab2/testsuite/good/core019.cc b/labs/lab2/testsuite/good/core019.cc similarity index 100% rename from laborations/lab2/testsuite/good/core019.cc rename to labs/lab2/testsuite/good/core019.cc diff --git a/laborations/lab2/testsuite/good/core019.cc.output b/labs/lab2/testsuite/good/core019.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/core019.cc.output rename to labs/lab2/testsuite/good/core019.cc.output diff --git a/laborations/lab2/testsuite/good/core102.cc b/labs/lab2/testsuite/good/core102.cc similarity index 100% rename from laborations/lab2/testsuite/good/core102.cc rename to labs/lab2/testsuite/good/core102.cc diff --git a/laborations/lab2/testsuite/good/core103.cc b/labs/lab2/testsuite/good/core103.cc similarity index 100% rename from laborations/lab2/testsuite/good/core103.cc rename to labs/lab2/testsuite/good/core103.cc diff --git a/laborations/lab2/testsuite/good/core103.cc.output b/labs/lab2/testsuite/good/core103.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/core103.cc.output rename to labs/lab2/testsuite/good/core103.cc.output diff --git a/laborations/lab2/testsuite/good/core105.cc b/labs/lab2/testsuite/good/core105.cc similarity index 100% rename from laborations/lab2/testsuite/good/core105.cc rename to labs/lab2/testsuite/good/core105.cc diff --git a/laborations/lab2/testsuite/good/core105.cc.output b/labs/lab2/testsuite/good/core105.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/core105.cc.output rename to labs/lab2/testsuite/good/core105.cc.output diff --git a/laborations/lab2/testsuite/good/core108.cc b/labs/lab2/testsuite/good/core108.cc similarity index 100% rename from laborations/lab2/testsuite/good/core108.cc rename to labs/lab2/testsuite/good/core108.cc diff --git a/laborations/lab2/testsuite/good/core108.cc.output b/labs/lab2/testsuite/good/core108.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/core108.cc.output rename to labs/lab2/testsuite/good/core108.cc.output diff --git a/laborations/lab2/testsuite/good/core109.cc b/labs/lab2/testsuite/good/core109.cc similarity index 100% rename from laborations/lab2/testsuite/good/core109.cc rename to labs/lab2/testsuite/good/core109.cc diff --git a/laborations/lab2/testsuite/good/core109.cc.output b/labs/lab2/testsuite/good/core109.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/core109.cc.output rename to labs/lab2/testsuite/good/core109.cc.output diff --git a/laborations/lab2/testsuite/good/core110.cc b/labs/lab2/testsuite/good/core110.cc similarity index 100% rename from laborations/lab2/testsuite/good/core110.cc rename to labs/lab2/testsuite/good/core110.cc diff --git a/laborations/lab2/testsuite/good/core110.cc.output b/labs/lab2/testsuite/good/core110.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/core110.cc.output rename to labs/lab2/testsuite/good/core110.cc.output diff --git a/laborations/lab2/testsuite/good/core111.cc b/labs/lab2/testsuite/good/core111.cc similarity index 100% rename from laborations/lab2/testsuite/good/core111.cc rename to labs/lab2/testsuite/good/core111.cc diff --git a/laborations/lab2/testsuite/good/core111.cc.input b/labs/lab2/testsuite/good/core111.cc.input similarity index 100% rename from laborations/lab2/testsuite/good/core111.cc.input rename to labs/lab2/testsuite/good/core111.cc.input diff --git a/laborations/lab2/testsuite/good/core111.cc.output b/labs/lab2/testsuite/good/core111.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/core111.cc.output rename to labs/lab2/testsuite/good/core111.cc.output diff --git a/laborations/lab2/testsuite/good/core113.cc b/labs/lab2/testsuite/good/core113.cc similarity index 100% rename from laborations/lab2/testsuite/good/core113.cc rename to labs/lab2/testsuite/good/core113.cc diff --git a/laborations/lab2/testsuite/good/core113.cc.output b/labs/lab2/testsuite/good/core113.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/core113.cc.output rename to labs/lab2/testsuite/good/core113.cc.output diff --git a/laborations/lab2/testsuite/good/decr_in_fun.cc b/labs/lab2/testsuite/good/decr_in_fun.cc similarity index 100% rename from laborations/lab2/testsuite/good/decr_in_fun.cc rename to labs/lab2/testsuite/good/decr_in_fun.cc diff --git a/laborations/lab2/testsuite/good/decr_in_fun.cc.output b/labs/lab2/testsuite/good/decr_in_fun.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/decr_in_fun.cc.output rename to labs/lab2/testsuite/good/decr_in_fun.cc.output diff --git a/laborations/lab2/testsuite/good/decr_in_if.cc b/labs/lab2/testsuite/good/decr_in_if.cc similarity index 100% rename from laborations/lab2/testsuite/good/decr_in_if.cc rename to labs/lab2/testsuite/good/decr_in_if.cc diff --git a/laborations/lab2/testsuite/good/decr_in_if.cc.output b/labs/lab2/testsuite/good/decr_in_if.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/decr_in_if.cc.output rename to labs/lab2/testsuite/good/decr_in_if.cc.output diff --git a/laborations/lab2/testsuite/good/desugar_stmt_to_block.cc b/labs/lab2/testsuite/good/desugar_stmt_to_block.cc similarity index 100% rename from laborations/lab2/testsuite/good/desugar_stmt_to_block.cc rename to labs/lab2/testsuite/good/desugar_stmt_to_block.cc diff --git a/laborations/lab2/testsuite/good/desugar_stmt_to_block.cc.output b/labs/lab2/testsuite/good/desugar_stmt_to_block.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/desugar_stmt_to_block.cc.output rename to labs/lab2/testsuite/good/desugar_stmt_to_block.cc.output diff --git a/laborations/lab2/testsuite/good/div.cc b/labs/lab2/testsuite/good/div.cc similarity index 100% rename from laborations/lab2/testsuite/good/div.cc rename to labs/lab2/testsuite/good/div.cc diff --git a/laborations/lab2/testsuite/good/div.cc.output b/labs/lab2/testsuite/good/div.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/div.cc.output rename to labs/lab2/testsuite/good/div.cc.output diff --git a/laborations/lab2/testsuite/good/do_nothing.cc b/labs/lab2/testsuite/good/do_nothing.cc similarity index 100% rename from laborations/lab2/testsuite/good/do_nothing.cc rename to labs/lab2/testsuite/good/do_nothing.cc diff --git a/laborations/lab2/testsuite/good/double__cmp.cc b/labs/lab2/testsuite/good/double__cmp.cc similarity index 100% rename from laborations/lab2/testsuite/good/double__cmp.cc rename to labs/lab2/testsuite/good/double__cmp.cc diff --git a/laborations/lab2/testsuite/good/double__cmp.cc.output b/labs/lab2/testsuite/good/double__cmp.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/double__cmp.cc.output rename to labs/lab2/testsuite/good/double__cmp.cc.output diff --git a/laborations/lab2/testsuite/good/double__core012.cc b/labs/lab2/testsuite/good/double__core012.cc similarity index 100% rename from laborations/lab2/testsuite/good/double__core012.cc rename to labs/lab2/testsuite/good/double__core012.cc diff --git a/laborations/lab2/testsuite/good/double__core012.cc.output b/labs/lab2/testsuite/good/double__core012.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/double__core012.cc.output rename to labs/lab2/testsuite/good/double__core012.cc.output diff --git a/laborations/lab2/testsuite/good/double__inc_dec.cc b/labs/lab2/testsuite/good/double__inc_dec.cc similarity index 100% rename from laborations/lab2/testsuite/good/double__inc_dec.cc rename to labs/lab2/testsuite/good/double__inc_dec.cc diff --git a/laborations/lab2/testsuite/good/double__inc_dec.cc.output b/labs/lab2/testsuite/good/double__inc_dec.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/double__inc_dec.cc.output rename to labs/lab2/testsuite/good/double__inc_dec.cc.output diff --git a/laborations/lab2/testsuite/good/double__postdecrement.cc b/labs/lab2/testsuite/good/double__postdecrement.cc similarity index 100% rename from laborations/lab2/testsuite/good/double__postdecrement.cc rename to labs/lab2/testsuite/good/double__postdecrement.cc diff --git a/laborations/lab2/testsuite/good/double__postdecrement.cc.output b/labs/lab2/testsuite/good/double__postdecrement.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/double__postdecrement.cc.output rename to labs/lab2/testsuite/good/double__postdecrement.cc.output diff --git a/laborations/lab2/testsuite/good/double__postincrement.cc b/labs/lab2/testsuite/good/double__postincrement.cc similarity index 100% rename from laborations/lab2/testsuite/good/double__postincrement.cc rename to labs/lab2/testsuite/good/double__postincrement.cc diff --git a/laborations/lab2/testsuite/good/double__postincrement.cc.output b/labs/lab2/testsuite/good/double__postincrement.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/double__postincrement.cc.output rename to labs/lab2/testsuite/good/double__postincrement.cc.output diff --git a/laborations/lab2/testsuite/good/double__predecrement.cc b/labs/lab2/testsuite/good/double__predecrement.cc similarity index 100% rename from laborations/lab2/testsuite/good/double__predecrement.cc rename to labs/lab2/testsuite/good/double__predecrement.cc diff --git a/laborations/lab2/testsuite/good/double__predecrement.cc.output b/labs/lab2/testsuite/good/double__predecrement.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/double__predecrement.cc.output rename to labs/lab2/testsuite/good/double__predecrement.cc.output diff --git a/laborations/lab2/testsuite/good/double__preincrement.cc b/labs/lab2/testsuite/good/double__preincrement.cc similarity index 100% rename from laborations/lab2/testsuite/good/double__preincrement.cc rename to labs/lab2/testsuite/good/double__preincrement.cc diff --git a/laborations/lab2/testsuite/good/double__preincrement.cc.output b/labs/lab2/testsuite/good/double__preincrement.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/double__preincrement.cc.output rename to labs/lab2/testsuite/good/double__preincrement.cc.output diff --git a/laborations/lab2/testsuite/good/double__read.cc b/labs/lab2/testsuite/good/double__read.cc similarity index 100% rename from laborations/lab2/testsuite/good/double__read.cc rename to labs/lab2/testsuite/good/double__read.cc diff --git a/laborations/lab2/testsuite/good/double__read.cc.input b/labs/lab2/testsuite/good/double__read.cc.input similarity index 100% rename from laborations/lab2/testsuite/good/double__read.cc.input rename to labs/lab2/testsuite/good/double__read.cc.input diff --git a/laborations/lab2/testsuite/good/double__read.cc.output b/labs/lab2/testsuite/good/double__read.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/double__read.cc.output rename to labs/lab2/testsuite/good/double__read.cc.output diff --git a/laborations/lab2/testsuite/good/double__small_program_fac.cc b/labs/lab2/testsuite/good/double__small_program_fac.cc similarity index 100% rename from laborations/lab2/testsuite/good/double__small_program_fac.cc rename to labs/lab2/testsuite/good/double__small_program_fac.cc diff --git a/laborations/lab2/testsuite/good/double__small_program_fac.cc.output b/labs/lab2/testsuite/good/double__small_program_fac.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/double__small_program_fac.cc.output rename to labs/lab2/testsuite/good/double__small_program_fac.cc.output diff --git a/laborations/lab2/testsuite/good/eval_order.cc b/labs/lab2/testsuite/good/eval_order.cc similarity index 100% rename from laborations/lab2/testsuite/good/eval_order.cc rename to labs/lab2/testsuite/good/eval_order.cc diff --git a/laborations/lab2/testsuite/good/eval_order.cc.output b/labs/lab2/testsuite/good/eval_order.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/eval_order.cc.output rename to labs/lab2/testsuite/good/eval_order.cc.output diff --git a/laborations/lab2/testsuite/good/fibonacci.cc b/labs/lab2/testsuite/good/fibonacci.cc similarity index 100% rename from laborations/lab2/testsuite/good/fibonacci.cc rename to labs/lab2/testsuite/good/fibonacci.cc diff --git a/laborations/lab2/testsuite/good/fibonacci.cc.output b/labs/lab2/testsuite/good/fibonacci.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/fibonacci.cc.output rename to labs/lab2/testsuite/good/fibonacci.cc.output diff --git a/laborations/lab2/testsuite/good/fun_app_two_parameters.cc b/labs/lab2/testsuite/good/fun_app_two_parameters.cc similarity index 100% rename from laborations/lab2/testsuite/good/fun_app_two_parameters.cc rename to labs/lab2/testsuite/good/fun_app_two_parameters.cc diff --git a/laborations/lab2/testsuite/good/good01.cc b/labs/lab2/testsuite/good/good01.cc similarity index 100% rename from laborations/lab2/testsuite/good/good01.cc rename to labs/lab2/testsuite/good/good01.cc diff --git a/laborations/lab2/testsuite/good/good01.cc.output b/labs/lab2/testsuite/good/good01.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/good01.cc.output rename to labs/lab2/testsuite/good/good01.cc.output diff --git a/laborations/lab2/testsuite/good/good03.cc b/labs/lab2/testsuite/good/good03.cc similarity index 100% rename from laborations/lab2/testsuite/good/good03.cc rename to labs/lab2/testsuite/good/good03.cc diff --git a/laborations/lab2/testsuite/good/good03.cc.input b/labs/lab2/testsuite/good/good03.cc.input similarity index 100% rename from laborations/lab2/testsuite/good/good03.cc.input rename to labs/lab2/testsuite/good/good03.cc.input diff --git a/laborations/lab2/testsuite/good/good03.cc.output b/labs/lab2/testsuite/good/good03.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/good03.cc.output rename to labs/lab2/testsuite/good/good03.cc.output diff --git a/laborations/lab2/testsuite/good/good05.cc b/labs/lab2/testsuite/good/good05.cc similarity index 100% rename from laborations/lab2/testsuite/good/good05.cc rename to labs/lab2/testsuite/good/good05.cc diff --git a/laborations/lab2/testsuite/good/good05.cc.input b/labs/lab2/testsuite/good/good05.cc.input similarity index 100% rename from laborations/lab2/testsuite/good/good05.cc.input rename to labs/lab2/testsuite/good/good05.cc.input diff --git a/laborations/lab2/testsuite/good/good05.cc.output b/labs/lab2/testsuite/good/good05.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/good05.cc.output rename to labs/lab2/testsuite/good/good05.cc.output diff --git a/laborations/lab2/testsuite/good/good07.cc b/labs/lab2/testsuite/good/good07.cc similarity index 100% rename from laborations/lab2/testsuite/good/good07.cc rename to labs/lab2/testsuite/good/good07.cc diff --git a/laborations/lab2/testsuite/good/good07.cc.input b/labs/lab2/testsuite/good/good07.cc.input similarity index 100% rename from laborations/lab2/testsuite/good/good07.cc.input rename to labs/lab2/testsuite/good/good07.cc.input diff --git a/laborations/lab2/testsuite/good/good07.cc.output b/labs/lab2/testsuite/good/good07.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/good07.cc.output rename to labs/lab2/testsuite/good/good07.cc.output diff --git a/laborations/lab2/testsuite/good/good09.cc b/labs/lab2/testsuite/good/good09.cc similarity index 100% rename from laborations/lab2/testsuite/good/good09.cc rename to labs/lab2/testsuite/good/good09.cc diff --git a/laborations/lab2/testsuite/good/good09.cc.input b/labs/lab2/testsuite/good/good09.cc.input similarity index 100% rename from laborations/lab2/testsuite/good/good09.cc.input rename to labs/lab2/testsuite/good/good09.cc.input diff --git a/laborations/lab2/testsuite/good/good09.cc.output b/labs/lab2/testsuite/good/good09.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/good09.cc.output rename to labs/lab2/testsuite/good/good09.cc.output diff --git a/laborations/lab2/testsuite/good/good11.cc b/labs/lab2/testsuite/good/good11.cc similarity index 100% rename from laborations/lab2/testsuite/good/good11.cc rename to labs/lab2/testsuite/good/good11.cc diff --git a/laborations/lab2/testsuite/good/good11.cc.input b/labs/lab2/testsuite/good/good11.cc.input similarity index 100% rename from laborations/lab2/testsuite/good/good11.cc.input rename to labs/lab2/testsuite/good/good11.cc.input diff --git a/laborations/lab2/testsuite/good/good11.cc.output b/labs/lab2/testsuite/good/good11.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/good11.cc.output rename to labs/lab2/testsuite/good/good11.cc.output diff --git a/laborations/lab2/testsuite/good/good13.cc b/labs/lab2/testsuite/good/good13.cc similarity index 100% rename from laborations/lab2/testsuite/good/good13.cc rename to labs/lab2/testsuite/good/good13.cc diff --git a/laborations/lab2/testsuite/good/good13.cc.input b/labs/lab2/testsuite/good/good13.cc.input similarity index 100% rename from laborations/lab2/testsuite/good/good13.cc.input rename to labs/lab2/testsuite/good/good13.cc.input diff --git a/laborations/lab2/testsuite/good/good13.cc.output b/labs/lab2/testsuite/good/good13.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/good13.cc.output rename to labs/lab2/testsuite/good/good13.cc.output diff --git a/laborations/lab2/testsuite/good/good15.cc b/labs/lab2/testsuite/good/good15.cc similarity index 100% rename from laborations/lab2/testsuite/good/good15.cc rename to labs/lab2/testsuite/good/good15.cc diff --git a/laborations/lab2/testsuite/good/good15.cc.output b/labs/lab2/testsuite/good/good15.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/good15.cc.output rename to labs/lab2/testsuite/good/good15.cc.output diff --git a/laborations/lab2/testsuite/good/good17.cc b/labs/lab2/testsuite/good/good17.cc similarity index 100% rename from laborations/lab2/testsuite/good/good17.cc rename to labs/lab2/testsuite/good/good17.cc diff --git a/laborations/lab2/testsuite/good/good17.cc.output b/labs/lab2/testsuite/good/good17.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/good17.cc.output rename to labs/lab2/testsuite/good/good17.cc.output diff --git a/laborations/lab2/testsuite/good/identifiers_case_sensitive.cc b/labs/lab2/testsuite/good/identifiers_case_sensitive.cc similarity index 100% rename from laborations/lab2/testsuite/good/identifiers_case_sensitive.cc rename to labs/lab2/testsuite/good/identifiers_case_sensitive.cc diff --git a/laborations/lab2/testsuite/good/identifiers_case_sensitive.cc.output b/labs/lab2/testsuite/good/identifiers_case_sensitive.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/identifiers_case_sensitive.cc.output rename to labs/lab2/testsuite/good/identifiers_case_sensitive.cc.output diff --git a/laborations/lab2/testsuite/good/if_state_propagation.cc b/labs/lab2/testsuite/good/if_state_propagation.cc similarity index 100% rename from laborations/lab2/testsuite/good/if_state_propagation.cc rename to labs/lab2/testsuite/good/if_state_propagation.cc diff --git a/laborations/lab2/testsuite/good/if_state_propagation.cc.output b/labs/lab2/testsuite/good/if_state_propagation.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/if_state_propagation.cc.output rename to labs/lab2/testsuite/good/if_state_propagation.cc.output diff --git a/laborations/lab2/testsuite/good/ineq_inclusive.cc b/labs/lab2/testsuite/good/ineq_inclusive.cc similarity index 100% rename from laborations/lab2/testsuite/good/ineq_inclusive.cc rename to labs/lab2/testsuite/good/ineq_inclusive.cc diff --git a/laborations/lab2/testsuite/good/ineq_inclusive.cc.output b/labs/lab2/testsuite/good/ineq_inclusive.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/ineq_inclusive.cc.output rename to labs/lab2/testsuite/good/ineq_inclusive.cc.output diff --git a/laborations/lab2/testsuite/good/large_const.cc b/labs/lab2/testsuite/good/large_const.cc similarity index 100% rename from laborations/lab2/testsuite/good/large_const.cc rename to labs/lab2/testsuite/good/large_const.cc diff --git a/laborations/lab2/testsuite/good/large_const.cc.output b/labs/lab2/testsuite/good/large_const.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/large_const.cc.output rename to labs/lab2/testsuite/good/large_const.cc.output diff --git a/laborations/lab2/testsuite/good/large_program_fac.cc b/labs/lab2/testsuite/good/large_program_fac.cc similarity index 100% rename from laborations/lab2/testsuite/good/large_program_fac.cc rename to labs/lab2/testsuite/good/large_program_fac.cc diff --git a/laborations/lab2/testsuite/good/large_program_fac.cc.output b/labs/lab2/testsuite/good/large_program_fac.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/large_program_fac.cc.output rename to labs/lab2/testsuite/good/large_program_fac.cc.output diff --git a/laborations/lab2/testsuite/good/large_program_fac.h b/labs/lab2/testsuite/good/large_program_fac.h similarity index 100% rename from laborations/lab2/testsuite/good/large_program_fac.h rename to labs/lab2/testsuite/good/large_program_fac.h diff --git a/laborations/lab2/testsuite/good/nested_if.cc b/labs/lab2/testsuite/good/nested_if.cc similarity index 100% rename from laborations/lab2/testsuite/good/nested_if.cc rename to labs/lab2/testsuite/good/nested_if.cc diff --git a/laborations/lab2/testsuite/good/nested_if.cc.output b/labs/lab2/testsuite/good/nested_if.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/nested_if.cc.output rename to labs/lab2/testsuite/good/nested_if.cc.output diff --git a/laborations/lab2/testsuite/good/postdecrement.cc b/labs/lab2/testsuite/good/postdecrement.cc similarity index 100% rename from laborations/lab2/testsuite/good/postdecrement.cc rename to labs/lab2/testsuite/good/postdecrement.cc diff --git a/laborations/lab2/testsuite/good/postdecrement.cc.output b/labs/lab2/testsuite/good/postdecrement.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/postdecrement.cc.output rename to labs/lab2/testsuite/good/postdecrement.cc.output diff --git a/laborations/lab2/testsuite/good/postincrement.cc b/labs/lab2/testsuite/good/postincrement.cc similarity index 100% rename from laborations/lab2/testsuite/good/postincrement.cc rename to labs/lab2/testsuite/good/postincrement.cc diff --git a/laborations/lab2/testsuite/good/postincrement.cc.output b/labs/lab2/testsuite/good/postincrement.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/postincrement.cc.output rename to labs/lab2/testsuite/good/postincrement.cc.output diff --git a/laborations/lab2/testsuite/good/predecrement.cc b/labs/lab2/testsuite/good/predecrement.cc similarity index 100% rename from laborations/lab2/testsuite/good/predecrement.cc rename to labs/lab2/testsuite/good/predecrement.cc diff --git a/laborations/lab2/testsuite/good/predecrement.cc.output b/labs/lab2/testsuite/good/predecrement.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/predecrement.cc.output rename to labs/lab2/testsuite/good/predecrement.cc.output diff --git a/laborations/lab2/testsuite/good/preincrement.cc b/labs/lab2/testsuite/good/preincrement.cc similarity index 100% rename from laborations/lab2/testsuite/good/preincrement.cc rename to labs/lab2/testsuite/good/preincrement.cc diff --git a/laborations/lab2/testsuite/good/preincrement.cc.output b/labs/lab2/testsuite/good/preincrement.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/preincrement.cc.output rename to labs/lab2/testsuite/good/preincrement.cc.output diff --git a/laborations/lab2/testsuite/good/redeclare_after_block.cc b/labs/lab2/testsuite/good/redeclare_after_block.cc similarity index 100% rename from laborations/lab2/testsuite/good/redeclare_after_block.cc rename to labs/lab2/testsuite/good/redeclare_after_block.cc diff --git a/laborations/lab2/testsuite/good/redeclare_after_block.cc.output b/labs/lab2/testsuite/good/redeclare_after_block.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/redeclare_after_block.cc.output rename to labs/lab2/testsuite/good/redeclare_after_block.cc.output diff --git a/laborations/lab2/testsuite/good/redeclare_after_if.cc b/labs/lab2/testsuite/good/redeclare_after_if.cc similarity index 100% rename from laborations/lab2/testsuite/good/redeclare_after_if.cc rename to labs/lab2/testsuite/good/redeclare_after_if.cc diff --git a/laborations/lab2/testsuite/good/redeclare_after_if.cc.output b/labs/lab2/testsuite/good/redeclare_after_if.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/redeclare_after_if.cc.output rename to labs/lab2/testsuite/good/redeclare_after_if.cc.output diff --git a/laborations/lab2/testsuite/good/redeclare_after_while.cc b/labs/lab2/testsuite/good/redeclare_after_while.cc similarity index 100% rename from laborations/lab2/testsuite/good/redeclare_after_while.cc rename to labs/lab2/testsuite/good/redeclare_after_while.cc diff --git a/laborations/lab2/testsuite/good/redeclare_after_while.cc.output b/labs/lab2/testsuite/good/redeclare_after_while.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/redeclare_after_while.cc.output rename to labs/lab2/testsuite/good/redeclare_after_while.cc.output diff --git a/laborations/lab2/testsuite/good/redeclare_in_block.cc b/labs/lab2/testsuite/good/redeclare_in_block.cc similarity index 100% rename from laborations/lab2/testsuite/good/redeclare_in_block.cc rename to labs/lab2/testsuite/good/redeclare_in_block.cc diff --git a/laborations/lab2/testsuite/good/redeclare_in_block.cc.output b/labs/lab2/testsuite/good/redeclare_in_block.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/redeclare_in_block.cc.output rename to labs/lab2/testsuite/good/redeclare_in_block.cc.output diff --git a/laborations/lab2/testsuite/good/redeclare_in_else.cc b/labs/lab2/testsuite/good/redeclare_in_else.cc similarity index 100% rename from laborations/lab2/testsuite/good/redeclare_in_else.cc rename to labs/lab2/testsuite/good/redeclare_in_else.cc diff --git a/laborations/lab2/testsuite/good/redeclare_in_else.cc.output b/labs/lab2/testsuite/good/redeclare_in_else.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/redeclare_in_else.cc.output rename to labs/lab2/testsuite/good/redeclare_in_else.cc.output diff --git a/laborations/lab2/testsuite/good/redeclare_in_if.cc b/labs/lab2/testsuite/good/redeclare_in_if.cc similarity index 100% rename from laborations/lab2/testsuite/good/redeclare_in_if.cc rename to labs/lab2/testsuite/good/redeclare_in_if.cc diff --git a/laborations/lab2/testsuite/good/redeclare_in_if.cc.output b/labs/lab2/testsuite/good/redeclare_in_if.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/redeclare_in_if.cc.output rename to labs/lab2/testsuite/good/redeclare_in_if.cc.output diff --git a/laborations/lab2/testsuite/good/redeclare_in_while.cc b/labs/lab2/testsuite/good/redeclare_in_while.cc similarity index 100% rename from laborations/lab2/testsuite/good/redeclare_in_while.cc rename to labs/lab2/testsuite/good/redeclare_in_while.cc diff --git a/laborations/lab2/testsuite/good/redeclare_in_while.cc.output b/labs/lab2/testsuite/good/redeclare_in_while.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/redeclare_in_while.cc.output rename to labs/lab2/testsuite/good/redeclare_in_while.cc.output diff --git a/laborations/lab2/testsuite/good/return_complex.cc b/labs/lab2/testsuite/good/return_complex.cc similarity index 100% rename from laborations/lab2/testsuite/good/return_complex.cc rename to labs/lab2/testsuite/good/return_complex.cc diff --git a/laborations/lab2/testsuite/good/return_complex.cc.output b/labs/lab2/testsuite/good/return_complex.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/return_complex.cc.output rename to labs/lab2/testsuite/good/return_complex.cc.output diff --git a/laborations/lab2/testsuite/good/return_fun_val.cc b/labs/lab2/testsuite/good/return_fun_val.cc similarity index 100% rename from laborations/lab2/testsuite/good/return_fun_val.cc rename to labs/lab2/testsuite/good/return_fun_val.cc diff --git a/laborations/lab2/testsuite/good/return_in_block.cc b/labs/lab2/testsuite/good/return_in_block.cc similarity index 100% rename from laborations/lab2/testsuite/good/return_in_block.cc rename to labs/lab2/testsuite/good/return_in_block.cc diff --git a/laborations/lab2/testsuite/good/return_in_block.cc.output b/labs/lab2/testsuite/good/return_in_block.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/return_in_block.cc.output rename to labs/lab2/testsuite/good/return_in_block.cc.output diff --git a/laborations/lab2/testsuite/good/return_in_block_block.cc b/labs/lab2/testsuite/good/return_in_block_block.cc similarity index 100% rename from laborations/lab2/testsuite/good/return_in_block_block.cc rename to labs/lab2/testsuite/good/return_in_block_block.cc diff --git a/laborations/lab2/testsuite/good/return_in_block_block.cc.output b/labs/lab2/testsuite/good/return_in_block_block.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/return_in_block_block.cc.output rename to labs/lab2/testsuite/good/return_in_block_block.cc.output diff --git a/laborations/lab2/testsuite/good/return_in_if_left.cc b/labs/lab2/testsuite/good/return_in_if_left.cc similarity index 100% rename from laborations/lab2/testsuite/good/return_in_if_left.cc rename to labs/lab2/testsuite/good/return_in_if_left.cc diff --git a/laborations/lab2/testsuite/good/return_in_if_left.cc.output b/labs/lab2/testsuite/good/return_in_if_left.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/return_in_if_left.cc.output rename to labs/lab2/testsuite/good/return_in_if_left.cc.output diff --git a/laborations/lab2/testsuite/good/return_in_if_right.cc b/labs/lab2/testsuite/good/return_in_if_right.cc similarity index 100% rename from laborations/lab2/testsuite/good/return_in_if_right.cc rename to labs/lab2/testsuite/good/return_in_if_right.cc diff --git a/laborations/lab2/testsuite/good/return_in_if_right.cc.output b/labs/lab2/testsuite/good/return_in_if_right.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/return_in_if_right.cc.output rename to labs/lab2/testsuite/good/return_in_if_right.cc.output diff --git a/laborations/lab2/testsuite/good/return_in_while.cc b/labs/lab2/testsuite/good/return_in_while.cc similarity index 100% rename from laborations/lab2/testsuite/good/return_in_while.cc rename to labs/lab2/testsuite/good/return_in_while.cc diff --git a/laborations/lab2/testsuite/good/return_in_while.cc.output b/labs/lab2/testsuite/good/return_in_while.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/return_in_while.cc.output rename to labs/lab2/testsuite/good/return_in_while.cc.output diff --git a/laborations/lab2/testsuite/good/return_var_in_block.cc b/labs/lab2/testsuite/good/return_var_in_block.cc similarity index 100% rename from laborations/lab2/testsuite/good/return_var_in_block.cc rename to labs/lab2/testsuite/good/return_var_in_block.cc diff --git a/laborations/lab2/testsuite/good/returns_many.cc b/labs/lab2/testsuite/good/returns_many.cc similarity index 100% rename from laborations/lab2/testsuite/good/returns_many.cc rename to labs/lab2/testsuite/good/returns_many.cc diff --git a/laborations/lab2/testsuite/good/returns_many.cc.output b/labs/lab2/testsuite/good/returns_many.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/returns_many.cc.output rename to labs/lab2/testsuite/good/returns_many.cc.output diff --git a/laborations/lab2/testsuite/good/scopes.cc b/labs/lab2/testsuite/good/scopes.cc similarity index 100% rename from laborations/lab2/testsuite/good/scopes.cc rename to labs/lab2/testsuite/good/scopes.cc diff --git a/laborations/lab2/testsuite/good/scopes.cc.output b/labs/lab2/testsuite/good/scopes.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/scopes.cc.output rename to labs/lab2/testsuite/good/scopes.cc.output diff --git a/laborations/lab2/testsuite/good/scopes_different_type_in_branches.cc b/labs/lab2/testsuite/good/scopes_different_type_in_branches.cc similarity index 100% rename from laborations/lab2/testsuite/good/scopes_different_type_in_branches.cc rename to labs/lab2/testsuite/good/scopes_different_type_in_branches.cc diff --git a/laborations/lab2/testsuite/good/scopes_if_leakage.cc b/labs/lab2/testsuite/good/scopes_if_leakage.cc similarity index 100% rename from laborations/lab2/testsuite/good/scopes_if_leakage.cc rename to labs/lab2/testsuite/good/scopes_if_leakage.cc diff --git a/laborations/lab2/testsuite/good/scopes_reuse_name.cc b/labs/lab2/testsuite/good/scopes_reuse_name.cc similarity index 100% rename from laborations/lab2/testsuite/good/scopes_reuse_name.cc rename to labs/lab2/testsuite/good/scopes_reuse_name.cc diff --git a/laborations/lab2/testsuite/good/scopes_reuse_name.cc.output b/labs/lab2/testsuite/good/scopes_reuse_name.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/scopes_reuse_name.cc.output rename to labs/lab2/testsuite/good/scopes_reuse_name.cc.output diff --git a/laborations/lab2/testsuite/good/scopes_while_leakage.cc b/labs/lab2/testsuite/good/scopes_while_leakage.cc similarity index 100% rename from laborations/lab2/testsuite/good/scopes_while_leakage.cc rename to labs/lab2/testsuite/good/scopes_while_leakage.cc diff --git a/laborations/lab2/testsuite/good/separate_namespaces.cc b/labs/lab2/testsuite/good/separate_namespaces.cc similarity index 100% rename from laborations/lab2/testsuite/good/separate_namespaces.cc rename to labs/lab2/testsuite/good/separate_namespaces.cc diff --git a/laborations/lab2/testsuite/good/small_program_fac.cc b/labs/lab2/testsuite/good/small_program_fac.cc similarity index 100% rename from laborations/lab2/testsuite/good/small_program_fac.cc rename to labs/lab2/testsuite/good/small_program_fac.cc diff --git a/laborations/lab2/testsuite/good/small_program_fac.cc.output b/labs/lab2/testsuite/good/small_program_fac.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/small_program_fac.cc.output rename to labs/lab2/testsuite/good/small_program_fac.cc.output diff --git a/laborations/lab2/testsuite/good/state_propagation.cc b/labs/lab2/testsuite/good/state_propagation.cc similarity index 100% rename from laborations/lab2/testsuite/good/state_propagation.cc rename to labs/lab2/testsuite/good/state_propagation.cc diff --git a/laborations/lab2/testsuite/good/state_propagation.cc.output b/labs/lab2/testsuite/good/state_propagation.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/state_propagation.cc.output rename to labs/lab2/testsuite/good/state_propagation.cc.output diff --git a/laborations/lab2/testsuite/good/subtyping/arith_ass_int_mult_double.cc b/labs/lab2/testsuite/good/subtyping/arith_ass_int_mult_double.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/arith_ass_int_mult_double.cc rename to labs/lab2/testsuite/good/subtyping/arith_ass_int_mult_double.cc diff --git a/laborations/lab2/testsuite/good/subtyping/arith_double_div_int.cc b/labs/lab2/testsuite/good/subtyping/arith_double_div_int.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/arith_double_div_int.cc rename to labs/lab2/testsuite/good/subtyping/arith_double_div_int.cc diff --git a/laborations/lab2/testsuite/good/subtyping/arith_double_mul_int.cc b/labs/lab2/testsuite/good/subtyping/arith_double_mul_int.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/arith_double_mul_int.cc rename to labs/lab2/testsuite/good/subtyping/arith_double_mul_int.cc diff --git a/laborations/lab2/testsuite/good/subtyping/arith_double_plus_int.cc b/labs/lab2/testsuite/good/subtyping/arith_double_plus_int.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/arith_double_plus_int.cc rename to labs/lab2/testsuite/good/subtyping/arith_double_plus_int.cc diff --git a/laborations/lab2/testsuite/good/subtyping/arith_double_sub_int.cc b/labs/lab2/testsuite/good/subtyping/arith_double_sub_int.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/arith_double_sub_int.cc rename to labs/lab2/testsuite/good/subtyping/arith_double_sub_int.cc diff --git a/laborations/lab2/testsuite/good/subtyping/arith_int_add_double.cc b/labs/lab2/testsuite/good/subtyping/arith_int_add_double.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/arith_int_add_double.cc rename to labs/lab2/testsuite/good/subtyping/arith_int_add_double.cc diff --git a/laborations/lab2/testsuite/good/subtyping/arith_int_div_double.cc b/labs/lab2/testsuite/good/subtyping/arith_int_div_double.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/arith_int_div_double.cc rename to labs/lab2/testsuite/good/subtyping/arith_int_div_double.cc diff --git a/laborations/lab2/testsuite/good/subtyping/arith_int_mul_double.cc b/labs/lab2/testsuite/good/subtyping/arith_int_mul_double.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/arith_int_mul_double.cc rename to labs/lab2/testsuite/good/subtyping/arith_int_mul_double.cc diff --git a/laborations/lab2/testsuite/good/subtyping/arith_int_sub_double.cc b/labs/lab2/testsuite/good/subtyping/arith_int_sub_double.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/arith_int_sub_double.cc rename to labs/lab2/testsuite/good/subtyping/arith_int_sub_double.cc diff --git a/laborations/lab2/testsuite/good/subtyping/ass_double_int.cc b/labs/lab2/testsuite/good/subtyping/ass_double_int.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/ass_double_int.cc rename to labs/lab2/testsuite/good/subtyping/ass_double_int.cc diff --git a/laborations/lab2/testsuite/good/subtyping/ass_double_int.cc.output b/labs/lab2/testsuite/good/subtyping/ass_double_int.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/ass_double_int.cc.output rename to labs/lab2/testsuite/good/subtyping/ass_double_int.cc.output diff --git a/laborations/lab2/testsuite/good/subtyping/ass_double_int_split.cc b/labs/lab2/testsuite/good/subtyping/ass_double_int_split.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/ass_double_int_split.cc rename to labs/lab2/testsuite/good/subtyping/ass_double_int_split.cc diff --git a/laborations/lab2/testsuite/good/subtyping/cmp_double_eq_int.cc b/labs/lab2/testsuite/good/subtyping/cmp_double_eq_int.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/cmp_double_eq_int.cc rename to labs/lab2/testsuite/good/subtyping/cmp_double_eq_int.cc diff --git a/laborations/lab2/testsuite/good/subtyping/cmp_double_ineq_int.cc b/labs/lab2/testsuite/good/subtyping/cmp_double_ineq_int.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/cmp_double_ineq_int.cc rename to labs/lab2/testsuite/good/subtyping/cmp_double_ineq_int.cc diff --git a/laborations/lab2/testsuite/good/subtyping/cmp_if_double_gt_int.cc b/labs/lab2/testsuite/good/subtyping/cmp_if_double_gt_int.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/cmp_if_double_gt_int.cc rename to labs/lab2/testsuite/good/subtyping/cmp_if_double_gt_int.cc diff --git a/laborations/lab2/testsuite/good/subtyping/cmp_if_double_gte_int.cc b/labs/lab2/testsuite/good/subtyping/cmp_if_double_gte_int.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/cmp_if_double_gte_int.cc rename to labs/lab2/testsuite/good/subtyping/cmp_if_double_gte_int.cc diff --git a/laborations/lab2/testsuite/good/subtyping/cmp_if_double_lt_int.cc b/labs/lab2/testsuite/good/subtyping/cmp_if_double_lt_int.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/cmp_if_double_lt_int.cc rename to labs/lab2/testsuite/good/subtyping/cmp_if_double_lt_int.cc diff --git a/laborations/lab2/testsuite/good/subtyping/cmp_if_double_lte_int.cc b/labs/lab2/testsuite/good/subtyping/cmp_if_double_lte_int.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/cmp_if_double_lte_int.cc rename to labs/lab2/testsuite/good/subtyping/cmp_if_double_lte_int.cc diff --git a/laborations/lab2/testsuite/good/subtyping/cmp_if_int_gt_double.cc b/labs/lab2/testsuite/good/subtyping/cmp_if_int_gt_double.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/cmp_if_int_gt_double.cc rename to labs/lab2/testsuite/good/subtyping/cmp_if_int_gt_double.cc diff --git a/laborations/lab2/testsuite/good/subtyping/cmp_if_int_gte_double.cc b/labs/lab2/testsuite/good/subtyping/cmp_if_int_gte_double.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/cmp_if_int_gte_double.cc rename to labs/lab2/testsuite/good/subtyping/cmp_if_int_gte_double.cc diff --git a/laborations/lab2/testsuite/good/subtyping/cmp_if_int_lt_double.cc b/labs/lab2/testsuite/good/subtyping/cmp_if_int_lt_double.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/cmp_if_int_lt_double.cc rename to labs/lab2/testsuite/good/subtyping/cmp_if_int_lt_double.cc diff --git a/laborations/lab2/testsuite/good/subtyping/cmp_if_int_lte_double.cc b/labs/lab2/testsuite/good/subtyping/cmp_if_int_lte_double.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/cmp_if_int_lte_double.cc rename to labs/lab2/testsuite/good/subtyping/cmp_if_int_lte_double.cc diff --git a/laborations/lab2/testsuite/good/subtyping/cmp_int_eq_double.cc b/labs/lab2/testsuite/good/subtyping/cmp_int_eq_double.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/cmp_int_eq_double.cc rename to labs/lab2/testsuite/good/subtyping/cmp_int_eq_double.cc diff --git a/laborations/lab2/testsuite/good/subtyping/cmp_int_ineq_double.cc b/labs/lab2/testsuite/good/subtyping/cmp_int_ineq_double.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/cmp_int_ineq_double.cc rename to labs/lab2/testsuite/good/subtyping/cmp_int_ineq_double.cc diff --git a/laborations/lab2/testsuite/good/subtyping/cmp_while_double_int_plus_int.cc b/labs/lab2/testsuite/good/subtyping/cmp_while_double_int_plus_int.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/cmp_while_double_int_plus_int.cc rename to labs/lab2/testsuite/good/subtyping/cmp_while_double_int_plus_int.cc diff --git a/laborations/lab2/testsuite/good/subtyping/cmp_while_int_eq_double.cc b/labs/lab2/testsuite/good/subtyping/cmp_while_int_eq_double.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/cmp_while_int_eq_double.cc rename to labs/lab2/testsuite/good/subtyping/cmp_while_int_eq_double.cc diff --git a/laborations/lab2/testsuite/good/subtyping/div_double_lhs.cc b/labs/lab2/testsuite/good/subtyping/div_double_lhs.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/div_double_lhs.cc rename to labs/lab2/testsuite/good/subtyping/div_double_lhs.cc diff --git a/laborations/lab2/testsuite/good/subtyping/div_double_lhs.cc.output b/labs/lab2/testsuite/good/subtyping/div_double_lhs.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/div_double_lhs.cc.output rename to labs/lab2/testsuite/good/subtyping/div_double_lhs.cc.output diff --git a/laborations/lab2/testsuite/good/subtyping/div_double_rhs.cc b/labs/lab2/testsuite/good/subtyping/div_double_rhs.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/div_double_rhs.cc rename to labs/lab2/testsuite/good/subtyping/div_double_rhs.cc diff --git a/laborations/lab2/testsuite/good/subtyping/div_double_rhs.cc.output b/labs/lab2/testsuite/good/subtyping/div_double_rhs.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/div_double_rhs.cc.output rename to labs/lab2/testsuite/good/subtyping/div_double_rhs.cc.output diff --git a/laborations/lab2/testsuite/good/subtyping/fun_app_built_in.cc b/labs/lab2/testsuite/good/subtyping/fun_app_built_in.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/fun_app_built_in.cc rename to labs/lab2/testsuite/good/subtyping/fun_app_built_in.cc diff --git a/laborations/lab2/testsuite/good/subtyping/fun_app_built_in.cc.output b/labs/lab2/testsuite/good/subtyping/fun_app_built_in.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/fun_app_built_in.cc.output rename to labs/lab2/testsuite/good/subtyping/fun_app_built_in.cc.output diff --git a/laborations/lab2/testsuite/good/subtyping/fun_app_id.cc b/labs/lab2/testsuite/good/subtyping/fun_app_id.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/fun_app_id.cc rename to labs/lab2/testsuite/good/subtyping/fun_app_id.cc diff --git a/laborations/lab2/testsuite/good/subtyping/fun_app_id.cc.output b/labs/lab2/testsuite/good/subtyping/fun_app_id.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/fun_app_id.cc.output rename to labs/lab2/testsuite/good/subtyping/fun_app_id.cc.output diff --git a/laborations/lab2/testsuite/good/subtyping/fun_return_incorrect_type.cc b/labs/lab2/testsuite/good/subtyping/fun_return_incorrect_type.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/fun_return_incorrect_type.cc rename to labs/lab2/testsuite/good/subtyping/fun_return_incorrect_type.cc diff --git a/laborations/lab2/testsuite/good/subtyping/fun_return_incorrect_type.cc.output b/labs/lab2/testsuite/good/subtyping/fun_return_incorrect_type.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/fun_return_incorrect_type.cc.output rename to labs/lab2/testsuite/good/subtyping/fun_return_incorrect_type.cc.output diff --git a/laborations/lab2/testsuite/good/subtyping/int_fun0.cc b/labs/lab2/testsuite/good/subtyping/int_fun0.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/int_fun0.cc rename to labs/lab2/testsuite/good/subtyping/int_fun0.cc diff --git a/laborations/lab2/testsuite/good/subtyping/int_fun0.cc.output b/labs/lab2/testsuite/good/subtyping/int_fun0.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/int_fun0.cc.output rename to labs/lab2/testsuite/good/subtyping/int_fun0.cc.output diff --git a/laborations/lab2/testsuite/good/subtyping/int_fun1.cc b/labs/lab2/testsuite/good/subtyping/int_fun1.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/int_fun1.cc rename to labs/lab2/testsuite/good/subtyping/int_fun1.cc diff --git a/laborations/lab2/testsuite/good/subtyping/int_fun1.cc.output b/labs/lab2/testsuite/good/subtyping/int_fun1.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/int_fun1.cc.output rename to labs/lab2/testsuite/good/subtyping/int_fun1.cc.output diff --git a/laborations/lab2/testsuite/good/subtyping/int_fun2.cc b/labs/lab2/testsuite/good/subtyping/int_fun2.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/int_fun2.cc rename to labs/lab2/testsuite/good/subtyping/int_fun2.cc diff --git a/laborations/lab2/testsuite/good/subtyping/int_fun2.cc.output b/labs/lab2/testsuite/good/subtyping/int_fun2.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/int_fun2.cc.output rename to labs/lab2/testsuite/good/subtyping/int_fun2.cc.output diff --git a/laborations/lab2/testsuite/good/subtyping/mixed.cc b/labs/lab2/testsuite/good/subtyping/mixed.cc similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/mixed.cc rename to labs/lab2/testsuite/good/subtyping/mixed.cc diff --git a/laborations/lab2/testsuite/good/subtyping/mixed.cc.output b/labs/lab2/testsuite/good/subtyping/mixed.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/subtyping/mixed.cc.output rename to labs/lab2/testsuite/good/subtyping/mixed.cc.output diff --git a/laborations/lab2/testsuite/good/var_mutation_ass_ass.cc b/labs/lab2/testsuite/good/var_mutation_ass_ass.cc similarity index 100% rename from laborations/lab2/testsuite/good/var_mutation_ass_ass.cc rename to labs/lab2/testsuite/good/var_mutation_ass_ass.cc diff --git a/laborations/lab2/testsuite/good/var_mutation_ass_ass.cc.output b/labs/lab2/testsuite/good/var_mutation_ass_ass.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/var_mutation_ass_ass.cc.output rename to labs/lab2/testsuite/good/var_mutation_ass_ass.cc.output diff --git a/laborations/lab2/testsuite/good/var_mutation_ass_id.cc b/labs/lab2/testsuite/good/var_mutation_ass_id.cc similarity index 100% rename from laborations/lab2/testsuite/good/var_mutation_ass_id.cc rename to labs/lab2/testsuite/good/var_mutation_ass_id.cc diff --git a/laborations/lab2/testsuite/good/var_mutation_ass_id.cc.output b/labs/lab2/testsuite/good/var_mutation_ass_id.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/var_mutation_ass_id.cc.output rename to labs/lab2/testsuite/good/var_mutation_ass_id.cc.output diff --git a/laborations/lab2/testsuite/good/var_mutation_ass_pdec.cc b/labs/lab2/testsuite/good/var_mutation_ass_pdec.cc similarity index 100% rename from laborations/lab2/testsuite/good/var_mutation_ass_pdec.cc rename to labs/lab2/testsuite/good/var_mutation_ass_pdec.cc diff --git a/laborations/lab2/testsuite/good/var_mutation_ass_pdec.cc.output b/labs/lab2/testsuite/good/var_mutation_ass_pdec.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/var_mutation_ass_pdec.cc.output rename to labs/lab2/testsuite/good/var_mutation_ass_pdec.cc.output diff --git a/laborations/lab2/testsuite/good/var_mutation_ass_pinc.cc b/labs/lab2/testsuite/good/var_mutation_ass_pinc.cc similarity index 100% rename from laborations/lab2/testsuite/good/var_mutation_ass_pinc.cc rename to labs/lab2/testsuite/good/var_mutation_ass_pinc.cc diff --git a/laborations/lab2/testsuite/good/var_mutation_ass_pinc.cc.output b/labs/lab2/testsuite/good/var_mutation_ass_pinc.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/var_mutation_ass_pinc.cc.output rename to labs/lab2/testsuite/good/var_mutation_ass_pinc.cc.output diff --git a/laborations/lab2/testsuite/good/var_mutation_init_ass.cc b/labs/lab2/testsuite/good/var_mutation_init_ass.cc similarity index 100% rename from laborations/lab2/testsuite/good/var_mutation_init_ass.cc rename to labs/lab2/testsuite/good/var_mutation_init_ass.cc diff --git a/laborations/lab2/testsuite/good/var_mutation_init_ass.cc.output b/labs/lab2/testsuite/good/var_mutation_init_ass.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/var_mutation_init_ass.cc.output rename to labs/lab2/testsuite/good/var_mutation_init_ass.cc.output diff --git a/laborations/lab2/testsuite/good/var_mutation_init_id.cc b/labs/lab2/testsuite/good/var_mutation_init_id.cc similarity index 100% rename from laborations/lab2/testsuite/good/var_mutation_init_id.cc rename to labs/lab2/testsuite/good/var_mutation_init_id.cc diff --git a/laborations/lab2/testsuite/good/var_mutation_init_id.cc.output b/labs/lab2/testsuite/good/var_mutation_init_id.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/var_mutation_init_id.cc.output rename to labs/lab2/testsuite/good/var_mutation_init_id.cc.output diff --git a/laborations/lab2/testsuite/good/var_mutation_init_pdec.cc b/labs/lab2/testsuite/good/var_mutation_init_pdec.cc similarity index 100% rename from laborations/lab2/testsuite/good/var_mutation_init_pdec.cc rename to labs/lab2/testsuite/good/var_mutation_init_pdec.cc diff --git a/laborations/lab2/testsuite/good/var_mutation_init_pdec.cc.output b/labs/lab2/testsuite/good/var_mutation_init_pdec.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/var_mutation_init_pdec.cc.output rename to labs/lab2/testsuite/good/var_mutation_init_pdec.cc.output diff --git a/laborations/lab2/testsuite/good/var_mutation_init_pinc.cc b/labs/lab2/testsuite/good/var_mutation_init_pinc.cc similarity index 100% rename from laborations/lab2/testsuite/good/var_mutation_init_pinc.cc rename to labs/lab2/testsuite/good/var_mutation_init_pinc.cc diff --git a/laborations/lab2/testsuite/good/var_mutation_init_pinc.cc.output b/labs/lab2/testsuite/good/var_mutation_init_pinc.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/var_mutation_init_pinc.cc.output rename to labs/lab2/testsuite/good/var_mutation_init_pinc.cc.output diff --git a/laborations/lab2/testsuite/good/void_call_return_empty.cc b/labs/lab2/testsuite/good/void_call_return_empty.cc similarity index 100% rename from laborations/lab2/testsuite/good/void_call_return_empty.cc rename to labs/lab2/testsuite/good/void_call_return_empty.cc diff --git a/laborations/lab2/testsuite/good/void_expr_as_stmt.cc b/labs/lab2/testsuite/good/void_expr_as_stmt.cc similarity index 100% rename from laborations/lab2/testsuite/good/void_expr_as_stmt.cc rename to labs/lab2/testsuite/good/void_expr_as_stmt.cc diff --git a/laborations/lab2/testsuite/good/void_expr_as_stmt.cc.output b/labs/lab2/testsuite/good/void_expr_as_stmt.cc.output similarity index 100% rename from laborations/lab2/testsuite/good/void_expr_as_stmt.cc.output rename to labs/lab2/testsuite/good/void_expr_as_stmt.cc.output diff --git a/laborations/lab2/testsuite/good/void_return.cc b/labs/lab2/testsuite/good/void_return.cc similarity index 100% rename from laborations/lab2/testsuite/good/void_return.cc rename to labs/lab2/testsuite/good/void_return.cc diff --git a/laborations/lab2/testsuite/good/void_return_empty.cc b/labs/lab2/testsuite/good/void_return_empty.cc similarity index 100% rename from laborations/lab2/testsuite/good/void_return_empty.cc rename to labs/lab2/testsuite/good/void_return_empty.cc diff --git a/laborations/lab2/testsuite/index.txt b/labs/lab2/testsuite/index.txt similarity index 100% rename from laborations/lab2/testsuite/index.txt rename to labs/lab2/testsuite/index.txt diff --git a/laborations/lab2/testsuite/plt-test-lab2.cabal b/labs/lab2/testsuite/plt-test-lab2.cabal similarity index 100% rename from laborations/lab2/testsuite/plt-test-lab2.cabal rename to labs/lab2/testsuite/plt-test-lab2.cabal diff --git a/laborations/lab2/testsuite/plt-test-lab2.hs b/labs/lab2/testsuite/plt-test-lab2.hs similarity index 100% rename from laborations/lab2/testsuite/plt-test-lab2.hs rename to labs/lab2/testsuite/plt-test-lab2.hs diff --git a/laborations/lab2/testsuite/prelude.cc b/labs/lab2/testsuite/prelude.cc similarity index 100% rename from laborations/lab2/testsuite/prelude.cc rename to labs/lab2/testsuite/prelude.cc diff --git a/laborations/lab2/testsuite/run-test-cabal.sh b/labs/lab2/testsuite/run-test-cabal.sh similarity index 100% rename from laborations/lab2/testsuite/run-test-cabal.sh rename to labs/lab2/testsuite/run-test-cabal.sh diff --git a/laborations/lab2/testsuite/run-test-ghc.sh b/labs/lab2/testsuite/run-test-ghc.sh similarity index 100% rename from laborations/lab2/testsuite/run-test-ghc.sh rename to labs/lab2/testsuite/run-test-ghc.sh diff --git a/laborations/lab2/testsuite/run-test-stack.sh b/labs/lab2/testsuite/run-test-stack.sh similarity index 100% rename from laborations/lab2/testsuite/run-test-stack.sh rename to labs/lab2/testsuite/run-test-stack.sh diff --git a/laborations/lab2/testsuite/stack.yaml b/labs/lab2/testsuite/stack.yaml similarity index 100% rename from laborations/lab2/testsuite/stack.yaml rename to labs/lab2/testsuite/stack.yaml diff --git a/laborations/lab3/Makefile b/labs/lab3/Makefile similarity index 100% rename from laborations/lab3/Makefile rename to labs/lab3/Makefile diff --git a/laborations/lab3/good03.cc b/labs/lab3/good03.cc similarity index 100% rename from laborations/lab3/good03.cc rename to labs/lab3/good03.cc diff --git a/laborations/lab3/good03.j b/labs/lab3/good03.j similarity index 100% rename from laborations/lab3/good03.j rename to labs/lab3/good03.j diff --git a/laborations/lab3/haskell/Annotated.hs b/labs/lab3/haskell/Annotated.hs similarity index 100% rename from laborations/lab3/haskell/Annotated.hs rename to labs/lab3/haskell/Annotated.hs diff --git a/laborations/lab3/haskell/CMM.cf b/labs/lab3/haskell/CMM.cf similarity index 100% rename from laborations/lab3/haskell/CMM.cf rename to labs/lab3/haskell/CMM.cf diff --git a/laborations/lab3/haskell/Compiler.hs b/labs/lab3/haskell/Compiler.hs similarity index 100% rename from laborations/lab3/haskell/Compiler.hs rename to labs/lab3/haskell/Compiler.hs diff --git a/laborations/lab3/haskell/Makefile b/labs/lab3/haskell/Makefile similarity index 100% rename from laborations/lab3/haskell/Makefile rename to labs/lab3/haskell/Makefile diff --git a/laborations/lab3/haskell/Runtime.java b/labs/lab3/haskell/Runtime.java similarity index 100% rename from laborations/lab3/haskell/Runtime.java rename to labs/lab3/haskell/Runtime.java diff --git a/laborations/lab3/haskell/Setup.hs b/labs/lab3/haskell/Setup.hs similarity index 100% rename from laborations/lab3/haskell/Setup.hs rename to labs/lab3/haskell/Setup.hs diff --git a/laborations/lab3/haskell/TypeChecker.hs b/labs/lab3/haskell/TypeChecker.hs similarity index 100% rename from laborations/lab3/haskell/TypeChecker.hs rename to labs/lab3/haskell/TypeChecker.hs diff --git a/laborations/lab3/haskell/cabal.project b/labs/lab3/haskell/cabal.project similarity index 100% rename from laborations/lab3/haskell/cabal.project rename to labs/lab3/haskell/cabal.project diff --git a/laborations/lab3/haskell/jasmin.jar b/labs/lab3/haskell/jasmin.jar similarity index 100% rename from laborations/lab3/haskell/jasmin.jar rename to labs/lab3/haskell/jasmin.jar diff --git a/laborations/lab3/haskell/lab3.cabal b/labs/lab3/haskell/lab3.cabal similarity index 100% rename from laborations/lab3/haskell/lab3.cabal rename to labs/lab3/haskell/lab3.cabal diff --git a/laborations/lab3/haskell/lab3.hs b/labs/lab3/haskell/lab3.hs similarity index 100% rename from laborations/lab3/haskell/lab3.hs rename to labs/lab3/haskell/lab3.hs diff --git a/laborations/lab3/haskell/stack.yaml b/labs/lab3/haskell/stack.yaml similarity index 100% rename from laborations/lab3/haskell/stack.yaml rename to labs/lab3/haskell/stack.yaml diff --git a/laborations/lab3/haskell/test.mk b/labs/lab3/haskell/test.mk similarity index 100% rename from laborations/lab3/haskell/test.mk rename to labs/lab3/haskell/test.mk diff --git a/laborations/lab3/index.txt b/labs/lab3/index.txt similarity index 100% rename from laborations/lab3/index.txt rename to labs/lab3/index.txt diff --git a/laborations/lab3/jasmin.jar b/labs/lab3/jasmin.jar similarity index 100% rename from laborations/lab3/jasmin.jar rename to labs/lab3/jasmin.jar diff --git a/laborations/lab3/java/Compiler.java b/labs/lab3/java/Compiler.java similarity index 100% rename from laborations/lab3/java/Compiler.java rename to labs/lab3/java/Compiler.java diff --git a/laborations/lab3/java/Makefile b/labs/lab3/java/Makefile similarity index 100% rename from laborations/lab3/java/Makefile rename to labs/lab3/java/Makefile diff --git a/laborations/lab3/java/Runtime.java b/labs/lab3/java/Runtime.java similarity index 100% rename from laborations/lab3/java/Runtime.java rename to labs/lab3/java/Runtime.java diff --git a/laborations/lab3/java/TypeChecker.java b/labs/lab3/java/TypeChecker.java similarity index 100% rename from laborations/lab3/java/TypeChecker.java rename to labs/lab3/java/TypeChecker.java diff --git a/laborations/lab3/java/TypeException.java b/labs/lab3/java/TypeException.java similarity index 100% rename from laborations/lab3/java/TypeException.java rename to labs/lab3/java/TypeException.java diff --git a/laborations/lab3/java/cmm.cf b/labs/lab3/java/cmm.cf similarity index 100% rename from laborations/lab3/java/cmm.cf rename to labs/lab3/java/cmm.cf diff --git a/laborations/lab3/java/jasmin.jar b/labs/lab3/java/jasmin.jar similarity index 100% rename from laborations/lab3/java/jasmin.jar rename to labs/lab3/java/jasmin.jar diff --git a/laborations/lab3/java/lab3.bat b/labs/lab3/java/lab3.bat similarity index 100% rename from laborations/lab3/java/lab3.bat rename to labs/lab3/java/lab3.bat diff --git a/laborations/lab3/java/lab3.hs b/labs/lab3/java/lab3.hs similarity index 100% rename from laborations/lab3/java/lab3.hs rename to labs/lab3/java/lab3.hs diff --git a/laborations/lab3/java/lab3.java b/labs/lab3/java/lab3.java similarity index 100% rename from laborations/lab3/java/lab3.java rename to labs/lab3/java/lab3.java diff --git a/laborations/lab3/java/lab3.sh b/labs/lab3/java/lab3.sh similarity index 100% rename from laborations/lab3/java/lab3.sh rename to labs/lab3/java/lab3.sh diff --git a/laborations/lab3/testsuite/.gitignore b/labs/lab3/testsuite/.gitignore similarity index 100% rename from laborations/lab3/testsuite/.gitignore rename to labs/lab3/testsuite/.gitignore diff --git a/laborations/lab3/testsuite/Makefile b/labs/lab3/testsuite/Makefile similarity index 100% rename from laborations/lab3/testsuite/Makefile rename to labs/lab3/testsuite/Makefile diff --git a/laborations/lab3/testsuite/Makefile-test b/labs/lab3/testsuite/Makefile-test similarity index 100% rename from laborations/lab3/testsuite/Makefile-test rename to labs/lab3/testsuite/Makefile-test diff --git a/laborations/lab3/testsuite/Runtime.java b/labs/lab3/testsuite/Runtime.java similarity index 100% rename from laborations/lab3/testsuite/Runtime.java rename to labs/lab3/testsuite/Runtime.java diff --git a/laborations/lab3/testsuite/build-tarball.sh b/labs/lab3/testsuite/build-tarball.sh similarity index 100% rename from laborations/lab3/testsuite/build-tarball.sh rename to labs/lab3/testsuite/build-tarball.sh diff --git a/laborations/lab3/testsuite/cabal.project b/labs/lab3/testsuite/cabal.project similarity index 100% rename from laborations/lab3/testsuite/cabal.project rename to labs/lab3/testsuite/cabal.project diff --git a/laborations/lab3/testsuite/dir-for-path-test/one-more-dir/simple.cc b/labs/lab3/testsuite/dir-for-path-test/one-more-dir/simple.cc similarity index 100% rename from laborations/lab3/testsuite/dir-for-path-test/one-more-dir/simple.cc rename to labs/lab3/testsuite/dir-for-path-test/one-more-dir/simple.cc diff --git a/laborations/lab3/testsuite/good b/labs/lab3/testsuite/good similarity index 100% rename from laborations/lab3/testsuite/good rename to labs/lab3/testsuite/good diff --git a/laborations/lab3/testsuite/index.txt b/labs/lab3/testsuite/index.txt similarity index 100% rename from laborations/lab3/testsuite/index.txt rename to labs/lab3/testsuite/index.txt diff --git a/laborations/lab3/testsuite/plt-test-lab3.cabal b/labs/lab3/testsuite/plt-test-lab3.cabal similarity index 100% rename from laborations/lab3/testsuite/plt-test-lab3.cabal rename to labs/lab3/testsuite/plt-test-lab3.cabal diff --git a/laborations/lab3/testsuite/plt-test-lab3.hs b/labs/lab3/testsuite/plt-test-lab3.hs similarity index 100% rename from laborations/lab3/testsuite/plt-test-lab3.hs rename to labs/lab3/testsuite/plt-test-lab3.hs diff --git a/laborations/lab3/testsuite/prelude.cc b/labs/lab3/testsuite/prelude.cc similarity index 100% rename from laborations/lab3/testsuite/prelude.cc rename to labs/lab3/testsuite/prelude.cc diff --git a/laborations/lab3/testsuite/run-test-cabal.sh b/labs/lab3/testsuite/run-test-cabal.sh similarity index 100% rename from laborations/lab3/testsuite/run-test-cabal.sh rename to labs/lab3/testsuite/run-test-cabal.sh diff --git a/laborations/lab3/testsuite/run-test-ghc.sh b/labs/lab3/testsuite/run-test-ghc.sh similarity index 100% rename from laborations/lab3/testsuite/run-test-ghc.sh rename to labs/lab3/testsuite/run-test-ghc.sh diff --git a/laborations/lab3/testsuite/run-test-stack.sh b/labs/lab3/testsuite/run-test-stack.sh similarity index 100% rename from laborations/lab3/testsuite/run-test-stack.sh rename to labs/lab3/testsuite/run-test-stack.sh diff --git a/laborations/lab3/testsuite/stack.yaml b/labs/lab3/testsuite/stack.yaml similarity index 100% rename from laborations/lab3/testsuite/stack.yaml rename to labs/lab3/testsuite/stack.yaml diff --git a/laborations/lab4/Fun.cf b/labs/lab4/Fun.cf similarity index 100% rename from laborations/lab4/Fun.cf rename to labs/lab4/Fun.cf diff --git a/laborations/lab4/Makefile b/labs/lab4/Makefile similarity index 100% rename from laborations/lab4/Makefile rename to labs/lab4/Makefile diff --git a/laborations/lab4/haskell/.gitignore b/labs/lab4/haskell/.gitignore similarity index 100% rename from laborations/lab4/haskell/.gitignore rename to labs/lab4/haskell/.gitignore diff --git a/laborations/lab4/haskell/Fun.cf b/labs/lab4/haskell/Fun.cf similarity index 100% rename from laborations/lab4/haskell/Fun.cf rename to labs/lab4/haskell/Fun.cf diff --git a/laborations/lab4/haskell/Interpreter.hs b/labs/lab4/haskell/Interpreter.hs similarity index 100% rename from laborations/lab4/haskell/Interpreter.hs rename to labs/lab4/haskell/Interpreter.hs diff --git a/laborations/lab4/haskell/Makefile b/labs/lab4/haskell/Makefile similarity index 100% rename from laborations/lab4/haskell/Makefile rename to labs/lab4/haskell/Makefile diff --git a/laborations/lab4/haskell/Setup.hs b/labs/lab4/haskell/Setup.hs similarity index 100% rename from laborations/lab4/haskell/Setup.hs rename to labs/lab4/haskell/Setup.hs diff --git a/laborations/lab4/haskell/cabal.project b/labs/lab4/haskell/cabal.project similarity index 100% rename from laborations/lab4/haskell/cabal.project rename to labs/lab4/haskell/cabal.project diff --git a/laborations/lab4/haskell/lab4.cabal b/labs/lab4/haskell/lab4.cabal similarity index 100% rename from laborations/lab4/haskell/lab4.cabal rename to labs/lab4/haskell/lab4.cabal diff --git a/laborations/lab4/haskell/lab4.hs b/labs/lab4/haskell/lab4.hs similarity index 100% rename from laborations/lab4/haskell/lab4.hs rename to labs/lab4/haskell/lab4.hs diff --git a/laborations/lab4/haskell/stack.yaml b/labs/lab4/haskell/stack.yaml similarity index 100% rename from laborations/lab4/haskell/stack.yaml rename to labs/lab4/haskell/stack.yaml diff --git a/laborations/lab4/haskell/test.mk b/labs/lab4/haskell/test.mk similarity index 100% rename from laborations/lab4/haskell/test.mk rename to labs/lab4/haskell/test.mk diff --git a/laborations/lab4/index.txt b/labs/lab4/index.txt similarity index 100% rename from laborations/lab4/index.txt rename to labs/lab4/index.txt diff --git a/laborations/lab4/java/.gitignore b/labs/lab4/java/.gitignore similarity index 100% rename from laborations/lab4/java/.gitignore rename to labs/lab4/java/.gitignore diff --git a/laborations/lab4/java/Interpreter.java b/labs/lab4/java/Interpreter.java similarity index 100% rename from laborations/lab4/java/Interpreter.java rename to labs/lab4/java/Interpreter.java diff --git a/laborations/lab4/java/Makefile b/labs/lab4/java/Makefile similarity index 100% rename from laborations/lab4/java/Makefile rename to labs/lab4/java/Makefile diff --git a/laborations/lab4/java/Strategy.java b/labs/lab4/java/Strategy.java similarity index 100% rename from laborations/lab4/java/Strategy.java rename to labs/lab4/java/Strategy.java diff --git a/laborations/lab4/java/fun.cf b/labs/lab4/java/fun.cf similarity index 100% rename from laborations/lab4/java/fun.cf rename to labs/lab4/java/fun.cf diff --git a/laborations/lab4/java/lab4.bat b/labs/lab4/java/lab4.bat similarity index 100% rename from laborations/lab4/java/lab4.bat rename to labs/lab4/java/lab4.bat diff --git a/laborations/lab4/java/lab4.hs b/labs/lab4/java/lab4.hs similarity index 100% rename from laborations/lab4/java/lab4.hs rename to labs/lab4/java/lab4.hs diff --git a/laborations/lab4/java/lab4.java b/labs/lab4/java/lab4.java similarity index 100% rename from laborations/lab4/java/lab4.java rename to labs/lab4/java/lab4.java diff --git a/laborations/lab4/java/lab4.sh b/labs/lab4/java/lab4.sh similarity index 100% rename from laborations/lab4/java/lab4.sh rename to labs/lab4/java/lab4.sh diff --git a/laborations/lab4/testsuite/.gitignore b/labs/lab4/testsuite/.gitignore similarity index 100% rename from laborations/lab4/testsuite/.gitignore rename to labs/lab4/testsuite/.gitignore diff --git a/laborations/lab4/testsuite/Makefile b/labs/lab4/testsuite/Makefile similarity index 100% rename from laborations/lab4/testsuite/Makefile rename to labs/lab4/testsuite/Makefile diff --git a/laborations/lab4/testsuite/Makefile-test b/labs/lab4/testsuite/Makefile-test similarity index 100% rename from laborations/lab4/testsuite/Makefile-test rename to labs/lab4/testsuite/Makefile-test diff --git a/laborations/lab4/testsuite/bad/add-functions-2.hs b/labs/lab4/testsuite/bad/add-functions-2.hs similarity index 100% rename from laborations/lab4/testsuite/bad/add-functions-2.hs rename to labs/lab4/testsuite/bad/add-functions-2.hs diff --git a/laborations/lab4/testsuite/bad/add-functions.hs b/labs/lab4/testsuite/bad/add-functions.hs similarity index 100% rename from laborations/lab4/testsuite/bad/add-functions.hs rename to labs/lab4/testsuite/bad/add-functions.hs diff --git a/laborations/lab4/testsuite/bad/if-function-2.hs b/labs/lab4/testsuite/bad/if-function-2.hs similarity index 100% rename from laborations/lab4/testsuite/bad/if-function-2.hs rename to labs/lab4/testsuite/bad/if-function-2.hs diff --git a/laborations/lab4/testsuite/bad/if-function.hs b/labs/lab4/testsuite/bad/if-function.hs similarity index 100% rename from laborations/lab4/testsuite/bad/if-function.hs rename to labs/lab4/testsuite/bad/if-function.hs diff --git a/laborations/lab4/testsuite/bad/invalid-app-2.hs b/labs/lab4/testsuite/bad/invalid-app-2.hs similarity index 100% rename from laborations/lab4/testsuite/bad/invalid-app-2.hs rename to labs/lab4/testsuite/bad/invalid-app-2.hs diff --git a/laborations/lab4/testsuite/bad/invalid-app.hs b/labs/lab4/testsuite/bad/invalid-app.hs similarity index 100% rename from laborations/lab4/testsuite/bad/invalid-app.hs rename to labs/lab4/testsuite/bad/invalid-app.hs diff --git a/laborations/lab4/testsuite/bad/less-functions-2.hs b/labs/lab4/testsuite/bad/less-functions-2.hs similarity index 100% rename from laborations/lab4/testsuite/bad/less-functions-2.hs rename to labs/lab4/testsuite/bad/less-functions-2.hs diff --git a/laborations/lab4/testsuite/bad/less-functions.hs b/labs/lab4/testsuite/bad/less-functions.hs similarity index 100% rename from laborations/lab4/testsuite/bad/less-functions.hs rename to labs/lab4/testsuite/bad/less-functions.hs diff --git a/laborations/lab4/testsuite/bad/main-missing-empty-file.hs b/labs/lab4/testsuite/bad/main-missing-empty-file.hs similarity index 100% rename from laborations/lab4/testsuite/bad/main-missing-empty-file.hs rename to labs/lab4/testsuite/bad/main-missing-empty-file.hs diff --git a/laborations/lab4/testsuite/bad/main-missing.hs b/labs/lab4/testsuite/bad/main-missing.hs similarity index 100% rename from laborations/lab4/testsuite/bad/main-missing.hs rename to labs/lab4/testsuite/bad/main-missing.hs diff --git a/laborations/lab4/testsuite/bad/main-not-int-2.hs b/labs/lab4/testsuite/bad/main-not-int-2.hs similarity index 100% rename from laborations/lab4/testsuite/bad/main-not-int-2.hs rename to labs/lab4/testsuite/bad/main-not-int-2.hs diff --git a/laborations/lab4/testsuite/bad/main-not-int.hs b/labs/lab4/testsuite/bad/main-not-int.hs similarity index 100% rename from laborations/lab4/testsuite/bad/main-not-int.hs rename to labs/lab4/testsuite/bad/main-not-int.hs diff --git a/laborations/lab4/testsuite/bad/sub-functions-2.hs b/labs/lab4/testsuite/bad/sub-functions-2.hs similarity index 100% rename from laborations/lab4/testsuite/bad/sub-functions-2.hs rename to labs/lab4/testsuite/bad/sub-functions-2.hs diff --git a/laborations/lab4/testsuite/bad/sub-functions.hs b/labs/lab4/testsuite/bad/sub-functions.hs similarity index 100% rename from laborations/lab4/testsuite/bad/sub-functions.hs rename to labs/lab4/testsuite/bad/sub-functions.hs diff --git a/laborations/lab4/testsuite/bad/twice-twice-twice.hs b/labs/lab4/testsuite/bad/twice-twice-twice.hs similarity index 100% rename from laborations/lab4/testsuite/bad/twice-twice-twice.hs rename to labs/lab4/testsuite/bad/twice-twice-twice.hs diff --git a/laborations/lab4/testsuite/bad/unknown-c.hs b/labs/lab4/testsuite/bad/unknown-c.hs similarity index 100% rename from laborations/lab4/testsuite/bad/unknown-c.hs rename to labs/lab4/testsuite/bad/unknown-c.hs diff --git a/laborations/lab4/testsuite/bad/unknown-mul.hs b/labs/lab4/testsuite/bad/unknown-mul.hs similarity index 100% rename from laborations/lab4/testsuite/bad/unknown-mul.hs rename to labs/lab4/testsuite/bad/unknown-mul.hs diff --git a/laborations/lab4/testsuite/bad/unknown-x.hs b/labs/lab4/testsuite/bad/unknown-x.hs similarity index 100% rename from laborations/lab4/testsuite/bad/unknown-x.hs rename to labs/lab4/testsuite/bad/unknown-x.hs diff --git a/laborations/lab4/testsuite/bad/unknown-y.hs b/labs/lab4/testsuite/bad/unknown-y.hs similarity index 100% rename from laborations/lab4/testsuite/bad/unknown-y.hs rename to labs/lab4/testsuite/bad/unknown-y.hs diff --git a/laborations/lab4/testsuite/build-tarball.sh b/labs/lab4/testsuite/build-tarball.sh similarity index 100% rename from laborations/lab4/testsuite/build-tarball.sh rename to labs/lab4/testsuite/build-tarball.sh diff --git a/laborations/lab4/testsuite/cabal.project b/labs/lab4/testsuite/cabal.project similarity index 100% rename from laborations/lab4/testsuite/cabal.project rename to labs/lab4/testsuite/cabal.project diff --git a/laborations/lab4/testsuite/good/001.hs b/labs/lab4/testsuite/good/001.hs similarity index 100% rename from laborations/lab4/testsuite/good/001.hs rename to labs/lab4/testsuite/good/001.hs diff --git a/laborations/lab4/testsuite/good/002.hs b/labs/lab4/testsuite/good/002.hs similarity index 100% rename from laborations/lab4/testsuite/good/002.hs rename to labs/lab4/testsuite/good/002.hs diff --git a/laborations/lab4/testsuite/good/003.hs b/labs/lab4/testsuite/good/003.hs similarity index 100% rename from laborations/lab4/testsuite/good/003.hs rename to labs/lab4/testsuite/good/003.hs diff --git a/laborations/lab4/testsuite/good/004.hs b/labs/lab4/testsuite/good/004.hs similarity index 100% rename from laborations/lab4/testsuite/good/004.hs rename to labs/lab4/testsuite/good/004.hs diff --git a/laborations/lab4/testsuite/good/005.hs b/labs/lab4/testsuite/good/005.hs similarity index 100% rename from laborations/lab4/testsuite/good/005.hs rename to labs/lab4/testsuite/good/005.hs diff --git a/laborations/lab4/testsuite/good/006.hs b/labs/lab4/testsuite/good/006.hs similarity index 100% rename from laborations/lab4/testsuite/good/006.hs rename to labs/lab4/testsuite/good/006.hs diff --git a/laborations/lab4/testsuite/good/007.hs b/labs/lab4/testsuite/good/007.hs similarity index 100% rename from laborations/lab4/testsuite/good/007.hs rename to labs/lab4/testsuite/good/007.hs diff --git a/laborations/lab4/testsuite/good/008.hs b/labs/lab4/testsuite/good/008.hs similarity index 100% rename from laborations/lab4/testsuite/good/008.hs rename to labs/lab4/testsuite/good/008.hs diff --git a/laborations/lab4/testsuite/good/009.hs b/labs/lab4/testsuite/good/009.hs similarity index 100% rename from laborations/lab4/testsuite/good/009.hs rename to labs/lab4/testsuite/good/009.hs diff --git a/laborations/lab4/testsuite/good/010.hs b/labs/lab4/testsuite/good/010.hs similarity index 100% rename from laborations/lab4/testsuite/good/010.hs rename to labs/lab4/testsuite/good/010.hs diff --git a/laborations/lab4/testsuite/good/011.hs b/labs/lab4/testsuite/good/011.hs similarity index 100% rename from laborations/lab4/testsuite/good/011.hs rename to labs/lab4/testsuite/good/011.hs diff --git a/laborations/lab4/testsuite/good/012.hs b/labs/lab4/testsuite/good/012.hs similarity index 100% rename from laborations/lab4/testsuite/good/012.hs rename to labs/lab4/testsuite/good/012.hs diff --git a/laborations/lab4/testsuite/good/013.hs b/labs/lab4/testsuite/good/013.hs similarity index 100% rename from laborations/lab4/testsuite/good/013.hs rename to labs/lab4/testsuite/good/013.hs diff --git a/laborations/lab4/testsuite/good/014.hs b/labs/lab4/testsuite/good/014.hs similarity index 100% rename from laborations/lab4/testsuite/good/014.hs rename to labs/lab4/testsuite/good/014.hs diff --git a/laborations/lab4/testsuite/good/016.hs b/labs/lab4/testsuite/good/016.hs similarity index 100% rename from laborations/lab4/testsuite/good/016.hs rename to labs/lab4/testsuite/good/016.hs diff --git a/laborations/lab4/testsuite/good/017.hs b/labs/lab4/testsuite/good/017.hs similarity index 100% rename from laborations/lab4/testsuite/good/017.hs rename to labs/lab4/testsuite/good/017.hs diff --git a/laborations/lab4/testsuite/good/018.hs b/labs/lab4/testsuite/good/018.hs similarity index 100% rename from laborations/lab4/testsuite/good/018.hs rename to labs/lab4/testsuite/good/018.hs diff --git a/laborations/lab4/testsuite/good/019.hs b/labs/lab4/testsuite/good/019.hs similarity index 100% rename from laborations/lab4/testsuite/good/019.hs rename to labs/lab4/testsuite/good/019.hs diff --git a/laborations/lab4/testsuite/good/church.hs b/labs/lab4/testsuite/good/church.hs similarity index 100% rename from laborations/lab4/testsuite/good/church.hs rename to labs/lab4/testsuite/good/church.hs diff --git a/laborations/lab4/testsuite/good/shadow.hs b/labs/lab4/testsuite/good/shadow.hs similarity index 100% rename from laborations/lab4/testsuite/good/shadow.hs rename to labs/lab4/testsuite/good/shadow.hs diff --git a/laborations/lab4/testsuite/good/shadow2.hs b/labs/lab4/testsuite/good/shadow2.hs similarity index 100% rename from laborations/lab4/testsuite/good/shadow2.hs rename to labs/lab4/testsuite/good/shadow2.hs diff --git a/laborations/lab4/testsuite/good/ski.hs b/labs/lab4/testsuite/good/ski.hs similarity index 100% rename from laborations/lab4/testsuite/good/ski.hs rename to labs/lab4/testsuite/good/ski.hs diff --git a/laborations/lab4/testsuite/index.txt b/labs/lab4/testsuite/index.txt similarity index 100% rename from laborations/lab4/testsuite/index.txt rename to labs/lab4/testsuite/index.txt diff --git a/laborations/lab4/testsuite/plt-test-lab4.cabal b/labs/lab4/testsuite/plt-test-lab4.cabal similarity index 100% rename from laborations/lab4/testsuite/plt-test-lab4.cabal rename to labs/lab4/testsuite/plt-test-lab4.cabal diff --git a/laborations/lab4/testsuite/plt-test-lab4.hs b/labs/lab4/testsuite/plt-test-lab4.hs similarity index 100% rename from laborations/lab4/testsuite/plt-test-lab4.hs rename to labs/lab4/testsuite/plt-test-lab4.hs diff --git a/laborations/lab4/testsuite/run-test-cabal.sh b/labs/lab4/testsuite/run-test-cabal.sh similarity index 100% rename from laborations/lab4/testsuite/run-test-cabal.sh rename to labs/lab4/testsuite/run-test-cabal.sh diff --git a/laborations/lab4/testsuite/run-test-ghc.sh b/labs/lab4/testsuite/run-test-ghc.sh similarity index 100% rename from laborations/lab4/testsuite/run-test-ghc.sh rename to labs/lab4/testsuite/run-test-ghc.sh diff --git a/laborations/lab4/testsuite/run-test-stack.sh b/labs/lab4/testsuite/run-test-stack.sh similarity index 100% rename from laborations/lab4/testsuite/run-test-stack.sh rename to labs/lab4/testsuite/run-test-stack.sh diff --git a/laborations/lab4/testsuite/stack.yaml b/labs/lab4/testsuite/stack.yaml similarity index 100% rename from laborations/lab4/testsuite/stack.yaml rename to labs/lab4/testsuite/stack.yaml diff --git a/laborations/mini/Makefile b/labs/mini/Makefile similarity index 100% rename from laborations/mini/Makefile rename to labs/mini/Makefile diff --git a/laborations/mini/index.txt b/labs/mini/index.txt similarity index 100% rename from laborations/mini/index.txt rename to labs/mini/index.txt diff --git a/laborations/mini/src/Ann.cf b/labs/mini/src/Ann.cf similarity index 100% rename from laborations/mini/src/Ann.cf rename to labs/mini/src/Ann.cf diff --git a/laborations/mini/src/Code.cf b/labs/mini/src/Code.cf similarity index 100% rename from laborations/mini/src/Code.cf rename to labs/mini/src/Code.cf diff --git a/laborations/mini/src/Makefile b/labs/mini/src/Makefile similarity index 100% rename from laborations/mini/src/Makefile rename to labs/mini/src/Makefile diff --git a/laborations/mini/src/MiniJS.cf b/labs/mini/src/MiniJS.cf similarity index 100% rename from laborations/mini/src/MiniJS.cf rename to labs/mini/src/MiniJS.cf diff --git a/laborations/mini/src/haskell/Ann.hs b/labs/mini/src/haskell/Ann.hs similarity index 100% rename from laborations/mini/src/haskell/Ann.hs rename to labs/mini/src/haskell/Ann.hs diff --git a/laborations/mini/src/haskell/AnnTypeChecker.hs b/labs/mini/src/haskell/AnnTypeChecker.hs similarity index 100% rename from laborations/mini/src/haskell/AnnTypeChecker.hs rename to labs/mini/src/haskell/AnnTypeChecker.hs diff --git a/laborations/mini/src/haskell/Code/Abs.hs b/labs/mini/src/haskell/Code/Abs.hs similarity index 100% rename from laborations/mini/src/haskell/Code/Abs.hs rename to labs/mini/src/haskell/Code/Abs.hs diff --git a/laborations/mini/src/haskell/Code/Print.hs b/labs/mini/src/haskell/Code/Print.hs similarity index 100% rename from laborations/mini/src/haskell/Code/Print.hs rename to labs/mini/src/haskell/Code/Print.hs diff --git a/laborations/mini/src/haskell/Compiler.hs b/labs/mini/src/haskell/Compiler.hs similarity index 100% rename from laborations/mini/src/haskell/Compiler.hs rename to labs/mini/src/haskell/Compiler.hs diff --git a/laborations/mini/src/haskell/Interpreter.hs b/labs/mini/src/haskell/Interpreter.hs similarity index 100% rename from laborations/mini/src/haskell/Interpreter.hs rename to labs/mini/src/haskell/Interpreter.hs diff --git a/laborations/mini/src/haskell/JVM.hs b/labs/mini/src/haskell/JVM.hs similarity index 100% rename from laborations/mini/src/haskell/JVM.hs rename to labs/mini/src/haskell/JVM.hs diff --git a/laborations/mini/src/haskell/Main.hs b/labs/mini/src/haskell/Main.hs similarity index 100% rename from laborations/mini/src/haskell/Main.hs rename to labs/mini/src/haskell/Main.hs diff --git a/laborations/mini/src/haskell/Makefile b/labs/mini/src/haskell/Makefile similarity index 100% rename from laborations/mini/src/haskell/Makefile rename to labs/mini/src/haskell/Makefile diff --git a/laborations/mini/src/haskell/MiniJS.cf b/labs/mini/src/haskell/MiniJS.cf similarity index 100% rename from laborations/mini/src/haskell/MiniJS.cf rename to labs/mini/src/haskell/MiniJS.cf diff --git a/laborations/mini/src/haskell/MiniJS/Abs.hs b/labs/mini/src/haskell/MiniJS/Abs.hs similarity index 100% rename from laborations/mini/src/haskell/MiniJS/Abs.hs rename to labs/mini/src/haskell/MiniJS/Abs.hs diff --git a/laborations/mini/src/haskell/MiniJS/ErrM.hs b/labs/mini/src/haskell/MiniJS/ErrM.hs similarity index 100% rename from laborations/mini/src/haskell/MiniJS/ErrM.hs rename to labs/mini/src/haskell/MiniJS/ErrM.hs diff --git a/laborations/mini/src/haskell/MiniJS/Lex.x b/labs/mini/src/haskell/MiniJS/Lex.x similarity index 100% rename from laborations/mini/src/haskell/MiniJS/Lex.x rename to labs/mini/src/haskell/MiniJS/Lex.x diff --git a/laborations/mini/src/haskell/MiniJS/Par.info b/labs/mini/src/haskell/MiniJS/Par.info similarity index 100% rename from laborations/mini/src/haskell/MiniJS/Par.info rename to labs/mini/src/haskell/MiniJS/Par.info diff --git a/laborations/mini/src/haskell/MiniJS/Par.y b/labs/mini/src/haskell/MiniJS/Par.y similarity index 100% rename from laborations/mini/src/haskell/MiniJS/Par.y rename to labs/mini/src/haskell/MiniJS/Par.y diff --git a/laborations/mini/src/haskell/MiniJS/Print.hs b/labs/mini/src/haskell/MiniJS/Print.hs similarity index 100% rename from laborations/mini/src/haskell/MiniJS/Print.hs rename to labs/mini/src/haskell/MiniJS/Print.hs diff --git a/laborations/mini/src/haskell/MiniJS/Test.hs b/labs/mini/src/haskell/MiniJS/Test.hs similarity index 100% rename from laborations/mini/src/haskell/MiniJS/Test.hs rename to labs/mini/src/haskell/MiniJS/Test.hs diff --git a/laborations/mini/src/haskell/Runtime.java b/labs/mini/src/haskell/Runtime.java similarity index 100% rename from laborations/mini/src/haskell/Runtime.java rename to labs/mini/src/haskell/Runtime.java diff --git a/laborations/mini/src/haskell/TypeChecker.hs b/labs/mini/src/haskell/TypeChecker.hs similarity index 100% rename from laborations/mini/src/haskell/TypeChecker.hs rename to labs/mini/src/haskell/TypeChecker.hs diff --git a/laborations/mini/src/haskell/Types.hs b/labs/mini/src/haskell/Types.hs similarity index 100% rename from laborations/mini/src/haskell/Types.hs rename to labs/mini/src/haskell/Types.hs diff --git a/laborations/mini/src/java/Ann/AbstractVisitor.java b/labs/mini/src/java/Ann/AbstractVisitor.java similarity index 100% rename from laborations/mini/src/java/Ann/AbstractVisitor.java rename to labs/mini/src/java/Ann/AbstractVisitor.java diff --git a/laborations/mini/src/java/Ann/Absyn/Div.java b/labs/mini/src/java/Ann/Absyn/Div.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/Div.java rename to labs/mini/src/java/Ann/Absyn/Div.java diff --git a/laborations/mini/src/java/Ann/Absyn/EArith.java b/labs/mini/src/java/Ann/Absyn/EArith.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/EArith.java rename to labs/mini/src/java/Ann/Absyn/EArith.java diff --git a/laborations/mini/src/java/Ann/Absyn/EDouble.java b/labs/mini/src/java/Ann/Absyn/EDouble.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/EDouble.java rename to labs/mini/src/java/Ann/Absyn/EDouble.java diff --git a/laborations/mini/src/java/Ann/Absyn/EI2D.java b/labs/mini/src/java/Ann/Absyn/EI2D.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/EI2D.java rename to labs/mini/src/java/Ann/Absyn/EI2D.java diff --git a/laborations/mini/src/java/Ann/Absyn/EInt.java b/labs/mini/src/java/Ann/Absyn/EInt.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/EInt.java rename to labs/mini/src/java/Ann/Absyn/EInt.java diff --git a/laborations/mini/src/java/Ann/Absyn/EVar.java b/labs/mini/src/java/Ann/Absyn/EVar.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/EVar.java rename to labs/mini/src/java/Ann/Absyn/EVar.java diff --git a/laborations/mini/src/java/Ann/Absyn/Exp.java b/labs/mini/src/java/Ann/Absyn/Exp.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/Exp.java rename to labs/mini/src/java/Ann/Absyn/Exp.java diff --git a/laborations/mini/src/java/Ann/Absyn/ListStm.java b/labs/mini/src/java/Ann/Absyn/ListStm.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/ListStm.java rename to labs/mini/src/java/Ann/Absyn/ListStm.java diff --git a/laborations/mini/src/java/Ann/Absyn/Minus.java b/labs/mini/src/java/Ann/Absyn/Minus.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/Minus.java rename to labs/mini/src/java/Ann/Absyn/Minus.java diff --git a/laborations/mini/src/java/Ann/Absyn/Op.java b/labs/mini/src/java/Ann/Absyn/Op.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/Op.java rename to labs/mini/src/java/Ann/Absyn/Op.java diff --git a/laborations/mini/src/java/Ann/Absyn/Plus.java b/labs/mini/src/java/Ann/Absyn/Plus.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/Plus.java rename to labs/mini/src/java/Ann/Absyn/Plus.java diff --git a/laborations/mini/src/java/Ann/Absyn/Prg.java b/labs/mini/src/java/Ann/Absyn/Prg.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/Prg.java rename to labs/mini/src/java/Ann/Absyn/Prg.java diff --git a/laborations/mini/src/java/Ann/Absyn/Program.java b/labs/mini/src/java/Ann/Absyn/Program.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/Program.java rename to labs/mini/src/java/Ann/Absyn/Program.java diff --git a/laborations/mini/src/java/Ann/Absyn/SAssign.java b/labs/mini/src/java/Ann/Absyn/SAssign.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/SAssign.java rename to labs/mini/src/java/Ann/Absyn/SAssign.java diff --git a/laborations/mini/src/java/Ann/Absyn/SPrint.java b/labs/mini/src/java/Ann/Absyn/SPrint.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/SPrint.java rename to labs/mini/src/java/Ann/Absyn/SPrint.java diff --git a/laborations/mini/src/java/Ann/Absyn/Stm.java b/labs/mini/src/java/Ann/Absyn/Stm.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/Stm.java rename to labs/mini/src/java/Ann/Absyn/Stm.java diff --git a/laborations/mini/src/java/Ann/Absyn/TDouble.java b/labs/mini/src/java/Ann/Absyn/TDouble.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/TDouble.java rename to labs/mini/src/java/Ann/Absyn/TDouble.java diff --git a/laborations/mini/src/java/Ann/Absyn/TInt.java b/labs/mini/src/java/Ann/Absyn/TInt.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/TInt.java rename to labs/mini/src/java/Ann/Absyn/TInt.java diff --git a/laborations/mini/src/java/Ann/Absyn/Times.java b/labs/mini/src/java/Ann/Absyn/Times.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/Times.java rename to labs/mini/src/java/Ann/Absyn/Times.java diff --git a/laborations/mini/src/java/Ann/Absyn/Type.java b/labs/mini/src/java/Ann/Absyn/Type.java similarity index 100% rename from laborations/mini/src/java/Ann/Absyn/Type.java rename to labs/mini/src/java/Ann/Absyn/Type.java diff --git a/laborations/mini/src/java/Ann/AllVisitor.java b/labs/mini/src/java/Ann/AllVisitor.java similarity index 100% rename from laborations/mini/src/java/Ann/AllVisitor.java rename to labs/mini/src/java/Ann/AllVisitor.java diff --git a/laborations/mini/src/java/Ann/ComposVisitor.java b/labs/mini/src/java/Ann/ComposVisitor.java similarity index 100% rename from laborations/mini/src/java/Ann/ComposVisitor.java rename to labs/mini/src/java/Ann/ComposVisitor.java diff --git a/laborations/mini/src/java/Ann/FoldVisitor.java b/labs/mini/src/java/Ann/FoldVisitor.java similarity index 100% rename from laborations/mini/src/java/Ann/FoldVisitor.java rename to labs/mini/src/java/Ann/FoldVisitor.java diff --git a/laborations/mini/src/java/Ann/PrettyPrinter.java b/labs/mini/src/java/Ann/PrettyPrinter.java similarity index 100% rename from laborations/mini/src/java/Ann/PrettyPrinter.java rename to labs/mini/src/java/Ann/PrettyPrinter.java diff --git a/laborations/mini/src/java/Ann/VisitSkel.java b/labs/mini/src/java/Ann/VisitSkel.java similarity index 100% rename from laborations/mini/src/java/Ann/VisitSkel.java rename to labs/mini/src/java/Ann/VisitSkel.java diff --git a/laborations/mini/src/java/Code/AbstractVisitor.java b/labs/mini/src/java/Code/AbstractVisitor.java similarity index 100% rename from laborations/mini/src/java/Code/AbstractVisitor.java rename to labs/mini/src/java/Code/AbstractVisitor.java diff --git a/laborations/mini/src/java/Code/Absyn/DAdd.java b/labs/mini/src/java/Code/Absyn/DAdd.java similarity index 100% rename from laborations/mini/src/java/Code/Absyn/DAdd.java rename to labs/mini/src/java/Code/Absyn/DAdd.java diff --git a/laborations/mini/src/java/Code/Absyn/DDiv.java b/labs/mini/src/java/Code/Absyn/DDiv.java similarity index 100% rename from laborations/mini/src/java/Code/Absyn/DDiv.java rename to labs/mini/src/java/Code/Absyn/DDiv.java diff --git a/laborations/mini/src/java/Code/Absyn/DLit.java b/labs/mini/src/java/Code/Absyn/DLit.java similarity index 100% rename from laborations/mini/src/java/Code/Absyn/DLit.java rename to labs/mini/src/java/Code/Absyn/DLit.java diff --git a/laborations/mini/src/java/Code/Absyn/DLoad.java b/labs/mini/src/java/Code/Absyn/DLoad.java similarity index 100% rename from laborations/mini/src/java/Code/Absyn/DLoad.java rename to labs/mini/src/java/Code/Absyn/DLoad.java diff --git a/laborations/mini/src/java/Code/Absyn/DMul.java b/labs/mini/src/java/Code/Absyn/DMul.java similarity index 100% rename from laborations/mini/src/java/Code/Absyn/DMul.java rename to labs/mini/src/java/Code/Absyn/DMul.java diff --git a/laborations/mini/src/java/Code/Absyn/DPrint.java b/labs/mini/src/java/Code/Absyn/DPrint.java similarity index 100% rename from laborations/mini/src/java/Code/Absyn/DPrint.java rename to labs/mini/src/java/Code/Absyn/DPrint.java diff --git a/laborations/mini/src/java/Code/Absyn/DStore.java b/labs/mini/src/java/Code/Absyn/DStore.java similarity index 100% rename from laborations/mini/src/java/Code/Absyn/DStore.java rename to labs/mini/src/java/Code/Absyn/DStore.java diff --git a/laborations/mini/src/java/Code/Absyn/DSub.java b/labs/mini/src/java/Code/Absyn/DSub.java similarity index 100% rename from laborations/mini/src/java/Code/Absyn/DSub.java rename to labs/mini/src/java/Code/Absyn/DSub.java diff --git a/laborations/mini/src/java/Code/Absyn/I2D.java b/labs/mini/src/java/Code/Absyn/I2D.java similarity index 100% rename from laborations/mini/src/java/Code/Absyn/I2D.java rename to labs/mini/src/java/Code/Absyn/I2D.java diff --git a/laborations/mini/src/java/Code/Absyn/IAdd.java b/labs/mini/src/java/Code/Absyn/IAdd.java similarity index 100% rename from laborations/mini/src/java/Code/Absyn/IAdd.java rename to labs/mini/src/java/Code/Absyn/IAdd.java diff --git a/laborations/mini/src/java/Code/Absyn/IDiv.java b/labs/mini/src/java/Code/Absyn/IDiv.java similarity index 100% rename from laborations/mini/src/java/Code/Absyn/IDiv.java rename to labs/mini/src/java/Code/Absyn/IDiv.java diff --git a/laborations/mini/src/java/Code/Absyn/ILit.java b/labs/mini/src/java/Code/Absyn/ILit.java similarity index 100% rename from laborations/mini/src/java/Code/Absyn/ILit.java rename to labs/mini/src/java/Code/Absyn/ILit.java diff --git a/laborations/mini/src/java/Code/Absyn/ILoad.java b/labs/mini/src/java/Code/Absyn/ILoad.java similarity index 100% rename from laborations/mini/src/java/Code/Absyn/ILoad.java rename to labs/mini/src/java/Code/Absyn/ILoad.java diff --git a/laborations/mini/src/java/Code/Absyn/IMul.java b/labs/mini/src/java/Code/Absyn/IMul.java similarity index 100% rename from laborations/mini/src/java/Code/Absyn/IMul.java rename to labs/mini/src/java/Code/Absyn/IMul.java diff --git a/laborations/mini/src/java/Code/Absyn/IPrint.java b/labs/mini/src/java/Code/Absyn/IPrint.java similarity index 100% rename from laborations/mini/src/java/Code/Absyn/IPrint.java rename to labs/mini/src/java/Code/Absyn/IPrint.java diff --git a/laborations/mini/src/java/Code/Absyn/IStore.java b/labs/mini/src/java/Code/Absyn/IStore.java similarity index 100% rename from laborations/mini/src/java/Code/Absyn/IStore.java rename to labs/mini/src/java/Code/Absyn/IStore.java diff --git a/laborations/mini/src/java/Code/Absyn/ISub.java b/labs/mini/src/java/Code/Absyn/ISub.java similarity index 100% rename from laborations/mini/src/java/Code/Absyn/ISub.java rename to labs/mini/src/java/Code/Absyn/ISub.java diff --git a/laborations/mini/src/java/Code/Absyn/Ins.java b/labs/mini/src/java/Code/Absyn/Ins.java similarity index 100% rename from laborations/mini/src/java/Code/Absyn/Ins.java rename to labs/mini/src/java/Code/Absyn/Ins.java diff --git a/laborations/mini/src/java/Code/AllVisitor.java b/labs/mini/src/java/Code/AllVisitor.java similarity index 100% rename from laborations/mini/src/java/Code/AllVisitor.java rename to labs/mini/src/java/Code/AllVisitor.java diff --git a/laborations/mini/src/java/Code/ComposVisitor.java b/labs/mini/src/java/Code/ComposVisitor.java similarity index 100% rename from laborations/mini/src/java/Code/ComposVisitor.java rename to labs/mini/src/java/Code/ComposVisitor.java diff --git a/laborations/mini/src/java/Code/FoldVisitor.java b/labs/mini/src/java/Code/FoldVisitor.java similarity index 100% rename from laborations/mini/src/java/Code/FoldVisitor.java rename to labs/mini/src/java/Code/FoldVisitor.java diff --git a/laborations/mini/src/java/Code/PrettyPrinter.java b/labs/mini/src/java/Code/PrettyPrinter.java similarity index 100% rename from laborations/mini/src/java/Code/PrettyPrinter.java rename to labs/mini/src/java/Code/PrettyPrinter.java diff --git a/laborations/mini/src/java/Code/VisitSkel.java b/labs/mini/src/java/Code/VisitSkel.java similarity index 100% rename from laborations/mini/src/java/Code/VisitSkel.java rename to labs/mini/src/java/Code/VisitSkel.java diff --git a/laborations/mini/src/java/Compiler.java b/labs/mini/src/java/Compiler.java similarity index 100% rename from laborations/mini/src/java/Compiler.java rename to labs/mini/src/java/Compiler.java diff --git a/laborations/mini/src/java/Interpreter.java b/labs/mini/src/java/Interpreter.java similarity index 100% rename from laborations/mini/src/java/Interpreter.java rename to labs/mini/src/java/Interpreter.java diff --git a/laborations/mini/src/java/Makefile b/labs/mini/src/java/Makefile similarity index 100% rename from laborations/mini/src/java/Makefile rename to labs/mini/src/java/Makefile diff --git a/laborations/mini/src/java/Mini.java b/labs/mini/src/java/Mini.java similarity index 100% rename from laborations/mini/src/java/Mini.java rename to labs/mini/src/java/Mini.java diff --git a/laborations/mini/src/java/MiniJS/AbstractVisitor.java b/labs/mini/src/java/MiniJS/AbstractVisitor.java similarity index 100% rename from laborations/mini/src/java/MiniJS/AbstractVisitor.java rename to labs/mini/src/java/MiniJS/AbstractVisitor.java diff --git a/laborations/mini/src/java/MiniJS/Absyn/EDiv.java b/labs/mini/src/java/MiniJS/Absyn/EDiv.java similarity index 100% rename from laborations/mini/src/java/MiniJS/Absyn/EDiv.java rename to labs/mini/src/java/MiniJS/Absyn/EDiv.java diff --git a/laborations/mini/src/java/MiniJS/Absyn/EDouble.java b/labs/mini/src/java/MiniJS/Absyn/EDouble.java similarity index 100% rename from laborations/mini/src/java/MiniJS/Absyn/EDouble.java rename to labs/mini/src/java/MiniJS/Absyn/EDouble.java diff --git a/laborations/mini/src/java/MiniJS/Absyn/EInt.java b/labs/mini/src/java/MiniJS/Absyn/EInt.java similarity index 100% rename from laborations/mini/src/java/MiniJS/Absyn/EInt.java rename to labs/mini/src/java/MiniJS/Absyn/EInt.java diff --git a/laborations/mini/src/java/MiniJS/Absyn/EMinus.java b/labs/mini/src/java/MiniJS/Absyn/EMinus.java similarity index 100% rename from laborations/mini/src/java/MiniJS/Absyn/EMinus.java rename to labs/mini/src/java/MiniJS/Absyn/EMinus.java diff --git a/laborations/mini/src/java/MiniJS/Absyn/EPlus.java b/labs/mini/src/java/MiniJS/Absyn/EPlus.java similarity index 100% rename from laborations/mini/src/java/MiniJS/Absyn/EPlus.java rename to labs/mini/src/java/MiniJS/Absyn/EPlus.java diff --git a/laborations/mini/src/java/MiniJS/Absyn/ETimes.java b/labs/mini/src/java/MiniJS/Absyn/ETimes.java similarity index 100% rename from laborations/mini/src/java/MiniJS/Absyn/ETimes.java rename to labs/mini/src/java/MiniJS/Absyn/ETimes.java diff --git a/laborations/mini/src/java/MiniJS/Absyn/EVar.java b/labs/mini/src/java/MiniJS/Absyn/EVar.java similarity index 100% rename from laborations/mini/src/java/MiniJS/Absyn/EVar.java rename to labs/mini/src/java/MiniJS/Absyn/EVar.java diff --git a/laborations/mini/src/java/MiniJS/Absyn/Exp.java b/labs/mini/src/java/MiniJS/Absyn/Exp.java similarity index 100% rename from laborations/mini/src/java/MiniJS/Absyn/Exp.java rename to labs/mini/src/java/MiniJS/Absyn/Exp.java diff --git a/laborations/mini/src/java/MiniJS/Absyn/ListStm.java b/labs/mini/src/java/MiniJS/Absyn/ListStm.java similarity index 100% rename from laborations/mini/src/java/MiniJS/Absyn/ListStm.java rename to labs/mini/src/java/MiniJS/Absyn/ListStm.java diff --git a/laborations/mini/src/java/MiniJS/Absyn/Prg.java b/labs/mini/src/java/MiniJS/Absyn/Prg.java similarity index 100% rename from laborations/mini/src/java/MiniJS/Absyn/Prg.java rename to labs/mini/src/java/MiniJS/Absyn/Prg.java diff --git a/laborations/mini/src/java/MiniJS/Absyn/Program.java b/labs/mini/src/java/MiniJS/Absyn/Program.java similarity index 100% rename from laborations/mini/src/java/MiniJS/Absyn/Program.java rename to labs/mini/src/java/MiniJS/Absyn/Program.java diff --git a/laborations/mini/src/java/MiniJS/Absyn/SAssign.java b/labs/mini/src/java/MiniJS/Absyn/SAssign.java similarity index 100% rename from laborations/mini/src/java/MiniJS/Absyn/SAssign.java rename to labs/mini/src/java/MiniJS/Absyn/SAssign.java diff --git a/laborations/mini/src/java/MiniJS/Absyn/SPrint.java b/labs/mini/src/java/MiniJS/Absyn/SPrint.java similarity index 100% rename from laborations/mini/src/java/MiniJS/Absyn/SPrint.java rename to labs/mini/src/java/MiniJS/Absyn/SPrint.java diff --git a/laborations/mini/src/java/MiniJS/Absyn/Stm.java b/labs/mini/src/java/MiniJS/Absyn/Stm.java similarity index 100% rename from laborations/mini/src/java/MiniJS/Absyn/Stm.java rename to labs/mini/src/java/MiniJS/Absyn/Stm.java diff --git a/laborations/mini/src/java/MiniJS/AllVisitor.java b/labs/mini/src/java/MiniJS/AllVisitor.java similarity index 100% rename from laborations/mini/src/java/MiniJS/AllVisitor.java rename to labs/mini/src/java/MiniJS/AllVisitor.java diff --git a/laborations/mini/src/java/MiniJS/ComposVisitor.java b/labs/mini/src/java/MiniJS/ComposVisitor.java similarity index 100% rename from laborations/mini/src/java/MiniJS/ComposVisitor.java rename to labs/mini/src/java/MiniJS/ComposVisitor.java diff --git a/laborations/mini/src/java/MiniJS/FoldVisitor.java b/labs/mini/src/java/MiniJS/FoldVisitor.java similarity index 100% rename from laborations/mini/src/java/MiniJS/FoldVisitor.java rename to labs/mini/src/java/MiniJS/FoldVisitor.java diff --git a/laborations/mini/src/java/MiniJS/PrettyPrinter.java b/labs/mini/src/java/MiniJS/PrettyPrinter.java similarity index 100% rename from laborations/mini/src/java/MiniJS/PrettyPrinter.java rename to labs/mini/src/java/MiniJS/PrettyPrinter.java diff --git a/laborations/mini/src/java/MiniJS/Test.java b/labs/mini/src/java/MiniJS/Test.java similarity index 100% rename from laborations/mini/src/java/MiniJS/Test.java rename to labs/mini/src/java/MiniJS/Test.java diff --git a/laborations/mini/src/java/MiniJS/VisitSkel.java b/labs/mini/src/java/MiniJS/VisitSkel.java similarity index 100% rename from laborations/mini/src/java/MiniJS/VisitSkel.java rename to labs/mini/src/java/MiniJS/VisitSkel.java diff --git a/laborations/mini/src/java/MiniJS/Yylex b/labs/mini/src/java/MiniJS/Yylex similarity index 100% rename from laborations/mini/src/java/MiniJS/Yylex rename to labs/mini/src/java/MiniJS/Yylex diff --git a/laborations/mini/src/java/MiniJS/Yylex.java b/labs/mini/src/java/MiniJS/Yylex.java similarity index 100% rename from laborations/mini/src/java/MiniJS/Yylex.java rename to labs/mini/src/java/MiniJS/Yylex.java diff --git a/laborations/mini/src/java/MiniJS/_cup.cup b/labs/mini/src/java/MiniJS/_cup.cup similarity index 100% rename from laborations/mini/src/java/MiniJS/_cup.cup rename to labs/mini/src/java/MiniJS/_cup.cup diff --git a/laborations/mini/src/java/MiniJS/parser.java b/labs/mini/src/java/MiniJS/parser.java similarity index 100% rename from laborations/mini/src/java/MiniJS/parser.java rename to labs/mini/src/java/MiniJS/parser.java diff --git a/laborations/mini/src/java/MiniJS/sym.java b/labs/mini/src/java/MiniJS/sym.java similarity index 100% rename from laborations/mini/src/java/MiniJS/sym.java rename to labs/mini/src/java/MiniJS/sym.java diff --git a/laborations/mini/src/java/Runtime.java b/labs/mini/src/java/Runtime.java similarity index 100% rename from laborations/mini/src/java/Runtime.java rename to labs/mini/src/java/Runtime.java diff --git a/laborations/mini/src/java/TypeChecker.java b/labs/mini/src/java/TypeChecker.java similarity index 100% rename from laborations/mini/src/java/TypeChecker.java rename to labs/mini/src/java/TypeChecker.java diff --git a/laborations/mini/src/test/Makefile b/labs/mini/src/test/Makefile similarity index 100% rename from laborations/mini/src/test/Makefile rename to labs/mini/src/test/Makefile diff --git a/laborations/mini/src/test/arith.j b/labs/mini/src/test/arith.j similarity index 100% rename from laborations/mini/src/test/arith.j rename to labs/mini/src/test/arith.j diff --git a/laborations/mini/src/test/arith.js b/labs/mini/src/test/arith.js similarity index 100% rename from laborations/mini/src/test/arith.js rename to labs/mini/src/test/arith.js diff --git a/laborations/mini/src/test/ex1.j b/labs/mini/src/test/ex1.j similarity index 100% rename from laborations/mini/src/test/ex1.j rename to labs/mini/src/test/ex1.j diff --git a/laborations/mini/src/test/ex1.js b/labs/mini/src/test/ex1.js similarity index 100% rename from laborations/mini/src/test/ex1.js rename to labs/mini/src/test/ex1.js diff --git a/laborations/mini/src/test/pi.j b/labs/mini/src/test/pi.j similarity index 100% rename from laborations/mini/src/test/pi.j rename to labs/mini/src/test/pi.j diff --git a/laborations/mini/src/test/pi.js b/labs/mini/src/test/pi.js similarity index 100% rename from laborations/mini/src/test/pi.js rename to labs/mini/src/test/pi.js diff --git a/laborations/mini/src/test/unbound.js b/labs/mini/src/test/unbound.js similarity index 100% rename from laborations/mini/src/test/unbound.js rename to labs/mini/src/test/unbound.js diff --git a/laborations/mk/test.mk b/labs/mk/test.mk similarity index 100% rename from laborations/mk/test.mk rename to labs/mk/test.mk diff --git a/laborations/old-2015-mini/Makefile b/labs/old-2015-mini/Makefile similarity index 100% rename from laborations/old-2015-mini/Makefile rename to labs/old-2015-mini/Makefile diff --git a/laborations/old-2015-mini/Mini.cf b/labs/old-2015-mini/Mini.cf similarity index 100% rename from laborations/old-2015-mini/Mini.cf rename to labs/old-2015-mini/Mini.cf diff --git a/laborations/old-2015-mini/Runtime.java b/labs/old-2015-mini/Runtime.java similarity index 100% rename from laborations/old-2015-mini/Runtime.java rename to labs/old-2015-mini/Runtime.java diff --git a/laborations/old-2015-mini/ex.mini b/labs/old-2015-mini/ex.mini similarity index 100% rename from laborations/old-2015-mini/ex.mini rename to labs/old-2015-mini/ex.mini diff --git a/laborations/old-2015-mini/ex2.mini b/labs/old-2015-mini/ex2.mini similarity index 100% rename from laborations/old-2015-mini/ex2.mini rename to labs/old-2015-mini/ex2.mini diff --git a/laborations/old-2015-mini/haskell/.gitignore b/labs/old-2015-mini/haskell/.gitignore similarity index 100% rename from laborations/old-2015-mini/haskell/.gitignore rename to labs/old-2015-mini/haskell/.gitignore diff --git a/laborations/old-2015-mini/haskell/AnnotCompiler.hs b/labs/old-2015-mini/haskell/AnnotCompiler.hs similarity index 100% rename from laborations/old-2015-mini/haskell/AnnotCompiler.hs rename to labs/old-2015-mini/haskell/AnnotCompiler.hs diff --git a/laborations/old-2015-mini/haskell/AnnotatingTypeChecker.hs b/labs/old-2015-mini/haskell/AnnotatingTypeChecker.hs similarity index 100% rename from laborations/old-2015-mini/haskell/AnnotatingTypeChecker.hs rename to labs/old-2015-mini/haskell/AnnotatingTypeChecker.hs diff --git a/laborations/old-2015-mini/haskell/Compiler.hs b/labs/old-2015-mini/haskell/Compiler.hs similarity index 100% rename from laborations/old-2015-mini/haskell/Compiler.hs rename to labs/old-2015-mini/haskell/Compiler.hs diff --git a/laborations/old-2015-mini/haskell/Interpreter.hs b/labs/old-2015-mini/haskell/Interpreter.hs similarity index 100% rename from laborations/old-2015-mini/haskell/Interpreter.hs rename to labs/old-2015-mini/haskell/Interpreter.hs diff --git a/laborations/old-2015-mini/haskell/Makefile b/labs/old-2015-mini/haskell/Makefile similarity index 100% rename from laborations/old-2015-mini/haskell/Makefile rename to labs/old-2015-mini/haskell/Makefile diff --git a/laborations/old-2015-mini/haskell/TypeChecker.hs b/labs/old-2015-mini/haskell/TypeChecker.hs similarity index 100% rename from laborations/old-2015-mini/haskell/TypeChecker.hs rename to labs/old-2015-mini/haskell/TypeChecker.hs diff --git a/laborations/old-2015-mini/haskell/compilemini.hs b/labs/old-2015-mini/haskell/compilemini.hs similarity index 100% rename from laborations/old-2015-mini/haskell/compilemini.hs rename to labs/old-2015-mini/haskell/compilemini.hs diff --git a/laborations/old-2015-mini/haskell/compmini.hs b/labs/old-2015-mini/haskell/compmini.hs similarity index 100% rename from laborations/old-2015-mini/haskell/compmini.hs rename to labs/old-2015-mini/haskell/compmini.hs diff --git a/laborations/old-2015-mini/haskell/index.txt b/labs/old-2015-mini/haskell/index.txt similarity index 100% rename from laborations/old-2015-mini/haskell/index.txt rename to labs/old-2015-mini/haskell/index.txt diff --git a/laborations/old-2015-mini/haskell/runmini.hs b/labs/old-2015-mini/haskell/runmini.hs similarity index 100% rename from laborations/old-2015-mini/haskell/runmini.hs rename to labs/old-2015-mini/haskell/runmini.hs diff --git a/laborations/old-2015-mini/java1.5/.gitignore b/labs/old-2015-mini/java1.5/.gitignore similarity index 100% rename from laborations/old-2015-mini/java1.5/.gitignore rename to labs/old-2015-mini/java1.5/.gitignore diff --git a/laborations/old-2015-mini/java1.5/AnnotCompiler.java b/labs/old-2015-mini/java1.5/AnnotCompiler.java similarity index 100% rename from laborations/old-2015-mini/java1.5/AnnotCompiler.java rename to labs/old-2015-mini/java1.5/AnnotCompiler.java diff --git a/laborations/old-2015-mini/java1.5/AnnotatingTypeChecker.java b/labs/old-2015-mini/java1.5/AnnotatingTypeChecker.java similarity index 100% rename from laborations/old-2015-mini/java1.5/AnnotatingTypeChecker.java rename to labs/old-2015-mini/java1.5/AnnotatingTypeChecker.java diff --git a/laborations/old-2015-mini/java1.5/Compiler.java b/labs/old-2015-mini/java1.5/Compiler.java similarity index 100% rename from laborations/old-2015-mini/java1.5/Compiler.java rename to labs/old-2015-mini/java1.5/Compiler.java diff --git a/laborations/old-2015-mini/java1.5/Interpreter.java b/labs/old-2015-mini/java1.5/Interpreter.java similarity index 100% rename from laborations/old-2015-mini/java1.5/Interpreter.java rename to labs/old-2015-mini/java1.5/Interpreter.java diff --git a/laborations/old-2015-mini/java1.5/Makefile b/labs/old-2015-mini/java1.5/Makefile similarity index 100% rename from laborations/old-2015-mini/java1.5/Makefile rename to labs/old-2015-mini/java1.5/Makefile diff --git a/laborations/old-2015-mini/java1.5/TypeChecker.java b/labs/old-2015-mini/java1.5/TypeChecker.java similarity index 100% rename from laborations/old-2015-mini/java1.5/TypeChecker.java rename to labs/old-2015-mini/java1.5/TypeChecker.java diff --git a/laborations/old-2015-mini/java1.5/TypeException.java b/labs/old-2015-mini/java1.5/TypeException.java similarity index 100% rename from laborations/old-2015-mini/java1.5/TypeException.java rename to labs/old-2015-mini/java1.5/TypeException.java diff --git a/laborations/old-2015-mini/java1.5/annotcompilemini.java b/labs/old-2015-mini/java1.5/annotcompilemini.java similarity index 100% rename from laborations/old-2015-mini/java1.5/annotcompilemini.java rename to labs/old-2015-mini/java1.5/annotcompilemini.java diff --git a/laborations/old-2015-mini/java1.5/compilemini b/labs/old-2015-mini/java1.5/compilemini similarity index 100% rename from laborations/old-2015-mini/java1.5/compilemini rename to labs/old-2015-mini/java1.5/compilemini diff --git a/laborations/old-2015-mini/java1.5/compilemini.java b/labs/old-2015-mini/java1.5/compilemini.java similarity index 100% rename from laborations/old-2015-mini/java1.5/compilemini.java rename to labs/old-2015-mini/java1.5/compilemini.java diff --git a/laborations/old-2015-mini/java1.5/index.txt b/labs/old-2015-mini/java1.5/index.txt similarity index 100% rename from laborations/old-2015-mini/java1.5/index.txt rename to labs/old-2015-mini/java1.5/index.txt diff --git a/laborations/old-2015-mini/java1.5/runmini b/labs/old-2015-mini/java1.5/runmini similarity index 100% rename from laborations/old-2015-mini/java1.5/runmini rename to labs/old-2015-mini/java1.5/runmini diff --git a/laborations/old-2015-mini/java1.5/runmini.java b/labs/old-2015-mini/java1.5/runmini.java similarity index 100% rename from laborations/old-2015-mini/java1.5/runmini.java rename to labs/old-2015-mini/java1.5/runmini.java diff --git a/laborations/old-2015-mini/mini.txt b/labs/old-2015-mini/mini.txt similarity index 100% rename from laborations/old-2015-mini/mini.txt rename to labs/old-2015-mini/mini.txt diff --git a/laborations/old-2018-lab1/Makefile b/labs/old-2018-lab1/Makefile similarity index 100% rename from laborations/old-2018-lab1/Makefile rename to labs/old-2018-lab1/Makefile diff --git a/laborations/old-2018-lab1/lab1.txt b/labs/old-2018-lab1/lab1.txt similarity index 100% rename from laborations/old-2018-lab1/lab1.txt rename to labs/old-2018-lab1/lab1.txt diff --git a/laborations/old-2018-lab1/testsuite/Makefile b/labs/old-2018-lab1/testsuite/Makefile similarity index 100% rename from laborations/old-2018-lab1/testsuite/Makefile rename to labs/old-2018-lab1/testsuite/Makefile diff --git a/laborations/old-2018-lab1/testsuite/Makefile-test b/labs/old-2018-lab1/testsuite/Makefile-test similarity index 100% rename from laborations/old-2018-lab1/testsuite/Makefile-test rename to labs/old-2018-lab1/testsuite/Makefile-test diff --git a/laborations/old-2018-lab1/testsuite/bad/bad001.cc b/labs/old-2018-lab1/testsuite/bad/bad001.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad001.cc rename to labs/old-2018-lab1/testsuite/bad/bad001.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad002.cc b/labs/old-2018-lab1/testsuite/bad/bad002.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad002.cc rename to labs/old-2018-lab1/testsuite/bad/bad002.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad003.cc b/labs/old-2018-lab1/testsuite/bad/bad003.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad003.cc rename to labs/old-2018-lab1/testsuite/bad/bad003.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad004.cc b/labs/old-2018-lab1/testsuite/bad/bad004.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad004.cc rename to labs/old-2018-lab1/testsuite/bad/bad004.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad005.cc b/labs/old-2018-lab1/testsuite/bad/bad005.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad005.cc rename to labs/old-2018-lab1/testsuite/bad/bad005.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad006.cc b/labs/old-2018-lab1/testsuite/bad/bad006.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad006.cc rename to labs/old-2018-lab1/testsuite/bad/bad006.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad007.cc b/labs/old-2018-lab1/testsuite/bad/bad007.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad007.cc rename to labs/old-2018-lab1/testsuite/bad/bad007.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad008.cc b/labs/old-2018-lab1/testsuite/bad/bad008.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad008.cc rename to labs/old-2018-lab1/testsuite/bad/bad008.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad009.cc b/labs/old-2018-lab1/testsuite/bad/bad009.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad009.cc rename to labs/old-2018-lab1/testsuite/bad/bad009.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad010.cc b/labs/old-2018-lab1/testsuite/bad/bad010.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad010.cc rename to labs/old-2018-lab1/testsuite/bad/bad010.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad011.cc b/labs/old-2018-lab1/testsuite/bad/bad011.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad011.cc rename to labs/old-2018-lab1/testsuite/bad/bad011.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad012.cc b/labs/old-2018-lab1/testsuite/bad/bad012.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad012.cc rename to labs/old-2018-lab1/testsuite/bad/bad012.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad013.cc b/labs/old-2018-lab1/testsuite/bad/bad013.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad013.cc rename to labs/old-2018-lab1/testsuite/bad/bad013.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad014.cc b/labs/old-2018-lab1/testsuite/bad/bad014.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad014.cc rename to labs/old-2018-lab1/testsuite/bad/bad014.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad015.cc b/labs/old-2018-lab1/testsuite/bad/bad015.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad015.cc rename to labs/old-2018-lab1/testsuite/bad/bad015.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad016.cc b/labs/old-2018-lab1/testsuite/bad/bad016.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad016.cc rename to labs/old-2018-lab1/testsuite/bad/bad016.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad017.cc b/labs/old-2018-lab1/testsuite/bad/bad017.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad017.cc rename to labs/old-2018-lab1/testsuite/bad/bad017.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad018.cc b/labs/old-2018-lab1/testsuite/bad/bad018.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad018.cc rename to labs/old-2018-lab1/testsuite/bad/bad018.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad019.cc b/labs/old-2018-lab1/testsuite/bad/bad019.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad019.cc rename to labs/old-2018-lab1/testsuite/bad/bad019.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad026.cc b/labs/old-2018-lab1/testsuite/bad/bad026.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad026.cc rename to labs/old-2018-lab1/testsuite/bad/bad026.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad027.cc b/labs/old-2018-lab1/testsuite/bad/bad027.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad027.cc rename to labs/old-2018-lab1/testsuite/bad/bad027.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad029.cc b/labs/old-2018-lab1/testsuite/bad/bad029.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad029.cc rename to labs/old-2018-lab1/testsuite/bad/bad029.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad030.cc b/labs/old-2018-lab1/testsuite/bad/bad030.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad030.cc rename to labs/old-2018-lab1/testsuite/bad/bad030.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad031.cc b/labs/old-2018-lab1/testsuite/bad/bad031.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad031.cc rename to labs/old-2018-lab1/testsuite/bad/bad031.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad032.cc b/labs/old-2018-lab1/testsuite/bad/bad032.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad032.cc rename to labs/old-2018-lab1/testsuite/bad/bad032.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad033.cc b/labs/old-2018-lab1/testsuite/bad/bad033.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad033.cc rename to labs/old-2018-lab1/testsuite/bad/bad033.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad034.cc b/labs/old-2018-lab1/testsuite/bad/bad034.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad034.cc rename to labs/old-2018-lab1/testsuite/bad/bad034.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad035.cc b/labs/old-2018-lab1/testsuite/bad/bad035.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad035.cc rename to labs/old-2018-lab1/testsuite/bad/bad035.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad036.cc b/labs/old-2018-lab1/testsuite/bad/bad036.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad036.cc rename to labs/old-2018-lab1/testsuite/bad/bad036.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad037.cc b/labs/old-2018-lab1/testsuite/bad/bad037.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad037.cc rename to labs/old-2018-lab1/testsuite/bad/bad037.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad038.cc b/labs/old-2018-lab1/testsuite/bad/bad038.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad038.cc rename to labs/old-2018-lab1/testsuite/bad/bad038.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad039.cc b/labs/old-2018-lab1/testsuite/bad/bad039.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad039.cc rename to labs/old-2018-lab1/testsuite/bad/bad039.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad040.cc b/labs/old-2018-lab1/testsuite/bad/bad040.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad040.cc rename to labs/old-2018-lab1/testsuite/bad/bad040.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad041.cc b/labs/old-2018-lab1/testsuite/bad/bad041.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad041.cc rename to labs/old-2018-lab1/testsuite/bad/bad041.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad042.cc b/labs/old-2018-lab1/testsuite/bad/bad042.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad042.cc rename to labs/old-2018-lab1/testsuite/bad/bad042.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad043.cc b/labs/old-2018-lab1/testsuite/bad/bad043.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad043.cc rename to labs/old-2018-lab1/testsuite/bad/bad043.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad044.cc b/labs/old-2018-lab1/testsuite/bad/bad044.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad044.cc rename to labs/old-2018-lab1/testsuite/bad/bad044.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad045.cc b/labs/old-2018-lab1/testsuite/bad/bad045.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad045.cc rename to labs/old-2018-lab1/testsuite/bad/bad045.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad046.cc b/labs/old-2018-lab1/testsuite/bad/bad046.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad046.cc rename to labs/old-2018-lab1/testsuite/bad/bad046.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad047.cc b/labs/old-2018-lab1/testsuite/bad/bad047.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad047.cc rename to labs/old-2018-lab1/testsuite/bad/bad047.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad048.cc b/labs/old-2018-lab1/testsuite/bad/bad048.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad048.cc rename to labs/old-2018-lab1/testsuite/bad/bad048.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad049.cc b/labs/old-2018-lab1/testsuite/bad/bad049.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad049.cc rename to labs/old-2018-lab1/testsuite/bad/bad049.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad050.cc b/labs/old-2018-lab1/testsuite/bad/bad050.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad050.cc rename to labs/old-2018-lab1/testsuite/bad/bad050.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad051.cc b/labs/old-2018-lab1/testsuite/bad/bad051.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad051.cc rename to labs/old-2018-lab1/testsuite/bad/bad051.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad052.cc b/labs/old-2018-lab1/testsuite/bad/bad052.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad052.cc rename to labs/old-2018-lab1/testsuite/bad/bad052.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad053.cc b/labs/old-2018-lab1/testsuite/bad/bad053.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad053.cc rename to labs/old-2018-lab1/testsuite/bad/bad053.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad058.cc b/labs/old-2018-lab1/testsuite/bad/bad058.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad058.cc rename to labs/old-2018-lab1/testsuite/bad/bad058.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad059.cc b/labs/old-2018-lab1/testsuite/bad/bad059.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad059.cc rename to labs/old-2018-lab1/testsuite/bad/bad059.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad060.cc b/labs/old-2018-lab1/testsuite/bad/bad060.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad060.cc rename to labs/old-2018-lab1/testsuite/bad/bad060.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad061.cc b/labs/old-2018-lab1/testsuite/bad/bad061.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad061.cc rename to labs/old-2018-lab1/testsuite/bad/bad061.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad062.cc b/labs/old-2018-lab1/testsuite/bad/bad062.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad062.cc rename to labs/old-2018-lab1/testsuite/bad/bad062.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad063.cc b/labs/old-2018-lab1/testsuite/bad/bad063.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad063.cc rename to labs/old-2018-lab1/testsuite/bad/bad063.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad064.cc b/labs/old-2018-lab1/testsuite/bad/bad064.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad064.cc rename to labs/old-2018-lab1/testsuite/bad/bad064.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad065.cc b/labs/old-2018-lab1/testsuite/bad/bad065.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad065.cc rename to labs/old-2018-lab1/testsuite/bad/bad065.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad066.cc b/labs/old-2018-lab1/testsuite/bad/bad066.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad066.cc rename to labs/old-2018-lab1/testsuite/bad/bad066.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad067.cc b/labs/old-2018-lab1/testsuite/bad/bad067.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad067.cc rename to labs/old-2018-lab1/testsuite/bad/bad067.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad072.cc b/labs/old-2018-lab1/testsuite/bad/bad072.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad072.cc rename to labs/old-2018-lab1/testsuite/bad/bad072.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad073.cc b/labs/old-2018-lab1/testsuite/bad/bad073.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad073.cc rename to labs/old-2018-lab1/testsuite/bad/bad073.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad074.cc b/labs/old-2018-lab1/testsuite/bad/bad074.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad074.cc rename to labs/old-2018-lab1/testsuite/bad/bad074.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad075.cc b/labs/old-2018-lab1/testsuite/bad/bad075.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad075.cc rename to labs/old-2018-lab1/testsuite/bad/bad075.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad076.cc b/labs/old-2018-lab1/testsuite/bad/bad076.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad076.cc rename to labs/old-2018-lab1/testsuite/bad/bad076.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad077.cc b/labs/old-2018-lab1/testsuite/bad/bad077.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad077.cc rename to labs/old-2018-lab1/testsuite/bad/bad077.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad078.cc b/labs/old-2018-lab1/testsuite/bad/bad078.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad078.cc rename to labs/old-2018-lab1/testsuite/bad/bad078.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad079.cc b/labs/old-2018-lab1/testsuite/bad/bad079.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad079.cc rename to labs/old-2018-lab1/testsuite/bad/bad079.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad080.cc b/labs/old-2018-lab1/testsuite/bad/bad080.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad080.cc rename to labs/old-2018-lab1/testsuite/bad/bad080.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad081.cc b/labs/old-2018-lab1/testsuite/bad/bad081.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad081.cc rename to labs/old-2018-lab1/testsuite/bad/bad081.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad082.cc b/labs/old-2018-lab1/testsuite/bad/bad082.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad082.cc rename to labs/old-2018-lab1/testsuite/bad/bad082.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad083.cc b/labs/old-2018-lab1/testsuite/bad/bad083.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad083.cc rename to labs/old-2018-lab1/testsuite/bad/bad083.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad084.cc b/labs/old-2018-lab1/testsuite/bad/bad084.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad084.cc rename to labs/old-2018-lab1/testsuite/bad/bad084.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad085.cc b/labs/old-2018-lab1/testsuite/bad/bad085.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad085.cc rename to labs/old-2018-lab1/testsuite/bad/bad085.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad086.cc b/labs/old-2018-lab1/testsuite/bad/bad086.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad086.cc rename to labs/old-2018-lab1/testsuite/bad/bad086.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad087.cc b/labs/old-2018-lab1/testsuite/bad/bad087.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad087.cc rename to labs/old-2018-lab1/testsuite/bad/bad087.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad088.cc b/labs/old-2018-lab1/testsuite/bad/bad088.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad088.cc rename to labs/old-2018-lab1/testsuite/bad/bad088.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad089.cc b/labs/old-2018-lab1/testsuite/bad/bad089.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad089.cc rename to labs/old-2018-lab1/testsuite/bad/bad089.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad090.cc b/labs/old-2018-lab1/testsuite/bad/bad090.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad090.cc rename to labs/old-2018-lab1/testsuite/bad/bad090.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad091.cc b/labs/old-2018-lab1/testsuite/bad/bad091.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad091.cc rename to labs/old-2018-lab1/testsuite/bad/bad091.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad092.cc b/labs/old-2018-lab1/testsuite/bad/bad092.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad092.cc rename to labs/old-2018-lab1/testsuite/bad/bad092.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad093.cc b/labs/old-2018-lab1/testsuite/bad/bad093.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad093.cc rename to labs/old-2018-lab1/testsuite/bad/bad093.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad094.cc b/labs/old-2018-lab1/testsuite/bad/bad094.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad094.cc rename to labs/old-2018-lab1/testsuite/bad/bad094.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad095.cc b/labs/old-2018-lab1/testsuite/bad/bad095.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad095.cc rename to labs/old-2018-lab1/testsuite/bad/bad095.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad096.cc b/labs/old-2018-lab1/testsuite/bad/bad096.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad096.cc rename to labs/old-2018-lab1/testsuite/bad/bad096.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad097.cc b/labs/old-2018-lab1/testsuite/bad/bad097.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad097.cc rename to labs/old-2018-lab1/testsuite/bad/bad097.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad098.cc b/labs/old-2018-lab1/testsuite/bad/bad098.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad098.cc rename to labs/old-2018-lab1/testsuite/bad/bad098.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad099.cc b/labs/old-2018-lab1/testsuite/bad/bad099.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad099.cc rename to labs/old-2018-lab1/testsuite/bad/bad099.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad100.cc b/labs/old-2018-lab1/testsuite/bad/bad100.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad100.cc rename to labs/old-2018-lab1/testsuite/bad/bad100.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad101.cc b/labs/old-2018-lab1/testsuite/bad/bad101.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad101.cc rename to labs/old-2018-lab1/testsuite/bad/bad101.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad102.cc b/labs/old-2018-lab1/testsuite/bad/bad102.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad102.cc rename to labs/old-2018-lab1/testsuite/bad/bad102.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad103.cc b/labs/old-2018-lab1/testsuite/bad/bad103.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad103.cc rename to labs/old-2018-lab1/testsuite/bad/bad103.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad104.cc b/labs/old-2018-lab1/testsuite/bad/bad104.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad104.cc rename to labs/old-2018-lab1/testsuite/bad/bad104.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad105.cc b/labs/old-2018-lab1/testsuite/bad/bad105.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad105.cc rename to labs/old-2018-lab1/testsuite/bad/bad105.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad106.cc b/labs/old-2018-lab1/testsuite/bad/bad106.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad106.cc rename to labs/old-2018-lab1/testsuite/bad/bad106.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad107.cc b/labs/old-2018-lab1/testsuite/bad/bad107.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad107.cc rename to labs/old-2018-lab1/testsuite/bad/bad107.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad108.cc b/labs/old-2018-lab1/testsuite/bad/bad108.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad108.cc rename to labs/old-2018-lab1/testsuite/bad/bad108.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad109.cc b/labs/old-2018-lab1/testsuite/bad/bad109.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad109.cc rename to labs/old-2018-lab1/testsuite/bad/bad109.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad110.cc b/labs/old-2018-lab1/testsuite/bad/bad110.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad110.cc rename to labs/old-2018-lab1/testsuite/bad/bad110.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad111.cc b/labs/old-2018-lab1/testsuite/bad/bad111.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad111.cc rename to labs/old-2018-lab1/testsuite/bad/bad111.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad112.cc b/labs/old-2018-lab1/testsuite/bad/bad112.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad112.cc rename to labs/old-2018-lab1/testsuite/bad/bad112.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad113.cc b/labs/old-2018-lab1/testsuite/bad/bad113.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad113.cc rename to labs/old-2018-lab1/testsuite/bad/bad113.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad114.cc b/labs/old-2018-lab1/testsuite/bad/bad114.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad114.cc rename to labs/old-2018-lab1/testsuite/bad/bad114.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad115.cc b/labs/old-2018-lab1/testsuite/bad/bad115.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad115.cc rename to labs/old-2018-lab1/testsuite/bad/bad115.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad116.cc b/labs/old-2018-lab1/testsuite/bad/bad116.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad116.cc rename to labs/old-2018-lab1/testsuite/bad/bad116.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad117.cc b/labs/old-2018-lab1/testsuite/bad/bad117.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad117.cc rename to labs/old-2018-lab1/testsuite/bad/bad117.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad118.cc b/labs/old-2018-lab1/testsuite/bad/bad118.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad118.cc rename to labs/old-2018-lab1/testsuite/bad/bad118.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad119.cc b/labs/old-2018-lab1/testsuite/bad/bad119.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad119.cc rename to labs/old-2018-lab1/testsuite/bad/bad119.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad120.cc b/labs/old-2018-lab1/testsuite/bad/bad120.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad120.cc rename to labs/old-2018-lab1/testsuite/bad/bad120.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad121.cc b/labs/old-2018-lab1/testsuite/bad/bad121.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad121.cc rename to labs/old-2018-lab1/testsuite/bad/bad121.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad122.cc b/labs/old-2018-lab1/testsuite/bad/bad122.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad122.cc rename to labs/old-2018-lab1/testsuite/bad/bad122.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad123.cc b/labs/old-2018-lab1/testsuite/bad/bad123.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad123.cc rename to labs/old-2018-lab1/testsuite/bad/bad123.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad124.cc b/labs/old-2018-lab1/testsuite/bad/bad124.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad124.cc rename to labs/old-2018-lab1/testsuite/bad/bad124.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad125.cc b/labs/old-2018-lab1/testsuite/bad/bad125.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad125.cc rename to labs/old-2018-lab1/testsuite/bad/bad125.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad126.cc b/labs/old-2018-lab1/testsuite/bad/bad126.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad126.cc rename to labs/old-2018-lab1/testsuite/bad/bad126.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad127.cc b/labs/old-2018-lab1/testsuite/bad/bad127.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad127.cc rename to labs/old-2018-lab1/testsuite/bad/bad127.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad129.cc b/labs/old-2018-lab1/testsuite/bad/bad129.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad129.cc rename to labs/old-2018-lab1/testsuite/bad/bad129.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad130.cc b/labs/old-2018-lab1/testsuite/bad/bad130.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad130.cc rename to labs/old-2018-lab1/testsuite/bad/bad130.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad132.cc b/labs/old-2018-lab1/testsuite/bad/bad132.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad132.cc rename to labs/old-2018-lab1/testsuite/bad/bad132.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad133.cc b/labs/old-2018-lab1/testsuite/bad/bad133.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad133.cc rename to labs/old-2018-lab1/testsuite/bad/bad133.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad134.cc b/labs/old-2018-lab1/testsuite/bad/bad134.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad134.cc rename to labs/old-2018-lab1/testsuite/bad/bad134.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad135.cc b/labs/old-2018-lab1/testsuite/bad/bad135.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad135.cc rename to labs/old-2018-lab1/testsuite/bad/bad135.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/bad136.cc b/labs/old-2018-lab1/testsuite/bad/bad136.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/bad136.cc rename to labs/old-2018-lab1/testsuite/bad/bad136.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/decl-const-const-in-main.cc b/labs/old-2018-lab1/testsuite/bad/decl-const-const-in-main.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/decl-const-const-in-main.cc rename to labs/old-2018-lab1/testsuite/bad/decl-const-const-in-main.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/decl-const-const.cc b/labs/old-2018-lab1/testsuite/bad/decl-const-const.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/decl-const-const.cc rename to labs/old-2018-lab1/testsuite/bad/decl-const-const.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/decl-fun-paren.cc b/labs/old-2018-lab1/testsuite/bad/decl-fun-paren.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/decl-fun-paren.cc rename to labs/old-2018-lab1/testsuite/bad/decl-fun-paren.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/decl-paren.cc b/labs/old-2018-lab1/testsuite/bad/decl-paren.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/decl-paren.cc rename to labs/old-2018-lab1/testsuite/bad/decl-paren.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/decl-trailing-comma-in-main.cc b/labs/old-2018-lab1/testsuite/bad/decl-trailing-comma-in-main.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/decl-trailing-comma-in-main.cc rename to labs/old-2018-lab1/testsuite/bad/decl-trailing-comma-in-main.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/decl-trailing-comma.cc b/labs/old-2018-lab1/testsuite/bad/decl-trailing-comma.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/decl-trailing-comma.cc rename to labs/old-2018-lab1/testsuite/bad/decl-trailing-comma.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/main-empty.cc b/labs/old-2018-lab1/testsuite/bad/main-empty.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/main-empty.cc rename to labs/old-2018-lab1/testsuite/bad/main-empty.cc diff --git a/laborations/old-2018-lab1/testsuite/bad/numbers.cc b/labs/old-2018-lab1/testsuite/bad/numbers.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/bad/numbers.cc rename to labs/old-2018-lab1/testsuite/bad/numbers.cc diff --git a/laborations/old-2018-lab1/testsuite/build-tarball.sh b/labs/old-2018-lab1/testsuite/build-tarball.sh similarity index 100% rename from laborations/old-2018-lab1/testsuite/build-tarball.sh rename to labs/old-2018-lab1/testsuite/build-tarball.sh diff --git a/laborations/old-2018-lab1/testsuite/good/1-hello.cc b/labs/old-2018-lab1/testsuite/good/1-hello.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/1-hello.cc rename to labs/old-2018-lab1/testsuite/good/1-hello.cc diff --git a/laborations/old-2018-lab1/testsuite/good/2-greet.cc b/labs/old-2018-lab1/testsuite/good/2-greet.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/2-greet.cc rename to labs/old-2018-lab1/testsuite/good/2-greet.cc diff --git a/laborations/old-2018-lab1/testsuite/good/3-med.cc b/labs/old-2018-lab1/testsuite/good/3-med.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/3-med.cc rename to labs/old-2018-lab1/testsuite/good/3-med.cc diff --git a/laborations/old-2018-lab1/testsuite/good/4-grade.cc b/labs/old-2018-lab1/testsuite/good/4-grade.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/4-grade.cc rename to labs/old-2018-lab1/testsuite/good/4-grade.cc diff --git a/laborations/old-2018-lab1/testsuite/good/5-palin.cc b/labs/old-2018-lab1/testsuite/good/5-palin.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/5-palin.cc rename to labs/old-2018-lab1/testsuite/good/5-palin.cc diff --git a/laborations/old-2018-lab1/testsuite/good/6-grammar.cc b/labs/old-2018-lab1/testsuite/good/6-grammar.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/6-grammar.cc rename to labs/old-2018-lab1/testsuite/good/6-grammar.cc diff --git a/laborations/old-2018-lab1/testsuite/good/conflict.cc.txt b/labs/old-2018-lab1/testsuite/good/conflict.cc.txt similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/conflict.cc.txt rename to labs/old-2018-lab1/testsuite/good/conflict.cc.txt diff --git a/laborations/old-2018-lab1/testsuite/good/const-ref.cc b/labs/old-2018-lab1/testsuite/good/const-ref.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/const-ref.cc rename to labs/old-2018-lab1/testsuite/good/const-ref.cc diff --git a/laborations/old-2018-lab1/testsuite/good/const.cc b/labs/old-2018-lab1/testsuite/good/const.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/const.cc rename to labs/old-2018-lab1/testsuite/good/const.cc diff --git a/laborations/old-2018-lab1/testsuite/good/decl-mult.cc b/labs/old-2018-lab1/testsuite/good/decl-mult.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/decl-mult.cc rename to labs/old-2018-lab1/testsuite/good/decl-mult.cc diff --git a/laborations/old-2018-lab1/testsuite/good/evil.cc b/labs/old-2018-lab1/testsuite/good/evil.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/evil.cc rename to labs/old-2018-lab1/testsuite/good/evil.cc diff --git a/laborations/old-2018-lab1/testsuite/good/for-const.cc b/labs/old-2018-lab1/testsuite/good/for-const.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/for-const.cc rename to labs/old-2018-lab1/testsuite/good/for-const.cc diff --git a/laborations/old-2018-lab1/testsuite/good/incr-decr.cc b/labs/old-2018-lab1/testsuite/good/incr-decr.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/incr-decr.cc rename to labs/old-2018-lab1/testsuite/good/incr-decr.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic001.cc b/labs/old-2018-lab1/testsuite/good/synthetic001.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic001.cc rename to labs/old-2018-lab1/testsuite/good/synthetic001.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic002.cc b/labs/old-2018-lab1/testsuite/good/synthetic002.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic002.cc rename to labs/old-2018-lab1/testsuite/good/synthetic002.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic003.cc b/labs/old-2018-lab1/testsuite/good/synthetic003.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic003.cc rename to labs/old-2018-lab1/testsuite/good/synthetic003.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic004.cc b/labs/old-2018-lab1/testsuite/good/synthetic004.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic004.cc rename to labs/old-2018-lab1/testsuite/good/synthetic004.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic005.cc b/labs/old-2018-lab1/testsuite/good/synthetic005.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic005.cc rename to labs/old-2018-lab1/testsuite/good/synthetic005.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic006.cc b/labs/old-2018-lab1/testsuite/good/synthetic006.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic006.cc rename to labs/old-2018-lab1/testsuite/good/synthetic006.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic007.cc b/labs/old-2018-lab1/testsuite/good/synthetic007.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic007.cc rename to labs/old-2018-lab1/testsuite/good/synthetic007.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic010.cc b/labs/old-2018-lab1/testsuite/good/synthetic010.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic010.cc rename to labs/old-2018-lab1/testsuite/good/synthetic010.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic011.cc b/labs/old-2018-lab1/testsuite/good/synthetic011.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic011.cc rename to labs/old-2018-lab1/testsuite/good/synthetic011.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic012.cc b/labs/old-2018-lab1/testsuite/good/synthetic012.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic012.cc rename to labs/old-2018-lab1/testsuite/good/synthetic012.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic013.cc b/labs/old-2018-lab1/testsuite/good/synthetic013.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic013.cc rename to labs/old-2018-lab1/testsuite/good/synthetic013.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic014.cc b/labs/old-2018-lab1/testsuite/good/synthetic014.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic014.cc rename to labs/old-2018-lab1/testsuite/good/synthetic014.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic015.cc b/labs/old-2018-lab1/testsuite/good/synthetic015.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic015.cc rename to labs/old-2018-lab1/testsuite/good/synthetic015.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic016.cc b/labs/old-2018-lab1/testsuite/good/synthetic016.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic016.cc rename to labs/old-2018-lab1/testsuite/good/synthetic016.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic017.cc b/labs/old-2018-lab1/testsuite/good/synthetic017.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic017.cc rename to labs/old-2018-lab1/testsuite/good/synthetic017.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic018.cc b/labs/old-2018-lab1/testsuite/good/synthetic018.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic018.cc rename to labs/old-2018-lab1/testsuite/good/synthetic018.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic019.cc b/labs/old-2018-lab1/testsuite/good/synthetic019.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic019.cc rename to labs/old-2018-lab1/testsuite/good/synthetic019.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic020.cc b/labs/old-2018-lab1/testsuite/good/synthetic020.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic020.cc rename to labs/old-2018-lab1/testsuite/good/synthetic020.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic021.cc b/labs/old-2018-lab1/testsuite/good/synthetic021.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic021.cc rename to labs/old-2018-lab1/testsuite/good/synthetic021.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic022.cc b/labs/old-2018-lab1/testsuite/good/synthetic022.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic022.cc rename to labs/old-2018-lab1/testsuite/good/synthetic022.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic023.cc b/labs/old-2018-lab1/testsuite/good/synthetic023.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic023.cc rename to labs/old-2018-lab1/testsuite/good/synthetic023.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic024.cc b/labs/old-2018-lab1/testsuite/good/synthetic024.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic024.cc rename to labs/old-2018-lab1/testsuite/good/synthetic024.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic025.cc b/labs/old-2018-lab1/testsuite/good/synthetic025.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic025.cc rename to labs/old-2018-lab1/testsuite/good/synthetic025.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic026.cc b/labs/old-2018-lab1/testsuite/good/synthetic026.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic026.cc rename to labs/old-2018-lab1/testsuite/good/synthetic026.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic027.cc b/labs/old-2018-lab1/testsuite/good/synthetic027.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic027.cc rename to labs/old-2018-lab1/testsuite/good/synthetic027.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic028.cc b/labs/old-2018-lab1/testsuite/good/synthetic028.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic028.cc rename to labs/old-2018-lab1/testsuite/good/synthetic028.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic029.cc b/labs/old-2018-lab1/testsuite/good/synthetic029.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic029.cc rename to labs/old-2018-lab1/testsuite/good/synthetic029.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic030.cc b/labs/old-2018-lab1/testsuite/good/synthetic030.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic030.cc rename to labs/old-2018-lab1/testsuite/good/synthetic030.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic031.cc b/labs/old-2018-lab1/testsuite/good/synthetic031.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic031.cc rename to labs/old-2018-lab1/testsuite/good/synthetic031.cc diff --git a/laborations/old-2018-lab1/testsuite/good/synthetic032.cc b/labs/old-2018-lab1/testsuite/good/synthetic032.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/synthetic032.cc rename to labs/old-2018-lab1/testsuite/good/synthetic032.cc diff --git a/laborations/old-2018-lab1/testsuite/good/throw.cc b/labs/old-2018-lab1/testsuite/good/throw.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/throw.cc rename to labs/old-2018-lab1/testsuite/good/throw.cc diff --git a/laborations/old-2018-lab1/testsuite/good/typedef-simple.cc b/labs/old-2018-lab1/testsuite/good/typedef-simple.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/typedef-simple.cc rename to labs/old-2018-lab1/testsuite/good/typedef-simple.cc diff --git a/laborations/old-2018-lab1/testsuite/good/using-simple.cc b/labs/old-2018-lab1/testsuite/good/using-simple.cc similarity index 100% rename from laborations/old-2018-lab1/testsuite/good/using-simple.cc rename to labs/old-2018-lab1/testsuite/good/using-simple.cc diff --git a/laborations/old-2018-lab1/testsuite/index.txt b/labs/old-2018-lab1/testsuite/index.txt similarity index 100% rename from laborations/old-2018-lab1/testsuite/index.txt rename to labs/old-2018-lab1/testsuite/index.txt diff --git a/laborations/old-2018-lab1/testsuite/progs-test-lab1.hs b/labs/old-2018-lab1/testsuite/progs-test-lab1.hs similarity index 100% rename from laborations/old-2018-lab1/testsuite/progs-test-lab1.hs rename to labs/old-2018-lab1/testsuite/progs-test-lab1.hs diff --git a/laborations/plt-run-java-lab.cabal b/labs/plt-run-java-lab.cabal similarity index 100% rename from laborations/plt-run-java-lab.cabal rename to labs/plt-run-java-lab.cabal diff --git a/laborations/stack.yaml b/labs/stack.yaml similarity index 100% rename from laborations/stack.yaml rename to labs/stack.yaml diff --git a/lp3-2015.txt b/lp3-2015.txt index a1ad00a..db11521 100644 --- a/lp3-2015.txt +++ b/lp3-2015.txt @@ -23,9 +23,9 @@ http://www.cse.chalmers.se/edu/year/2014/course/DAT151/index.html (building on H�rsalv�gen opposite our lecture hall HA2). Only aid allowed: English dictionary. -2015-03-03 [Lab4 laborations/lab4/lab4.html] is up. +2015-03-03 [Lab4 labs/lab4/lab4.html] is up. -2015-02-17 [Lab3 laborations/lab3/lab3.html] is up. +2015-02-17 [Lab3 labs/lab3/lab3.html] is up. Note that you have to submit //something// for the first deadline in order to resubmit to the final deadline. @@ -33,14 +33,14 @@ http://www.cse.chalmers.se/edu/year/2014/course/DAT151/index.html Deadlines of labs 3 and 4 and final deadline have been shifted back to accommodate for the extra week in LP3. -2015-02-10 [Lab2 laborations/lab2/lab2.html] +2015-02-10 [Lab2 labs/lab2/lab2.html] now has the correct test program to compile under ghc-7.6 and up. Also, it has seen minor modifications in the expression grammar. (However, they are neutral wrt. the testsuite. If you already started with the 2014 grammar, you can choose to stick with it.) -2015-01-19 [Lab1 laborations/lab1/lab1.html] is up. +2015-01-19 [Lab1 labs/lab1/lab1.html] is up. To submit, first register at [Fire http://xdat09.ce.chalmers.se/plt/]. 2015-01-13 First version of this page - mostly a copy of the 2014 material. @@ -58,20 +58,20 @@ Slides follow closely the plt book. || Date | Time | Title | Material || | Tue 20/1 | 13-15 | Introduction: Compilation Phases | [slides http://www.digitalgrammars.com/ipl-book/slides/1-slides-ipl-book.pdf], plt 1, dragon 1 | Thu 22/1 | 13-15 | Grammars | [slides http://www.digitalgrammars.com/ipl-book/slides/2-slides-ipl-book.pdf], plt 2, dragon 2.8.2,4.1-4.3 -| Tue 27/1 | 13-15 | Hands-on with Lab 1 | [lab1 PM laborations/lab1/lab1.html] +| Tue 27/1 | 13-15 | Hands-on with Lab 1 | [lab1 PM labs/lab1/lab1.html] | Thu 29/1 | 13-15 | Theory of lexing and parsing | [slides http://www.digitalgrammars.com/ipl-book/slides/3-slides-ipl-book.pdf], plt 3, dragon 3,4 -| //Mon 2/2// | //23// | //Lab 1 deadline// | //[lab1 PM laborations/lab1/lab1.html]// +| //Mon 2/2// | //23// | //Lab 1 deadline// | //[lab1 PM labs/lab1/lab1.html]// | Thu 5/2 | 13-15 | Type checking | [slides http://www.digitalgrammars.com/ipl-book/slides/4-slides-ipl-book.pdf], plt 4, dragon 5,6 | Tue 10/2 | 13-15 | Interpreters | [slides http://www.digitalgrammars.com/ipl-book/slides/5-slides-ipl-book.pdf], plt 5 -| Thu 12/2 | 13-15 | Hands-on with Lab 2 | [lab2 PM laborations/lab2/lab2.html] -| //Mon 16/2// | //23// | //Lab 2 deadline// | //[lab2 PM laborations/lab2/lab2.html]// +| Thu 12/2 | 13-15 | Hands-on with Lab 2 | [lab2 PM labs/lab2/lab2.html] +| //Mon 16/2// | //23// | //Lab 2 deadline// | //[lab2 PM labs/lab2/lab2.html]// | Tue 17/2 | 13-15 | Code generation | [slides http://www.digitalgrammars.com/ipl-book/slides/6-slides-ipl-book.pdf], plt 6, dragon 6,7 -| Tue 24/2 | 13-15 | Hands-on with Lab 3, The language design space | [slides http://www.digitalgrammars.com/ipl-book/slides/8-slides-ipl-book.pdf], plt 8, dragon 1. //[lab3 PM laborations/lab3/lab3.html]// +| Tue 24/2 | 13-15 | Hands-on with Lab 3, The language design space | [slides http://www.digitalgrammars.com/ipl-book/slides/8-slides-ipl-book.pdf], plt 8, dragon 1. //[lab3 PM labs/lab3/lab3.html]// | Thu 26/2 | 13-15 | Functional programming languages | [slides http://www.digitalgrammars.com/ipl-book/slides/7-slides-ipl-book.pdf], plt 7, dragon 6.5,7.3 -| //Mon 2/3// | //23// | //Lab 3 deadline// | //[lab3 PM laborations/lab3/lab3.html]// -| Tue 3/3 | 13-15 | Hands-on with Lab 4 | [lab4 PM laborations/lab4/lab4.html] +| //Mon 2/3// | //23// | //Lab 3 deadline// | //[lab3 PM labs/lab3/lab3.html]// +| Tue 3/3 | 13-15 | Hands-on with Lab 4 | [lab4 PM labs/lab4/lab4.html] | Thu 5/3 | 13-15 | Preparing for the exam | [Training Exam exams/exam-plt-2013-2.pdf] -| //Mon 16/3// | //23// | //Lab 4 deadline// | //[lab4 PM laborations/lab4/lab4.html]// +| //Mon 16/3// | //23// | //Lab 4 deadline// | //[lab4 PM labs/lab4/lab4.html]// | //Fri 20/3// | 14-18 | //Exam// (in house M) | [old exams exams/] | //Sat 21/3// | //23// | //Final lab deadline// | //all lab returns// | //Wed 15/4// | 8.30-12.30 | //Exam// (in house M) | [old exams exams/] @@ -143,7 +143,7 @@ If you are not yet member of the group, you have to This is necessary to identify you as a participant of the course. -=Laboration times and supervision= +=Lab times and supervision= Times: - Tuesday 15-17 (no class on 3 February) (Inari, Daniel) , in ED3507. @@ -155,26 +155,26 @@ The lab rooms and supervision are available from Tuesday 20 January till 10 March. **Attendance in these classes is optional**. -Normally, each student should attend **at most one** supervised laboration time each week. +Normally, each student should attend **at most one** supervised lab time each week. Since attendance is not compulsory, there may be room for more times. But, if there is lack of room, those who attend their first supervision of the week have priority to get a place and supervisor help. -=Laborations= +=Labs= -There will be four laborations, written individually or in +There will be four labs, written individually or in pairs. -- deadline 2/2: [parser laborations/lab1/lab1.html] -- deadline 16/2: [type checker and interpreter laborations/lab2/lab2.html] -- deadline 2/3: [code generator laborations/lab3/lab3.html] -- deadline 16/3: [functional language interpreter laborations/lab4/lab4.html] +- deadline 2/2: [parser labs/lab1/lab1.html] +- deadline 16/2: [type checker and interpreter labs/lab2/lab2.html] +- deadline 2/3: [code generator labs/lab3/lab3.html] +- deadline 16/3: [functional language interpreter labs/lab4/lab4.html] Reporting is done via [Fire http://xdat09.ce.chalmers.se/plt/]. Before reporting, you must run your program through a test suite, -such as the one for [lab 1 laborations/lab1/testscript/]. +such as the one for [lab 1 labs/lab1/testscript/]. **Final deadline is Saturday 21 March** for all returned and corrected labs. No labs will be graded after this deadline.