diff --git a/Cargo.toml b/Cargo.toml
index 67b4dad..5bae461 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,6 +5,7 @@ resolver = "2"
 
 # @formatter:off
 members = [
+    "crates/app",
     "crates/bean",
     "crates/core",
     "crates/ctx",
diff --git a/crates/app/Cargo.toml b/crates/app/Cargo.toml
new file mode 100644
index 0000000..345d0a1
--- /dev/null
+++ b/crates/app/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "omigaapp"
+version = "0.1.0"
+edition = "2021"
+license = "Apache-2.0"
+
+[dependencies]
+omigacore = { path = "../core" }
diff --git a/crates/web/src/app.rs b/crates/app/src/app.rs
similarity index 99%
rename from crates/web/src/app.rs
rename to crates/app/src/app.rs
index c83ac79..6c35f7b 100644
--- a/crates/web/src/app.rs
+++ b/crates/app/src/app.rs
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-// omigaweb/app
+// omigaapp/app
 
 // ----------------------------------------------------------------
 
 use omigacore::constants::{COMMA, SIGMA_CORE_PROFILE_ACTIVES_DEFAULT};
-
-use crate::core::kv::Kv;
+use omigacore::model::kv::Kv;
 
 // ----------------------------------------------------------------
 
diff --git a/crates/app/src/lib.rs b/crates/app/src/lib.rs
new file mode 100644
index 0000000..2855267
--- /dev/null
+++ b/crates/app/src/lib.rs
@@ -0,0 +1,21 @@
+/*
+ * Copyright © 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// lib
+
+// ----------------------------------------------------------------
+
+pub mod app;
diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs
index dbd9fa3..a3054ac 100644
--- a/crates/core/src/lib.rs
+++ b/crates/core/src/lib.rs
@@ -19,4 +19,8 @@
 // ----------------------------------------------------------------
 
 pub mod constants;
-mod error;
+pub mod error;
+
+// ----------------------------------------------------------------
+
+pub mod model;
diff --git a/crates/web/src/core.rs b/crates/core/src/model.rs
similarity index 98%
rename from crates/web/src/core.rs
rename to crates/core/src/model.rs
index 92b15c3..730ac09 100644
--- a/crates/web/src/core.rs
+++ b/crates/core/src/model.rs
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// core
+// model
 
 // ----------------------------------------------------------------
 
diff --git a/crates/web/src/core/kv.rs b/crates/core/src/model/kv.rs
similarity index 98%
rename from crates/web/src/core/kv.rs
rename to crates/core/src/model/kv.rs
index 03a38be..d01f423 100644
--- a/crates/web/src/core/kv.rs
+++ b/crates/core/src/model/kv.rs
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// core/kv
+// model/kv
 
 // ----------------------------------------------------------------
 
diff --git a/crates/tests/Cargo.toml b/crates/tests/Cargo.toml
index a25055d..4ed6c5e 100644
--- a/crates/tests/Cargo.toml
+++ b/crates/tests/Cargo.toml
@@ -7,11 +7,12 @@ license = "Apache-2.0"
 publish = false
 
 [dependencies]
-macroattr = { path = "../macroattr" }
-omigacore = { path = "../core" }
-macrofn = { path = "../macrofn" }
+omigaapp = { path = "../app" }
 omigabean = { path = "../bean" }
+omigacore = { path = "../core" }
 omigactx = { path = "../ctx" }
 omigaenv = { path = "../env" }
+macroattr = { path = "../macroattr" }
+macrofn = { path = "../macrofn" }
 omigatesting = { path = "../testing" }
 omigaweb = { path = "../web" }
diff --git a/crates/tests/src/integration_tests.rs b/crates/tests/src/integration_tests.rs
index 8a79d0f..beea909 100644
--- a/crates/tests/src/integration_tests.rs
+++ b/crates/tests/src/integration_tests.rs
@@ -18,8 +18,8 @@
 
 // ----------------------------------------------------------------
 
+use omigaapp::app::{Application, OmigaApplication};
 use omigacore::constants::SIGMA_CORE_PROFILE_ACTIVES_DEFAULT;
-use omigaweb::app::{Application, OmigaApplication};
 
 // ----------------------------------------------------------------
 
diff --git a/crates/web/Cargo.toml b/crates/web/Cargo.toml
index 7b79db5..625c4f1 100644
--- a/crates/web/Cargo.toml
+++ b/crates/web/Cargo.toml
@@ -5,5 +5,3 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-macrofn = { path = "../macrofn" }
-omigacore = { path = "../core" }
diff --git a/crates/web/src/lib.rs b/crates/web/src/lib.rs
index a36a01c..7c989e5 100644
--- a/crates/web/src/lib.rs
+++ b/crates/web/src/lib.rs
@@ -17,6 +17,3 @@
 // omigaweb
 
 // ----------------------------------------------------------------
-
-pub mod app;
-pub mod core;