reorganized HomeAutomationCommands.Device