diff --git a/psConfig/challenge/nea/nea.conf b/psConfig/archive/2018/challenge/nea/nea.conf
similarity index 100%
rename from psConfig/challenge/nea/nea.conf
rename to psConfig/archive/2018/challenge/nea/nea.conf
diff --git a/psConfig/challenge/pollen/pollen.conf b/psConfig/archive/2018/challenge/pollen/pollen.conf
similarity index 100%
rename from psConfig/challenge/pollen/pollen.conf
rename to psConfig/archive/2018/challenge/pollen/pollen.conf
diff --git a/psConfig/challenge/team2/configTeam2.conf b/psConfig/archive/2018/challenge/team2/configTeam2.conf
similarity index 100%
rename from psConfig/challenge/team2/configTeam2.conf
rename to psConfig/archive/2018/challenge/team2/configTeam2.conf
diff --git a/psConfig/exercise/cstollen/cstollen.conf b/psConfig/archive/2018/exercise/cstollen/cstollen.conf
similarity index 100%
rename from psConfig/exercise/cstollen/cstollen.conf
rename to psConfig/archive/2018/exercise/cstollen/cstollen.conf
diff --git a/psConfig/exercise/dfinnerEx4.conf b/psConfig/archive/2018/exercise/dfinnerEx4.conf
similarity index 100%
rename from psConfig/exercise/dfinnerEx4.conf
rename to psConfig/archive/2018/exercise/dfinnerEx4.conf
diff --git a/psConfig/exercise/jschlueter_ex4.conf b/psConfig/archive/2018/exercise/jschlueter_ex4.conf
similarity index 100%
rename from psConfig/exercise/jschlueter_ex4.conf
rename to psConfig/archive/2018/exercise/jschlueter_ex4.conf
diff --git a/psConfig/exercise/mdiallo_Ex4.conf b/psConfig/archive/2018/exercise/mdiallo_Ex4.conf
similarity index 100%
rename from psConfig/exercise/mdiallo_Ex4.conf
rename to psConfig/archive/2018/exercise/mdiallo_Ex4.conf
diff --git a/psConfig/exercise/mdiallo_calc.conf b/psConfig/archive/2018/exercise/mdiallo_calc.conf
similarity index 100%
rename from psConfig/exercise/mdiallo_calc.conf
rename to psConfig/archive/2018/exercise/mdiallo_calc.conf
diff --git a/psConfig/exercise/mvieth.conf b/psConfig/archive/2018/exercise/mvieth.conf
similarity index 100%
rename from psConfig/exercise/mvieth.conf
rename to psConfig/archive/2018/exercise/mvieth.conf
diff --git a/psConfig/exercise/psConfig_jniermann.conf b/psConfig/archive/2018/exercise/psConfig_jniermann.conf
similarity index 100%
rename from psConfig/exercise/psConfig_jniermann.conf
rename to psConfig/archive/2018/exercise/psConfig_jniermann.conf
diff --git a/psConfig/exercise/rlipperts_exercises.conf b/psConfig/archive/2018/exercise/rlipperts_exercises.conf
similarity index 100%
rename from psConfig/exercise/rlipperts_exercises.conf
rename to psConfig/archive/2018/exercise/rlipperts_exercises.conf
diff --git a/psGrammar/team_lit/lit_command.jsgf b/psGrammar/archive/2017/team_lit/lit_command.jsgf
similarity index 100%
rename from psGrammar/team_lit/lit_command.jsgf
rename to psGrammar/archive/2017/team_lit/lit_command.jsgf
diff --git a/psGrammar/team_lit/lit_name.jsgf b/psGrammar/archive/2017/team_lit/lit_name.jsgf
similarity index 100%
rename from psGrammar/team_lit/lit_name.jsgf
rename to psGrammar/archive/2017/team_lit/lit_name.jsgf
diff --git a/psGrammar/team_lit/lit_testfile b/psGrammar/archive/2017/team_lit/lit_testfile
similarity index 100%
rename from psGrammar/team_lit/lit_testfile
rename to psGrammar/archive/2017/team_lit/lit_testfile
diff --git a/psGrammar/challenge/nea/nea.jsgf b/psGrammar/archive/2018/challenge/nea/nea.jsgf
similarity index 100%
rename from psGrammar/challenge/nea/nea.jsgf
rename to psGrammar/archive/2018/challenge/nea/nea.jsgf
diff --git a/psGrammar/challenge/nea/removeAddBillItem.jsgf b/psGrammar/archive/2018/challenge/nea/removeAddBillItem.jsgf
similarity index 100%
rename from psGrammar/challenge/nea/removeAddBillItem.jsgf
rename to psGrammar/archive/2018/challenge/nea/removeAddBillItem.jsgf
diff --git a/psGrammar/challenge/nea/takeOrder.jsgf b/psGrammar/archive/2018/challenge/nea/takeOrder.jsgf
similarity index 100%
rename from psGrammar/challenge/nea/takeOrder.jsgf
rename to psGrammar/archive/2018/challenge/nea/takeOrder.jsgf
diff --git a/psGrammar/challenge/pollen/challenge.jsgf b/psGrammar/archive/2018/challenge/pollen/challenge.jsgf
similarity index 100%
rename from psGrammar/challenge/pollen/challenge.jsgf
rename to psGrammar/archive/2018/challenge/pollen/challenge.jsgf
diff --git a/psGrammar/challenge/pollen/confirm.jsgf b/psGrammar/archive/2018/challenge/pollen/confirm.jsgf
similarity index 100%
rename from psGrammar/challenge/pollen/confirm.jsgf
rename to psGrammar/archive/2018/challenge/pollen/confirm.jsgf
diff --git a/psGrammar/challenge/pollen/newGuest.jsgf b/psGrammar/archive/2018/challenge/pollen/newGuest.jsgf
similarity index 100%
rename from psGrammar/challenge/pollen/newGuest.jsgf
rename to psGrammar/archive/2018/challenge/pollen/newGuest.jsgf
diff --git a/psGrammar/challenge/pollen/sandbox.jsgf b/psGrammar/archive/2018/challenge/pollen/sandbox.jsgf
similarity index 100%
rename from psGrammar/challenge/pollen/sandbox.jsgf
rename to psGrammar/archive/2018/challenge/pollen/sandbox.jsgf
diff --git a/psGrammar/challenge/pollen/setUpBill.jsgf b/psGrammar/archive/2018/challenge/pollen/setUpBill.jsgf
similarity index 100%
rename from psGrammar/challenge/pollen/setUpBill.jsgf
rename to psGrammar/archive/2018/challenge/pollen/setUpBill.jsgf
diff --git a/psGrammar/challenge/pollen/table.jsgf b/psGrammar/archive/2018/challenge/pollen/table.jsgf
similarity index 100%
rename from psGrammar/challenge/pollen/table.jsgf
rename to psGrammar/archive/2018/challenge/pollen/table.jsgf
diff --git a/psGrammar/challenge/team2/bill.jsgf b/psGrammar/archive/2018/challenge/team2/bill.jsgf
similarity index 100%
rename from psGrammar/challenge/team2/bill.jsgf
rename to psGrammar/archive/2018/challenge/team2/bill.jsgf
diff --git a/psGrammar/challenge/team2/order.jsgf b/psGrammar/archive/2018/challenge/team2/order.jsgf
similarity index 100%
rename from psGrammar/challenge/team2/order.jsgf
rename to psGrammar/archive/2018/challenge/team2/order.jsgf
diff --git a/psGrammar/challenge/team2/table.jsgf b/psGrammar/archive/2018/challenge/team2/table.jsgf
similarity index 100%
rename from psGrammar/challenge/team2/table.jsgf
rename to psGrammar/archive/2018/challenge/team2/table.jsgf
diff --git a/psGrammar/challenge/team2/task5.jsgf b/psGrammar/archive/2018/challenge/team2/task5.jsgf
similarity index 100%
rename from psGrammar/challenge/team2/task5.jsgf
rename to psGrammar/archive/2018/challenge/team2/task5.jsgf
diff --git a/psGrammar/exercise/cstollen/calculator.jsgf b/psGrammar/archive/2018/exercises/cstollen/calculator.jsgf
similarity index 100%
rename from psGrammar/exercise/cstollen/calculator.jsgf
rename to psGrammar/archive/2018/exercises/cstollen/calculator.jsgf
diff --git a/psGrammar/exercise/cstollen/confirm.jsgf b/psGrammar/archive/2018/exercises/cstollen/confirm.jsgf
similarity index 100%
rename from psGrammar/exercise/cstollen/confirm.jsgf
rename to psGrammar/archive/2018/exercises/cstollen/confirm.jsgf
diff --git a/psGrammar/exercise/cstollen/confirm_drivetodoor.jsgf b/psGrammar/archive/2018/exercises/cstollen/confirm_drivetodoor.jsgf
similarity index 100%
rename from psGrammar/exercise/cstollen/confirm_drivetodoor.jsgf
rename to psGrammar/archive/2018/exercises/cstollen/confirm_drivetodoor.jsgf
diff --git a/psGrammar/exercise/cstollen/goto.jsgf b/psGrammar/archive/2018/exercises/cstollen/goto.jsgf
similarity index 100%
rename from psGrammar/exercise/cstollen/goto.jsgf
rename to psGrammar/archive/2018/exercises/cstollen/goto.jsgf
diff --git a/psGrammar/exercise/cstollen/stop.jsgf b/psGrammar/archive/2018/exercises/cstollen/stop.jsgf
similarity index 100%
rename from psGrammar/exercise/cstollen/stop.jsgf
rename to psGrammar/archive/2018/exercises/cstollen/stop.jsgf
diff --git a/psGrammar/exercise/cstollen/telljoke.jsgf b/psGrammar/archive/2018/exercises/cstollen/telljoke.jsgf
similarity index 100%
rename from psGrammar/exercise/cstollen/telljoke.jsgf
rename to psGrammar/archive/2018/exercises/cstollen/telljoke.jsgf
diff --git a/psGrammar/exercise/cstollen/thanks.jsgf b/psGrammar/archive/2018/exercises/cstollen/thanks.jsgf
similarity index 100%
rename from psGrammar/exercise/cstollen/thanks.jsgf
rename to psGrammar/archive/2018/exercises/cstollen/thanks.jsgf
diff --git a/psGrammar/exercise/dfinnerEx4.jsgf b/psGrammar/archive/2018/exercises/dfinnerEx4.jsgf
similarity index 100%
rename from psGrammar/exercise/dfinnerEx4.jsgf
rename to psGrammar/archive/2018/exercises/dfinnerEx4.jsgf
diff --git a/psGrammar/exercise/jniermann/calculatorGrammar_jniermann.jsgf b/psGrammar/archive/2018/exercises/jniermann/calculatorGrammar_jniermann.jsgf
similarity index 100%
rename from psGrammar/exercise/jniermann/calculatorGrammar_jniermann.jsgf
rename to psGrammar/archive/2018/exercises/jniermann/calculatorGrammar_jniermann.jsgf
diff --git a/psGrammar/exercise/jniermann/followPersonGrammar_jniermann.jsgf b/psGrammar/archive/2018/exercises/jniermann/followPersonGrammar_jniermann.jsgf
similarity index 100%
rename from psGrammar/exercise/jniermann/followPersonGrammar_jniermann.jsgf
rename to psGrammar/archive/2018/exercises/jniermann/followPersonGrammar_jniermann.jsgf
diff --git a/psGrammar/exercise/jniermann/grammar_jniermann.jsgf b/psGrammar/archive/2018/exercises/jniermann/grammar_jniermann.jsgf
similarity index 100%
rename from psGrammar/exercise/jniermann/grammar_jniermann.jsgf
rename to psGrammar/archive/2018/exercises/jniermann/grammar_jniermann.jsgf
diff --git a/psGrammar/exercise/jschlueter_grammar.jsgf b/psGrammar/archive/2018/exercises/jschlueter_grammar.jsgf
similarity index 100%
rename from psGrammar/exercise/jschlueter_grammar.jsgf
rename to psGrammar/archive/2018/exercises/jschlueter_grammar.jsgf
diff --git a/psGrammar/exercise/mdialloEx4_grammar.jsgf b/psGrammar/archive/2018/exercises/mdialloEx4_grammar.jsgf
similarity index 100%
rename from psGrammar/exercise/mdialloEx4_grammar.jsgf
rename to psGrammar/archive/2018/exercises/mdialloEx4_grammar.jsgf
diff --git a/psGrammar/exercise/mdiallo_calculator.jsgf b/psGrammar/archive/2018/exercises/mdiallo_calculator.jsgf
similarity index 100%
rename from psGrammar/exercise/mdiallo_calculator.jsgf
rename to psGrammar/archive/2018/exercises/mdiallo_calculator.jsgf
diff --git a/psGrammar/exercise/mvieth_grammar.jsgf b/psGrammar/archive/2018/exercises/mvieth_grammar.jsgf
similarity index 100%
rename from psGrammar/exercise/mvieth_grammar.jsgf
rename to psGrammar/archive/2018/exercises/mvieth_grammar.jsgf
diff --git a/psGrammar/exercise/rlipperts/calculator.jsgf b/psGrammar/archive/2018/exercises/rlipperts/calculator.jsgf
similarity index 100%
rename from psGrammar/exercise/rlipperts/calculator.jsgf
rename to psGrammar/archive/2018/exercises/rlipperts/calculator.jsgf
diff --git a/psGrammar/exercise/rlipperts/exercise4.jsgf b/psGrammar/archive/2018/exercises/rlipperts/exercise4.jsgf
similarity index 100%
rename from psGrammar/exercise/rlipperts/exercise4.jsgf
rename to psGrammar/archive/2018/exercises/rlipperts/exercise4.jsgf
diff --git a/psGrammar/exercise/rlipperts/exercise6.jsgf b/psGrammar/archive/2018/exercises/rlipperts/exercise6.jsgf
similarity index 100%
rename from psGrammar/exercise/rlipperts/exercise6.jsgf
rename to psGrammar/archive/2018/exercises/rlipperts/exercise6.jsgf