Refactor map into class
Move app classes out of components to create more modular layout