diff --git a/lib/livekit_client.dart b/lib/livekit_client.dart
index ed58905..8c3e48c 100644
--- a/lib/livekit_client.dart
+++ b/lib/livekit_client.dart
@@ -1,27 +1,27 @@
 /// Flutter Client SDK to LiveKit.
 library livekit_client;
 
+export 'src/core/room.dart';
 export 'src/events.dart';
 export 'src/exceptions.dart';
 export 'src/livekit.dart';
 export 'src/managers/event.dart';
 export 'src/options.dart';
-export 'src/participant/local_participant.dart';
-export 'src/participant/local_participant.dart';
+export 'src/participant/local.dart';
+export 'src/participant/local.dart';
 export 'src/participant/participant.dart';
-export 'src/participant/remote_participant.dart';
+export 'src/participant/remote.dart';
 export 'src/proto/livekit_models.pb.dart' show TrackType, VideoQuality;
-export 'src/publication/local_track_publication.dart';
-export 'src/publication/remote_track_publication.dart';
+export 'src/publication/local.dart';
+export 'src/publication/remote.dart';
 export 'src/publication/track_publication.dart';
-export 'src/room.dart';
-export 'src/track/local.dart';
 export 'src/track/local/audio.dart';
+export 'src/track/local/local.dart';
 export 'src/track/local/video.dart';
-export 'src/track/remote.dart';
-export 'src/track/remote/audio.dart';
-export 'src/track/remote/video.dart';
 export 'src/track/options.dart';
+export 'src/track/remote/audio.dart';
+export 'src/track/remote/remote.dart';
+export 'src/track/remote/video.dart';
 export 'src/track/track.dart';
 export 'src/types.dart';
 export 'src/widget/video_track_renderer.dart';
diff --git a/lib/src/rtc_engine.dart b/lib/src/core/engine.dart
similarity index 97%
rename from lib/src/rtc_engine.dart
rename to lib/src/core/engine.dart
index 72312b0..4286600 100644
--- a/lib/src/rtc_engine.dart
+++ b/lib/src/core/engine.dart
@@ -6,24 +6,24 @@ import 'package:collection/collection.dart';
 import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
 import 'package:meta/meta.dart';
 
-import 'constants.dart';
-import 'events.dart';
-import 'exceptions.dart';
-import 'extensions.dart';
-import 'internal/events.dart';
-import 'logger.dart';
-import 'managers/delay.dart';
-import 'managers/event.dart';
-import 'options.dart';
-import 'proto/livekit_models.pb.dart' as lk_models;
-import 'proto/livekit_rtc.pb.dart' as lk_rtc;
+import '../constants.dart';
+import '../events.dart';
+import '../exceptions.dart';
+import '../extensions.dart';
+import '../internal/events.dart';
+import '../logger.dart';
+import '../managers/delay.dart';
+import '../managers/event.dart';
+import '../options.dart';
+import '../proto/livekit_models.pb.dart' as lk_models;
+import '../proto/livekit_rtc.pb.dart' as lk_rtc;
+import '../support/disposable.dart';
+import '../types.dart';
 import 'room.dart';
 import 'signal_client.dart';
-import 'support/disposable.dart';
 import 'transport.dart';
-import 'types.dart';
 
