BaseDevice/Device/SimpleDevice have been moved into slic.core.device

furka.py

@@ -5,13 +5,13 @@ from slic.core.acquisition import PVAcquisition
 #from slic.core.acquisition import FakeAcquisition
 from slic.core.adjustable import PVAdjustable, DummyAdjustable
 from slic.core.condition import PVCondition
+from slic.core.device import SimpleDevice
 from slic.core.scanner import Scanner
 from slic.devices.general.delay_stage import DelayStage
 from slic.devices.general.motor import Motor
 from slic.devices.general.smaract import SmarActAxis
 from slic.gui import GUI
 from slic.utils import devices
-from slic.devices.simpledevice import SimpleDevice
 from slic.utils import as_shortcut, Marker
 
 from undulator import Undulators

qspace.py

@@ -6,9 +6,8 @@ from diffcalc.hkl.geometry import Position
 from diffcalc.ub.calc import UBCalculation
 
 from slic.core.adjustable import Adjustable, PVAdjustable
+from slic.core.device import Device, SimpleDevice
 from slic.devices.general.motor import Motor
-from slic.devices.device import Device
-from slic.devices.simpledevice import SimpleDevice
 from slic.utils.printing import printable_table