diff --git a/lib.old/spinify.dart b/lib.old/spinify.dart
new file mode 100644
index 0000000..8158ec7
--- /dev/null
+++ b/lib.old/spinify.dart
@@ -0,0 +1,31 @@
+library spinify;
+
+export 'src/client/config.dart';
+export 'src/client/observer.dart';
+export 'src/client/spinify.dart' show Spinify;
+export 'src/client/state.dart';
+export 'src/client/states_stream.dart';
+export 'src/model/channel_presence.dart';
+export 'src/model/channel_push.dart';
+export 'src/model/client_info.dart';
+export 'src/model/connect.dart';
+export 'src/model/disconnect.dart';
+export 'src/model/event.dart';
+export 'src/model/exception.dart';
+export 'src/model/history.dart';
+export 'src/model/jwt.dart';
+export 'src/model/message.dart';
+export 'src/model/metrics.dart';
+export 'src/model/presence.dart';
+export 'src/model/presence_stats.dart';
+export 'src/model/publication.dart';
+export 'src/model/pushes_stream.dart';
+export 'src/model/refresh.dart';
+export 'src/model/stream_position.dart';
+export 'src/model/subscribe.dart';
+export 'src/model/unsubscribe.dart';
+export 'src/subscription/subcibed_on_channel.dart';
+export 'src/subscription/subscription.dart';
+export 'src/subscription/subscription_config.dart';
+export 'src/subscription/subscription_state.dart';
+export 'src/subscription/subscription_states_stream.dart';
diff --git a/lib/src/client/config.dart b/lib.old/src/client/config.dart
similarity index 98%
rename from lib/src/client/config.dart
rename to lib.old/src/client/config.dart
index b6fa095..7188a47 100644
--- a/lib/src/client/config.dart
+++ b/lib.old/src/client/config.dart
@@ -1,7 +1,8 @@
 import 'dart:async';
 
 import 'package:meta/meta.dart';
-import 'package:spinify/src/model/pubspec.yaml.g.dart';
+
+import '../model/pubspec.yaml.g.dart';
 
 /// Token used for authentication
 ///
diff --git a/lib/src/client/disconnect_code.dart b/lib.old/src/client/disconnect_code.dart
similarity index 100%
rename from lib/src/client/disconnect_code.dart
rename to lib.old/src/client/disconnect_code.dart
diff --git a/lib/src/client/observer.dart b/lib.old/src/client/observer.dart
similarity index 80%
rename from lib/src/client/observer.dart
rename to lib.old/src/client/observer.dart
index 51bfc16..3968e32 100644
--- a/lib/src/client/observer.dart
+++ b/lib.old/src/client/observer.dart
@@ -1,9 +1,9 @@
-import 'package:spinify/src/client/spinify_interface.dart';
-import 'package:spinify/src/client/state.dart';
-import 'package:spinify/src/model/event.dart';
-import 'package:spinify/src/model/exception.dart';
-import 'package:spinify/src/subscription/subscription.dart';
-import 'package:spinify/src/subscription/subscription_state.dart';
+import '../model/event.dart';
+import '../model/exception.dart';
+import '../subscription/subscription.dart';
+import '../subscription/subscription_state.dart';
+import 'spinify_interface.dart';
+import 'state.dart';
 
 /// An interface for observing the behavior of Spinify instances.
 /// {@category Client}
diff --git a/lib/src/client/spinify.dart b/lib.old/src/client/spinify.dart
similarity index 93%
rename from lib/src/client/spinify.dart
rename to lib.old/src/client/spinify.dart
index 09b62be..8d72dd7 100644
--- a/lib/src/client/spinify.dart
+++ b/lib.old/src/client/spinify.dart
@@ -1,37 +1,38 @@
 import 'dart:async';
 
 import 'package:meta/meta.dart';
