Move some stuff around

Yay