diff --git a/packages/stream_chat_flutter/example/lib/customize_message_widget.dart b/packages/stream_chat_flutter/example/lib/customize_message_widget.dart
deleted file mode 100644
index d19d6023..00000000
--- a/packages/stream_chat_flutter/example/lib/customize_message_widget.dart
+++ /dev/null
@@ -1,135 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:stream_chat_flutter/stream_chat_flutter.dart';
-
-/// Fifth step of the [tutorial](https://getstream.io/chat/flutter/tutorial/)
-///
-/// Customizing how messages are rendered is another very common use-case that the SDK supports easily.
-///
-/// Replace the built-in message component with your own is done by passing it as a builder function to the [MessageListView] widget.
-///
-/// The message builder function will get the usual [BuildContext] argument as well as the [Message] object and its position inside the list.
-///
-/// If you look at the code you can see that we use [StreamChat.of] to retrieve the current user so that we can style messages own messages in a different way.
-///
-/// Since custom widgets and builders are always children of [StreamChat] or part of a [Channel],
-/// you can use [StreamChat.of], [StreamChannel.of] and [StreamChatTheme.of] to use the API client directly
-/// or to retrieve outer scope needed such as messages from the [Channel.state].
-void main() async {
-  final client = StreamChatClient(
-    's2dxdhpxd94g',
-    logLevel: Level.INFO,
-  );
-
-  await client.setUser(
-    User(id: 'super-band-9'),
-    'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoic3VwZXItYmFuZC05In0.0L6lGoeLwkz0aZRUcpZKsvaXtNEDHBcezVTZ0oPq40A',
-  );
-
-  runApp(MyApp(client));
-}
-
-class MyApp extends StatelessWidget {
-  final StreamChatClient client;
-
-  MyApp(this.client);
-
-  @override
-  Widget build(BuildContext context) {
-    return MaterialApp(
-      builder: (context, child) => StreamChat(
-        child: child,
-        client: client,
-      ),
-      home: Container(
-        child: ChannelListPage(),
-      ),
-    );
-  }
-}
-
-class ChannelListPage extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: ChannelsBloc(
-        child: ChannelListView(
-          filter: {
-            'members': {
-              '\$in': [StreamChat.of(context).user.id],
-            }
-          },
-          sort: [SortOption('last_message_at')],
-          pagination: PaginationParams(
-            limit: 20,
-          ),
-          channelWidget: ChannelPage(),
-        ),
-      ),
-    );
-  }
-}
-
-class ChannelPage extends StatelessWidget {
-  const ChannelPage({
-    Key key,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: ChannelHeader(),
-      body: Column(
-        children: <Widget>[
-          Expanded(
-            child: MessageListView(
-              messageBuilder: _messageBuilder,
-            ),
-          ),
-          MessageInput(),
-        ],
-      ),
-    );
-  }
-
-  Widget _messageBuilder(
-    BuildContext context,
-    MessageDetails details,
-    List<Message> messages,
-  ) {
-    final message = details.message;
-    final color = details.isMyMessage ? Colors.red : Colors.blue;
-    if (message.isSystem) {
-      return SizedBox();
-    }
-    return MessageWidget(
-      message: message,
-      messageTheme: details.isMyMessage
-          ? StreamChatTheme.of(context).ownMessageTheme
-          : StreamChatTheme.of(context).otherMessageTheme,
-      borderSide: BorderSide(
-        color: color,
-        width: 2,
-      ),
-      padding: const EdgeInsets.symmetric(
-        vertical: 2,
-        horizontal: 4,
-      ),
-      attachmentBorderSide: BorderSide(
-        color: color,
-        width: 2,
-      ),
-      attachmentPadding: EdgeInsets.all(8),
-      borderRadiusGeometry: BorderRadius.vertical(
-        top: !details.isLastUser ? Radius.circular(16) : Radius.zero,
-        bottom: !details.isNextUser ? Radius.circular(16) : Radius.zero,
-      ),
-      showSendingIndicator: false,
-      reverse: false,
-      showUserAvatar:
-          details.isNextUser ? DisplayWidget.hide : DisplayWidget.show,
-      showTimestamp: !details.isNextUser,
-      showUsername: !details.isNextUser,
-      showReactions: false,
-    );
-  }
-}
diff --git a/packages/stream_chat_flutter/example/lib/single_conversation.dart b/packages/stream_chat_flutter/example/lib/tutorial-part-1.dart
similarity index 100%
rename from packages/stream_chat_flutter/example/lib/single_conversation.dart
rename to packages/stream_chat_flutter/example/lib/tutorial-part-1.dart
diff --git a/packages/stream_chat_flutter/example/lib/multiple_conversation.dart b/packages/stream_chat_flutter/example/lib/tutorial-part-2.dart
similarity index 100%
rename from packages/stream_chat_flutter/example/lib/multiple_conversation.dart
rename to packages/stream_chat_flutter/example/lib/tutorial-part-2.dart
diff --git a/packages/stream_chat_flutter/example/lib/customize_channel_preview.dart b/packages/stream_chat_flutter/example/lib/tutorial-part-3.dart
similarity index 100%
rename from packages/stream_chat_flutter/example/lib/customize_channel_preview.dart
rename to packages/stream_chat_flutter/example/lib/tutorial-part-3.dart
diff --git a/packages/stream_chat_flutter/example/lib/threads.dart b/packages/stream_chat_flutter/example/lib/tutorial-part-4.dart
similarity index 100%
rename from packages/stream_chat_flutter/example/lib/threads.dart
rename to packages/stream_chat_flutter/example/lib/tutorial-part-4.dart
diff --git a/packages/stream_chat_flutter/example/lib/custom_message.dart b/packages/stream_chat_flutter/example/lib/tutorial-part-5.dart
similarity index 100%
rename from packages/stream_chat_flutter/example/lib/custom_message.dart
rename to packages/stream_chat_flutter/example/lib/tutorial-part-5.dart
diff --git a/packages/stream_chat_flutter/example/lib/custom_theme.dart b/packages/stream_chat_flutter/example/lib/tutorial-part-6.dart
similarity index 100%
rename from packages/stream_chat_flutter/example/lib/custom_theme.dart
rename to packages/stream_chat_flutter/example/lib/tutorial-part-6.dart