Move some things to the correct place