diff --git a/go.sum b/go.sum
index 442ad17..3f18916 100644
--- a/go.sum
+++ b/go.sum
@@ -58,6 +58,8 @@ github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/vincentkoc/crawlkit v0.2.0 h1:w6jfcckVsKOcx6fFwKj9mvyTJHmSDg3ro+j2/TgNkuE=
 github.com/vincentkoc/crawlkit v0.2.0/go.mod h1:Zp6k0f6owZ81wccG26jPbLSDGmfjoxPdzgPXZcUpmW4=
+github.com/vincentkoc/crawlkit v0.3.0 h1:37QsucIaUmaRygk2fn7NQniD6YSAAi0DR1vzL8UimoI=
+github.com/vincentkoc/crawlkit v0.3.0/go.mod h1:Zp6k0f6owZ81wccG26jPbLSDGmfjoxPdzgPXZcUpmW4=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
diff --git a/internal/config/config.go b/internal/config/config.go
index b19cfb0..f8fd11d 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/vincentkoc/crawlkit/configkit"
+	crawlconfig "github.com/vincentkoc/crawlkit/config"
 )
 
 const (
@@ -49,12 +49,12 @@ type TokenResolution struct {
 	Source string
 }
 
-var appConfig = configkit.App{Name: "gitcrawl", ConfigEnv: DefaultConfigEnv}
+var appConfig = crawlconfig.App{Name: "gitcrawl", ConfigEnv: DefaultConfigEnv}
 
 func Default() Config {
 	paths, err := appConfig.DefaultPaths()
 	if err != nil {
-		paths = configkit.Paths{
+		paths = crawlconfig.Paths{
 			DBPath:   filepath.Join(homeDir(), ".config", "gitcrawl", "gitcrawl.db"),
 			CacheDir: filepath.Join(homeDir(), ".config", "gitcrawl", "cache"),
 			LogDir:   filepath.Join(homeDir(), ".config", "gitcrawl", "logs"),
@@ -96,7 +96,7 @@ func ResolvePath(flagPath string) string {
 func Load(path string) (Config, error) {
 	cfg := Default()
 	resolved := ResolvePath(path)
-	if err := configkit.LoadTOML(resolved, &cfg); err != nil {
+	if err := crawlconfig.LoadTOML(resolved, &cfg); err != nil {
 		return Config{}, err
 	}
 	if err := cfg.Normalize(); err != nil {
@@ -110,18 +110,18 @@ func Save(path string, cfg Config) error {
 		return err
 	}
 	resolved := ResolvePath(path)
-	return configkit.WriteTOML(resolved, cfg, 0o600)
+	return crawlconfig.WriteTOML(resolved, cfg, 0o600)
 }
 
 func EnsureRuntimeDirs(cfg Config) error {
-	if err := configkit.EnsureRuntimeDirs(configkit.RuntimeConfig{
+	if err := crawlconfig.EnsureRuntimeDirs(crawlconfig.RuntimeConfig{
 		DBPath:   cfg.DBPath,
 		CacheDir: cfg.CacheDir,
 		LogDir:   cfg.LogDir,
 	}); err != nil {
 		return err
 	}
-	if err := os.MkdirAll(configkit.ExpandHome(cfg.VectorDir), 0o755); err != nil {
+	if err := os.MkdirAll(crawlconfig.ExpandHome(cfg.VectorDir), 0o755); err != nil {
 		return fmt.Errorf("create runtime dir %s: %w", cfg.VectorDir, err)
 	}
 	return nil
@@ -200,7 +200,7 @@ func envOrDefault(primary, fallback string) string {
 }
 
 func expandHome(path string) string {
-	return configkit.ExpandHome(path)
+	return crawlconfig.ExpandHome(path)
 }
 
 func homeDir() string {
diff --git a/internal/store/store.go b/internal/store/store.go
index 812c751..0d202d1 100644
--- a/internal/store/store.go
+++ b/internal/store/store.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/vincentkoc/crawlkit/sqlitekit"
+	crawlstore "github.com/vincentkoc/crawlkit/store"
 )
 
 const (
@@ -36,7 +36,7 @@ type Status struct {
 }
 
 func Open(ctx context.Context, path string) (*Store, error) {
-	base, err := sqlitekit.Open(ctx, sqlitekit.Options{Path: path})
+	base, err := crawlstore.Open(ctx, crawlstore.Options{Path: path})
 	if err != nil {
 		return nil, err
 	}
@@ -50,7 +50,7 @@ func Open(ctx context.Context, path string) (*Store, error) {
 }
 
 func OpenReadOnly(ctx context.Context, path string) (*Store, error) {
-	base, err := sqlitekit.OpenReadOnly(ctx, path)
+	base, err := crawlstore.OpenReadOnly(ctx, path)
 	if err != nil {
 		return nil, err
 	}