Reorganising bits and bobs.