Broke off App class into separate file
Removed temp files