Reorganize file structure
Merge branch 'master' of https://github.com/paulb896/ZoomingMapApp