move stuff to the correct place