Reorganised project folder