Some quick cleanup of project namespace