diff --git a/bitrise.yml b/bitrise.yml
index d6aad9a50..f9a8bd034 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -74,10 +74,10 @@ workflows:
             cd ../contact
             flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
 
-            cd ../rule_filter
+            cd ../forward
             flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
 
-            cd ../forward
+            cd ../rule_filter
             flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
 
             cd ..
@@ -106,6 +106,12 @@ workflows:
     - flutter-test@1:
         inputs:
         - additional_params: contact
+    - flutter-test@1:
+        inputs:
+        - additional_params: forward
+    - flutter-test@1:
+        inputs:
+        - additional_params: rule_filter
     - certificate-and-profile-installer@1:
         is_always_run: true
     - set-xcode-build-number@1:
diff --git a/forward/README.md b/forward/README.md
index 8b55e735b..0a7e1350f 100644
--- a/forward/README.md
+++ b/forward/README.md
@@ -1,39 +1,3 @@
-<!-- 
-This README describes the package. If you publish this package to pub.dev,
-this README's contents appear on the landing page for your package.
+# forward
 
-For information about how to write a good package README, see the guide for
-[writing package pages](https://dart.dev/guides/libraries/writing-package-pages). 
-
-For general information about developing packages, see the Dart guide for
-[creating packages](https://dart.dev/guides/libraries/create-library-packages)
-and the Flutter guide for
-[developing packages and plugins](https://flutter.dev/developing-packages). 
--->
-
-TODO: Put a short description of the package here that helps potential users
-know whether this package might be useful for them.
-
-## Features
-
-TODO: List what your package can do. Maybe include images, gifs, or videos.
-
-## Getting started
-
-TODO: List prerequisites and provide or point to information on how to
-start using the package.
-
-## Usage
-
-TODO: Include short and useful examples for package users. Add longer examples
-to `/example` folder. 
-
-```dart
-const like = 'sample';
-```
-
-## Additional information
-
-TODO: Tell users more about the package: where to find more information, how to 
-contribute to the package, how to file issues, what response they can expect 
-from the package authors, and more.
+TMail Forward extension
\ No newline at end of file
diff --git a/forward/lib/forward/converter/rule_filter_id_coverter.dart b/forward/lib/forward/converter/forward_id_coverter.dart
similarity index 100%
rename from forward/lib/forward/converter/rule_filter_id_coverter.dart
rename to forward/lib/forward/converter/forward_id_coverter.dart
diff --git a/forward/lib/forward/forward_id.dart b/forward/lib/forward/forward_id.dart
index a4ac343c7..2311b41ea 100644
--- a/forward/lib/forward/forward_id.dart
+++ b/forward/lib/forward/forward_id.dart
@@ -1,5 +1,5 @@
 import 'package:equatable/equatable.dart';
-import 'package:forward/forward/converter/rule_filter_id_coverter.dart';
+import 'package:forward/forward/converter/forward_id_coverter.dart';
 import 'package:jmap_dart_client/http/converter/id_converter.dart';
 import 'package:jmap_dart_client/jmap/core/id.dart';
 
@@ -11,8 +11,6 @@ enum ForwardIdType {
   final String value;
 }
 
-@ForwardIdConverter()
-@IdConverter()
 class ForwardId with EquatableMixin {
   final Id id;
 
diff --git a/forward/lib/forward/get/get_forward_method.dart b/forward/lib/forward/get/get_forward_method.dart
index 5fce71200..81976cba5 100644
--- a/forward/lib/forward/get/get_forward_method.dart
+++ b/forward/lib/forward/get/get_forward_method.dart
@@ -1,5 +1,5 @@
 import 'package:forward/forward/capability_forward.dart';
-import 'package:forward/forward/converter/rule_filter_id_coverter.dart';
+import 'package:forward/forward/converter/forward_id_coverter.dart';
 import 'package:jmap_dart_client/http/converter/account_id_converter.dart';
 import 'package:jmap_dart_client/http/converter/id_converter.dart';
 import 'package:jmap_dart_client/http/converter/properties_converter.dart';
diff --git a/forward/lib/forward/tmail_forward.dart b/forward/lib/forward/tmail_forward.dart
index cd188662c..636fbd8f2 100644
--- a/forward/lib/forward/tmail_forward.dart
+++ b/forward/lib/forward/tmail_forward.dart
@@ -1,4 +1,4 @@
-import 'package:forward/forward/converter/rule_filter_id_coverter.dart';
+import 'package:forward/forward/converter/forward_id_coverter.dart';
 import 'package:forward/forward/forward.dart';
 import 'package:forward/forward/forward_id.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
diff --git a/forward/test/forward/get_forward_method_test.dart b/forward/test/forward/get_forward_method_test.dart
index cc3db3820..5297ae39b 100644
--- a/forward/test/forward/get_forward_method_test.dart
+++ b/forward/test/forward/get_forward_method_test.dart
@@ -77,7 +77,7 @@ void main() {
 
       final getForwardMethod = GetForwardMethod(accountId)
         ..addIds({ForwardIdSingleton.forwardIdSingleton.id});
-      final getRuleFilterInvocation =
+      final getForwardInvocation =
           requestBuilder.invocation(getForwardMethod);
       final response = await (requestBuilder
             ..usings(getForwardMethod.requiredCapabilities))
@@ -85,7 +85,7 @@ void main() {
           .execute();
 
       final resultList = response.parse<GetForwardResponse>(
-          getRuleFilterInvocation.methodCallId,
+          getForwardInvocation.methodCallId,
           GetForwardResponse.deserialize);
 
       expect(resultList?.list.length, equals(1));
diff --git a/pubspec.yaml b/pubspec.yaml
index e3bc7c95f..375d57299 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -39,6 +39,9 @@ dependencies:
   rule_filter:
     path: rule_filter
 
+  forward:
+    path: forward
+
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2