clean up some stuff make packages more uniformed in name.