device/ device class controllers refactored