Devices refactored
Config and devices refactored