Moved all devices to separate library and added 'Factory' for device creation.