reorganize for devices/controllers