diff --git a/moor/lib/remote.dart b/moor/lib/remote.dart
index c4553eba..e4fbc87b 100644
--- a/moor/lib/remote.dart
+++ b/moor/lib/remote.dart
@@ -56,10 +56,10 @@ import 'package:stream_channel/stream_channel.dart';
 import 'moor.dart';
 import 'remote.dart' as self;
 
-import 'src/runtime/remote/client_impl.dart';
-import 'src/runtime/remote/communication.dart';
-import 'src/runtime/remote/protocol.dart';
-import 'src/runtime/remote/server_impl.dart';
+import 'src/remote/client_impl.dart';
+import 'src/remote/communication.dart';
+import 'src/remote/protocol.dart';
+import 'src/remote/server_impl.dart';
 
 /// Serves a moor database connection over any two-way communication channel.
 ///
diff --git a/moor/lib/src/runtime/remote/client_impl.dart b/moor/lib/src/remote/client_impl.dart
similarity index 99%
rename from moor/lib/src/runtime/remote/client_impl.dart
rename to moor/lib/src/remote/client_impl.dart
index 954d5f00..f7f316f3 100644
--- a/moor/lib/src/runtime/remote/client_impl.dart
+++ b/moor/lib/src/remote/client_impl.dart
@@ -6,7 +6,7 @@ import 'package:moor/src/runtime/executor/stream_queries.dart';
 import 'package:moor/src/runtime/types/sql_types.dart';
 import 'package:stream_channel/stream_channel.dart';
 
-import '../cancellation_zone.dart';
+import '../runtime/cancellation_zone.dart';
 import 'communication.dart';
 import 'protocol.dart';
 
diff --git a/moor/lib/src/runtime/remote/communication.dart b/moor/lib/src/remote/communication.dart
similarity index 99%
rename from moor/lib/src/runtime/remote/communication.dart
rename to moor/lib/src/remote/communication.dart
index 313813cf..26f18866 100644
--- a/moor/lib/src/runtime/remote/communication.dart
+++ b/moor/lib/src/remote/communication.dart
@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:moor/src/runtime/api/runtime_api.dart';
 import 'package:stream_channel/stream_channel.dart';
 
-import '../cancellation_zone.dart';
+import '../runtime/cancellation_zone.dart';
 import 'protocol.dart';
 
 /// Wrapper around a two-way communication channel to support requests and
diff --git a/moor/lib/src/runtime/remote/protocol.dart b/moor/lib/src/remote/protocol.dart
similarity index 100%
rename from moor/lib/src/runtime/remote/protocol.dart
rename to moor/lib/src/remote/protocol.dart
diff --git a/moor/lib/src/runtime/remote/server_impl.dart b/moor/lib/src/remote/server_impl.dart
similarity index 99%
rename from moor/lib/src/runtime/remote/server_impl.dart
rename to moor/lib/src/remote/server_impl.dart
index 1e9adeb0..759cada7 100644
--- a/moor/lib/src/runtime/remote/server_impl.dart
+++ b/moor/lib/src/remote/server_impl.dart
@@ -4,7 +4,7 @@ import 'package:moor/moor.dart';
 import 'package:moor/remote.dart';
 import 'package:stream_channel/stream_channel.dart';
 
-import '../cancellation_zone.dart';
+import '../runtime/cancellation_zone.dart';
 import 'communication.dart';
 import 'protocol.dart';