Refactored interrupt and device controllers