diff --git a/.github/release-plz.toml b/.github/release-plz.toml
index b48186ce..da8bfd06 100644
--- a/.github/release-plz.toml
+++ b/.github/release-plz.toml
@@ -19,13 +19,13 @@ publish = true
 publish_no_verify = false
 changelog_include = [
 	"skim",
+  "skim-common",
+  "skim-tuikit",
 	"shell",
 	"plugin",
 	"bin",
 	"xtask",
-	"common",
-	"e2e",
-	"tuikit"
+	"e2e"
 ]
 changelog_path = "./CHANGELOG.md"
 changelog_update = true
@@ -34,11 +34,21 @@ git_release_enable = true
 git_tag_name = "v{{ version }}"
 
 [[package]]
-name = "e2e"
-release = false
-publish = false
+name = "skim-common"
+publish = true
+publish_no_verify = false
+git_tag_enable = true
+git_tag_name = "common-v{{ version }}"
+
 [[package]]
-name = "tuikit"
+name = "skim-tuikit"
+publish = true
+publish_no_verify = false
+git_tag_enable = true
+git_tag_name = "tuikit-v{{ version }}"
+
+[[package]]
+name = "e2e"
 release = false
 publish = false
 [[package]]
diff --git a/common/Cargo.toml b/skim-common/Cargo.toml
similarity index 74%
rename from common/Cargo.toml
rename to skim-common/Cargo.toml
index fa027730..fa632948 100644
--- a/common/Cargo.toml
+++ b/skim-common/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "common"
+name = "skim-common"
 version = "0.1.0"
 edition = "2024"
 
diff --git a/common/src/lib.rs b/skim-common/src/lib.rs
similarity index 100%
rename from common/src/lib.rs
rename to skim-common/src/lib.rs
diff --git a/common/src/spinlock.rs b/skim-common/src/spinlock.rs
similarity index 100%
rename from common/src/spinlock.rs
rename to skim-common/src/spinlock.rs
diff --git a/tuikit/.gitignore b/skim-tuikit/.gitignore
similarity index 100%
rename from tuikit/.gitignore
rename to skim-tuikit/.gitignore
diff --git a/tuikit/CHANGELOG.md b/skim-tuikit/CHANGELOG.md
similarity index 100%
rename from tuikit/CHANGELOG.md
rename to skim-tuikit/CHANGELOG.md
diff --git a/tuikit/Cargo.lock b/skim-tuikit/Cargo.lock
similarity index 100%
rename from tuikit/Cargo.lock
rename to skim-tuikit/Cargo.lock
diff --git a/tuikit/Cargo.toml b/skim-tuikit/Cargo.toml
similarity index 76%
rename from tuikit/Cargo.toml
rename to skim-tuikit/Cargo.toml
index 3f6c55d6..37b89f16 100644
--- a/tuikit/Cargo.toml
+++ b/skim-tuikit/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
-name = "tuikit"
+name = "skim-tuikit"
 version = "0.6.0"
 authors = ["Jinzhou Zhang <lotabout@gmail.com>"]
 description = "Toolkit for writing TUI applications"
 documentation = "https://docs.rs/tuikit"
-homepage = "https://github.com/lotabout/tuikit"
-repository = "https://github.com/lotabout/tuikit"
+homepage = "https://github.com/skim-rs/skim/tuikit"
+repository = "https://github.com/skim-rs/skim"
 readme  = "README.md"
 keywords = ["tui", "terminal", "tty", "color"]
 license = "MIT"
@@ -13,7 +13,7 @@ edition = "2018"
 
 [dependencies]
 bitflags = { workspace = true }
-common = { path = "../common/" }
+skim-common = { path = "../skim-common/", version = "0.1.0" }
 lazy_static = { workspace = true }
 log = { workspace = true }
 nix = { workspace = true, default-features = false, features = ["fs", "poll", "signal", "term"] }
