MDL-44164 atto: Refactor the world