Cleanup - change naming
Add DeviceWs

*add device
*get device
*update device