diff --git a/psConfig/exercise/SALT/challenge.conf b/psConfig/archive/2017/exercise/SALT/challenge.conf
similarity index 100%
rename from psConfig/exercise/SALT/challenge.conf
rename to psConfig/archive/2017/exercise/SALT/challenge.conf
diff --git a/psConfig/exercise/angrydragons/angrydragons.conf b/psConfig/archive/2017/exercise/angrydragons/angrydragons.conf
similarity index 100%
rename from psConfig/exercise/angrydragons/angrydragons.conf
rename to psConfig/archive/2017/exercise/angrydragons/angrydragons.conf
diff --git a/psConfig/exercise/janUndPhil/janUndPhil.conf b/psConfig/archive/2017/exercise/janUndPhil/janUndPhil.conf
similarity index 100%
rename from psConfig/exercise/janUndPhil/janUndPhil.conf
rename to psConfig/archive/2017/exercise/janUndPhil/janUndPhil.conf
diff --git a/psConfig/exercise/lit_challenge_speech_configuration.conf b/psConfig/archive/2017/exercise/lit_challenge_speech_configuration.conf
similarity index 100%
rename from psConfig/exercise/lit_challenge_speech_configuration.conf
rename to psConfig/archive/2017/exercise/lit_challenge_speech_configuration.conf
diff --git a/psConfig/exercise/team2/team2.conf b/psConfig/archive/2017/exercise/team2/team2.conf
similarity index 100%
rename from psConfig/exercise/team2/team2.conf
rename to psConfig/archive/2017/exercise/team2/team2.conf
diff --git a/psConfig/exercise/team_hypnodisc/main-speech.conf b/psConfig/archive/2017/exercise/team_hypnodisc/main-speech.conf
similarity index 100%
rename from psConfig/exercise/team_hypnodisc/main-speech.conf
rename to psConfig/archive/2017/exercise/team_hypnodisc/main-speech.conf
diff --git a/psConfig/exercise/team_team/wfoperator.conf b/psConfig/archive/2017/exercise/team_team/wfoperator.conf
similarity index 100%
rename from psConfig/exercise/team_team/wfoperator.conf
rename to psConfig/archive/2017/exercise/team_team/wfoperator.conf
diff --git a/psConfig/exercise/team_workInProgress/team_workInProgress.conf b/psConfig/archive/2017/exercise/team_workInProgress/team_workInProgress.conf
similarity index 100%
rename from psConfig/exercise/team_workInProgress/team_workInProgress.conf
rename to psConfig/archive/2017/exercise/team_workInProgress/team_workInProgress.conf
diff --git a/psConfig/exercise/.gitkeep b/psConfig/exercise/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/psGrammar/exercise/SALT/confirm.jsgf b/psGrammar/archive/2017/exercise/SALT/confirm.jsgf
similarity index 100%
rename from psGrammar/exercise/SALT/confirm.jsgf
rename to psGrammar/archive/2017/exercise/SALT/confirm.jsgf
diff --git a/psGrammar/exercise/SALT/order.jsgf b/psGrammar/archive/2017/exercise/SALT/order.jsgf
similarity index 100%
rename from psGrammar/exercise/SALT/order.jsgf
rename to psGrammar/archive/2017/exercise/SALT/order.jsgf
diff --git a/psGrammar/exercise/SALT/shirtColour.jsgf b/psGrammar/archive/2017/exercise/SALT/shirtColour.jsgf
similarity index 100%
rename from psGrammar/exercise/SALT/shirtColour.jsgf
rename to psGrammar/archive/2017/exercise/SALT/shirtColour.jsgf
diff --git a/psGrammar/exercise/SALT/task.jsgf b/psGrammar/archive/2017/exercise/SALT/task.jsgf
similarity index 100%
rename from psGrammar/exercise/SALT/task.jsgf
rename to psGrammar/archive/2017/exercise/SALT/task.jsgf
diff --git a/psGrammar/exercise/angrydragons/confirm.jsgf b/psGrammar/archive/2017/exercise/angrydragons/confirm.jsgf
similarity index 100%
rename from psGrammar/exercise/angrydragons/confirm.jsgf
rename to psGrammar/archive/2017/exercise/angrydragons/confirm.jsgf
diff --git a/psGrammar/exercise/angrydragons/stop.jsgf b/psGrammar/archive/2017/exercise/angrydragons/stop.jsgf
similarity index 100%
rename from psGrammar/exercise/angrydragons/stop.jsgf
rename to psGrammar/archive/2017/exercise/angrydragons/stop.jsgf
diff --git a/psGrammar/exercise/angrydragons/task1.jsgf b/psGrammar/archive/2017/exercise/angrydragons/task1.jsgf
similarity index 100%
rename from psGrammar/exercise/angrydragons/task1.jsgf
rename to psGrammar/archive/2017/exercise/angrydragons/task1.jsgf
diff --git a/psGrammar/exercise/janUndPhil/colors.jsgf b/psGrammar/archive/2017/exercise/janUndPhil/colors.jsgf
similarity index 100%
rename from psGrammar/exercise/janUndPhil/colors.jsgf
rename to psGrammar/archive/2017/exercise/janUndPhil/colors.jsgf
diff --git a/psGrammar/exercise/janUndPhil/confirm.jsgf b/psGrammar/archive/2017/exercise/janUndPhil/confirm.jsgf
similarity index 100%
rename from psGrammar/exercise/janUndPhil/confirm.jsgf
rename to psGrammar/archive/2017/exercise/janUndPhil/confirm.jsgf
diff --git a/psGrammar/exercise/janUndPhil/order.jsgf b/psGrammar/archive/2017/exercise/janUndPhil/order.jsgf
similarity index 100%
rename from psGrammar/exercise/janUndPhil/order.jsgf
rename to psGrammar/archive/2017/exercise/janUndPhil/order.jsgf
diff --git a/psGrammar/exercise/janUndPhil/thanks.jsgf b/psGrammar/archive/2017/exercise/janUndPhil/thanks.jsgf
similarity index 100%
rename from psGrammar/exercise/janUndPhil/thanks.jsgf
rename to psGrammar/archive/2017/exercise/janUndPhil/thanks.jsgf
diff --git a/psGrammar/exercise/saschroeder.jsgf b/psGrammar/archive/2017/exercise/saschroeder.jsgf
similarity index 100%
rename from psGrammar/exercise/saschroeder.jsgf
rename to psGrammar/archive/2017/exercise/saschroeder.jsgf
diff --git a/psGrammar/exercise/team2/confirm.jsgf b/psGrammar/archive/2017/exercise/team2/confirm.jsgf
similarity index 100%
rename from psGrammar/exercise/team2/confirm.jsgf
rename to psGrammar/archive/2017/exercise/team2/confirm.jsgf
diff --git a/psGrammar/exercise/team2/drinks.jsgf b/psGrammar/archive/2017/exercise/team2/drinks.jsgf
similarity index 100%
rename from psGrammar/exercise/team2/drinks.jsgf
rename to psGrammar/archive/2017/exercise/team2/drinks.jsgf
diff --git a/psGrammar/exercise/team2/shirtcolor.jsgf b/psGrammar/archive/2017/exercise/team2/shirtcolor.jsgf
similarity index 100%
rename from psGrammar/exercise/team2/shirtcolor.jsgf
rename to psGrammar/archive/2017/exercise/team2/shirtcolor.jsgf
diff --git a/psGrammar/exercise/team_hypnodisc/person.jsgf b/psGrammar/archive/2017/exercise/team_hypnodisc/person.jsgf
similarity index 100%
rename from psGrammar/exercise/team_hypnodisc/person.jsgf
rename to psGrammar/archive/2017/exercise/team_hypnodisc/person.jsgf
diff --git a/psGrammar/exercise/team_hypnodisc/stop.jsgf b/psGrammar/archive/2017/exercise/team_hypnodisc/stop.jsgf
similarity index 100%
rename from psGrammar/exercise/team_hypnodisc/stop.jsgf
rename to psGrammar/archive/2017/exercise/team_hypnodisc/stop.jsgf
diff --git a/psGrammar/exercise/team_hypnodisc/takeOrder.jsgf b/psGrammar/archive/2017/exercise/team_hypnodisc/takeOrder.jsgf
similarity index 100%
rename from psGrammar/exercise/team_hypnodisc/takeOrder.jsgf
rename to psGrammar/archive/2017/exercise/team_hypnodisc/takeOrder.jsgf
diff --git a/psGrammar/exercise/team_team/order.jsgf b/psGrammar/archive/2017/exercise/team_team/order.jsgf
similarity index 100%
rename from psGrammar/exercise/team_team/order.jsgf
rename to psGrammar/archive/2017/exercise/team_team/order.jsgf
diff --git a/psGrammar/exercise/team_team/wfoperator.jsgf b/psGrammar/archive/2017/exercise/team_team/wfoperator.jsgf
similarity index 100%
rename from psGrammar/exercise/team_team/wfoperator.jsgf
rename to psGrammar/archive/2017/exercise/team_team/wfoperator.jsgf
diff --git a/psGrammar/exercise/team_workInProgress/followPerson.jsgf b/psGrammar/archive/2017/exercise/team_workInProgress/followPerson.jsgf
similarity index 100%
rename from psGrammar/exercise/team_workInProgress/followPerson.jsgf
rename to psGrammar/archive/2017/exercise/team_workInProgress/followPerson.jsgf
diff --git a/psGrammar/exercise/team_workInProgress/learnName.jsgf b/psGrammar/archive/2017/exercise/team_workInProgress/learnName.jsgf
similarity index 100%
rename from psGrammar/exercise/team_workInProgress/learnName.jsgf
rename to psGrammar/archive/2017/exercise/team_workInProgress/learnName.jsgf
diff --git a/psGrammar/exercise/team_workInProgress/takeOrder.jsgf b/psGrammar/archive/2017/exercise/team_workInProgress/takeOrder.jsgf
similarity index 100%
rename from psGrammar/exercise/team_workInProgress/takeOrder.jsgf
rename to psGrammar/archive/2017/exercise/team_workInProgress/takeOrder.jsgf
diff --git a/psGrammar/exercise/.gitkeep b/psGrammar/exercise/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000