diff --git a/bin/main.dart b/bin/main.dart
index d15461b..30dd9c1 100644
--- a/bin/main.dart
+++ b/bin/main.dart
@@ -1,17 +1,15 @@
 import 'dart:io';
 
-import 'package:cbj_integrations_controller/infrastructure/shared_variables.dart';
-import 'package:cbj_integrations_controller/infrastructure/system_commands/system_commands_manager_d.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/core_u/smart_device_manager_u.dart';
 import 'package:cbj_smart_device/infrastructure/datasources/core_d/manage_physical_components/device_pin_manager.dart';
 import 'package:cbj_smart_device/utils.dart';
-import 'package:network_tools/network_tools.dart';
 
 void main(List<String> arguments) async {
   logger.i('Smart device is activated');
 
   try {
-    configureNetworkTools('network_tools_db');
+    // configureNetworkTools('network_tools_db');
     SystemCommandsManager();
     SharedVariables()
         .asyncConstructor(arguments.firstOrNull ?? Directory.current.path);
diff --git a/lib/application/usecases/button_object_u/button_object_local_u.dart b/lib/application/usecases/button_object_u/button_object_local_u.dart
index 8061583..b8fc72f 100644
--- a/lib/application/usecases/button_object_u/button_object_local_u.dart
+++ b/lib/application/usecases/button_object_u/button_object_local_u.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/button_object_u/button_object_local_abstract.dart';
 import 'package:cbj_smart_device/application/usecases/devices_pin_configuration_u/pin_information.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base.dart';
diff --git a/lib/application/usecases/button_object_u/button_with_light_object.dart b/lib/application/usecases/button_object_u/button_with_light_object.dart
index 374ca1d..3807a27 100644
--- a/lib/application/usecases/button_object_u/button_with_light_object.dart
+++ b/lib/application/usecases/button_object_u/button_with_light_object.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/button_object_u/simple_button_object.dart';
 import 'package:cbj_smart_device/application/usecases/devices_pin_configuration_u/pin_information.dart';
 import 'package:cbj_smart_device/application/usecases/wish_classes_u/off_wish_u.dart';
diff --git a/lib/application/usecases/button_object_u/simple_button_object.dart b/lib/application/usecases/button_object_u/simple_button_object.dart
index 27591a0..ec2d59b 100644
--- a/lib/application/usecases/button_object_u/simple_button_object.dart
+++ b/lib/application/usecases/button_object_u/simple_button_object.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/devices_pin_configuration_u/pin_information.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base_abstract.dart';
@@ -26,7 +26,6 @@ class ButtonObject extends SmartDeviceBaseAbstract {
   @override
   // ignore: overridden_fields
   CbjDeviceTypes? smartDeviceType = CbjDeviceTypes.button;
-  
 
   /// The button will save list of states like on, off, long press, double tap.
   /// For each button press state we save the smart object and the actions that
@@ -70,8 +69,7 @@ class ButtonObject extends SmartDeviceBaseAbstract {
 
   /// Execute on button press
   Future<String> executeOnButtonPress() async {
-    logger.i(
-        'Button number ${buttonPin?.pinAndPhysicalPinConfiguration}'
+    logger.i('Button number ${buttonPin?.pinAndPhysicalPinConfiguration}'
         ' was pressed');
     pressStateCounter++;
     if (pressStateCounter > 2) {
diff --git a/lib/application/usecases/core_u/actions_to_preform_u.dart b/lib/application/usecases/core_u/actions_to_preform_u.dart
index b93ea2c..ac95949 100644
--- a/lib/application/usecases/core_u/actions_to_preform_u.dart
+++ b/lib/application/usecases/core_u/actions_to_preform_u.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base.dart';
 
 class ActionsToPreformU {
diff --git a/lib/application/usecases/core_u/smart_device_manager_u.dart b/lib/application/usecases/core_u/smart_device_manager_u.dart
index f653400..696dfc1 100644
--- a/lib/application/usecases/core_u/smart_device_manager_u.dart
+++ b/lib/application/usecases/core_u/smart_device_manager_u.dart
@@ -31,7 +31,7 @@ class SmartDeviceManagerU {
     ///  Setting up all the device from the memory
     _setDevicesUseCase.setAllDevices(deviceList: smartDeviceFromDb);
 
-    logger.i('Device local IP: ${await getIps()}');
+    logger.i('Entity local IP: ${await getIps()}');
 
     ///  Start listen for in incoming connections from the local internet (LAN/Wifi)
     _smartServerUseCase.waitForConnection(firebaseAccountsInformationD);
diff --git a/lib/application/usecases/smart_client/smart_client.dart b/lib/application/usecases/smart_client/smart_client.dart
index 74d7d3f..c9912a3 100644
--- a/lib/application/usecases/smart_client/smart_client.dart
+++ b/lib/application/usecases/smart_client/smart_client.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/smart_server_u/smart_server_u.dart';
 import 'package:cbj_smart_device/utils.dart';
 import 'package:grpc/grpc.dart';
diff --git a/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base.dart b/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base.dart
index 5c30b9f..67b8dd8 100644
--- a/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base.dart
+++ b/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/button_object_u/button_object_local_u.dart';
 import 'package:cbj_smart_device/application/usecases/devices_pin_configuration_u/pin_information.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base_abstract.dart';
@@ -80,7 +80,7 @@ abstract class SmartDeviceBase extends SmartDeviceBaseAbstract {
   ///  Turn on the device basic action
   String _setOn(PinInformation? pinNumber) {
 //    if (deviceInformation == null) {
-//      return 'Device information is missing, can't turn on';
+//      return 'Entity information is missing, can't turn on';
 //    }
     OnWishU.setOn(deviceInformation, pinNumber);
     onOff = true;
@@ -90,7 +90,7 @@ abstract class SmartDeviceBase extends SmartDeviceBaseAbstract {
   ///  Turn off the device basic action
   String _setOff(PinInformation? pinNumber) {
 //    if (deviceInformation == null) {
-//      return 'Device information is missing, can't turn off';
+//      return 'Entity information is missing, can't turn off';
 //    }
     OffWishU.setOff(deviceInformation, pinNumber);
     onOff = false;
diff --git a/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base_abstract.dart b/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base_abstract.dart
index eea5202..2430097 100644
--- a/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base_abstract.dart
+++ b/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base_abstract.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/devices_pin_configuration_u/pin_information.dart';
 import 'package:cbj_smart_device/core/device_information.dart';
 import 'package:cbj_smart_device/core/helper_methods.dart';
@@ -62,7 +62,6 @@ abstract class SmartDeviceBaseAbstract {
 
   //  Getters
 
-
   /// Returning the non abstract of this object
   Type getTheNonAbstractObjectOfThisInstance() {
     return EnumHelper.getTheNonAbstractObjectOfSmartDeviceBaseAbstract(
diff --git a/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_dynamic_abstract.dart b/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_dynamic_abstract.dart
index 8e6973f..77343fa 100644
--- a/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_dynamic_abstract.dart
+++ b/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_dynamic_abstract.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_simple_abstract.dart';
 import 'package:cbj_smart_device/application/usecases/wish_classes_u/dynamic_wish_u.dart';
 
diff --git a/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_simple_abstract.dart b/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_simple_abstract.dart
index a739fc6..51b22bb 100644
--- a/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_simple_abstract.dart
+++ b/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_simple_abstract.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base.dart';
 
 ///  Abstract class for smart devices with on time property
diff --git a/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_static_abstract.dart b/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_static_abstract.dart
index cdccb44..fe007c4 100644
--- a/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_static_abstract.dart
+++ b/lib/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_static_abstract.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base.dart';
 import 'package:cbj_smart_device/utils.dart';
 
diff --git a/lib/application/usecases/smart_device_objects_u/simple_devices/boiler_object.dart b/lib/application/usecases/smart_device_objects_u/simple_devices/boiler_object.dart
index c88590f..dcb90a9 100644
--- a/lib/application/usecases/smart_device_objects_u/simple_devices/boiler_object.dart
+++ b/lib/application/usecases/smart_device_objects_u/simple_devices/boiler_object.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/button_object_u/button_object_local_u.dart';
 import 'package:cbj_smart_device/application/usecases/devices_pin_configuration_u/pin_information.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_simple_abstract.dart';
@@ -76,8 +76,7 @@ class BoilerObject extends SmartDeviceSimpleAbstract {
     }
 
     if (wishExecuteResult != null) {
-      if (deviceState != CbjDeviceStateGRPC.ack) {
-      }
+      if (deviceState != CbjDeviceStateGRPC.ack) {}
       return wishExecuteResult;
     }
 
diff --git a/lib/application/usecases/smart_device_objects_u/simple_devices/light_object.dart b/lib/application/usecases/smart_device_objects_u/simple_devices/light_object.dart
index 269f470..04f589b 100644
--- a/lib/application/usecases/smart_device_objects_u/simple_devices/light_object.dart
+++ b/lib/application/usecases/smart_device_objects_u/simple_devices/light_object.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_simple_abstract.dart';
 import 'package:cbj_smart_device/utils.dart';
 
diff --git a/lib/application/usecases/smart_device_objects_u/simple_devices/smart_camera_object.dart b/lib/application/usecases/smart_device_objects_u/simple_devices/smart_camera_object.dart
index 9b427fa..a8b172f 100644
--- a/lib/application/usecases/smart_device_objects_u/simple_devices/smart_camera_object.dart
+++ b/lib/application/usecases/smart_device_objects_u/simple_devices/smart_camera_object.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_simple_abstract.dart';
 import 'package:cbj_smart_device/utils.dart';
 
@@ -19,7 +19,6 @@ class SmartCameraObject extends SmartDeviceSimpleAbstract {
   @override
   List<String> getNeededPinTypesList() => <String>[];
 
-
   ///  Return smart device type
   @override
   CbjDeviceTypes getDeviceType() => CbjDeviceTypes.smart_camera;
diff --git a/lib/application/usecases/smart_device_objects_u/simple_devices/smart_computer_object.dart b/lib/application/usecases/smart_device_objects_u/simple_devices/smart_computer_object.dart
index 662d644..18aec43 100644
--- a/lib/application/usecases/smart_device_objects_u/simple_devices/smart_computer_object.dart
+++ b/lib/application/usecases/smart_device_objects_u/simple_devices/smart_computer_object.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_simple_abstract.dart';
 import 'package:cbj_smart_device/utils.dart';
 
diff --git a/lib/application/usecases/smart_device_objects_u/static_devices/blinds_object.dart b/lib/application/usecases/smart_device_objects_u/static_devices/blinds_object.dart
index 439c149..f232d31 100644
--- a/lib/application/usecases/smart_device_objects_u/static_devices/blinds_object.dart
+++ b/lib/application/usecases/smart_device_objects_u/static_devices/blinds_object.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/button_object_u/button_object_local_u.dart';
 import 'package:cbj_smart_device/application/usecases/devices_pin_configuration_u/pin_information.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_static_abstract.dart';
diff --git a/lib/application/usecases/smart_server_u/smart_server_u.dart b/lib/application/usecases/smart_server_u/smart_server_u.dart
index 758fa3c..9c592cf 100644
--- a/lib/application/usecases/smart_server_u/smart_server_u.dart
+++ b/lib/application/usecases/smart_server_u/smart_server_u.dart
@@ -1,8 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
-import 'package:cbj_integrations_controller/infrastructure/system_commands/system_commands_manager_d.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/core_u/actions_to_preform_u.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base_abstract.dart';
diff --git a/lib/application/usecases/wish_classes_u/on_wish_u.dart b/lib/application/usecases/wish_classes_u/on_wish_u.dart
index c1c5bb9..173cea5 100644
--- a/lib/application/usecases/wish_classes_u/on_wish_u.dart
+++ b/lib/application/usecases/wish_classes_u/on_wish_u.dart
@@ -17,7 +17,7 @@ class OnWishU {
       case final RemoteDevice type:
         return setOnRemote(type, pinNumber);
     }
-    logger.i('Device type ${deviceInformation.name} is not specified ');
+    logger.i('Entity type ${deviceInformation.name} is not specified ');
 
     return 'DeviceBase type not supported';
   }
diff --git a/lib/application/usecases/wish_classes_u/smart_computer_wish_u.dart b/lib/application/usecases/wish_classes_u/smart_computer_wish_u.dart
index 6d40e50..953a06f 100644
--- a/lib/application/usecases/wish_classes_u/smart_computer_wish_u.dart
+++ b/lib/application/usecases/wish_classes_u/smart_computer_wish_u.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/system_commands/system_commands_manager_d.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/core/device_information.dart';
 
 ///  Class to change wish on status to device
diff --git a/lib/core/my_singleton.dart b/lib/core/my_singleton.dart
index 3b40b99..f83a322 100644
--- a/lib/core/my_singleton.dart
+++ b/lib/core/my_singleton.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/system_commands/system_commands_manager_d.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base_abstract.dart';
 
 class MySingleton {
@@ -23,7 +23,6 @@ class MySingleton {
   Future<String?> getCurrentUserName() =>
       _currentUserName ??= SystemCommandsManager().getCurrentUserName();
 
- 
   void addToSmartDevicesList(SmartDeviceBaseAbstract smartDeviceVal) {
     smartDevicesList.add(smartDeviceVal);
   }
diff --git a/lib/core/permissions/permissions.dart b/lib/core/permissions/permissions.dart
index c54077f..cf283ba 100644
--- a/lib/core/permissions/permissions.dart
+++ b/lib/core/permissions/permissions.dart
@@ -5,5 +5,4 @@ class Permission {
   bool read = false;
   bool write = false;
   bool execute = false;
-
 }
diff --git a/lib/core/permissions/permissions_manager.dart b/lib/core/permissions/permissions_manager.dart
index 8ec7748..3e50ae2 100644
--- a/lib/core/permissions/permissions_manager.dart
+++ b/lib/core/permissions/permissions_manager.dart
@@ -14,5 +14,4 @@ class PermissionsManager {
 //  Set
 
 //  Get
-
 }
diff --git a/lib/domain/entities/core_e/enums_e.dart b/lib/domain/entities/core_e/enums_e.dart
index a501f51..31a7c68 100644
--- a/lib/domain/entities/core_e/enums_e.dart
+++ b/lib/domain/entities/core_e/enums_e.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/button_object_u/button_with_light_object.dart';
 import 'package:cbj_smart_device/application/usecases/button_object_u/simple_button_object.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base_abstract.dart';
@@ -24,7 +24,7 @@ import 'package:cbj_smart_device/utils.dart';
 //   Speakers,
 //
 //   ///  Cleaning robot
-//   Roomba,
+//   Areaba,
 //
 //   ///  Give water to plants
 //   Irrigation,
diff --git a/lib/domain/entities/set_devices_e/set_devices_e.dart b/lib/domain/entities/set_devices_e/set_devices_e.dart
index 4164e19..c0210a9 100644
--- a/lib/domain/entities/set_devices_e/set_devices_e.dart
+++ b/lib/domain/entities/set_devices_e/set_devices_e.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/button_object_u/button_with_light_object.dart';
 import 'package:cbj_smart_device/application/usecases/button_object_u/simple_button_object.dart';
 import 'package:cbj_smart_device/application/usecases/devices_pin_configuration_u/pin_information.dart';
diff --git a/lib/infrastructure/datasources/core_d/manage_physical_components/device_pin_manager.dart b/lib/infrastructure/datasources/core_d/manage_physical_components/device_pin_manager.dart
index 1df994c..d973f95 100644
--- a/lib/infrastructure/datasources/core_d/manage_physical_components/device_pin_manager.dart
+++ b/lib/infrastructure/datasources/core_d/manage_physical_components/device_pin_manager.dart
@@ -1,5 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
-import 'package:cbj_integrations_controller/infrastructure/system_commands/system_commands_manager_d.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/button_object_u/button_with_light_object.dart';
 import 'package:cbj_smart_device/application/usecases/button_object_u/simple_button_object.dart';
 import 'package:cbj_smart_device/application/usecases/devices_pin_configuration_u/device_configuration_base_class.dart';
@@ -148,7 +147,7 @@ class DevicePinListManager extends DevicePinListManagerAbstract {
         default:
           {
             logger.i('Detected deviceHostName $deviceHostName \n'
-                'Device is not supported, the software will not be able to '
+                'Entity is not supported, the software will not be able to '
                 'control the pins.');
             break;
           }
@@ -171,7 +170,9 @@ class DevicePinListManager extends DevicePinListManagerAbstract {
     try {
       final int isGpioFree = physicalDevice!.isGpioPinFree(pinNumber);
       if (isGpioFree != 0) {
-        logger.i('Gpio $pinNumber is not free, exist with error code $isGpioFree');
+        logger.i(
+          'Gpio $pinNumber is not free, exist with error code $isGpioFree',
+        );
         return null;
       }
 
diff --git a/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/getting_signals_from_pins/listen_to_pin_high_wiring_pi_setup_phys.dart b/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/getting_signals_from_pins/listen_to_pin_high_wiring_pi_setup_phys.dart
index cbc6ead..189d242 100644
--- a/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/getting_signals_from_pins/listen_to_pin_high_wiring_pi_setup_phys.dart
+++ b/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/getting_signals_from_pins/listen_to_pin_high_wiring_pi_setup_phys.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:cbj_integrations_controller/infrastructure/shared_variables.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 
 class ListenToPinHighWiringPiSetupPhys {
   ///  Listen to button press once and return exist code
diff --git a/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/offSignal/turn_pin_on_wiring_pi_setup.dart b/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/offSignal/turn_pin_on_wiring_pi_setup.dart
index f84f381..6b00a6b 100644
--- a/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/offSignal/turn_pin_on_wiring_pi_setup.dart
+++ b/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/offSignal/turn_pin_on_wiring_pi_setup.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:cbj_integrations_controller/infrastructure/shared_variables.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 
 class TurnPinOffWiringPiSetup {
   Future<ProcessResult> turnThePinOff(String physicalPinNumber) async {
diff --git a/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/offSignal/turn_pin_on_wiring_pi_setup_gpio.dart b/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/offSignal/turn_pin_on_wiring_pi_setup_gpio.dart
index 574b09c..2ad6a46 100644
--- a/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/offSignal/turn_pin_on_wiring_pi_setup_gpio.dart
+++ b/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/offSignal/turn_pin_on_wiring_pi_setup_gpio.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:cbj_integrations_controller/infrastructure/shared_variables.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 
 class TurnPinOffWiringPiSetupGpio {
   Future<ProcessResult> turnThePinOff(String physicalPinNumber) async {
diff --git a/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/offSignal/turn_pin_on_wiring_pi_setup_phys.dart b/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/offSignal/turn_pin_on_wiring_pi_setup_phys.dart
index 76a26bb..0a1a180 100644
--- a/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/offSignal/turn_pin_on_wiring_pi_setup_phys.dart
+++ b/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/offSignal/turn_pin_on_wiring_pi_setup_phys.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:cbj_integrations_controller/infrastructure/shared_variables.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 
 class TurnPinOffWiringPiSetupPhys {
   Future<ProcessResult> turnThePinOff(String physicalPinNumber) async {
diff --git a/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/offSignal/turn_pin_on_wiring_pi_setup_sys.dart b/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/offSignal/turn_pin_on_wiring_pi_setup_sys.dart
index d515e5e..ba8a182 100644
--- a/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/offSignal/turn_pin_on_wiring_pi_setup_sys.dart
+++ b/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/offSignal/turn_pin_on_wiring_pi_setup_sys.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:cbj_integrations_controller/infrastructure/shared_variables.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 
 class TurnPinOffWiringPiSetupSys {
   Future<ProcessResult> turnThePinOff(String physicalPinNumber) async {
diff --git a/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/onSignal/turn_pin_on_wiring_pi_setup.dart b/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/onSignal/turn_pin_on_wiring_pi_setup.dart
index c6d8d76..12a4989 100644
--- a/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/onSignal/turn_pin_on_wiring_pi_setup.dart
+++ b/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/onSignal/turn_pin_on_wiring_pi_setup.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:cbj_integrations_controller/infrastructure/shared_variables.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 
 class TurnPinOnWiringPiSetup {
   Future<ProcessResult> turnThePinOn(String physicalPinNumber) async {
diff --git a/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/onSignal/turn_pin_on_wiring_pi_setup_gpio.dart b/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/onSignal/turn_pin_on_wiring_pi_setup_gpio.dart
index 0e0325d..f268c60 100644
--- a/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/onSignal/turn_pin_on_wiring_pi_setup_gpio.dart
+++ b/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/onSignal/turn_pin_on_wiring_pi_setup_gpio.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:cbj_integrations_controller/infrastructure/shared_variables.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 
 class TurnPinOnWiringPiSetupGpio {
   Future<ProcessResult> turnThePinOn(String physicalPinNumber) async {
diff --git a/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/onSignal/turn_pin_on_wiring_pi_setup_phys.dart b/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/onSignal/turn_pin_on_wiring_pi_setup_phys.dart
index b4648a0..de47286 100644
--- a/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/onSignal/turn_pin_on_wiring_pi_setup_phys.dart
+++ b/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/onSignal/turn_pin_on_wiring_pi_setup_phys.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:cbj_integrations_controller/infrastructure/shared_variables.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 
 class TurnPinOnWiringPiSetupPhys {
   Future<ProcessResult> turnThePinOn(String physicalPinNumber) async {
diff --git a/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/onSignal/turn_pin_on_wiring_pi_setup_sys.dart b/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/onSignal/turn_pin_on_wiring_pi_setup_sys.dart
index ce6d216..6e6dc92 100644
--- a/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/onSignal/turn_pin_on_wiring_pi_setup_sys.dart
+++ b/lib/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/sending_signals_to_pins/onSignal/turn_pin_on_wiring_pi_setup_sys.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:cbj_integrations_controller/infrastructure/shared_variables.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 
 class TurnPinOnWiringPiSetupSys {
   Future<ProcessResult> turnThePinOn(String physicalPinNumber) async {
diff --git a/lib/infrastructure/datasources/hive_d/hive_d.dart b/lib/infrastructure/datasources/hive_d/hive_d.dart
index 6fc04fe..d649eeb 100644
--- a/lib/infrastructure/datasources/hive_d/hive_d.dart
+++ b/lib/infrastructure/datasources/hive_d/hive_d.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/system_commands/system_commands_manager_d.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/core/my_singleton.dart';
 import 'package:cbj_smart_device/infrastructure/datasources/hive_d/hive_objects_d/isar_database_information_d.dart';
 import 'package:cbj_smart_device/infrastructure/datasources/hive_d/hive_objects_d/isar_devices_d.dart';
diff --git a/lib/infrastructure/datasources/local_db_d/local_db_d.dart b/lib/infrastructure/datasources/local_db_d/local_db_d.dart
index 154f1dd..814d13a 100644
--- a/lib/infrastructure/datasources/local_db_d/local_db_d.dart
+++ b/lib/infrastructure/datasources/local_db_d/local_db_d.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/button_object_u/button_with_light_object.dart';
 import 'package:cbj_smart_device/application/usecases/button_object_u/simple_button_object.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base_abstract.dart';
diff --git a/lib/infrastructure/datasources/set_devices_d/set_devices_d.dart b/lib/infrastructure/datasources/set_devices_d/set_devices_d.dart
index dca3983..8ee1f24 100644
--- a/lib/infrastructure/datasources/set_devices_d/set_devices_d.dart
+++ b/lib/infrastructure/datasources/set_devices_d/set_devices_d.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/system_commands/system_commands_manager_d.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 
 class SetDevicesD {
   Future<String> getCurrentDeviceUUid() {
diff --git a/lib/infrastructure/datasources/smart_device_objects_d/smart_device_objects_d.dart b/lib/infrastructure/datasources/smart_device_objects_d/smart_device_objects_d.dart
index e6ce27c..50c2d23 100644
--- a/lib/infrastructure/datasources/smart_device_objects_d/smart_device_objects_d.dart
+++ b/lib/infrastructure/datasources/smart_device_objects_d/smart_device_objects_d.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/system_commands/system_commands_manager_d.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 
 class SmartDeviceObjectsD {
   static Future<String> getUuid() {
diff --git a/lib/infrastructure/datasources/smart_server_d/smart_server_helper.dart b/lib/infrastructure/datasources/smart_server_d/smart_server_helper.dart
index c105495..d18e67e 100644
--- a/lib/infrastructure/datasources/smart_server_d/smart_server_helper.dart
+++ b/lib/infrastructure/datasources/smart_server_d/smart_server_helper.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 
 /// Cleaner way to get grpc client types
 class GrpcClientTypes {
diff --git a/lib/infrastructure/repositories/local_db_r/local_db_r.dart b/lib/infrastructure/repositories/local_db_r/local_db_r.dart
index b32fbb9..fbb592b 100644
--- a/lib/infrastructure/repositories/local_db_r/local_db_r.dart
+++ b/lib/infrastructure/repositories/local_db_r/local_db_r.dart
@@ -1,4 +1,4 @@
-import 'package:cbj_integrations_controller/infrastructure/gen/cbj_smart_device_server/protoc_as_dart/cbj_smart_device_server.pbgrpc.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/button_object_u/button_with_light_object.dart';
 import 'package:cbj_smart_device/application/usecases/button_object_u/simple_button_object.dart';
 import 'package:cbj_smart_device/application/usecases/smart_device_objects_u/abstracts_devices/smart_device_base.dart';
diff --git a/lib/infrastructure/repositories/set_devices_r/set_devices_r.dart b/lib/infrastructure/repositories/set_devices_r/set_devices_r.dart
index 77dd94e..30a1038 100644
--- a/lib/infrastructure/repositories/set_devices_r/set_devices_r.dart
+++ b/lib/infrastructure/repositories/set_devices_r/set_devices_r.dart
@@ -5,7 +5,7 @@ class SetDevicesR {
     _setDevicesD = SetDevicesD();
   }
 
- late SetDevicesD _setDevicesD;
+  late SetDevicesD _setDevicesD;
 
   Future<String> getCurrentDeviceUUid() {
     return _setDevicesD.getCurrentDeviceUUid();
diff --git a/lib/infrastructure/repositories/wish_classes_r/turn_pin_on_off_local.dart b/lib/infrastructure/repositories/wish_classes_r/turn_pin_on_off_local.dart
index 6272a46..bbcca30 100644
--- a/lib/infrastructure/repositories/wish_classes_r/turn_pin_on_off_local.dart
+++ b/lib/infrastructure/repositories/wish_classes_r/turn_pin_on_off_local.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:cbj_integrations_controller/infrastructure/shared_variables.dart';
+import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:cbj_smart_device/application/usecases/devices_pin_configuration_u/pin_information.dart';
 import 'package:cbj_smart_device/infrastructure/datasources/core_d/manage_physical_components/pins_datasource/pin_setup_method_enum.dart';
 import 'package:cbj_smart_device/infrastructure/datasources/wish_classes_d/wish_classes_d.dart';
@@ -18,7 +18,8 @@ class TurnPinOnOffLocal extends TurnPinOnOffLocalAbstract {
   @override
   Future<String> pinOn(PinInformation? pinNumber) async {
     if (pinNumber?.pinAndPhysicalPinConfiguration == null) {
-      logger.i('Error PinInformation.pinAndPhysicalPinConfiguration was not set');
+      logger
+          .i('Error PinInformation.pinAndPhysicalPinConfiguration was not set');
       return 'Error PinInformation.pinAndPhysicalPinConfiguration was not set';
     }
     final String? projectRootDirectoryPath =
@@ -51,7 +52,8 @@ class TurnPinOnOffLocal extends TurnPinOnOffLocalAbstract {
   @override
   Future<String> pinOff(PinInformation? pinNumber) async {
     if (pinNumber?.pinAndPhysicalPinConfiguration == null) {
-      logger.i('Error PinInformation.pinAndPhysicalPinConfiguration was not set');
+      logger
+          .i('Error PinInformation.pinAndPhysicalPinConfiguration was not set');
       return 'Error PinInformation.pinAndPhysicalPinConfiguration was not set';
     }