-import 'package:spinify/src/client/config.dart';
-import 'package:spinify/src/client/disconnect_code.dart';
-import 'package:spinify/src/client/observer.dart';
-import 'package:spinify/src/client/spinify_interface.dart';
-import 'package:spinify/src/client/state.dart';
-import 'package:spinify/src/client/states_stream.dart';
-import 'package:spinify/src/model/channel_presence.dart';
-import 'package:spinify/src/model/channel_push.dart';
-import 'package:spinify/src/model/connect.dart';
-import 'package:spinify/src/model/disconnect.dart';
-import 'package:spinify/src/model/event.dart';
-import 'package:spinify/src/model/exception.dart';
-import 'package:spinify/src/model/history.dart';
-import 'package:spinify/src/model/message.dart';
-import 'package:spinify/src/model/metrics.dart';
-import 'package:spinify/src/model/presence.dart';
-import 'package:spinify/src/model/presence_stats.dart';
-import 'package:spinify/src/model/publication.dart';
-import 'package:spinify/src/model/pushes_stream.dart';
-import 'package:spinify/src/model/refresh.dart';
-import 'package:spinify/src/model/stream_position.dart';
-import 'package:spinify/src/model/subscribe.dart';
-import 'package:spinify/src/model/unsubscribe.dart';
-import 'package:spinify/src/subscription/client_subscription_manager.dart';
-import 'package:spinify/src/subscription/server_subscription_manager.dart';
-import 'package:spinify/src/subscription/subscription.dart';
-import 'package:spinify/src/subscription/subscription_config.dart';
-import 'package:spinify/src/transport/transport_interface.dart';
-import 'package:spinify/src/transport/ws_protobuf_transport.dart';
-import 'package:spinify/src/util/event_queue.dart';
-import 'package:spinify/src/util/logger.dart' as logger;
+
+import '../model/channel_presence.dart';
+import '../model/channel_push.dart';
+import '../model/connect.dart';
+import '../model/disconnect.dart';
+import '../model/event.dart';
+import '../model/exception.dart';
+import '../model/history.dart';
+import '../model/message.dart';
+import '../model/metrics.dart';
+import '../model/presence.dart';
+import '../model/presence_stats.dart';
+import '../model/publication.dart';
+import '../model/pushes_stream.dart';
+import '../model/refresh.dart';
+import '../model/stream_position.dart';
+import '../model/subscribe.dart';
+import '../model/unsubscribe.dart';
+import '../subscription/client_subscription_manager.dart';
+import '../subscription/server_subscription_manager.dart';
+import '../subscription/subscription.dart';
+import '../subscription/subscription_config.dart';
+import '../transport/transport_interface.dart';
+import '../transport/ws_protobuf_transport.dart';
+import '../util/event_queue.dart';
+import '../util/logger.dart' as logger;
+import 'config.dart';
+import 'disconnect_code.dart';
+import 'observer.dart';
+import 'spinify_interface.dart';
+import 'state.dart';
+import 'states_stream.dart';
 
 /// {@template spinify}
 /// Spinify client for Centrifuge.
diff --git a/lib/src/client/spinify_interface.dart b/lib.old/src/client/spinify_interface.dart
similarity index 88%
rename from lib/src/client/spinify_interface.dart
rename to lib.old/src/client/spinify_interface.dart
index cec9c6e..5158298 100644
--- a/lib/src/client/spinify_interface.dart
+++ b/lib.old/src/client/spinify_interface.dart
@@ -2,16 +2,16 @@
 
 import 'dart:async';
 
-import 'package:spinify/src/client/state.dart';
-import 'package:spinify/src/client/states_stream.dart';
-import 'package:spinify/src/model/history.dart';
-import 'package:spinify/src/model/metrics.dart';
-import 'package:spinify/src/model/presence.dart';
-import 'package:spinify/src/model/presence_stats.dart';
-import 'package:spinify/src/model/pushes_stream.dart';
-import 'package:spinify/src/model/stream_position.dart';
-import 'package:spinify/src/subscription/subscription.dart';
-import 'package:spinify/src/subscription/subscription_config.dart';
+import '../model/history.dart';
+import '../model/metrics.dart';
+import '../model/presence.dart';
+import '../model/presence_stats.dart';
+import '../model/pushes_stream.dart';
+import '../model/stream_position.dart';
+import '../subscription/subscription.dart';
+import '../subscription/subscription_config.dart';
+import 'state.dart';
+import 'states_stream.dart';
 
 /// Spinify client interface.
 abstract interface class ISpinify
diff --git a/lib/src/client/state.dart b/lib.old/src/client/state.dart
similarity index 100%
rename from lib/src/client/state.dart
rename to lib.old/src/client/state.dart
diff --git a/lib/src/client/states_stream.dart b/lib.old/src/client/states_stream.dart
similarity index 95%
rename from lib/src/client/states_stream.dart
rename to lib.old/src/client/states_stream.dart
index c4ba0e2..5c2996c 100644
--- a/lib/src/client/states_stream.dart
+++ b/lib.old/src/client/states_stream.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:spinify/src/client/state.dart';
+import 'state.dart';
 
 /// Stream of Spinify's [SpinifyState] changes.
 /// {@category Client}
diff --git a/lib/src/model/channel_presence.dart b/lib.old/src/model/channel_presence.dart
similarity index 93%
rename from lib/src/model/channel_presence.dart
rename to lib.old/src/model/channel_presence.dart
index bbafc08..8637a3d 100644
--- a/lib/src/model/channel_presence.dart
+++ b/lib.old/src/model/channel_presence.dart
@@ -1,6 +1,7 @@
 import 'package:meta/meta.dart';
-import 'package:spinify/src/model/channel_push.dart';
-import 'package:spinify/src/model/client_info.dart';
+
+import 'channel_push.dart';
+import 'client_info.dart';
 
 /// {@template channel_presence}
 /// Channel presence.
diff --git a/lib/src/model/channel_push.dart b/lib.old/src/model/channel_push.dart
similarity index 92%
rename from lib/src/model/channel_push.dart
rename to lib.old/src/model/channel_push.dart
index 5fb7f44..48c579f 100644
--- a/lib/src/model/channel_push.dart
+++ b/lib.old/src/model/channel_push.dart
@@ -1,5 +1,6 @@
 import 'package:meta/meta.dart';
-import 'package:spinify/src/model/event.dart';
+
+import 'event.dart';
 
 /// {@template spinify_channel_push}
 /// Base class for all channel push events.
