Reorganization of app main class
Merge branch 'master' of https://github.com/MathieuAA/TheInf_projekt