diff --git a/tuikit/LICENSE b/skim-tuikit/LICENSE
similarity index 100%
rename from tuikit/LICENSE
rename to skim-tuikit/LICENSE
diff --git a/tuikit/README.md b/skim-tuikit/README.md
similarity index 100%
rename from tuikit/README.md
rename to skim-tuikit/README.md
diff --git a/tuikit/examples/256color.rs b/skim-tuikit/examples/256color.rs
similarity index 100%
rename from tuikit/examples/256color.rs
rename to skim-tuikit/examples/256color.rs
diff --git a/tuikit/examples/256color_on_screen.rs b/skim-tuikit/examples/256color_on_screen.rs
similarity index 100%
rename from tuikit/examples/256color_on_screen.rs
rename to skim-tuikit/examples/256color_on_screen.rs
diff --git a/tuikit/examples/custom-event.rs b/skim-tuikit/examples/custom-event.rs
similarity index 100%
rename from tuikit/examples/custom-event.rs
rename to skim-tuikit/examples/custom-event.rs
diff --git a/tuikit/examples/get_keys.rs b/skim-tuikit/examples/get_keys.rs
similarity index 100%
rename from tuikit/examples/get_keys.rs
rename to skim-tuikit/examples/get_keys.rs
diff --git a/tuikit/examples/hello-world.rs b/skim-tuikit/examples/hello-world.rs
similarity index 100%
rename from tuikit/examples/hello-world.rs
rename to skim-tuikit/examples/hello-world.rs
diff --git a/tuikit/examples/split.rs b/skim-tuikit/examples/split.rs
similarity index 100%
rename from tuikit/examples/split.rs
rename to skim-tuikit/examples/split.rs
diff --git a/tuikit/examples/stack.rs b/skim-tuikit/examples/stack.rs
similarity index 100%
rename from tuikit/examples/stack.rs
rename to skim-tuikit/examples/stack.rs
diff --git a/tuikit/examples/term_size.rs b/skim-tuikit/examples/term_size.rs
similarity index 100%
rename from tuikit/examples/term_size.rs
rename to skim-tuikit/examples/term_size.rs
diff --git a/tuikit/examples/termbox.rs b/skim-tuikit/examples/termbox.rs
similarity index 100%
rename from tuikit/examples/termbox.rs
rename to skim-tuikit/examples/termbox.rs
diff --git a/tuikit/examples/true_color.rs b/skim-tuikit/examples/true_color.rs
similarity index 100%
rename from tuikit/examples/true_color.rs
rename to skim-tuikit/examples/true_color.rs
diff --git a/tuikit/examples/win.rs b/skim-tuikit/examples/win.rs
similarity index 100%
rename from tuikit/examples/win.rs
rename to skim-tuikit/examples/win.rs
diff --git a/tuikit/src/attr.rs b/skim-tuikit/src/attr.rs
similarity index 100%
rename from tuikit/src/attr.rs
rename to skim-tuikit/src/attr.rs
diff --git a/tuikit/src/canvas.rs b/skim-tuikit/src/canvas.rs
similarity index 100%
rename from tuikit/src/canvas.rs
rename to skim-tuikit/src/canvas.rs
diff --git a/tuikit/src/cell.rs b/skim-tuikit/src/cell.rs
similarity index 100%
rename from tuikit/src/cell.rs
rename to skim-tuikit/src/cell.rs
diff --git a/tuikit/src/color.rs b/skim-tuikit/src/color.rs
similarity index 100%
rename from tuikit/src/color.rs
rename to skim-tuikit/src/color.rs
diff --git a/tuikit/src/draw.rs b/skim-tuikit/src/draw.rs
similarity index 100%
rename from tuikit/src/draw.rs
rename to skim-tuikit/src/draw.rs
diff --git a/tuikit/src/error.rs b/skim-tuikit/src/error.rs
similarity index 100%
rename from tuikit/src/error.rs
rename to skim-tuikit/src/error.rs
diff --git a/tuikit/src/event.rs b/skim-tuikit/src/event.rs
similarity index 100%
rename from tuikit/src/event.rs
rename to skim-tuikit/src/event.rs
diff --git a/tuikit/src/input.rs b/skim-tuikit/src/input.rs
similarity index 100%
rename from tuikit/src/input.rs
rename to skim-tuikit/src/input.rs
diff --git a/tuikit/src/key.rs b/skim-tuikit/src/key.rs
similarity index 100%
rename from tuikit/src/key.rs
rename to skim-tuikit/src/key.rs
diff --git a/tuikit/src/lib.rs b/skim-tuikit/src/lib.rs
similarity index 100%
rename from tuikit/src/lib.rs
rename to skim-tuikit/src/lib.rs
diff --git a/tuikit/src/macros.rs b/skim-tuikit/src/macros.rs
similarity index 100%
rename from tuikit/src/macros.rs
rename to skim-tuikit/src/macros.rs
diff --git a/tuikit/src/output.rs b/skim-tuikit/src/output.rs
similarity index 100%
rename from tuikit/src/output.rs
rename to skim-tuikit/src/output.rs
diff --git a/tuikit/src/prelude.rs b/skim-tuikit/src/prelude.rs
similarity index 100%
rename from tuikit/src/prelude.rs
rename to skim-tuikit/src/prelude.rs
diff --git a/tuikit/src/raw.rs b/skim-tuikit/src/raw.rs
similarity index 100%
rename from tuikit/src/raw.rs
rename to skim-tuikit/src/raw.rs
diff --git a/tuikit/src/screen.rs b/skim-tuikit/src/screen.rs
similarity index 100%
rename from tuikit/src/screen.rs
rename to skim-tuikit/src/screen.rs
diff --git a/tuikit/src/sys/file.rs b/skim-tuikit/src/sys/file.rs
similarity index 100%
rename from tuikit/src/sys/file.rs
rename to skim-tuikit/src/sys/file.rs
diff --git a/tuikit/src/sys/mod.rs b/skim-tuikit/src/sys/mod.rs
similarity index 100%
rename from tuikit/src/sys/mod.rs
rename to skim-tuikit/src/sys/mod.rs
diff --git a/tuikit/src/sys/signal.rs b/skim-tuikit/src/sys/signal.rs
similarity index 100%
rename from tuikit/src/sys/signal.rs
rename to skim-tuikit/src/sys/signal.rs
diff --git a/tuikit/src/sys/size.rs b/skim-tuikit/src/sys/size.rs
similarity index 100%
rename from tuikit/src/sys/size.rs
rename to skim-tuikit/src/sys/size.rs
diff --git a/tuikit/src/term.rs b/skim-tuikit/src/term.rs
similarity index 100%
rename from tuikit/src/term.rs
rename to skim-tuikit/src/term.rs
diff --git a/tuikit/src/widget/align.rs b/skim-tuikit/src/widget/align.rs
similarity index 100%
rename from tuikit/src/widget/align.rs
rename to skim-tuikit/src/widget/align.rs
diff --git a/tuikit/src/widget/mod.rs b/skim-tuikit/src/widget/mod.rs
similarity index 100%
rename from tuikit/src/widget/mod.rs
rename to skim-tuikit/src/widget/mod.rs
diff --git a/tuikit/src/widget/split.rs b/skim-tuikit/src/widget/split.rs
similarity index 100%
rename from tuikit/src/widget/split.rs
rename to skim-tuikit/src/widget/split.rs
diff --git a/tuikit/src/widget/stack.rs b/skim-tuikit/src/widget/stack.rs
similarity index 100%
rename from tuikit/src/widget/stack.rs
rename to skim-tuikit/src/widget/stack.rs
diff --git a/tuikit/src/widget/util.rs b/skim-tuikit/src/widget/util.rs
similarity index 100%
rename from tuikit/src/widget/util.rs
rename to skim-tuikit/src/widget/util.rs
diff --git a/tuikit/src/widget/win.rs b/skim-tuikit/src/widget/win.rs
similarity index 100%
rename from tuikit/src/widget/win.rs
rename to skim-tuikit/src/widget/win.rs
diff --git a/skim/Cargo.toml b/skim/Cargo.toml
index 3ee07571..bdf912fc 100644
--- a/skim/Cargo.toml
+++ b/skim/Cargo.toml
@@ -24,7 +24,6 @@ beef = { workspace = true }
 bitflags = { workspace = true }
 chrono = { workspace = true }
 clap = { workspace = true, optional = true, features = ["cargo", "derive", "unstable-markdown"] }
-common = { path = "../common/" }
 crossbeam = { workspace = true }
 defer-drop = { workspace = true }
 derive_builder = { workspace = true }
@@ -38,9 +37,10 @@ rayon = { workspace = true }
 regex = { workspace = true }
 shell-quote = { workspace = true }
 shlex = { workspace = true, optional = true }
+skim-common = { path = "../skim-common/", version = "0.1.0" }
+skim-tuikit = { path = "../skim-tuikit/", version = "0.6.0" }
 time = { workspace = true }
 timer = { workspace = true }
-tuikit = { path = "../tuikit/" }
 unicode-width = { workspace = true }
 vte = { workspace = true }
 which = { workspace = true }