Re-organising code.
Delete.