diff --git a/lib/src/model/client_info.dart b/lib.old/src/model/client_info.dart
similarity index 100%
rename from lib/src/model/client_info.dart
rename to lib.old/src/model/client_info.dart
diff --git a/lib/src/model/connect.dart b/lib.old/src/model/connect.dart
similarity index 96%
rename from lib/src/model/connect.dart
rename to lib.old/src/model/connect.dart
index aede9e4..7af4476 100644
--- a/lib/src/model/connect.dart
+++ b/lib.old/src/model/connect.dart
@@ -1,4 +1,4 @@
-import 'package:spinify/src/model/channel_push.dart';
+import 'channel_push.dart';
 
 /// {@template connect}
 /// Connect push from Centrifugo server.
diff --git a/lib/src/model/disconnect.dart b/lib.old/src/model/disconnect.dart
similarity index 92%
rename from lib/src/model/disconnect.dart
rename to lib.old/src/model/disconnect.dart
index 2eeecf5..d29f24b 100644
--- a/lib/src/model/disconnect.dart
+++ b/lib.old/src/model/disconnect.dart
@@ -1,4 +1,4 @@
-import 'package:spinify/src/model/channel_push.dart';
+import 'channel_push.dart';
 
 /// {@template disconnect}
 /// Disconnect push from Centrifugo server.
diff --git a/lib/src/model/event.dart b/lib.old/src/model/event.dart
similarity index 100%
rename from lib/src/model/event.dart
rename to lib.old/src/model/event.dart
diff --git a/lib/src/model/exception.dart b/lib.old/src/model/exception.dart
similarity index 100%
rename from lib/src/model/exception.dart
rename to lib.old/src/model/exception.dart
diff --git a/lib/src/model/history.dart b/lib.old/src/model/history.dart
similarity index 81%
rename from lib/src/model/history.dart
rename to lib.old/src/model/history.dart
index 5945ce9..30d03ea 100644
--- a/lib/src/model/history.dart
+++ b/lib.old/src/model/history.dart
@@ -1,6 +1,7 @@
 import 'package:meta/meta.dart';
-import 'package:spinify/src/model/publication.dart';
-import 'package:spinify/src/model/stream_position.dart';
+
+import 'publication.dart';
+import 'stream_position.dart';
 
 /// {@template history}
 /// History
diff --git a/lib/src/model/jwt.dart b/lib.old/src/model/jwt.dart
similarity index 100%
rename from lib/src/model/jwt.dart
rename to lib.old/src/model/jwt.dart
diff --git a/lib/src/model/message.dart b/lib.old/src/model/message.dart
similarity index 90%
rename from lib/src/model/message.dart
rename to lib.old/src/model/message.dart
index 779f4c4..7066365 100644
--- a/lib/src/model/message.dart
+++ b/lib.old/src/model/message.dart
@@ -1,4 +1,4 @@
-import 'package:spinify/src/model/channel_push.dart';
+import 'channel_push.dart';
 
 /// {@template message}
 /// Message push from Centrifugo server.
diff --git a/lib/src/model/metrics.dart b/lib.old/src/model/metrics.dart
similarity index 98%
rename from lib/src/model/metrics.dart
rename to lib.old/src/model/metrics.dart
index 67f17ee..1e358ee 100644
--- a/lib/src/model/metrics.dart
+++ b/lib.old/src/model/metrics.dart
@@ -1,5 +1,6 @@
 import 'package:meta/meta.dart';
-import 'package:spinify/src/client/state.dart';
+
+import '../client/state.dart';
 
 /// Subscription count
 /// - total
diff --git a/lib/src/model/presence.dart b/lib.old/src/model/presence.dart
similarity index 89%
rename from lib/src/model/presence.dart
rename to lib.old/src/model/presence.dart
index 38dacd9..2dce4df 100644
--- a/lib/src/model/presence.dart
+++ b/lib.old/src/model/presence.dart
@@ -1,5 +1,6 @@
 import 'package:meta/meta.dart';
-import 'package:spinify/src/model/client_info.dart';
+
+import 'client_info.dart';
 
 /// {@template presence}
 /// Presence
diff --git a/lib/src/model/presence_stats.dart b/lib.old/src/model/presence_stats.dart
similarity index 100%
rename from lib/src/model/presence_stats.dart
rename to lib.old/src/model/presence_stats.dart
diff --git a/lib/src/model/publication.dart b/lib.old/src/model/publication.dart
similarity index 90%
rename from lib/src/model/publication.dart
rename to lib.old/src/model/publication.dart
index a30a5c4..d1dc979 100644
--- a/lib/src/model/publication.dart
+++ b/lib.old/src/model/publication.dart
@@ -1,7 +1,8 @@
 import 'package:fixnum/fixnum.dart' as fixnum;
 import 'package:meta/meta.dart';
-import 'package:spinify/src/model/channel_push.dart';
-import 'package:spinify/src/model/client_info.dart';
+
+import 'channel_push.dart';
+import 'client_info.dart';
 
 /// {@template publication}
 /// Publication context
diff --git a/lib/src/model/pubspec.yaml.g.dart b/lib.old/src/model/pubspec.yaml.g.dart
similarity index 100%
rename from lib/src/model/pubspec.yaml.g.dart
rename to lib.old/src/model/pubspec.yaml.g.dart
diff --git a/lib/src/model/pushes_stream.dart b/lib.old/src/model/pushes_stream.dart
similarity index 84%
rename from lib/src/model/pushes_stream.dart
rename to lib.old/src/model/pushes_stream.dart
index 6a3b505..110ce44 100644
--- a/lib/src/model/pushes_stream.dart
+++ b/lib.old/src/model/pushes_stream.dart
@@ -1,11 +1,12 @@
 import 'dart:async';
 
 import 'package:meta/meta.dart';
