5 files changed, 7 insertions, 12 deletions
diff --git a/lib/model/device.dart b/lib/model/device/device.dart
index 98445fa..98445fa 100644
--- a/lib/model/device.dart
+++ b/lib/model/device/device.dart
diff --git a/lib/model/flutter_blue_plus_device.dart b/lib/model/device/flutter_blue_plus_device.dart
index 101c489..e56223b 100644
--- a/lib/model/flutter_blue_plus_device.dart
+++ b/lib/model/device/flutter_blue_plus_device.dart
@@ -1,10 +1,12 @@
-import 'package:uvok_epaper_badge/model/device.dart';
+import 'package:uvok_epaper_badge/model/device/device.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:uvok_epaper_badge/utility.dart';
 
 class FlutterBluePlusDevice implements Device {
   final ScanResult scanResult;
 
+  FlutterBluePlusDevice.fromScan(this.scanResult);
+
   @override
   String? get address => scanResult.device.remoteId.str;
 
@@ -17,11 +19,4 @@ class FlutterBluePlusDevice implements Device {
 
   @override
   int? get rssi => scanResult.rssi;
-
-  FlutterBluePlusDevice._(this.scanResult);
-
-  static FlutterBluePlusDevice fromScan(ScanResult scanResult) {
-    var bleDevice = FlutterBluePlusDevice._(scanResult);
-    return bleDevice;
-  }
 }
diff --git a/lib/model/mock_device.dart b/lib/model/device/mock_device.dart
index 64558c1..78770e1 100644
--- a/lib/model/mock_device.dart
+++ b/lib/model/device/mock_device.dart
@@ -1,4 +1,4 @@
-import 'package:uvok_epaper_badge/model/device.dart';
+import 'package:uvok_epaper_badge/model/device/device.dart';
 
 class MockDevice implements Device {
   final int _id;
diff --git a/lib/model/device_connection_factory.dart b/lib/model/device_connection_factory.dart
index d73db0b..ef845fc 100644
--- a/lib/model/device_connection_factory.dart
+++ b/lib/model/device_connection_factory.dart
@@ -13,9 +13,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import 'package:uvok_epaper_badge/model/device.dart';
+import 'package:uvok_epaper_badge/model/device/device.dart';
 import 'package:uvok_epaper_badge/model/device_connection.dart';
-import 'package:uvok_epaper_badge/model/flutter_blue_plus_device.dart';
+import 'package:uvok_epaper_badge/model/device/flutter_blue_plus_device.dart';
 import 'package:uvok_epaper_badge/model/flutter_blue_plus_device_connection.dart';
 import 'package:uvok_epaper_badge/model/mock_device_connection.dart';
 
diff --git a/lib/model/flutter_blue_plus_device_connection.dart b/lib/model/flutter_blue_plus_device_connection.dart
index 2505af5..e5c34aa 100644
--- a/lib/model/flutter_blue_plus_device_connection.dart
+++ b/lib/model/flutter_blue_plus_device_connection.dart
@@ -19,7 +19,7 @@ import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:logger/logger.dart';
 import 'package:uvok_epaper_badge/first_where_ext.dart';
 import 'package:uvok_epaper_badge/model/device_connection.dart';
-import 'package:uvok_epaper_badge/model/flutter_blue_plus_device.dart';
+import 'package:uvok_epaper_badge/model/device/flutter_blue_plus_device.dart';
 
 var logger = Logger();