Restructured project. Changes to mapview.