Modular map generation

Map generation now more modular.