move stuff to correct location