Move stuff around

Probably for the worst ...