move stuff around again