Refactored app organization
Changed app object structure to organize functions into sub-objects in order to clean up the code's overall organization