master: bdcc0c5122924cfbd94d12fc917a38fa6aa7d3ff add sub map, restructure directories