Moving more things and cleaning up