Move stuff where it is supposed to be