Rearrange dirs + map rendering support (no collisions)