diff --git a/cyberwow/lib/logic/controller/refresh.dart b/cyberwow/lib/logic/controller/refresh.dart
index 8b6699b..8f6c20d 100644
--- a/cyberwow/lib/logic/controller/refresh.dart
+++ b/cyberwow/lib/logic/controller/refresh.dart
@@ -23,7 +23,6 @@ import 'package:logging/logging.dart';
 
 import 'dart:ui';
 import 'dart:async';
-import 'rpc/rpc.dart' as rpc;
 
 import '../../config.dart';
 import '../../logging.dart';
diff --git a/cyberwow/lib/logic/sensor/daemon.dart b/cyberwow/lib/logic/sensor/daemon.dart
index f40180f..b98c587 100644
--- a/cyberwow/lib/logic/sensor/daemon.dart
+++ b/cyberwow/lib/logic/sensor/daemon.dart
@@ -22,7 +22,7 @@ along with CyberWOW.  If not, see <https://www.gnu.org/licenses/>.
 import 'dart:async';
 import 'dart:convert';
 
-import '../controller/rpc/rpc.dart' as rpc;
+import 'rpc/rpc.dart' as rpc;
 import '../../config.dart' as config;
 import '../../logging.dart';
 
diff --git a/cyberwow/lib/logic/controller/rpc/rpc.dart b/cyberwow/lib/logic/sensor/rpc/rpc.dart
similarity index 100%
rename from cyberwow/lib/logic/controller/rpc/rpc.dart
rename to cyberwow/lib/logic/sensor/rpc/rpc.dart
diff --git a/cyberwow/lib/logic/controller/rpc/rpc2.dart b/cyberwow/lib/logic/sensor/rpc/rpc2.dart
similarity index 100%
rename from cyberwow/lib/logic/controller/rpc/rpc2.dart
rename to cyberwow/lib/logic/sensor/rpc/rpc2.dart
diff --git a/cyberwow/lib/logic/controller/rpc/rpc2View.dart b/cyberwow/lib/logic/sensor/rpc/rpc2View.dart
similarity index 100%
rename from cyberwow/lib/logic/controller/rpc/rpc2View.dart
rename to cyberwow/lib/logic/sensor/rpc/rpc2View.dart
diff --git a/cyberwow/lib/logic/controller/rpc/rpcView.dart b/cyberwow/lib/logic/sensor/rpc/rpcView.dart
similarity index 100%
rename from cyberwow/lib/logic/controller/rpc/rpcView.dart
rename to cyberwow/lib/logic/sensor/rpc/rpcView.dart
diff --git a/cyberwow/lib/state/resyncing.dart b/cyberwow/lib/state/resyncing.dart
index 7354e31..fd2569e 100644
--- a/cyberwow/lib/state/resyncing.dart
+++ b/cyberwow/lib/state/resyncing.dart
@@ -22,9 +22,9 @@ along with CyberWOW.  If not, see <https://www.gnu.org/licenses/>.
 import 'dart:async';
 import 'dart:collection';
 
-import '../logic/controller/rpc/rpc.dart' as rpc;
-import '../logic/controller/daemon.dart' as daemon;
 import '../logic/controller/refresh.dart' as refresh;
+import '../logic/sensor/rpc/rpc.dart' as rpc;
+import '../logic/sensor/daemon.dart' as daemon;
 import '../config.dart' as config;
 import '../logging.dart';
 
diff --git a/cyberwow/lib/state/synced.dart b/cyberwow/lib/state/synced.dart
index 3de2760..61b748a 100644
--- a/cyberwow/lib/state/synced.dart
+++ b/cyberwow/lib/state/synced.dart
@@ -26,12 +26,12 @@ import 'dart:collection';
 import 'package:flutter/material.dart';
 
 import '../config.dart' as config;
-import '../logic/controller/daemon.dart' as daemon;
+import '../logic/sensor/daemon.dart' as daemon;
 import '../logic/controller/refresh.dart' as refresh;
-import '../logic/controller/rpc/rpc.dart' as rpc;
-import '../logic/controller/rpc/rpc2.dart' as rpc;
-import '../logic/controller/rpc/rpc2View.dart' as rpc2View;
-import '../logic/controller/rpc/rpcView.dart' as rpcView;
+import '../logic/sensor/rpc/rpc.dart' as rpc;
+import '../logic/sensor/rpc/rpc2.dart' as rpc;
+import '../logic/sensor/rpc/rpc2View.dart' as rpc2View;
+import '../logic/sensor/rpc/rpcView.dart' as rpcView;
 import '../helper.dart';
 import '../logging.dart';
 
diff --git a/cyberwow/lib/state/syncing.dart b/cyberwow/lib/state/syncing.dart
index e83b587..9b21db6 100644
--- a/cyberwow/lib/state/syncing.dart
+++ b/cyberwow/lib/state/syncing.dart
@@ -22,7 +22,7 @@ along with CyberWOW.  If not, see <https://www.gnu.org/licenses/>.
 import 'dart:async';
 import 'dart:collection';
 
-import '../logic/controller/rpc/rpc.dart' as rpc;
+import '../logic/sensor/rpc/rpc.dart' as rpc;
 import '../logic/sensor/daemon.dart' as daemon;
 import '../logic/controller/refresh.dart' as refresh;
 import '../config.dart' as config;