Major restructure good stuff, less map, less complexity, more modularity