Renaming some files & classes

Renaming a couple classes and their files
Progressing on the Countdown
Merging
Fucking merging
FUCKING FUCKING MERGE
Merge branch 'master' of https://github.com/Aurelien51/projet