Changed the project folder structure