diff --git a/build.yaml b/build.yaml
deleted file mode 100644
index c525868..0000000
--- a/build.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-targets:
-  $default:
-    builders:
-      json_serializable:
-        options:
-  github:
-    sources:
-      - lib/gql_github/*
-    builders:
-      ferry_generator|graphql_builder:
-        enabled: true
-        options:
-          schema: git_touch|lib/gql_github/schema.graphql
-          type_overrides:
-            DateTime:
-              name: DateTime
-            URI:
-              name: String
-            GitObjectID:
-              name: String
-      ferry_generator|serializer_builder:
-        enabled: true
-        options:
-          schema: git_touch|lib/gql_github/schema.graphql
-          custom_serializers:
-            - import: package:git_touch/utils/date_time_serializer.dart
-              name: DateTimeSerializer
-  gitlab:
-    sources:
-      - lib/gql_gitlab/*
-    builders:
-      ferry_generator|graphql_builder:
-        enabled: true
-        options:
-          schema: git_touch|lib/gql_gitlab/schema.graphql
-      ferry_generator|serializer_builder:
-        enabled: true
-        options:
-          schema: git_touch|lib/gql_gitlab/schema.graphql
diff --git a/lib/screens/gh_commits.dart b/lib/screens/gh_commits.dart
index abdcc17..bb64b30 100644
--- a/lib/screens/gh_commits.dart
+++ b/lib/screens/gh_commits.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_gen/gen_l10n/S.dart';
-import 'package:git_touch/gql_github/__generated__/commits.data.gql.dart';
-import 'package:git_touch/gql_github/__generated__/commits.req.gql.dart';
-import 'package:git_touch/gql_github/__generated__/schema.schema.gql.dart';
 import 'package:git_touch/models/auth.dart';
 import 'package:git_touch/scaffolds/list_stateful.dart';
 import 'package:git_touch/widgets/app_bar_title.dart';
 import 'package:git_touch/widgets/commit_item.dart';
+import 'package:gql_github/commits.data.gql.dart';
+import 'package:gql_github/commits.req.gql.dart';
+import 'package:gql_github/schema.schema.gql.dart';
 import 'package:provider/provider.dart';
 
 class GhCommits extends StatelessWidget {
diff --git a/lib/screens/gh_gists.dart b/lib/screens/gh_gists.dart
index c4300be..a2869d6 100644
--- a/lib/screens/gh_gists.dart
+++ b/lib/screens/gh_gists.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_gen/gen_l10n/S.dart';
-import 'package:git_touch/gql_github/__generated__/gists.data.gql.dart';
-import 'package:git_touch/gql_github/__generated__/gists.req.gql.dart';
 import 'package:git_touch/models/auth.dart';
 import 'package:git_touch/scaffolds/list_stateful.dart';
 import 'package:git_touch/widgets/app_bar_title.dart';
 import 'package:git_touch/widgets/gists_item.dart';
+import 'package:gql_github/gists.data.gql.dart';
+import 'package:gql_github/gists.req.gql.dart';
 import 'package:provider/provider.dart';
 
 class GhGistsScreen extends StatelessWidget {
diff --git a/lib/screens/gh_gists_files.dart b/lib/screens/gh_gists_files.dart
index b11b919..82290c2 100644
--- a/lib/screens/gh_gists_files.dart
+++ b/lib/screens/gh_gists_files.dart
@@ -2,12 +2,12 @@ import 'package:antd_mobile/antd_mobile.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_gen/gen_l10n/S.dart';
-import 'package:git_touch/gql_github/__generated__/gist.data.gql.dart';
-import 'package:git_touch/gql_github/__generated__/gist.req.gql.dart';
 import 'package:git_touch/models/auth.dart';
 import 'package:git_touch/scaffolds/refresh_stateful.dart';
 import 'package:git_touch/widgets/app_bar_title.dart';
 import 'package:git_touch/widgets/object_tree.dart';
+import 'package:gql_github/gist.data.gql.dart';
+import 'package:gql_github/gist.req.gql.dart';
 import 'package:provider/provider.dart';
 
 class GhGistsFilesScreen extends StatelessWidget {
diff --git a/lib/screens/gh_issue.dart b/lib/screens/gh_issue.dart
index 5f185c4..1626a89 100644
--- a/lib/screens/gh_issue.dart
+++ b/lib/screens/gh_issue.dart
@@ -1,7 +1,5 @@
 import 'package:antd_mobile/antd_mobile.dart';
 import 'package:flutter/widgets.dart';
-import 'package:git_touch/gql_github/__generated__/issue.data.gql.dart';
-import 'package:git_touch/gql_github/__generated__/issue.req.gql.dart';
 import 'package:git_touch/models/auth.dart';
 import 'package:git_touch/models/theme.dart';
 import 'package:git_touch/scaffolds/long_list.dart';
@@ -12,6 +10,8 @@ import 'package:git_touch/widgets/comment_item.dart';
 import 'package:git_touch/widgets/link.dart';
 import 'package:git_touch/widgets/timeline_item.dart';
 import 'package:github/github.dart' as github;
+import 'package:gql_github/issue.data.gql.dart';
+import 'package:gql_github/issue.req.gql.dart';
 import 'package:primer/primer.dart';
 import 'package:provider/provider.dart';
 
diff --git a/lib/screens/gh_issues.dart b/lib/screens/gh_issues.dart
index a357494..68944d4 100644
--- a/lib/screens/gh_issues.dart
+++ b/lib/screens/gh_issues.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_gen/gen_l10n/S.dart';
-import 'package:git_touch/gql_github/__generated__/issues.data.gql.dart';
-import 'package:git_touch/gql_github/__generated__/issues.req.gql.dart';
 import 'package:git_touch/models/auth.dart';
 import 'package:git_touch/scaffolds/list_stateful.dart';
 import 'package:git_touch/widgets/action_entry.dart';
 import 'package:git_touch/widgets/app_bar_title.dart';
 import 'package:git_touch/widgets/hex_color_tag.dart';
 import 'package:git_touch/widgets/issue_item.dart';
+import 'package:gql_github/issues.data.gql.dart';
+import 'package:gql_github/issues.req.gql.dart';
 import 'package:provider/provider.dart';
 
 class GhIssuesScreen extends StatelessWidget {
diff --git a/lib/screens/gh_meta.dart b/lib/screens/gh_meta.dart
index 7bf05e0..20d8f71 100644
--- a/lib/screens/gh_meta.dart
+++ b/lib/screens/gh_meta.dart
@@ -1,9 +1,9 @@
 import 'package:antd_mobile/antd_mobile.dart';
 import 'package:flutter/widgets.dart';
-import 'package:git_touch/gql_github/__generated__/meta.data.gql.dart';
-import 'package:git_touch/gql_github/__generated__/meta.req.gql.dart';
 import 'package:git_touch/models/auth.dart';
 import 'package:git_touch/scaffolds/refresh_stateful.dart';
+import 'package:gql_github/meta.data.gql.dart';
+import 'package:gql_github/meta.req.gql.dart';
 import 'package:provider/provider.dart';
 
 class GhMetaScreen extends StatelessWidget {
diff --git a/lib/screens/gh_pulls.dart b/lib/screens/gh_pulls.dart
index 0a9b56f..033f44e 100644
--- a/lib/screens/gh_pulls.dart
+++ b/lib/screens/gh_pulls.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_gen/gen_l10n/S.dart';
-import 'package:git_touch/gql_github/__generated__/issues.data.gql.dart';
-import 'package:git_touch/gql_github/__generated__/issues.req.gql.dart';
 import 'package:git_touch/models/auth.dart';
 import 'package:git_touch/scaffolds/list_stateful.dart';
 import 'package:git_touch/widgets/app_bar_title.dart';
 import 'package:git_touch/widgets/hex_color_tag.dart';
 import 'package:git_touch/widgets/issue_item.dart';
+import 'package:gql_github/issues.data.gql.dart';
+import 'package:gql_github/issues.req.gql.dart';
 import 'package:provider/provider.dart';
 
 class GhPullsScreen extends StatelessWidget {
diff --git a/lib/screens/gh_releases.dart b/lib/screens/gh_releases.dart
index bbd561b..1acb2db 100644
--- a/lib/screens/gh_releases.dart
+++ b/lib/screens/gh_releases.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/widgets.dart';
-import 'package:git_touch/gql_github/__generated__/releases.data.gql.dart';
-import 'package:git_touch/gql_github/__generated__/releases.req.gql.dart';
 import 'package:git_touch/models/auth.dart';
 import 'package:git_touch/scaffolds/list_stateful.dart';
 import 'package:git_touch/widgets/app_bar_title.dart';
 import 'package:git_touch/widgets/release_item.dart';
+import 'package:gql_github/releases.data.gql.dart';
+import 'package:gql_github/releases.req.gql.dart';
 import 'package:provider/provider.dart';
 
 class GhReleasesScreen extends StatelessWidget {
diff --git a/lib/screens/gh_repo.dart b/lib/screens/gh_repo.dart
index 0ae9c4b..42d4087 100644
--- a/lib/screens/gh_repo.dart
+++ b/lib/screens/gh_repo.dart
@@ -3,9 +3,6 @@ import 'package:filesize/filesize.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_gen/gen_l10n/S.dart';
-import 'package:git_touch/gql_github/__generated__/repo.data.gql.dart';
-import 'package:git_touch/gql_github/__generated__/repo.req.gql.dart';
-import 'package:git_touch/gql_github/__generated__/schema.schema.gql.dart';
 import 'package:git_touch/models/auth.dart';
 import 'package:git_touch/models/theme.dart';
 import 'package:git_touch/scaffolds/refresh_stateful.dart';
@@ -19,6 +16,9 @@ import 'package:git_touch/widgets/mutation_button.dart';
 import 'package:git_touch/widgets/repo_header.dart';
 import 'package:github/github.dart';
 import 'package:go_router/go_router.dart';
+import 'package:gql_github/repo.data.gql.dart';
+import 'package:gql_github/repo.req.gql.dart';
+import 'package:gql_github/schema.schema.gql.dart';
 import 'package:primer/primer.dart';
 import 'package:provider/provider.dart';
 import 'package:tuple/tuple.dart';
diff --git a/lib/screens/gh_repos.dart b/lib/screens/gh_repos.dart
index f3312d8..ee9c21a 100644
--- a/lib/screens/gh_repos.dart
+++ b/lib/screens/gh_repos.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/widgets.dart';
-import 'package:git_touch/gql_github/__generated__/repos.data.gql.dart';
-import 'package:git_touch/gql_github/__generated__/repos.req.gql.dart';
 import 'package:git_touch/models/auth.dart';
 import 'package:git_touch/scaffolds/list_stateful.dart';
 import 'package:git_touch/widgets/app_bar_title.dart';
 import 'package:git_touch/widgets/repository_item.dart';
+import 'package:gql_github/repos.data.gql.dart';
+import 'package:gql_github/repos.req.gql.dart';
 import 'package:provider/provider.dart';
 import 'package:timeago/timeago.dart' as timeago;
 
diff --git a/lib/screens/gh_user.dart b/lib/screens/gh_user.dart
index 7490070..ddd6c88 100644
--- a/lib/screens/gh_user.dart
+++ b/lib/screens/gh_user.dart
@@ -2,8 +2,6 @@ import 'package:antd_mobile/antd_mobile.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_gen/gen_l10n/S.dart';
-import 'package:git_touch/gql_github/__generated__/user.data.gql.dart';
-import 'package:git_touch/gql_github/__generated__/user.req.gql.dart';
 import 'package:git_touch/models/auth.dart';
 import 'package:git_touch/models/theme.dart';
 import 'package:git_touch/scaffolds/refresh_stateful.dart';
@@ -18,6 +16,8 @@ import 'package:git_touch/widgets/repository_item.dart';
 import 'package:git_touch/widgets/text_with_at.dart';
 import 'package:git_touch/widgets/user_header.dart';
 import 'package:go_router/go_router.dart';
+import 'package:gql_github/user.data.gql.dart';
+import 'package:gql_github/user.req.gql.dart';
 import 'package:provider/provider.dart';
 
 class _Repos extends StatelessWidget {
diff --git a/lib/screens/gh_users.dart b/lib/screens/gh_users.dart
index 4117bdd..9968eea 100644
--- a/lib/screens/gh_users.dart
+++ b/lib/screens/gh_users.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/widgets.dart';
-import 'package:git_touch/gql_github/__generated__/users.data.gql.dart';
-import 'package:git_touch/gql_github/__generated__/users.req.gql.dart';
 import 'package:git_touch/models/auth.dart';
 import 'package:git_touch/scaffolds/list_stateful.dart';
 import 'package:git_touch/widgets/app_bar_title.dart';
 import 'package:git_touch/widgets/user_item.dart';
+import 'package:gql_github/users.data.gql.dart';
+import 'package:gql_github/users.req.gql.dart';
 import 'package:provider/provider.dart';
 
 class GhFollowers extends StatelessWidget {
diff --git a/lib/widgets/comment_item.dart b/lib/widgets/comment_item.dart
index 6015ce1..d2ceba8 100644
--- a/lib/widgets/comment_item.dart
+++ b/lib/widgets/comment_item.dart
@@ -1,7 +1,5 @@
 import 'package:antd_mobile/antd_mobile.dart';
 import 'package:flutter/widgets.dart';
-import 'package:git_touch/gql_github/__generated__/issue.data.gql.dart';
-import 'package:git_touch/gql_github/__generated__/schema.schema.gql.dart';
 import 'package:git_touch/models/auth.dart';
 import 'package:git_touch/models/theme.dart';
 import 'package:git_touch/utils/utils.dart';
@@ -10,6 +8,8 @@ import 'package:git_touch/widgets/avatar.dart';
 import 'package:git_touch/widgets/link.dart';
 import 'package:git_touch/widgets/markdown_view.dart';
 import 'package:git_touch/widgets/user_name.dart';
+import 'package:gql_github/issue.data.gql.dart';
+import 'package:gql_github/schema.schema.gql.dart';
 import 'package:primer/primer.dart';
 import 'package:provider/provider.dart';
 import 'package:timeago/timeago.dart' as timeago;
diff --git a/lib/widgets/release_item.dart b/lib/widgets/release_item.dart
index 216e7e5..d08928c 100644
--- a/lib/widgets/release_item.dart
+++ b/lib/widgets/release_item.dart
@@ -1,11 +1,11 @@
 import 'package:antd_mobile/antd_mobile.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_gen/gen_l10n/S.dart';
-import 'package:git_touch/gql_github/__generated__/releases.data.gql.dart';
 import 'package:git_touch/models/theme.dart';
 import 'package:git_touch/utils/utils.dart';
 import 'package:git_touch/widgets/avatar.dart';
 import 'package:git_touch/widgets/markdown_view.dart';
+import 'package:gql_github/releases.data.gql.dart';
 import 'package:provider/provider.dart';
 import 'package:timeago/timeago.dart' as timeago;
 
diff --git a/lib/widgets/repository_item.dart b/lib/widgets/repository_item.dart
index 6ca532d..48ab6bd 100644
--- a/lib/widgets/repository_item.dart
+++ b/lib/widgets/repository_item.dart
@@ -2,7 +2,6 @@ import 'package:antd_mobile/antd_mobile.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/widgets.dart';
 import 'package:from_css_color/from_css_color.dart';
-import 'package:git_touch/gql_github/__generated__/repos.data.gql.dart';
 import 'package:git_touch/models/bitbucket.dart';
 import 'package:git_touch/models/gitlab.dart';
 import 'package:git_touch/models/gogs.dart';
@@ -10,6 +9,7 @@ import 'package:git_touch/models/theme.dart';
 import 'package:git_touch/utils/utils.dart';
 import 'package:git_touch/widgets/avatar.dart';
 import 'package:github/github.dart' as github;
+import 'package:gql_github/repos.data.gql.dart';
 import 'package:provider/provider.dart';
 import 'package:timeago/timeago.dart' as timeago;
 
diff --git a/lib/widgets/timeline_item.dart b/lib/widgets/timeline_item.dart
index e97d27d..0098b63 100644
--- a/lib/widgets/timeline_item.dart
+++ b/lib/widgets/timeline_item.dart
@@ -3,13 +3,13 @@ import 'dart:core';
 import 'package:antd_mobile/antd_mobile.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_gen/gen_l10n/S.dart';
-import 'package:git_touch/gql_github/__generated__/issue.data.gql.dart';
-import 'package:git_touch/gql_github/__generated__/schema.schema.gql.dart';
 import 'package:git_touch/models/theme.dart';
 import 'package:git_touch/utils/utils.dart';
 import 'package:git_touch/widgets/branch_name.dart';
 import 'package:git_touch/widgets/comment_item.dart';
 import 'package:git_touch/widgets/hex_color_tag.dart';
+import 'package:gql_github/issue.data.gql.dart';
+import 'package:gql_github/schema.schema.gql.dart';
 import 'package:provider/provider.dart';
 
 TextSpan createUserSpan(BuildContext context, String? login) {
diff --git a/lib/widgets/user_item.dart b/lib/widgets/user_item.dart
index 1af55ea..04e3e66 100644
--- a/lib/widgets/user_item.dart
+++ b/lib/widgets/user_item.dart
@@ -1,9 +1,9 @@
 import 'package:antd_mobile/antd_mobile.dart';
 import 'package:flutter/widgets.dart';
-import 'package:git_touch/gql_github/__generated__/users.data.gql.dart';
 import 'package:git_touch/models/theme.dart';
 import 'package:git_touch/utils/utils.dart';
 import 'package:git_touch/widgets/avatar.dart';
+import 'package:gql_github/users.data.gql.dart';
 import 'package:provider/provider.dart';
 
 const userGqlChunk = '''
diff --git a/packages/gql_github/build.yaml b/packages/gql_github/build.yaml
new file mode 100644
index 0000000..7f8adf3
--- /dev/null
+++ b/packages/gql_github/build.yaml
@@ -0,0 +1,23 @@
+targets:
+  $default:
+    builders:
+      ferry_generator:graphql_builder:
+        enabled: true
+        options:
+          schema: gql_github|lib/schema.graphql
+          output_dir: ""
+          type_overrides:
+            DateTime:
+              name: DateTime
+            URI:
+              name: String
+            GitObjectID:
+              name: String
+      ferry_generator:serializer_builder:
+        enabled: true
+        options:
+          schema: gql_github|lib/schema.graphql
+          output_dir: ""
+          custom_serializers:
+            - import: package:gql_github/utils/date_time_serializer.dart
+              name: DateTimeSerializer
diff --git a/lib/gql_github/commits.graphql b/packages/gql_github/lib/commits.graphql
similarity index 100%
rename from lib/gql_github/commits.graphql
rename to packages/gql_github/lib/commits.graphql
diff --git a/lib/gql_github/gist.graphql b/packages/gql_github/lib/gist.graphql
similarity index 100%
rename from lib/gql_github/gist.graphql
rename to packages/gql_github/lib/gist.graphql
diff --git a/lib/gql_github/gists.graphql b/packages/gql_github/lib/gists.graphql
similarity index 100%
rename from lib/gql_github/gists.graphql
rename to packages/gql_github/lib/gists.graphql
diff --git a/lib/gql_github/issue.graphql b/packages/gql_github/lib/issue.graphql
similarity index 100%
rename from lib/gql_github/issue.graphql
rename to packages/gql_github/lib/issue.graphql
diff --git a/lib/gql_github/issues.graphql b/packages/gql_github/lib/issues.graphql
similarity index 100%
rename from lib/gql_github/issues.graphql
rename to packages/gql_github/lib/issues.graphql
diff --git a/lib/gql_github/meta.graphql b/packages/gql_github/lib/meta.graphql
similarity index 100%
rename from lib/gql_github/meta.graphql
rename to packages/gql_github/lib/meta.graphql
diff --git a/lib/gql_github/releases.graphql b/packages/gql_github/lib/releases.graphql
similarity index 100%
rename from lib/gql_github/releases.graphql
rename to packages/gql_github/lib/releases.graphql
diff --git a/lib/gql_github/repo.graphql b/packages/gql_github/lib/repo.graphql
similarity index 100%
rename from lib/gql_github/repo.graphql
rename to packages/gql_github/lib/repo.graphql
diff --git a/lib/gql_github/repos.graphql b/packages/gql_github/lib/repos.graphql
similarity index 100%
rename from lib/gql_github/repos.graphql
rename to packages/gql_github/lib/repos.graphql
diff --git a/lib/gql_github/schema.graphql b/packages/gql_github/lib/schema.graphql
similarity index 100%
rename from lib/gql_github/schema.graphql
rename to packages/gql_github/lib/schema.graphql
diff --git a/lib/gql_github/user.graphql b/packages/gql_github/lib/user.graphql
similarity index 100%
rename from lib/gql_github/user.graphql
rename to packages/gql_github/lib/user.graphql
diff --git a/lib/gql_github/users.graphql b/packages/gql_github/lib/users.graphql
similarity index 100%
rename from lib/gql_github/users.graphql
rename to packages/gql_github/lib/users.graphql
diff --git a/lib/utils/date_time_serializer.dart b/packages/gql_github/lib/utils/date_time_serializer.dart
similarity index 100%
rename from lib/utils/date_time_serializer.dart
rename to packages/gql_github/lib/utils/date_time_serializer.dart
diff --git a/packages/gql_github/pubspec.lock b/packages/gql_github/pubspec.lock
new file mode 100644
index 0000000..74a7142
--- /dev/null
+++ b/packages/gql_github/pubspec.lock
@@ -0,0 +1,418 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  _fe_analyzer_shared:
+    dependency: transitive
+    description:
+      name: _fe_analyzer_shared
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "47.0.0"
+  analyzer:
+    dependency: transitive
+    description:
+      name: analyzer
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.7.0"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.3.1"
+  async:
+    dependency: transitive
+    description:
+      name: async
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.9.0"
+  build:
+    dependency: transitive
+    description:
+      name: build
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.3.1"
+  build_config:
+    dependency: transitive
+    description:
+      name: build_config
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
+  build_daemon:
+    dependency: transitive
+    description:
+      name: build_daemon
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.1.0"
+  build_resolvers:
+    dependency: transitive
+    description:
+      name: build_resolvers
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.10"
+  build_runner:
+    dependency: "direct dev"
+    description:
+      name: build_runner
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.1"
+  build_runner_core:
+    dependency: transitive
+    description:
+      name: build_runner_core
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "7.2.4"
+  built_collection:
+    dependency: transitive
+    description:
+      name: built_collection
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "5.1.1"
+  built_value:
+    dependency: transitive
+    description:
+      name: built_value
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "8.4.1"
+  built_value_generator:
+    dependency: transitive
+    description:
+      name: built_value_generator
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "8.4.1"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.1"
+  code_builder:
+    dependency: transitive
+    description:
+      name: code_builder
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.3.0"
+  collection:
+    dependency: transitive
+    description:
+      name: collection
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.16.0"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.2"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.2"
+  dart_style:
+    dependency: transitive
+    description:
+      name: dart_style
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.4"
+  ferry_exec:
+    dependency: transitive
+    description:
+      name: ferry_exec
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.0"
+  ferry_generator:
+    dependency: "direct dev"
+    description:
+      name: ferry_generator
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.1"
+  file:
+    dependency: transitive
+    description:
+      name: file
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.1.4"
+  fixnum:
+    dependency: transitive
+    description:
+      name: fixnum
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
+  frontend_server_client:
+    dependency: transitive
+    description:
+      name: frontend_server_client
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
+  glob:
+    dependency: transitive
+    description:
+      name: glob
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.0"
+  gql:
+    dependency: transitive
+    description:
+      name: gql
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.14.0"
+  gql_code_builder:
+    dependency: transitive
+    description:
+      name: gql_code_builder
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.0"
+  gql_exec:
+    dependency: transitive
+    description:
+      name: gql_exec
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.1"
+  gql_link:
+    dependency: transitive
+    description:
+      name: gql_link
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.5.0"
+  graphs:
+    dependency: transitive
+    description:
+      name: graphs
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.0"
+  http_multi_server:
+    dependency: transitive
+    description:
+      name: http_multi_server
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.2.1"
+  http_parser:
+    dependency: transitive
+    description:
+      name: http_parser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.0.1"
+  io:
+    dependency: transitive
+    description:
+      name: io
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.3"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.4"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.7.0"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.2"
+  matcher:
+    dependency: transitive
+    description:
+      name: matcher
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.12.12"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.8.0"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.2"
+  package_config:
+    dependency: transitive
+    description:
+      name: package_config
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.0"
+  path:
+    dependency: transitive
+    description:
+      name: path
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.8.2"
+  pool:
+    dependency: transitive
+    description:
+      name: pool
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.1"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  pubspec_parse:
+    dependency: transitive
+    description:
+      name: pubspec_parse
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.1"
+  quiver:
+    dependency: transitive
+    description:
+      name: quiver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.1.0"
+  shelf:
+    dependency: transitive
+    description:
+      name: shelf
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.4.0"
+  shelf_web_socket:
+    dependency: transitive
+    description:
+      name: shelf_web_socket
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.2"
+  source_gen:
+    dependency: transitive
+    description:
+      name: source_gen
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.5"
+  source_span:
+    dependency: transitive
+    description:
+      name: source_span
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.9.1"
+  stack_trace:
+    dependency: transitive
+    description:
+      name: stack_trace
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.10.0"
+  stream_channel:
+    dependency: transitive
+    description:
+      name: stream_channel
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  stream_transform:
+    dependency: transitive
+    description:
+      name: stream_transform
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
+  string_scanner:
+    dependency: transitive
+    description:
+      name: string_scanner
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.1"
+  term_glyph:
+    dependency: transitive
+    description:
+      name: term_glyph
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.1"
+  timing:
+    dependency: transitive
+    description:
+      name: timing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
+  typed_data:
+    dependency: transitive
+    description:
+      name: typed_data
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.3.1"
+  watcher:
+    dependency: transitive
+    description:
+      name: watcher
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.0"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.1.1"
+sdks:
+  dart: ">=2.17.5 <3.0.0"
diff --git a/packages/gql_github/pubspec.yaml b/packages/gql_github/pubspec.yaml
new file mode 100644
index 0000000..05c8b6f
--- /dev/null
+++ b/packages/gql_github/pubspec.yaml
@@ -0,0 +1,7 @@
+name: gql_github
+publish_to: none
+environment:
+  sdk: ">=2.17.5 <3.0.0"
+dev_dependencies:
+  ferry_generator:
+  build_runner:
diff --git a/packages/gql_gitlab/build.yaml b/packages/gql_gitlab/build.yaml
new file mode 100644
index 0000000..0e1e3ba
--- /dev/null
+++ b/packages/gql_gitlab/build.yaml
@@ -0,0 +1,13 @@
+targets:
+  $default:
+    builders:
+      ferry_generator:graphql_builder:
+        enabled: true
+        options:
+          schema: gql_gitlab|lib/schema.graphql
+          output_dir: ""
+      ferry_generator:serializer_builder:
+        enabled: true
+        options:
+          schema: gql_gitlab|lib/schema.graphql
+          output_dir: ""
diff --git a/lib/gql_gitlab/project.graphql b/packages/gql_gitlab/lib/project.graphql
similarity index 100%
rename from lib/gql_gitlab/project.graphql
rename to packages/gql_gitlab/lib/project.graphql
diff --git a/lib/gql_gitlab/schema.graphql b/packages/gql_gitlab/lib/schema.graphql
similarity index 100%
rename from lib/gql_gitlab/schema.graphql
rename to packages/gql_gitlab/lib/schema.graphql
diff --git a/packages/gql_gitlab/pubspec.lock b/packages/gql_gitlab/pubspec.lock
new file mode 100644
index 0000000..74a7142
--- /dev/null
+++ b/packages/gql_gitlab/pubspec.lock
@@ -0,0 +1,418 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  _fe_analyzer_shared:
+    dependency: transitive
+    description:
+      name: _fe_analyzer_shared
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "47.0.0"
+  analyzer:
+    dependency: transitive
+    description:
+      name: analyzer
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.7.0"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.3.1"
+  async:
+    dependency: transitive
+    description:
+      name: async
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.9.0"
+  build:
+    dependency: transitive
+    description:
+      name: build
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.3.1"
+  build_config:
+    dependency: transitive
+    description:
+      name: build_config
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
+  build_daemon:
+    dependency: transitive
+    description:
+      name: build_daemon
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.1.0"
+  build_resolvers:
+    dependency: transitive
+    description:
+      name: build_resolvers
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.10"
+  build_runner:
+    dependency: "direct dev"
+    description:
+      name: build_runner
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.1"
+  build_runner_core:
+    dependency: transitive
+    description:
+      name: build_runner_core
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "7.2.4"
+  built_collection:
+    dependency: transitive
+    description:
+      name: built_collection
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "5.1.1"
+  built_value:
+    dependency: transitive
+    description:
+      name: built_value
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "8.4.1"
+  built_value_generator:
+    dependency: transitive
+    description:
+      name: built_value_generator
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "8.4.1"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.1"
+  code_builder:
+    dependency: transitive
+    description:
+      name: code_builder
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.3.0"
+  collection:
+    dependency: transitive
+    description:
+      name: collection
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.16.0"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.2"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.2"
+  dart_style:
+    dependency: transitive
+    description:
+      name: dart_style
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.4"
+  ferry_exec:
+    dependency: transitive
+    description:
+      name: ferry_exec
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.0"
+  ferry_generator:
+    dependency: "direct dev"
+    description:
+      name: ferry_generator
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.1"
+  file:
+    dependency: transitive
+    description:
+      name: file
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.1.4"
+  fixnum:
+    dependency: transitive
+    description:
+      name: fixnum
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
+  frontend_server_client:
+    dependency: transitive
+    description:
+      name: frontend_server_client
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
+  glob:
+    dependency: transitive
+    description:
+      name: glob
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.0"
+  gql:
+    dependency: transitive
+    description:
+      name: gql
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.14.0"
+  gql_code_builder:
+    dependency: transitive
+    description:
+      name: gql_code_builder
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.0"
+  gql_exec:
+    dependency: transitive
+    description:
+      name: gql_exec
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.1"
+  gql_link:
+    dependency: transitive
+    description:
+      name: gql_link
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.5.0"
+  graphs:
+    dependency: transitive
+    description:
+      name: graphs
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.0"
+  http_multi_server:
+    dependency: transitive
+    description:
+      name: http_multi_server
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.2.1"
+  http_parser:
+    dependency: transitive
+    description:
+      name: http_parser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.0.1"
+  io:
+    dependency: transitive
+    description:
+      name: io
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.3"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.4"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.7.0"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.2"
+  matcher:
+    dependency: transitive
+    description:
+      name: matcher
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.12.12"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.8.0"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.2"
+  package_config:
+    dependency: transitive
+    description:
+      name: package_config
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.0"
+  path:
+    dependency: transitive
+    description:
+      name: path
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.8.2"
+  pool:
+    dependency: transitive
+    description:
+      name: pool
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.1"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  pubspec_parse:
+    dependency: transitive
+    description:
+      name: pubspec_parse
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.1"
+  quiver:
+    dependency: transitive
+    description:
+      name: quiver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.1.0"
+  shelf:
+    dependency: transitive
+    description:
+      name: shelf
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.4.0"
+  shelf_web_socket:
+    dependency: transitive
+    description:
+      name: shelf_web_socket
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.2"
+  source_gen:
+    dependency: transitive
+    description:
+      name: source_gen
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.5"
+  source_span:
+    dependency: transitive
+    description:
+      name: source_span
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.9.1"
+  stack_trace:
+    dependency: transitive
+    description:
+      name: stack_trace
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.10.0"
+  stream_channel:
+    dependency: transitive
+    description:
+      name: stream_channel
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  stream_transform:
+    dependency: transitive
+    description:
+      name: stream_transform
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
+  string_scanner:
+    dependency: transitive
+    description:
+      name: string_scanner
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.1"
+  term_glyph:
+    dependency: transitive
+    description:
+      name: term_glyph
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.1"
+  timing:
+    dependency: transitive
+    description:
+      name: timing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
+  typed_data:
+    dependency: transitive
+    description:
+      name: typed_data
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.3.1"
+  watcher:
+    dependency: transitive
+    description:
+      name: watcher
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.0"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.1.1"
+sdks:
+  dart: ">=2.17.5 <3.0.0"
diff --git a/packages/gql_gitlab/pubspec.yaml b/packages/gql_gitlab/pubspec.yaml
new file mode 100644
index 0000000..6bec923
--- /dev/null
+++ b/packages/gql_gitlab/pubspec.yaml
@@ -0,0 +1,7 @@
+name: gql_gitlab
+publish_to: none
+environment:
+  sdk: ">=2.17.5 <3.0.0"
+dev_dependencies:
+  ferry_generator:
+  build_runner:
diff --git a/pubspec.lock b/pubspec.lock
index 46f6121..e23d6e9 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -385,6 +385,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.4.1"
+  gql_github:
+    dependency: "direct main"
+    description:
+      path: "packages/gql_github"
+      relative: true
+    source: path
+    version: "0.0.0"
+  gql_gitlab:
+    dependency: "direct main"
+    description:
+      path: "packages/gql_gitlab"
+      relative: true
+    source: path
+    version: "0.0.0"
   gql_http_link:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 830f5a7..ebee9dd 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -31,6 +31,10 @@ dependencies:
     sdk: flutter
   flutter_localizations:
     sdk: flutter
+  gql_github:
+    path: ./packages/gql_github
+  gql_gitlab:
+    path: ./packages/gql_gitlab
   cupertino_icons:
   ferry:
   ferry_flutter:
diff --git a/scripts/update-schema.sh b/scripts/update-schema.sh
index 7898796..ad7d35e 100644
--- a/scripts/update-schema.sh
+++ b/scripts/update-schema.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 # https://docs.github.com/en/graphql/overview/public-schema
-curl -o lib/gql_github/schema.graphql https://docs.github.com/public/schema.docs.graphql
+curl -o packages/gql_github/lib/schema.graphql https://docs.github.com/public/schema.docs.graphql
 
-npx --yes get-graphql-schema https://gitlab.com/api/graphql > lib/gql_gitlab/schema.graphql
+npx --yes get-graphql-schema https://gitlab.com/api/graphql > packages/gql_gitlab/lib/schema.graphql