Move stuff into the right place