-import 'package:spinify/src/model/channel_presence.dart';
-import 'package:spinify/src/model/channel_push.dart';
-import 'package:spinify/src/model/event.dart';
-import 'package:spinify/src/model/message.dart';
-import 'package:spinify/src/model/publication.dart';
+
+import 'channel_presence.dart';
+import 'channel_push.dart';
+import 'event.dart';
+import 'message.dart';
+import 'publication.dart';
 
 /// Stream of received pushes from Centrifugo server for a channel.
 /// {@category Event}
diff --git a/lib/src/model/refresh.dart b/lib.old/src/model/refresh.dart
similarity index 91%
rename from lib/src/model/refresh.dart
rename to lib.old/src/model/refresh.dart
index 32eecfa..fb635d5 100644
--- a/lib/src/model/refresh.dart
+++ b/lib.old/src/model/refresh.dart
@@ -1,4 +1,4 @@
-import 'package:spinify/src/model/channel_push.dart';
+import 'channel_push.dart';
 
 /// {@template refresh}
 /// Refresh push from Centrifugo server.
diff --git a/lib/src/model/refresh_result.dart b/lib.old/src/model/refresh_result.dart
similarity index 100%
rename from lib/src/model/refresh_result.dart
rename to lib.old/src/model/refresh_result.dart
diff --git a/lib/src/model/stream_position.dart b/lib.old/src/model/stream_position.dart
similarity index 100%
rename from lib/src/model/stream_position.dart
rename to lib.old/src/model/stream_position.dart
diff --git a/lib/src/model/subscribe.dart b/lib.old/src/model/subscribe.dart
similarity index 88%
rename from lib/src/model/subscribe.dart
rename to lib.old/src/model/subscribe.dart
index be8d8eb..b855747 100644
--- a/lib/src/model/subscribe.dart
+++ b/lib.old/src/model/subscribe.dart
@@ -1,5 +1,5 @@
-import 'package:spinify/src/model/channel_push.dart';
-import 'package:spinify/src/model/stream_position.dart';
+import 'channel_push.dart';
+import 'stream_position.dart';
 
 /// {@template subscribe}
 /// Subscribe push from Centrifugo server.
diff --git a/lib/src/model/unsubscribe.dart b/lib.old/src/model/unsubscribe.dart
similarity index 91%
rename from lib/src/model/unsubscribe.dart
rename to lib.old/src/model/unsubscribe.dart
index 786e8cc..c312cb0 100644
--- a/lib/src/model/unsubscribe.dart
+++ b/lib.old/src/model/unsubscribe.dart
@@ -1,4 +1,4 @@
-import 'package:spinify/src/model/channel_push.dart';
+import 'channel_push.dart';
 
 /// {@template unsubscribe}
 /// Unsubscribe push from Centrifugo server.
diff --git a/lib/src/subscription/client_subscription_impl.dart b/lib.old/src/subscription/client_subscription_impl.dart
similarity index 92%
rename from lib/src/subscription/client_subscription_impl.dart
rename to lib.old/src/subscription/client_subscription_impl.dart
index 3ad363b..8768935 100644
--- a/lib/src/subscription/client_subscription_impl.dart
+++ b/lib.old/src/subscription/client_subscription_impl.dart
@@ -2,31 +2,32 @@ import 'dart:async';
 
 import 'package:fixnum/fixnum.dart' as fixnum;
 import 'package:meta/meta.dart';
-import 'package:spinify/src/client/disconnect_code.dart';
-import 'package:spinify/src/client/spinify.dart';
-import 'package:spinify/src/model/channel_presence.dart';
-import 'package:spinify/src/model/channel_push.dart';
-import 'package:spinify/src/model/connect.dart';
-import 'package:spinify/src/model/disconnect.dart';
-import 'package:spinify/src/model/event.dart';
-import 'package:spinify/src/model/exception.dart';
-import 'package:spinify/src/model/history.dart';
-import 'package:spinify/src/model/message.dart';
-import 'package:spinify/src/model/presence.dart';
-import 'package:spinify/src/model/presence_stats.dart';
-import 'package:spinify/src/model/publication.dart';
-import 'package:spinify/src/model/pushes_stream.dart';
-import 'package:spinify/src/model/refresh.dart';
-import 'package:spinify/src/model/stream_position.dart';
-import 'package:spinify/src/model/subscribe.dart';
-import 'package:spinify/src/model/unsubscribe.dart';
-import 'package:spinify/src/subscription/subscription.dart';
-import 'package:spinify/src/subscription/subscription_config.dart';
-import 'package:spinify/src/subscription/subscription_state.dart';
-import 'package:spinify/src/subscription/subscription_states_stream.dart';
-import 'package:spinify/src/transport/transport_interface.dart';
-import 'package:spinify/src/util/event_queue.dart';
-import 'package:spinify/src/util/logger.dart' as logger;
+
+import '../client/disconnect_code.dart';
+import '../client/spinify.dart';
+import '../model/channel_presence.dart';
+import '../model/channel_push.dart';
+import '../model/connect.dart';
+import '../model/disconnect.dart';
+import '../model/event.dart';
+import '../model/exception.dart';
+import '../model/history.dart';
+import '../model/message.dart';
+import '../model/presence.dart';
+import '../model/presence_stats.dart';
+import '../model/publication.dart';
+import '../model/pushes_stream.dart';
+import '../model/refresh.dart';
+import '../model/stream_position.dart';
+import '../model/subscribe.dart';
+import '../model/unsubscribe.dart';
+import '../transport/transport_interface.dart';
+import '../util/event_queue.dart';
+import '../util/logger.dart' as logger;
+import 'subscription.dart';
+import 'subscription_config.dart';
+import 'subscription_state.dart';
+import 'subscription_states_stream.dart';
 
 /// Client-side subscription implementation.
 @internal