-class RTCEngine extends Disposable with EventsEmittable<EngineEvent> {
+class Engine extends Disposable with EventsEmittable<EngineEvent> {
   static const _lossyDCLabel = '_lossy';
   static const _reliableDCLabel = '_reliable';
   static const _maxReconnectAttempts = 5;
@@ -80,7 +80,7 @@ class RTCEngine extends Disposable with EventsEmittable<EngineEvent> {
 
   final delays = CancelableDelayManager();
 
-  RTCEngine({
+  Engine({
     required this.room,
     SignalClient? signalClient,
   }) : signalClient = signalClient ?? SignalClient() {
diff --git a/lib/src/room.dart b/lib/src/core/room.dart
similarity index 95%
rename from lib/src/room.dart
rename to lib/src/core/room.dart
index a5aad56..29facab 100644
--- a/lib/src/room.dart
+++ b/lib/src/core/room.dart
@@ -2,23 +2,23 @@ import 'dart:collection';
 
 import 'package:collection/collection.dart';
 
-import 'constants.dart';
-import 'events.dart';
-import 'exceptions.dart';
-import 'extensions.dart';
-import 'internal/events.dart';
-import 'logger.dart';
-import 'managers/event.dart';
-import 'options.dart';
-import 'participant/local_participant.dart';
-import 'participant/participant.dart';
-import 'participant/remote_participant.dart';
-import 'proto/livekit_models.pb.dart' as lk_models;
-import 'proto/livekit_rtc.pb.dart' as lk_rtc;
-import 'rtc_engine.dart';
-import 'support/disposable.dart';
-import 'track/track.dart';
-import 'types.dart';
+import '../constants.dart';
+import '../events.dart';
+import '../exceptions.dart';
+import '../extensions.dart';
+import '../internal/events.dart';
+import '../logger.dart';
+import '../managers/event.dart';
+import '../options.dart';
+import '../participant/local.dart';
+import '../participant/participant.dart';
+import '../participant/remote.dart';
+import '../proto/livekit_models.pb.dart' as lk_models;
+import '../proto/livekit_rtc.pb.dart' as lk_rtc;
+import '../support/disposable.dart';
+import '../track/track.dart';
+import '../types.dart';
+import 'engine.dart';
 
 /// Room is the primary construct for LiveKit conferences. It contains a
 /// group of [Participant]s, each publishing and subscribing to [Track]s.
@@ -61,7 +61,7 @@ class Room extends DisposableChangeNotifier with EventsEmittable<RoomEvent> {
   UnmodifiableListView<Participant> get activeSpeakers =>
       UnmodifiableListView<Participant>(_activeSpeakers);
 
-  late final engine = RTCEngine(room: this);
+  late final engine = Engine(room: this);
 
   // suppport for multiple event listeners
   late final _engineListener = engine.createListener();
diff --git a/lib/src/signal_client.dart b/lib/src/core/signal_client.dart
similarity index 94%
rename from lib/src/signal_client.dart
rename to lib/src/core/signal_client.dart
index 6b1b591..a9bc960 100644
--- a/lib/src/signal_client.dart
+++ b/lib/src/core/signal_client.dart
@@ -3,19 +3,19 @@ import 'dart:async';
 import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
 import 'package:http/http.dart' as http;
 
-import 'events.dart';
-import 'exceptions.dart';
-import 'extensions.dart';
-import 'internal/events.dart';
-import 'logger.dart';
-import 'managers/event.dart';
-import 'options.dart';
-import 'proto/livekit_models.pb.dart' as lk_models;
-import 'proto/livekit_rtc.pb.dart' as lk_rtc;
-import 'support/disposable.dart';
-import 'support/websocket.dart';
-import 'types.dart';
-import 'utils.dart';
+import '../events.dart';
+import '../exceptions.dart';
+import '../extensions.dart';
+import '../internal/events.dart';
+import '../logger.dart';
+import '../managers/event.dart';
+import '../options.dart';
+import '../proto/livekit_models.pb.dart' as lk_models;
+import '../proto/livekit_rtc.pb.dart' as lk_rtc;
+import '../support/disposable.dart';
+import '../support/websocket.dart';
+import '../types.dart';
+import '../utils.dart';
 
 class SignalClient extends Disposable with EventsEmittable<SignalEvent> {
   //
diff --git a/lib/src/transport.dart b/lib/src/core/transport.dart
similarity index 96%
rename from lib/src/transport.dart
rename to lib/src/core/transport.dart
index 76c02b2..32bd3ec 100644
--- a/lib/src/transport.dart
+++ b/lib/src/core/transport.dart
@@ -2,12 +2,12 @@ import 'dart:async';
 
 import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
 
-import 'constants.dart';
-import 'extensions.dart';
-import 'logger.dart';
-import 'support/disposable.dart';
-import 'types.dart';
-import 'utils.dart';
+import '../constants.dart';
+import '../extensions.dart';
+import '../logger.dart';
+import '../support/disposable.dart';
+import '../types.dart';
+import '../utils.dart';
 
 typedef PCTransportOnOffer = void Function(rtc.RTCSessionDescription offer);
 
diff --git a/lib/src/events.dart b/lib/src/events.dart
index d3fab90..f7c91a8 100644
--- a/lib/src/events.dart
+++ b/lib/src/events.dart
@@ -1,12 +1,12 @@
-import 'participant/local_participant.dart';
+import 'core/engine.dart';
+import 'core/room.dart';
+import 'core/signal_client.dart';
+import 'participant/local.dart';
 import 'participant/participant.dart';
-import 'participant/remote_participant.dart';
-import 'publication/local_track_publication.dart';
-import 'publication/remote_track_publication.dart';
+import 'participant/remote.dart';
+import 'publication/local.dart';
+import 'publication/remote.dart';
 import 'publication/track_publication.dart';
-import 'room.dart';
-import 'rtc_engine.dart';
-import 'signal_client.dart';
 import 'track/track.dart';
 import 'types.dart';
 
@@ -22,7 +22,7 @@ abstract class ParticipantEvent implements LiveKitEvent {}
 /// Base type for all [Track] events.
 abstract class TrackEvent implements LiveKitEvent {}
 
-/// Base type for all [RTCEngine] events.
+/// Base type for all [Engine] events.
 abstract class EngineEvent implements LiveKitEvent {}
 
 /// Base type for all [SignalClient] events.
diff --git a/lib/src/livekit.dart b/lib/src/livekit.dart
index 2892389..5f2a0b8 100644
--- a/lib/src/livekit.dart
+++ b/lib/src/livekit.dart
@@ -1,5 +1,5 @@
+import 'core/room.dart';
 import 'options.dart';
-import 'room.dart';
 
 /// Main entry point to connect to a room.
 /// {@category Room}
diff --git a/lib/src/options.dart b/lib/src/options.dart
index 40d09b0..b717229 100644
--- a/lib/src/options.dart
+++ b/lib/src/options.dart
@@ -1,10 +1,10 @@
+import 'core/room.dart';
+import 'publication/remote.dart';
 import 'track/local/audio.dart';
 import 'track/local/video.dart';
 import 'track/options.dart';
 import 'track/track.dart';
-import 'publication/remote_track_publication.dart';
 import 'types.dart';
-import 'room.dart';
 
 /// Options used when connecting to the server.
 class ConnectOptions {
diff --git a/lib/src/participant/local_participant.dart b/lib/src/participant/local.dart
similarity index 98%
rename from lib/src/participant/local_participant.dart
rename to lib/src/participant/local.dart
index a5a3e2e..c48ca97 100644
--- a/lib/src/participant/local_participant.dart
+++ b/lib/src/participant/local.dart
@@ -3,16 +3,16 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
 import 'package:meta/meta.dart';
 
+import '../core/room.dart';
 import '../events.dart';
 import '../exceptions.dart';
 import '../extensions.dart';
 import '../logger.dart';
 import '../options.dart';
 import '../proto/livekit_models.pb.dart' as lk_models;
-import '../publication/local_track_publication.dart';
-import '../room.dart';
-import '../track/local.dart';
+import '../publication/local.dart';
 import '../track/local/audio.dart';
+import '../track/local/local.dart';
 import '../track/local/video.dart';
 import '../types.dart';
 import '../utils.dart';
diff --git a/lib/src/participant/participant.dart b/lib/src/participant/participant.dart
index 2f093f6..a4b33ae 100644
--- a/lib/src/participant/participant.dart
+++ b/lib/src/participant/participant.dart
@@ -1,19 +1,19 @@
 import 'package:collection/collection.dart';
 import 'package:meta/meta.dart';
 
+import '../core/room.dart';
 import '../events.dart';
 import '../extensions.dart';
 import '../logger.dart';
 import '../managers/event.dart';
 import '../proto/livekit_models.pb.dart' as lk_models;
 import '../publication/track_publication.dart';
-import '../room.dart';
 import '../support/disposable.dart';
+import '../track/local/local.dart';
 import '../track/track.dart';
-import '../track/local.dart';
 import '../types.dart';
-import 'remote_participant.dart';
-import 'local_participant.dart';
+import 'local.dart';
+import 'remote.dart';
 
 /// Represents a Participant in the room, notifies changes via delegates as
 /// well as ChangeNotifier/providers.
diff --git a/lib/src/participant/remote_participant.dart b/lib/src/participant/remote.dart
similarity index 98%
rename from lib/src/participant/remote_participant.dart
rename to lib/src/participant/remote.dart
index f06f0ea..69cc9ff 100644
--- a/lib/src/participant/remote_participant.dart
+++ b/lib/src/participant/remote.dart
@@ -2,15 +2,15 @@ import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
 import 'package:meta/meta.dart';
 
 import '../constants.dart';
+import '../core/room.dart';
 import '../events.dart';
 import '../exceptions.dart';
 import '../extensions.dart';
 import '../logger.dart';
 import '../proto/livekit_models.pb.dart' as lk_models;
-import '../publication/remote_track_publication.dart';
-import '../room.dart';
-import '../track/remote.dart';
+import '../publication/remote.dart';
 import '../track/remote/audio.dart';
+import '../track/remote/remote.dart';
 import '../track/remote/video.dart';
 import '../types.dart';
 import 'participant.dart';
diff --git a/lib/src/proto/livekit_models.pbenum.dart b/lib/src/proto/livekit_models.pbenum.dart
index 3ef1b5f..e985269 100644
--- a/lib/src/proto/livekit_models.pbenum.dart
+++ b/lib/src/proto/livekit_models.pbenum.dart
@@ -6,7 +6,9 @@
 // ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
 
 // ignore_for_file: UNDEFINED_SHOWN_NAME
+
 import 'dart:core' as $core;
+
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class TrackType extends $pb.ProtobufEnum {
diff --git a/lib/src/proto/livekit_models.pbjson.dart b/lib/src/proto/livekit_models.pbjson.dart
index e8f88fd..f2b28b0 100644
--- a/lib/src/proto/livekit_models.pbjson.dart
+++ b/lib/src/proto/livekit_models.pbjson.dart
@@ -5,8 +5,8 @@
 // @dart = 2.12
 // ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
 
-import 'dart:core' as $core;
 import 'dart:convert' as $convert;
+import 'dart:core' as $core;
 import 'dart:typed_data' as $typed_data;
 
 @$core.Deprecated('Use trackTypeDescriptor instead')
diff --git a/lib/src/proto/livekit_rtc.pb.dart b/lib/src/proto/livekit_rtc.pb.dart
index 64d9c6c..c9bc472 100644
--- a/lib/src/proto/livekit_rtc.pb.dart
+++ b/lib/src/proto/livekit_rtc.pb.dart
@@ -10,7 +10,6 @@ import 'dart:core' as $core;
 import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'livekit_models.pb.dart' as $0;
-
 import 'livekit_models.pbenum.dart' as $0;
 import 'livekit_rtc.pbenum.dart';
 
diff --git a/lib/src/proto/livekit_rtc.pbenum.dart b/lib/src/proto/livekit_rtc.pbenum.dart
index 3414912..8e893a6 100644
--- a/lib/src/proto/livekit_rtc.pbenum.dart
+++ b/lib/src/proto/livekit_rtc.pbenum.dart
@@ -6,7 +6,9 @@
 // ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
 
 // ignore_for_file: UNDEFINED_SHOWN_NAME
+
 import 'dart:core' as $core;
+
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class SignalTarget extends $pb.ProtobufEnum {
diff --git a/lib/src/proto/livekit_rtc.pbjson.dart b/lib/src/proto/livekit_rtc.pbjson.dart
index 5b5e4be..0375633 100644
--- a/lib/src/proto/livekit_rtc.pbjson.dart
+++ b/lib/src/proto/livekit_rtc.pbjson.dart
@@ -5,8 +5,8 @@
 // @dart = 2.12
 // ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
 
-import 'dart:core' as $core;
 import 'dart:convert' as $convert;
+import 'dart:core' as $core;
 import 'dart:typed_data' as $typed_data;
 
 @$core.Deprecated('Use signalTargetDescriptor instead')
diff --git a/lib/src/publication/local_track_publication.dart b/lib/src/publication/local.dart
similarity index 90%
rename from lib/src/publication/local_track_publication.dart
rename to lib/src/publication/local.dart
index f0861de..3e42233 100644
--- a/lib/src/publication/local_track_publication.dart
+++ b/lib/src/publication/local.dart
@@ -1,6 +1,6 @@
-import '../participant/local_participant.dart';
+import '../participant/local.dart';
 import '../proto/livekit_models.pb.dart' as lk_models;
-import '../track/local.dart';
+import '../track/local/local.dart';
 import 'track_publication.dart';
 
 class LocalTrackPublication<T extends LocalTrack> extends TrackPublication<T> {
diff --git a/lib/src/publication/remote_track_publication.dart b/lib/src/publication/remote.dart
similarity index 99%
rename from lib/src/publication/remote_track_publication.dart
rename to lib/src/publication/remote.dart
index 31cdcb1..f6126b6 100644
--- a/lib/src/publication/remote_track_publication.dart
+++ b/lib/src/publication/remote.dart
@@ -9,10 +9,10 @@ import '../extensions.dart';
 import '../internal/events.dart';
 import '../logger.dart';
 import '../options.dart';
-import '../participant/remote_participant.dart';
+import '../participant/remote.dart';
 import '../proto/livekit_models.pb.dart' as lk_models;
 import '../proto/livekit_rtc.pb.dart' as lk_rtc;
-import '../track/remote.dart';
+import '../track/remote/remote.dart';
 import '../types.dart';
 import '../utils.dart';
 import 'track_publication.dart';
diff --git a/lib/src/publication/track_publication.dart b/lib/src/publication/track_publication.dart
index 3506966..f5c9205 100644
--- a/lib/src/publication/track_publication.dart
+++ b/lib/src/publication/track_publication.dart
@@ -1,8 +1,8 @@
-import '../events.dart';
-import '../internal/events.dart';
 import 'package:meta/meta.dart';
 
+import '../events.dart';
 import '../extensions.dart';
+import '../internal/events.dart';
 import '../logger.dart';
 import '../participant/participant.dart';
 import '../proto/livekit_models.pb.dart' as lk_models;
diff --git a/lib/src/support/platform/io.dart b/lib/src/support/platform/io.dart
index 59ef81d..769b776 100644
--- a/lib/src/support/platform/io.dart
+++ b/lib/src/support/platform/io.dart
@@ -1,6 +1,7 @@
-import '../platform.dart';
 import 'dart:io';
 
+import '../platform.dart';
+
 PlatformType lkPlatformImplementation() {
   if (Platform.isWindows) return PlatformType.windows;
   if (Platform.isFuchsia) return PlatformType.fuchsia;
diff --git a/lib/src/track/audio_management.dart b/lib/src/track/audio_management.dart
index a442aea..bd9b0be 100644
--- a/lib/src/track/audio_management.dart
+++ b/lib/src/track/audio_management.dart
@@ -1,11 +1,10 @@
-import '../support/platform.dart';
-
 import 'package:synchronized/synchronized.dart' as sync;
 
 import '../logger.dart';
 import '../support/native_audio.dart';
-import 'local.dart';
+import '../support/platform.dart';
 import 'local/audio.dart';
+import 'local/local.dart';
 
 enum AudioTrackState {
   none,
diff --git a/lib/src/track/local/audio.dart b/lib/src/track/local/audio.dart
index 5132b7d..a8f0805 100644
--- a/lib/src/track/local/audio.dart
+++ b/lib/src/track/local/audio.dart
@@ -5,8 +5,8 @@ import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
 import '../../proto/livekit_models.pb.dart' as lk_models;
 import '../../types.dart';
 import '../audio_management.dart';
-import '../local.dart';
 import '../options.dart';
+import 'local.dart';
 
 class LocalAudioTrack extends LocalTrack with AudioTrack, AudioManagementMixin {
   // Options used for this track
diff --git a/lib/src/track/local.dart b/lib/src/track/local/local.dart
similarity index 90%
rename from lib/src/track/local.dart
rename to lib/src/track/local/local.dart
index 9f47403..5a479a1 100644
--- a/lib/src/track/local.dart
+++ b/lib/src/track/local/local.dart
@@ -1,19 +1,19 @@
 import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
-import '../support/platform.dart';
 import 'package:meta/meta.dart';
 
-import '../exceptions.dart';
-import '../logger.dart';
-import '../proto/livekit_models.pb.dart' as lk_models;
-import '../types.dart';
-import 'options.dart';
-import 'track.dart';
-import '../track/local/audio.dart';
-import '../track/local/video.dart';
-import '../track/remote/audio.dart';
-import '../track/remote/video.dart';
-import '../events.dart';
-import '../participant/remote_participant.dart';
+import '../../events.dart';
+import '../../exceptions.dart';
+import '../../logger.dart';
+import '../../participant/remote.dart';
+import '../../proto/livekit_models.pb.dart' as lk_models;
+import '../../support/platform.dart';
+import '../../types.dart';
+import '../options.dart';
+import '../remote/audio.dart';
+import '../remote/video.dart';
+import '../track.dart';
+import 'audio.dart';
+import 'video.dart';
 
 /// Used to group [LocalVideoTrack] and [RemoteVideoTrack].
 mixin VideoTrack on Track {}
diff --git a/lib/src/track/local/video.dart b/lib/src/track/local/video.dart
index fc0f97e..544415e 100644
--- a/lib/src/track/local/video.dart
+++ b/lib/src/track/local/video.dart
@@ -3,9 +3,9 @@ import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
 import '../../logger.dart';
 import '../../proto/livekit_models.pb.dart' as lk_models;
 import '../../types.dart';
-import '../local.dart';
 import '../options.dart';
 import '../track.dart';
+import 'local.dart';
 
 /// A video track from the local device. Use static methods in this class to create
 /// video tracks.
diff --git a/lib/src/track/options.dart b/lib/src/track/options.dart
index 2c4297e..24d2aa1 100644
--- a/lib/src/track/options.dart
+++ b/lib/src/track/options.dart
@@ -1,6 +1,7 @@
 import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
-import '../track/local/video.dart';
+
 import '../track/local/audio.dart';
+import '../track/local/video.dart';
 import '../types.dart';
 
 /// A type that represents front or back of the camera.
diff --git a/lib/src/track/remote/audio.dart b/lib/src/track/remote/audio.dart
index fb3e104..876925d 100644
--- a/lib/src/track/remote/audio.dart
+++ b/lib/src/track/remote/audio.dart
@@ -3,8 +3,8 @@ import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
 import '../../proto/livekit_models.pb.dart' as lk_models;
 import '../../types.dart';
 import '../audio_management.dart';
-import '../local.dart';
-import '../remote.dart';
+import '../local/local.dart';
+import 'remote.dart';
 
 import '../web/_audio_api.dart' if (dart.library.html) '../web/_audio_html.dart'
     as audio;
diff --git a/lib/src/track/remote.dart b/lib/src/track/remote/remote.dart
similarity index 86%
rename from lib/src/track/remote.dart
rename to lib/src/track/remote/remote.dart
index 7deef67..5c40f4d 100644
--- a/lib/src/track/remote.dart
+++ b/lib/src/track/remote/remote.dart
@@ -1,8 +1,8 @@
 import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
 
-import '../proto/livekit_models.pb.dart' as lk_models;
-import '../types.dart';
-import 'track.dart';
+import '../../proto/livekit_models.pb.dart' as lk_models;
+import '../../types.dart';
+import '../track.dart';
 
 abstract class RemoteTrack extends Track {
   RemoteTrack(
diff --git a/lib/src/track/remote/video.dart b/lib/src/track/remote/video.dart
index eb2a4db..c4503d4 100644
--- a/lib/src/track/remote/video.dart
+++ b/lib/src/track/remote/video.dart
@@ -2,8 +2,8 @@ import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
 
 import '../../proto/livekit_models.pb.dart' as lk_models;
 import '../../types.dart';
-import '../local.dart';
-import '../remote.dart';
+import '../local/local.dart';
+import 'remote.dart';
 
 class RemoteVideoTrack extends RemoteTrack with VideoTrack {
   //
diff --git a/lib/src/track/web/_audio_html.dart b/lib/src/track/web/_audio_html.dart
index cde1b59..5117985 100644
--- a/lib/src/track/web/_audio_html.dart
+++ b/lib/src/track/web/_audio_html.dart
@@ -1,4 +1,5 @@
 // ignore: avoid_web_libraries_in_flutter
+
 import 'dart:html' as html;
 
 // ignore: implementation_imports
diff --git a/lib/src/types.dart b/lib/src/types.dart
index 7f362d2..4b269af 100644
--- a/lib/src/types.dart
+++ b/lib/src/types.dart
@@ -1,7 +1,8 @@
+import 'dart:math' as math;
+
 import 'package:flutter/material.dart';
 
 import 'extensions.dart';
-import 'dart:math' as math;
 
 typedef CancelListenFunc = Function();
 
diff --git a/lib/src/utils.dart b/lib/src/utils.dart
index f03f71d..1ccb407 100644
--- a/lib/src/utils.dart
+++ b/lib/src/utils.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
-import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
 import 'package:collection/collection.dart';
+import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
 
 import './proto/livekit_models.pb.dart' as lk_models;
 import 'extensions.dart';
diff --git a/lib/src/widget/video_track_renderer.dart b/lib/src/widget/video_track_renderer.dart
index 84291be..e8061a7 100644
--- a/lib/src/widget/video_track_renderer.dart
+++ b/lib/src/widget/video_track_renderer.dart
@@ -8,7 +8,7 @@ import '../extensions.dart';
 import '../internal/events.dart';
 import '../logger.dart';
 import '../managers/event.dart';
-import '../track/local.dart';
+import '../track/local/local.dart';
 import '../track/local/video.dart';
 
 /// Widget that renders a [VideoTrack].