In the middle of shit...
Moved all the core app to one file and renamed some stuff