Rearranged flat and 2d world components