More moving stuff around

And stuff