Reorganized/Renamed projects and namespaces to something that makes a bit more sense