Moving things around

[skip ci]