Added map view
Reorg; added MapController