diff --git a/lib/src/subscription/client_subscription_manager.dart b/lib.old/src/subscription/client_subscription_manager.dart
similarity index 91%
rename from lib/src/subscription/client_subscription_manager.dart
rename to lib.old/src/subscription/client_subscription_manager.dart
index 702ff1f..27699de 100644
--- a/lib/src/subscription/client_subscription_manager.dart
+++ b/lib.old/src/subscription/client_subscription_manager.dart
@@ -1,13 +1,14 @@
 import 'dart:collection';
 
 import 'package:meta/meta.dart';
-import 'package:spinify/src/model/channel_push.dart';
-import 'package:spinify/src/model/exception.dart';
-import 'package:spinify/src/subscription/client_subscription_impl.dart';
-import 'package:spinify/src/subscription/subscription.dart';
-import 'package:spinify/src/subscription/subscription_config.dart';
-import 'package:spinify/src/subscription/subscription_state.dart';
-import 'package:spinify/src/transport/transport_interface.dart';
+
+import '../model/channel_push.dart';
+import '../model/exception.dart';
+import '../transport/transport_interface.dart';
+import 'client_subscription_impl.dart';
+import 'subscription.dart';
+import 'subscription_config.dart';
+import 'subscription_state.dart';
 
 /// Responsible for managing client-side subscriptions.
 @internal
diff --git a/lib/src/subscription/server_subscription_impl.dart b/lib.old/src/subscription/server_subscription_impl.dart
similarity index 90%
rename from lib/src/subscription/server_subscription_impl.dart
rename to lib.old/src/subscription/server_subscription_impl.dart
index 0cb6b3c..32fc054 100644
--- a/lib/src/subscription/server_subscription_impl.dart
+++ b/lib.old/src/subscription/server_subscription_impl.dart
@@ -2,29 +2,30 @@ import 'dart:async';
 
 import 'package:fixnum/fixnum.dart' as fixnum;
 import 'package:meta/meta.dart';
-import 'package:spinify/src/client/spinify.dart';
-import 'package:spinify/src/model/channel_presence.dart';
-import 'package:spinify/src/model/channel_push.dart';
-import 'package:spinify/src/model/connect.dart';
-import 'package:spinify/src/model/disconnect.dart';
-import 'package:spinify/src/model/event.dart';
-import 'package:spinify/src/model/exception.dart';
-import 'package:spinify/src/model/history.dart';
-import 'package:spinify/src/model/message.dart';
-import 'package:spinify/src/model/presence.dart';
-import 'package:spinify/src/model/presence_stats.dart';
-import 'package:spinify/src/model/publication.dart';
-import 'package:spinify/src/model/pushes_stream.dart';
-import 'package:spinify/src/model/refresh.dart';
-import 'package:spinify/src/model/stream_position.dart';
-import 'package:spinify/src/model/subscribe.dart';
-import 'package:spinify/src/model/unsubscribe.dart';
-import 'package:spinify/src/subscription/subscription.dart';
-import 'package:spinify/src/subscription/subscription_state.dart';
-import 'package:spinify/src/subscription/subscription_states_stream.dart';
-import 'package:spinify/src/transport/transport_interface.dart';
-import 'package:spinify/src/util/event_queue.dart';
-import 'package:spinify/src/util/logger.dart' as logger;
+
+import '../client/spinify.dart';
+import '../model/channel_presence.dart';
+import '../model/channel_push.dart';
+import '../model/connect.dart';
+import '../model/disconnect.dart';
+import '../model/event.dart';
+import '../model/exception.dart';
+import '../model/history.dart';
+import '../model/message.dart';
+import '../model/presence.dart';
+import '../model/presence_stats.dart';
+import '../model/publication.dart';
+import '../model/pushes_stream.dart';
+import '../model/refresh.dart';
+import '../model/stream_position.dart';
+import '../model/subscribe.dart';
+import '../model/unsubscribe.dart';
+import '../transport/transport_interface.dart';
+import '../util/event_queue.dart';
+import '../util/logger.dart' as logger;
+import 'subscription.dart';
+import 'subscription_state.dart';
+import 'subscription_states_stream.dart';
 
 /// Server-side subscription implementation.
 @internal
