Redid folder layout for project.