Revert "move some items around"

This reverts commit ccd7db71bc30229c72c8aac1a443e14779ad120e.