Cleaning up to re-organise structure