Reorganising code.