add sub map, restructure directories