move stuff to right file