Restructured into a project to be included