rm map + reorganisation