Move config

[ci skip]
Tidy up