Extracted map and map rendering to separate classes. Rendering is not
fully working yet