wip: diff reorganization with diff drivers