move stuff in the right place