Move stuff to correct package