Update to project folder structure