Fixed project structure, removed irrelevant classes & moved code into new app structure