Re-Organise the code.