Updated project folder structure