Reorganised src and include files