diff --git a/Cargo.toml b/Cargo.toml
index fa24b510..7e4e4d7f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,16 +6,16 @@ edition = "2021"
 resolver = "2"
 
 [dependencies]
-lapce-core = { path = "./core" }
-lapce-proxy = { path = "./proxy" }
+lapce-core = { path = "./lapce-core" }
+lapce-proxy = { path = "./lapce-proxy" }
 
 [[bin]]
 name = "lapce"
-path = "core/src/bin/lapce.rs"
+path = "lapce-core/src/bin/lapce.rs"
 
 [[bin]]
 name = "lapce-proxy"
-path = "proxy/src/bin/lapce-proxy.rs"
+path = "lapce-proxy/src/bin/lapce-proxy.rs"
 
 [workspace]
-members = ["core", "proxy", "rpc"]
+members = ["lapce-core", "lapce-proxy", "lapce-rpc"]
diff --git a/core/Cargo.toml b/lapce-core/Cargo.toml
similarity index 95%
rename from core/Cargo.toml
rename to lapce-core/Cargo.toml
index 1542b417..6b33d775 100644
--- a/core/Cargo.toml
+++ b/lapce-core/Cargo.toml
@@ -57,8 +57,8 @@ druid = { git = "https://github.com/lapce/druid", features = ["svg", "im", "serd
 toml = { version = "0.5.8", features = ["preserve_order"] }
 structdesc = { git = "https://github.com/lapce/structdesc" }
 #structdesc = { path = "../../structdesc" }
-lapce-rpc = { path = "../rpc" }
-lapce-proxy = { path = "../proxy" }
+lapce-rpc = { path = "../lapce-rpc" }
+lapce-proxy = { path = "../lapce-proxy" }
 
 [build-dependencies]
 cc = "1"
diff --git a/core/src/activity.rs b/lapce-core/src/activity.rs
similarity index 100%
rename from core/src/activity.rs
rename to lapce-core/src/activity.rs
diff --git a/core/src/app.rs b/lapce-core/src/app.rs
similarity index 100%
rename from core/src/app.rs
rename to lapce-core/src/app.rs
diff --git a/core/src/bin/lapce.rs b/lapce-core/src/bin/lapce.rs
similarity index 100%
rename from core/src/bin/lapce.rs
rename to lapce-core/src/bin/lapce.rs
diff --git a/core/src/buffer.rs b/lapce-core/src/buffer.rs
similarity index 100%
rename from core/src/buffer.rs
rename to lapce-core/src/buffer.rs
diff --git a/core/src/code_action.rs b/lapce-core/src/code_action.rs
similarity index 100%
rename from core/src/code_action.rs
rename to lapce-core/src/code_action.rs
diff --git a/core/src/command.rs b/lapce-core/src/command.rs
similarity index 100%
rename from core/src/command.rs
rename to lapce-core/src/command.rs
diff --git a/core/src/completion.rs b/lapce-core/src/completion.rs
similarity index 100%
rename from core/src/completion.rs
rename to lapce-core/src/completion.rs
diff --git a/core/src/config.rs b/lapce-core/src/config.rs
similarity index 100%
rename from core/src/config.rs
rename to lapce-core/src/config.rs
diff --git a/core/src/container.rs b/lapce-core/src/container.rs
similarity index 100%
rename from core/src/container.rs
rename to lapce-core/src/container.rs
diff --git a/core/src/data.rs b/lapce-core/src/data.rs
similarity index 100%
rename from core/src/data.rs
rename to lapce-core/src/data.rs
diff --git a/core/src/db.rs b/lapce-core/src/db.rs
similarity index 100%
rename from core/src/db.rs
rename to lapce-core/src/db.rs
diff --git a/core/src/editor.rs b/lapce-core/src/editor.rs
similarity index 100%
rename from core/src/editor.rs
rename to lapce-core/src/editor.rs
diff --git a/core/src/explorer.rs b/lapce-core/src/explorer.rs
similarity index 100%
rename from core/src/explorer.rs
rename to lapce-core/src/explorer.rs
diff --git a/core/src/find.rs b/lapce-core/src/find.rs
similarity index 100%
rename from core/src/find.rs
rename to lapce-core/src/find.rs
diff --git a/core/src/keymap.rs b/lapce-core/src/keymap.rs
similarity index 100%
rename from core/src/keymap.rs
rename to lapce-core/src/keymap.rs
diff --git a/core/src/keypress.rs b/lapce-core/src/keypress.rs
similarity index 100%
rename from core/src/keypress.rs
rename to lapce-core/src/keypress.rs
diff --git a/core/src/language.rs b/lapce-core/src/language.rs
similarity index 100%
rename from core/src/language.rs
rename to lapce-core/src/language.rs
diff --git a/core/src/lib.rs b/lapce-core/src/lib.rs
similarity index 100%
rename from core/src/lib.rs
rename to lapce-core/src/lib.rs
diff --git a/core/src/lsp.rs b/lapce-core/src/lsp.rs
similarity index 100%
rename from core/src/lsp.rs
rename to lapce-core/src/lsp.rs
diff --git a/core/src/menu.rs b/lapce-core/src/menu.rs
similarity index 100%
rename from core/src/menu.rs
rename to lapce-core/src/menu.rs
diff --git a/core/src/movement.rs b/lapce-core/src/movement.rs
similarity index 100%
rename from core/src/movement.rs
rename to lapce-core/src/movement.rs
diff --git a/core/src/outline.rs b/lapce-core/src/outline.rs
similarity index 100%
rename from core/src/outline.rs
rename to lapce-core/src/outline.rs
diff --git a/core/src/palette.rs b/lapce-core/src/palette.rs
similarity index 100%
rename from core/src/palette.rs
rename to lapce-core/src/palette.rs
diff --git a/core/src/panel.rs b/lapce-core/src/panel.rs
similarity index 100%
rename from core/src/panel.rs
rename to lapce-core/src/panel.rs
diff --git a/core/src/picker.rs b/lapce-core/src/picker.rs
similarity index 100%
rename from core/src/picker.rs
rename to lapce-core/src/picker.rs
diff --git a/core/src/plugin.rs b/lapce-core/src/plugin.rs
similarity index 100%
rename from core/src/plugin.rs
rename to lapce-core/src/plugin.rs
diff --git a/core/src/problem.rs b/lapce-core/src/problem.rs
similarity index 100%
rename from core/src/problem.rs
rename to lapce-core/src/problem.rs
diff --git a/core/src/proxy.rs b/lapce-core/src/proxy.rs
similarity index 100%
rename from core/src/proxy.rs
rename to lapce-core/src/proxy.rs
diff --git a/core/src/scroll.rs b/lapce-core/src/scroll.rs
similarity index 100%
rename from core/src/scroll.rs
rename to lapce-core/src/scroll.rs
diff --git a/core/src/search.rs b/lapce-core/src/search.rs
similarity index 100%
rename from core/src/search.rs
rename to lapce-core/src/search.rs
diff --git a/core/src/settings.rs b/lapce-core/src/settings.rs
similarity index 100%
rename from core/src/settings.rs
rename to lapce-core/src/settings.rs
diff --git a/core/src/signature.rs b/lapce-core/src/signature.rs
similarity index 100%
rename from core/src/signature.rs
rename to lapce-core/src/signature.rs
diff --git a/core/src/source_control.rs b/lapce-core/src/source_control.rs
similarity index 100%
rename from core/src/source_control.rs
rename to lapce-core/src/source_control.rs
diff --git a/core/src/split.rs b/lapce-core/src/split.rs
similarity index 100%
rename from core/src/split.rs
rename to lapce-core/src/split.rs
diff --git a/core/src/state.rs b/lapce-core/src/state.rs
similarity index 100%
rename from core/src/state.rs
rename to lapce-core/src/state.rs
diff --git a/core/src/status.rs b/lapce-core/src/status.rs
similarity index 100%
rename from core/src/status.rs
rename to lapce-core/src/status.rs
diff --git a/core/src/svg.rs b/lapce-core/src/svg.rs
similarity index 100%
rename from core/src/svg.rs
rename to lapce-core/src/svg.rs
diff --git a/core/src/tab.rs b/lapce-core/src/tab.rs
similarity index 100%
rename from core/src/tab.rs
rename to lapce-core/src/tab.rs
diff --git a/core/src/terminal.rs b/lapce-core/src/terminal.rs
similarity index 100%
rename from core/src/terminal.rs
rename to lapce-core/src/terminal.rs
diff --git a/core/src/theme.rs b/lapce-core/src/theme.rs
similarity index 100%
rename from core/src/theme.rs
rename to lapce-core/src/theme.rs
diff --git a/core/src/title.rs b/lapce-core/src/title.rs
similarity index 100%
rename from core/src/title.rs
rename to lapce-core/src/title.rs
diff --git a/core/src/window.rs b/lapce-core/src/window.rs
similarity index 100%
rename from core/src/window.rs
rename to lapce-core/src/window.rs
diff --git a/proxy/Cargo.toml b/lapce-proxy/Cargo.toml
similarity index 96%
rename from proxy/Cargo.toml
rename to lapce-proxy/Cargo.toml
index c672a343..7d1e6b88 100644
--- a/proxy/Cargo.toml
+++ b/lapce-proxy/Cargo.toml
@@ -20,7 +20,7 @@ alacritty_terminal = "0.16.0-rc2"
 mio = "0.6.20"
 hotwatch = "0.4.6"
 notify = "5.0.0-pre.13"
-lapce-rpc = { path = "../rpc" }
+lapce-rpc = { path = "../lapce-rpc" }
 xi-rope = { git = "https://github.com/lapce/xi-editor", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 lsp-types = { version = "0.89.2", features = ["proposed"] }
diff --git a/proxy/src/bin/lapce-proxy.rs b/lapce-proxy/src/bin/lapce-proxy.rs
similarity index 100%
rename from proxy/src/bin/lapce-proxy.rs
rename to lapce-proxy/src/bin/lapce-proxy.rs
diff --git a/proxy/src/buffer.rs b/lapce-proxy/src/buffer.rs
similarity index 100%
rename from proxy/src/buffer.rs
rename to lapce-proxy/src/buffer.rs
diff --git a/proxy/src/dispatch.rs b/lapce-proxy/src/dispatch.rs
similarity index 100%
rename from proxy/src/dispatch.rs
rename to lapce-proxy/src/dispatch.rs
diff --git a/proxy/src/lib.rs b/lapce-proxy/src/lib.rs
similarity index 100%
rename from proxy/src/lib.rs
rename to lapce-proxy/src/lib.rs
diff --git a/proxy/src/lsp.rs b/lapce-proxy/src/lsp.rs
similarity index 100%
rename from proxy/src/lsp.rs
rename to lapce-proxy/src/lsp.rs
diff --git a/proxy/src/plugin.rs b/lapce-proxy/src/plugin.rs
similarity index 100%
rename from proxy/src/plugin.rs
rename to lapce-proxy/src/plugin.rs
diff --git a/proxy/src/terminal.rs b/lapce-proxy/src/terminal.rs
similarity index 100%
rename from proxy/src/terminal.rs
rename to lapce-proxy/src/terminal.rs
diff --git a/rpc/Cargo.toml b/lapce-rpc/Cargo.toml
similarity index 100%
rename from rpc/Cargo.toml
rename to lapce-rpc/Cargo.toml
diff --git a/rpc/src/lib.rs b/lapce-rpc/src/lib.rs
similarity index 100%
rename from rpc/src/lib.rs
rename to lapce-rpc/src/lib.rs
diff --git a/rpc/src/parse.rs b/lapce-rpc/src/parse.rs
similarity index 100%
rename from rpc/src/parse.rs
rename to lapce-rpc/src/parse.rs
diff --git a/rpc/src/stdio.rs b/lapce-rpc/src/stdio.rs
similarity index 100%
rename from rpc/src/stdio.rs
rename to lapce-rpc/src/stdio.rs