rework to issue-based structure