Reorganize app, add testing, add tests for City