diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4c4f28..68fbe11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 6.0.0
+* Refactor the timeline package to use the new structure
+
 ## 5.1.0
 
 * Added `routeToPostDetail` to the `TimelineUserStory` to allow for navigation to the post detail screen.
diff --git a/FEATURES.md b/FEATURES.md
deleted file mode 100644
index 3076797..0000000
--- a/FEATURES.md
+++ /dev/null
@@ -1 +0,0 @@
-List of Features from this component:
diff --git a/README.md b/README.md
index 1ecc8bc..e8e33d2 100644
--- a/README.md
+++ b/README.md
@@ -24,9 +24,6 @@ If you are going to use Firebase as the back-end of the Timeline, you should als
 ```
 
 In firebase add firestore and storage to your project.
-In firestore add a collection named `timeline` and a collection named `users`.
-In the `timeline` collection all posts will be stored. In the `users` collection all users will be stored.
-In the `users` collection you should add your users data.
 
 Add the following code in your `main` function, before the runApp().
 And import this package:   import 'package:intl/date_symbol_data_local.dart';
diff --git a/packages/firebase_timeline_repository/CHANGELOG.md b/packages/firebase_timeline_repository/CHANGELOG.md
new file mode 120000
index 0000000..699cc9e
--- /dev/null
+++ b/packages/firebase_timeline_repository/CHANGELOG.md
@@ -0,0 +1 @@
+../../CHANGELOG.md
\ No newline at end of file
diff --git a/packages/firebase_timeline_repository/CONTRIBUTING.md b/packages/firebase_timeline_repository/CONTRIBUTING.md
new file mode 120000
index 0000000..f939e75
--- /dev/null
+++ b/packages/firebase_timeline_repository/CONTRIBUTING.md
@@ -0,0 +1 @@
+../../CONTRIBUTING.md
\ No newline at end of file
diff --git a/packages/firebase_timeline_repository/LICENSE b/packages/firebase_timeline_repository/LICENSE
new file mode 120000
index 0000000..30cff74
--- /dev/null
+++ b/packages/firebase_timeline_repository/LICENSE
@@ -0,0 +1 @@
+../../LICENSE
\ No newline at end of file
diff --git a/packages/firebase_timeline_repository/README.md b/packages/firebase_timeline_repository/README.md
new file mode 120000
index 0000000..fe84005
--- /dev/null
+++ b/packages/firebase_timeline_repository/README.md
@@ -0,0 +1 @@
+../../README.md
\ No newline at end of file
diff --git a/packages/flutter_timeline/CONTRIBUTING.md b/packages/flutter_timeline/CONTRIBUTING.md
new file mode 120000
index 0000000..f939e75
--- /dev/null
+++ b/packages/flutter_timeline/CONTRIBUTING.md
@@ -0,0 +1 @@
+../../CONTRIBUTING.md
\ No newline at end of file
diff --git a/packages/flutter_timeline/example/pubspec.yaml b/packages/flutter_timeline/example/pubspec.yaml
index 678f1e6..73ee111 100644
--- a/packages/flutter_timeline/example/pubspec.yaml
+++ b/packages/flutter_timeline/example/pubspec.yaml
@@ -12,9 +12,10 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_timeline:
-    path: ../../flutter_timeline
-  timeline_repository_interface:
-    path: ../../timeline_repository_interface
+    git:
+      url: https://github.com/Iconica-Development/flutter_timeline
+      ref: 6.0.0
+      path: packages/flutter_timeline
   intl: 0.19.0
 dev_dependencies:
   flutter_lints: ^4.0.0
diff --git a/packages/flutter_timeline/lib/flutter_timeline.dart b/packages/flutter_timeline/lib/flutter_timeline.dart
index 01c4960..629152c 100644
--- a/packages/flutter_timeline/lib/flutter_timeline.dart
+++ b/packages/flutter_timeline/lib/flutter_timeline.dart
@@ -6,6 +6,7 @@ library flutter_timeline;
 
 /// userstory
 export "src/flutter_timeline_navigator_userstory.dart";
+export "package:timeline_repository_interface/timeline_repository_interface.dart";
 
 /// models
 export "src/models/timeline_options.dart";
diff --git a/packages/timeline_repository_interface/CHANGELOG.md b/packages/timeline_repository_interface/CHANGELOG.md
new file mode 120000
index 0000000..699cc9e
--- /dev/null
+++ b/packages/timeline_repository_interface/CHANGELOG.md
@@ -0,0 +1 @@
+../../CHANGELOG.md
\ No newline at end of file
diff --git a/packages/timeline_repository_interface/CONTRIBUTING.md b/packages/timeline_repository_interface/CONTRIBUTING.md
new file mode 120000
index 0000000..f939e75
--- /dev/null
+++ b/packages/timeline_repository_interface/CONTRIBUTING.md
@@ -0,0 +1 @@
+../../CONTRIBUTING.md
\ No newline at end of file
diff --git a/packages/timeline_repository_interface/LICENSE b/packages/timeline_repository_interface/LICENSE
new file mode 120000
index 0000000..30cff74
--- /dev/null
+++ b/packages/timeline_repository_interface/LICENSE
@@ -0,0 +1 @@
+../../LICENSE
\ No newline at end of file
diff --git a/packages/timeline_repository_interface/README.md b/packages/timeline_repository_interface/README.md
new file mode 120000
index 0000000..fe84005
--- /dev/null
+++ b/packages/timeline_repository_interface/README.md
@@ -0,0 +1 @@
+../../README.md
\ No newline at end of file