Improve structure and add example mapview