Reorganised the structure so that is is broken down by the different areas