Finishing implementation of objects in separate files
Splitting screens into separate files as well, but the app is crashing :(
I've added some debug messages to help with that