Move stuff to where it shold be