diff --git a/Cargo.toml b/Cargo.toml
index 85077fe..c55f5d8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 workspace.resolver = "2"
-members = ["twust-macro", "tailwind"]
+members = ["twust", "twust_macro", "tailwind"]
 
 
 [workspace.package]
@@ -12,6 +12,7 @@ email = ["oyelowo.oss@gmai.com"]
 readme = "README.md"
 documentation = "https://docs.rs/nom"
 # documentation = "https://codebreather.com/oyelowo"
+repository = "https://github.com/Oyelowo/twust"
 description = "Zero-config Static type-checker for Tailwind CSS"
 license = "MIT/Apache-2.0"
 categories = ["UI", "css", "tailwindcss", "web-programming"]
@@ -34,7 +35,8 @@ keywords = [
 
 
 [workspace.dependencies]
-twust = { path = "twust-macro" }
+twust = { path = "twust" }
+twust_macro = { path = "twust_macro" }
 # tailwind = { path = "tailwind" }
 
 proc-macro2 = "1.0.69"
diff --git a/twust/Cargo.toml b/twust/Cargo.toml
new file mode 100644
index 0000000..001ce18
--- /dev/null
+++ b/twust/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "twust"
+version = { workspace = true }
+edition = { workspace = true }
+authors = { workspace = true }
+documentation = { workspace = true }
+description = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
+readme = { workspace = true }
+keywords = { workspace = true }
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[features]
+daisyui = []
+
+[dependencies]
+twust_macro = { workspace = true }
+
+
diff --git a/twust-macro/Cargo.toml b/twust_macro/Cargo.toml
similarity index 71%
rename from twust-macro/Cargo.toml
rename to twust_macro/Cargo.toml
index f790d06..044e82e 100644
--- a/twust-macro/Cargo.toml
+++ b/twust_macro/Cargo.toml
@@ -1,15 +1,14 @@
 [package]
-name = "twust"
+name = "twust_macro"
 version = { workspace = true }
 edition = { workspace = true }
 authors = { workspace = true }
-# description = { workspace = true }
 documentation = { workspace = true }
 license = { workspace = true }
-repository = "https://github.com/Oyelowo/twust"
-description = "Static checker for tailwindcss class names in rust for rust"
-readme = "../README.md"
-keywords = ["tailwindcss", "tailwind", "css", "leptos", "yew"]
+repository = { workspace = true }
+description = { workspace = true }
+readme = { workspace = true }
+keywords = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/twust-macro/src/config/classes.rs b/twust_macro/src/config/classes.rs
similarity index 100%
rename from twust-macro/src/config/classes.rs
rename to twust_macro/src/config/classes.rs
diff --git a/twust-macro/src/config/macros.rs b/twust_macro/src/config/macros.rs
similarity index 100%
rename from twust-macro/src/config/macros.rs
rename to twust_macro/src/config/macros.rs
diff --git a/twust-macro/src/config/mod.rs b/twust_macro/src/config/mod.rs
similarity index 100%
rename from twust-macro/src/config/mod.rs
rename to twust_macro/src/config/mod.rs
diff --git a/twust-macro/src/config/modifiers.rs b/twust_macro/src/config/modifiers.rs
similarity index 100%
rename from twust-macro/src/config/modifiers.rs
rename to twust_macro/src/config/modifiers.rs
diff --git a/twust-macro/src/config/noconfig.rs b/twust_macro/src/config/noconfig.rs
similarity index 100%
rename from twust-macro/src/config/noconfig.rs
rename to twust_macro/src/config/noconfig.rs
diff --git a/twust-macro/src/lib.rs b/twust_macro/src/lib.rs
similarity index 100%
rename from twust-macro/src/lib.rs
rename to twust_macro/src/lib.rs
diff --git a/twust-macro/src/plugins/daisyui.rs b/twust_macro/src/plugins/daisyui.rs
similarity index 100%
rename from twust-macro/src/plugins/daisyui.rs
rename to twust_macro/src/plugins/daisyui.rs
diff --git a/twust-macro/src/plugins/mod.rs b/twust_macro/src/plugins/mod.rs
similarity index 100%
rename from twust-macro/src/plugins/mod.rs
rename to twust_macro/src/plugins/mod.rs
diff --git a/twust-macro/src/tailwind/colorful.rs b/twust_macro/src/tailwind/colorful.rs
similarity index 100%
rename from twust-macro/src/tailwind/colorful.rs
rename to twust_macro/src/tailwind/colorful.rs
diff --git a/twust-macro/src/tailwind/default_classnames.rs b/twust_macro/src/tailwind/default_classnames.rs
similarity index 100%
rename from twust-macro/src/tailwind/default_classnames.rs
rename to twust_macro/src/tailwind/default_classnames.rs
diff --git a/twust-macro/src/tailwind/lengthy.rs b/twust_macro/src/tailwind/lengthy.rs
similarity index 100%
rename from twust-macro/src/tailwind/lengthy.rs
rename to twust_macro/src/tailwind/lengthy.rs
diff --git a/twust-macro/src/tailwind/mod.rs b/twust_macro/src/tailwind/mod.rs
similarity index 100%
rename from twust-macro/src/tailwind/mod.rs
rename to twust_macro/src/tailwind/mod.rs
diff --git a/twust-macro/src/tailwind/modifiers.rs b/twust_macro/src/tailwind/modifiers.rs
similarity index 100%
rename from twust-macro/src/tailwind/modifiers.rs
rename to twust_macro/src/tailwind/modifiers.rs
diff --git a/twust-macro/src/tailwind/signable.rs b/twust_macro/src/tailwind/signable.rs
similarity index 100%
rename from twust-macro/src/tailwind/signable.rs
rename to twust_macro/src/tailwind/signable.rs
diff --git a/twust-macro/src/tailwind/tailwind_config.rs b/twust_macro/src/tailwind/tailwind_config.rs
similarity index 100%
rename from twust-macro/src/tailwind/tailwind_config.rs
rename to twust_macro/src/tailwind/tailwind_config.rs
diff --git a/twust-macro/src/tailwind/valid_baseclass_names.rs b/twust_macro/src/tailwind/valid_baseclass_names.rs
similarity index 100%
rename from twust-macro/src/tailwind/valid_baseclass_names.rs
rename to twust_macro/src/tailwind/valid_baseclass_names.rs