Re-organising code.