Removed unnecessary/legacy sub-projects; renamed existing sub-projects
to real names