cleaned up the folder structure and renamed the DeviceController namespaces