Updated project/folder structure