diff --git a/lib/src/subscription/server_subscription_manager.dart b/lib.old/src/subscription/server_subscription_manager.dart
similarity index 91%
rename from lib/src/subscription/server_subscription_manager.dart
rename to lib.old/src/subscription/server_subscription_manager.dart
index 3d96bf3..6aa5004 100644
--- a/lib/src/subscription/server_subscription_manager.dart
+++ b/lib.old/src/subscription/server_subscription_manager.dart
@@ -1,13 +1,14 @@
 import 'dart:collection';
 
 import 'package:meta/meta.dart';
-import 'package:spinify/src/model/channel_push.dart';
-import 'package:spinify/src/model/subscribe.dart';
-import 'package:spinify/src/model/unsubscribe.dart';
-import 'package:spinify/src/subscription/server_subscription_impl.dart';
-import 'package:spinify/src/subscription/subscription.dart';
-import 'package:spinify/src/subscription/subscription_state.dart';
-import 'package:spinify/src/transport/transport_interface.dart';
+
+import '../model/channel_push.dart';
+import '../model/subscribe.dart';
+import '../model/unsubscribe.dart';
+import '../transport/transport_interface.dart';
+import 'server_subscription_impl.dart';
+import 'subscription.dart';
+import 'subscription_state.dart';
 
 /// Responsible for managing client-side subscriptions.
 @internal
diff --git a/lib/src/subscription/subcibed_on_channel.dart b/lib.old/src/subscription/subcibed_on_channel.dart
similarity index 92%
rename from lib/src/subscription/subcibed_on_channel.dart
rename to lib.old/src/subscription/subcibed_on_channel.dart
index 1ea3e3f..6be1ba3 100644
--- a/lib/src/subscription/subcibed_on_channel.dart
+++ b/lib.old/src/subscription/subcibed_on_channel.dart
@@ -1,6 +1,7 @@
 import 'package:meta/meta.dart';
-import 'package:spinify/src/model/publication.dart';
-import 'package:spinify/src/model/stream_position.dart';
+
+import '../model/publication.dart';
+import '../model/stream_position.dart';
 
 /// Subscribed on channel message.
 /// {@category Subscription}
diff --git a/lib/src/subscription/subscription.dart b/lib.old/src/subscription/subscription.dart
similarity index 93%
rename from lib/src/subscription/subscription.dart
rename to lib.old/src/subscription/subscription.dart
index deee860..f268ae4 100644
--- a/lib/src/subscription/subscription.dart
+++ b/lib.old/src/subscription/subscription.dart
@@ -1,12 +1,12 @@
 import 'dart:async';
 
-import 'package:spinify/src/model/history.dart';
-import 'package:spinify/src/model/presence.dart';
-import 'package:spinify/src/model/presence_stats.dart';
-import 'package:spinify/src/model/pushes_stream.dart';
-import 'package:spinify/src/model/stream_position.dart';
-import 'package:spinify/src/subscription/subscription_state.dart';
-import 'package:spinify/src/subscription/subscription_states_stream.dart';
+import '../model/history.dart';
+import '../model/presence.dart';
+import '../model/presence_stats.dart';
+import '../model/pushes_stream.dart';
+import '../model/stream_position.dart';
+import 'subscription_state.dart';
+import 'subscription_states_stream.dart';
 
 /// {@template subscription}
 /// Spinify subscription interface.
diff --git a/lib/src/subscription/subscription_config.dart b/lib.old/src/subscription/subscription_config.dart
similarity index 100%
rename from lib/src/subscription/subscription_config.dart
rename to lib.old/src/subscription/subscription_config.dart
diff --git a/lib/src/subscription/subscription_state.dart b/lib.old/src/subscription/subscription_state.dart
similarity index 100%
rename from lib/src/subscription/subscription_state.dart
rename to lib.old/src/subscription/subscription_state.dart
diff --git a/lib/src/subscription/subscription_states_stream.dart b/lib.old/src/subscription/subscription_states_stream.dart
similarity index 94%
rename from lib/src/subscription/subscription_states_stream.dart
rename to lib.old/src/subscription/subscription_states_stream.dart
index 310e373..abdd01c 100644
--- a/lib/src/subscription/subscription_states_stream.dart
+++ b/lib.old/src/subscription/subscription_states_stream.dart
@@ -1,7 +1,8 @@
 import 'dart:async';
 
 import 'package:meta/meta.dart';
-import 'package:spinify/src/subscription/subscription_state.dart';
+
+import 'subscription_state.dart';
 
 /// Stream of Spinify's [SpinifySubscriptionState] changes.
 /// {@category Subscription}
