Fix project name.
Minor reorder on main namespace.