Reorganised the source tree