Reorganised the project folder