diff --git a/lib/src/subscription/unsubscribe_code.dart b/lib.old/src/subscription/unsubscribe_code.dart
similarity index 100%
rename from lib/src/subscription/unsubscribe_code.dart
rename to lib.old/src/subscription/unsubscribe_code.dart
diff --git a/lib/src/transport/protobuf/client.pb.dart b/lib.old/src/transport/protobuf/client.pb.dart
similarity index 100%
rename from lib/src/transport/protobuf/client.pb.dart
rename to lib.old/src/transport/protobuf/client.pb.dart
diff --git a/lib/src/transport/protobuf/client.pbenum.dart b/lib.old/src/transport/protobuf/client.pbenum.dart
similarity index 100%
rename from lib/src/transport/protobuf/client.pbenum.dart
rename to lib.old/src/transport/protobuf/client.pbenum.dart
diff --git a/lib/src/transport/protobuf/client.pbjson.dart b/lib.old/src/transport/protobuf/client.pbjson.dart
similarity index 100%
rename from lib/src/transport/protobuf/client.pbjson.dart
rename to lib.old/src/transport/protobuf/client.pbjson.dart
diff --git a/lib/src/transport/protobuf/client.pbserver.dart b/lib.old/src/transport/protobuf/client.pbserver.dart
similarity index 100%
rename from lib/src/transport/protobuf/client.pbserver.dart
rename to lib.old/src/transport/protobuf/client.pbserver.dart
diff --git a/lib/src/transport/protobuf/client.proto b/lib.old/src/transport/protobuf/client.proto
similarity index 100%
rename from lib/src/transport/protobuf/client.proto
rename to lib.old/src/transport/protobuf/client.proto
diff --git a/lib/src/transport/transport_interface.dart b/lib.old/src/transport/transport_interface.dart
similarity index 80%
rename from lib/src/transport/transport_interface.dart
rename to lib.old/src/transport/transport_interface.dart
index 19efe67..3151ea0 100644
--- a/lib/src/transport/transport_interface.dart
+++ b/lib.old/src/transport/transport_interface.dart
@@ -1,17 +1,18 @@
 import 'dart:async';
 
 import 'package:meta/meta.dart';
-import 'package:spinify/src/client/state.dart';
-import 'package:spinify/src/model/event.dart';
-import 'package:spinify/src/model/history.dart';
-import 'package:spinify/src/model/presence.dart';
-import 'package:spinify/src/model/presence_stats.dart';
-import 'package:spinify/src/model/refresh_result.dart';
-import 'package:spinify/src/model/stream_position.dart';
-import 'package:spinify/src/subscription/server_subscription_manager.dart';
-import 'package:spinify/src/subscription/subcibed_on_channel.dart';
-import 'package:spinify/src/subscription/subscription_config.dart';
-import 'package:spinify/src/util/notifier.dart';
+
+import '../client/state.dart';
+import '../model/event.dart';
+import '../model/history.dart';
+import '../model/presence.dart';
+import '../model/presence_stats.dart';
+import '../model/refresh_result.dart';
+import '../model/stream_position.dart';
+import '../subscription/server_subscription_manager.dart';
+import '../subscription/subcibed_on_channel.dart';
+import '../subscription/subscription_config.dart';
+import '../util/notifier.dart';
 
 /// Class responsible for sending and receiving data from the server.
 @internal
diff --git a/lib/src/transport/transport_protobuf_codec.dart b/lib.old/src/transport/transport_protobuf_codec.dart
similarity index 92%
rename from lib/src/transport/transport_protobuf_codec.dart
rename to lib.old/src/transport/transport_protobuf_codec.dart
index 5d27b99..aa47de7 100644
--- a/lib/src/transport/transport_protobuf_codec.dart
+++ b/lib.old/src/transport/transport_protobuf_codec.dart
@@ -2,8 +2,9 @@ import 'dart:convert';
 
 import 'package:meta/meta.dart';
 import 'package:protobuf/protobuf.dart' as pb;
