Reorganized app structure. Deleted classes that never used