Adding Map Activity
Change class names