Cleaning up and rationalizing service and issue structure.