more package organization, moving to more ROS-style movement