Another round of refactoring: renaming everything and moving it all around to get closer to the proposed best practice for app structure: https://docs.google.com/document/d/1XXMvReO8-Awi1EZXAXS4PzDzdNvV6pGcuaF4Q9821Es/pub