Updated map + folder restructure