Clean up some project namespaces and code cleanup