Move some stuff around again