-import 'package:spinify/src/transport/protobuf/client.pb.dart' as pb;
-import 'package:spinify/src/util/logger.dart' as logger;
+
+import '../util/logger.dart' as logger;
+import 'protobuf/client.pb.dart' as pb;
 
 @internal
 final class TransportProtobufCodec extends Codec<Object, List<int>> {
diff --git a/lib/src/transport/ws_protobuf_transport.dart b/lib.old/src/transport/ws_protobuf_transport.dart
similarity index 94%
rename from lib/src/transport/ws_protobuf_transport.dart
rename to lib.old/src/transport/ws_protobuf_transport.dart
index 9d1c28b..3f5e45a 100644
--- a/lib/src/transport/ws_protobuf_transport.dart
+++ b/lib.old/src/transport/ws_protobuf_transport.dart
@@ -4,38 +4,39 @@ import 'dart:convert';
 
 import 'package:meta/meta.dart';
 import 'package:protobuf/protobuf.dart' as pb;
-import 'package:spinify/src/client/config.dart';
-import 'package:spinify/src/client/disconnect_code.dart';
-import 'package:spinify/src/client/state.dart';
-import 'package:spinify/src/model/channel_presence.dart';
-import 'package:spinify/src/model/client_info.dart';
-import 'package:spinify/src/model/connect.dart';
-import 'package:spinify/src/model/disconnect.dart';
-import 'package:spinify/src/model/event.dart';
-import 'package:spinify/src/model/exception.dart';
-import 'package:spinify/src/model/history.dart';
-import 'package:spinify/src/model/message.dart';
-import 'package:spinify/src/model/presence.dart';
-import 'package:spinify/src/model/presence_stats.dart';
-import 'package:spinify/src/model/publication.dart';
-import 'package:spinify/src/model/refresh.dart';
-import 'package:spinify/src/model/refresh_result.dart';
-import 'package:spinify/src/model/stream_position.dart';
-import 'package:spinify/src/model/subscribe.dart';
-import 'package:spinify/src/model/unsubscribe.dart';
-import 'package:spinify/src/subscription/server_subscription_manager.dart';
-import 'package:spinify/src/subscription/subcibed_on_channel.dart';
-import 'package:spinify/src/subscription/subscription.dart';
-import 'package:spinify/src/subscription/subscription_config.dart';
-import 'package:spinify/src/subscription/subscription_state.dart';
-import 'package:spinify/src/transport/protobuf/client.pb.dart' as pb;
-import 'package:spinify/src/transport/transport_interface.dart';
-import 'package:spinify/src/transport/transport_protobuf_codec.dart';
-import 'package:spinify/src/util/logger.dart' as logger;
-import 'package:spinify/src/util/notifier.dart';
-import 'package:spinify/src/util/speed_meter.dart';
 import 'package:ws/ws.dart';
 
+import '../client/config.dart';
+import '../client/disconnect_code.dart';
+import '../client/state.dart';
+import '../model/channel_presence.dart';
+import '../model/client_info.dart';
+import '../model/connect.dart';
+import '../model/disconnect.dart';
+import '../model/event.dart';
+import '../model/exception.dart';
+import '../model/history.dart';
+import '../model/message.dart';
+import '../model/presence.dart';
+import '../model/presence_stats.dart';
+import '../model/publication.dart';
+import '../model/refresh.dart';
+import '../model/refresh_result.dart';
+import '../model/stream_position.dart';
+import '../model/subscribe.dart';
+import '../model/unsubscribe.dart';
+import '../subscription/server_subscription_manager.dart';
+import '../subscription/subcibed_on_channel.dart';
+import '../subscription/subscription.dart';
+import '../subscription/subscription_config.dart';
+import '../subscription/subscription_state.dart';
+import '../util/logger.dart' as logger;
+import '../util/notifier.dart';
+import '../util/speed_meter.dart';
+import 'protobuf/client.pb.dart' as pb;
+import 'transport_interface.dart';
+import 'transport_protobuf_codec.dart';
+
 @internal
 abstract base class SpinifyWSPBTransportBase implements ISpinifyTransport {
   SpinifyWSPBTransportBase({
diff --git a/lib/src/util/event_queue.dart b/lib.old/src/util/event_queue.dart
similarity index 97%
rename from lib/src/util/event_queue.dart
rename to lib.old/src/util/event_queue.dart
index 3ae6f61..8f8fa7b 100644
--- a/lib/src/util/event_queue.dart
+++ b/lib.old/src/util/event_queue.dart
@@ -2,7 +2,8 @@ import 'dart:async';
 import 'dart:collection';
 
 import 'package:meta/meta.dart';
-import 'package:spinify/src/util/logger.dart';
+
+import 'logger.dart';
 
 @internal
 final class SpinifyEventQueue {
diff --git a/lib/src/util/logger.dart b/lib.old/src/util/logger.dart
similarity index 100%
rename from lib/src/util/logger.dart
rename to lib.old/src/util/logger.dart
diff --git a/lib/src/util/notifier.dart b/lib.old/src/util/notifier.dart
similarity index 100%
rename from lib/src/util/notifier.dart
rename to lib.old/src/util/notifier.dart
diff --git a/lib/src/util/speed_meter.dart b/lib.old/src/util/speed_meter.dart
similarity index 100%
rename from lib/src/util/speed_meter.dart
rename to lib.old/src/util/speed_meter.dart
diff --git a/lib/spinify.dart b/lib/spinify.dart
deleted file mode 100644
index 266485f..0000000
--- a/lib/spinify.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-library spinify;
-
-export 'package:spinify/src/client/config.dart';
-export 'package:spinify/src/client/observer.dart';
-export 'package:spinify/src/client/spinify.dart' show Spinify;
-export 'package:spinify/src/client/state.dart';
-export 'package:spinify/src/client/states_stream.dart';
-export 'package:spinify/src/model/channel_presence.dart';
-export 'package:spinify/src/model/channel_push.dart';
-export 'package:spinify/src/model/client_info.dart';
-export 'package:spinify/src/model/connect.dart';
-export 'package:spinify/src/model/disconnect.dart';
-export 'package:spinify/src/model/event.dart';
-export 'package:spinify/src/model/exception.dart';
-export 'package:spinify/src/model/history.dart';
-export 'package:spinify/src/model/jwt.dart';
-export 'package:spinify/src/model/message.dart';
-export 'package:spinify/src/model/metrics.dart';
-export 'package:spinify/src/model/presence.dart';
-export 'package:spinify/src/model/presence_stats.dart';
-export 'package:spinify/src/model/publication.dart';
-export 'package:spinify/src/model/pushes_stream.dart';
-export 'package:spinify/src/model/refresh.dart';
-export 'package:spinify/src/model/stream_position.dart';
-export 'package:spinify/src/model/subscribe.dart';
-export 'package:spinify/src/model/unsubscribe.dart';
-export 'package:spinify/src/subscription/subcibed_on_channel.dart';
-export 'package:spinify/src/subscription/subscription.dart';
-export 'package:spinify/src/subscription/subscription_config.dart';
-export 'package:spinify/src/subscription/subscription_state.dart';
-export 'package:spinify/src/subscription/subscription_states_stream.dart';