Made some big changes to all the files in app folder. Cleaned up a lot of clutter