Move some stuff around