refactor: reorganize folder hierarchy

32 files changed, 20 insertions, 32 deletions

diff --git a/Cargo.toml b/Cargo.toml
index a0e6dd9..41d00f8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,24 @@
+[package]
+name = "syrette"
+version = "0.1.0"
+license = "LGPL-2.1"
+authors = ["HampusM <hampus@hampusmat.com>"]
+description = "The convenient dependency injection library"
+repository = "https://git.hampusmat.com/syrette"
+keywords = ["DI", "dependency-injection", "ioc", "inversion-of-control"]
+edition = "2021"
+
+[dependencies]
+syrette_macros = "0.1.0"
+linkme = "0.3.0"
+once_cell = "1.4"
+error-stack = "0.1.1"
+
+[dev_dependencies]
+mockall = "0.11.1"
+
 [workspace]
 members = [
-	"syrette",
-	"syrette_macros",
+	"macros",
 	"example",
 ]
diff --git a/syrette_macros/Cargo.toml b/macros/Cargo.toml
index 74b4f91..74b4f91 100644
--- a/syrette_macros/Cargo.toml
+++ b/macros/Cargo.toml
diff --git a/syrette_macros/src/declare_interface_args.rs b/macros/src/declare_interface_args.rs
index b54f458..b54f458 100644
--- a/syrette_macros/src/declare_interface_args.rs
+++ b/macros/src/declare_interface_args.rs
diff --git a/syrette_macros/src/factory_type_alias.rs b/macros/src/factory_type_alias.rs
index 8ea7baa..8ea7baa 100644
--- a/syrette_macros/src/factory_type_alias.rs
+++ b/macros/src/factory_type_alias.rs
diff --git a/syrette_macros/src/injectable_impl.rs b/macros/src/injectable_impl.rs
index 3000253..3000253 100644
--- a/syrette_macros/src/injectable_impl.rs
+++ b/macros/src/injectable_impl.rs
diff --git a/syrette_macros/src/injectable_macro_args.rs b/macros/src/injectable_macro_args.rs
index 4ef4389..4ef4389 100644
--- a/syrette_macros/src/injectable_macro_args.rs
+++ b/macros/src/injectable_macro_args.rs
diff --git a/syrette_macros/src/lib.rs b/macros/src/lib.rs
index ed1a509..ed1a509 100644
--- a/syrette_macros/src/lib.rs
+++ b/macros/src/lib.rs
diff --git a/syrette/src/libs/intertrait/LICENSE-APACHE b/macros/src/libs/intertrait_macros/LICENSE-APACHE
index d9a10c0..d9a10c0 100644
--- a/syrette/src/libs/intertrait/LICENSE-APACHE
+++ b/macros/src/libs/intertrait_macros/LICENSE-APACHE
diff --git a/syrette/src/libs/intertrait/LICENSE-MIT b/macros/src/libs/intertrait_macros/LICENSE-MIT
index 969d061..969d061 100644
--- a/syrette/src/libs/intertrait/LICENSE-MIT
+++ b/macros/src/libs/intertrait_macros/LICENSE-MIT
diff --git a/syrette_macros/src/libs/intertrait_macros/gen_caster.rs b/macros/src/libs/intertrait_macros/gen_caster.rs
index 9126200..9126200 100644
--- a/syrette_macros/src/libs/intertrait_macros/gen_caster.rs
+++ b/macros/src/libs/intertrait_macros/gen_caster.rs
diff --git a/syrette_macros/src/libs/intertrait_macros/mod.rs b/macros/src/libs/intertrait_macros/mod.rs
index fa8c021..fa8c021 100644
--- a/syrette_macros/src/libs/intertrait_macros/mod.rs
+++ b/macros/src/libs/intertrait_macros/mod.rs
diff --git a/syrette_macros/src/libs/mod.rs b/macros/src/libs/mod.rs
index e4964de..e4964de 100644
--- a/syrette_macros/src/libs/mod.rs
+++ b/macros/src/libs/mod.rs
diff --git a/syrette/src/castable_factory.rs b/src/castable_factory.rs
index 5d582bb..5d582bb 100644
--- a/syrette/src/castable_factory.rs
+++ b/src/castable_factory.rs
diff --git a/syrette/src/di_container.rs b/src/di_container.rs
index 6982a10..6982a10 100644
--- a/syrette/src/di_container.rs
+++ b/src/di_container.rs
diff --git a/syrette/src/errors/di_container.rs b/src/errors/di_container.rs
index f2b8add..f2b8add 100644
--- a/syrette/src/errors/di_container.rs
+++ b/src/errors/di_container.rs
diff --git a/syrette/src/errors/injectable.rs b/src/errors/injectable.rs
index 6b0cdc5..6b0cdc5 100644
--- a/syrette/src/errors/injectable.rs
+++ b/src/errors/injectable.rs
diff --git a/syrette/src/errors/mod.rs b/src/errors/mod.rs
index b0d50f0..b0d50f0 100644
--- a/syrette/src/errors/mod.rs
+++ b/src/errors/mod.rs
diff --git a/syrette/src/interfaces/factory.rs b/src/interfaces/factory.rs
index c97fc09..c97fc09 100644
--- a/syrette/src/interfaces/factory.rs
+++ b/src/interfaces/factory.rs
diff --git a/syrette/src/interfaces/injectable.rs b/src/interfaces/injectable.rs
index 24032a6..24032a6 100644
--- a/syrette/src/interfaces/injectable.rs
+++ b/src/interfaces/injectable.rs
diff --git a/syrette/src/interfaces/mod.rs b/src/interfaces/mod.rs
index 921bb9c..921bb9c 100644
--- a/syrette/src/interfaces/mod.rs
+++ b/src/interfaces/mod.rs
diff --git a/syrette/src/lib.rs b/src/lib.rs
index 992f276..992f276 100644
--- a/syrette/src/lib.rs
+++ b/src/lib.rs
diff --git a/syrette_macros/src/libs/intertrait_macros/LICENSE-APACHE b/src/libs/intertrait/LICENSE-APACHE
index d9a10c0..d9a10c0 100644
--- a/syrette_macros/src/libs/intertrait_macros/LICENSE-APACHE
+++ b/src/libs/intertrait/LICENSE-APACHE
diff --git a/syrette_macros/src/libs/intertrait_macros/LICENSE-MIT b/src/libs/intertrait/LICENSE-MIT
index 969d061..969d061 100644
--- a/syrette_macros/src/libs/intertrait_macros/LICENSE-MIT
+++ b/src/libs/intertrait/LICENSE-MIT
diff --git a/syrette/src/libs/intertrait/cast_box.rs b/src/libs/intertrait/cast_box.rs
index 793efd0..793efd0 100644
--- a/syrette/src/libs/intertrait/cast_box.rs
+++ b/src/libs/intertrait/cast_box.rs
diff --git a/syrette/src/libs/intertrait/cast_rc.rs b/src/libs/intertrait/cast_rc.rs
index 79d8d60..79d8d60 100644
--- a/syrette/src/libs/intertrait/cast_rc.rs
+++ b/src/libs/intertrait/cast_rc.rs
diff --git a/syrette/src/libs/intertrait/hasher.rs b/src/libs/intertrait/hasher.rs
index e7f110d..e7f110d 100644
--- a/syrette/src/libs/intertrait/hasher.rs
+++ b/src/libs/intertrait/hasher.rs
diff --git a/syrette/src/libs/intertrait/mod.rs b/src/libs/intertrait/mod.rs
index 1daca64..1daca64 100644
--- a/syrette/src/libs/intertrait/mod.rs
+++ b/src/libs/intertrait/mod.rs
diff --git a/syrette/src/libs/mod.rs b/src/libs/mod.rs
index 8d5583d..8d5583d 100644
--- a/syrette/src/libs/mod.rs
+++ b/src/libs/mod.rs
diff --git a/syrette/src/provider.rs b/src/provider.rs
index 3b7e04c..3b7e04c 100644
--- a/syrette/src/provider.rs
+++ b/src/provider.rs
diff --git a/syrette/src/ptr.rs b/src/ptr.rs
index 414d086..414d086 100644
--- a/syrette/src/ptr.rs
+++ b/src/ptr.rs
diff --git a/syrette/Cargo.toml b/syrette/Cargo.toml
deleted file mode 100644
index ab1d551..0000000
--- a/syrette/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "syrette"
-version = "0.1.0"
-license = "LGPL-2.1"
-authors = ["HampusM <hampus@hampusmat.com>"]
-description = "The convenient dependency injection library"
-repository = "https://git.hampusmat.com/syrette"
-keywords = ["DI", "dependency-injection", "ioc", "inversion-of-control"]
-edition = "2021"
-
-[dependencies]
-syrette_macros = "0.1.0"
-linkme = "0.3.0"
-once_cell = "1.4"
-error-stack = "0.1.1"
-
-[dev_dependencies]
-mockall = "0.11.1"
-
diff --git a/syrette/README.md b/syrette/README.md
deleted file mode 100644
index 74eab4f..0000000
--- a/syrette/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-## Syrette
-
-The convenient dependency injection library for Rust.
-
-## Namesake
-
-From the [Syrette Wikipedia article](https://en.wikipedia.org/wiki/Syrette).
-> A syrette is a device for injecting liquid through a needle.
-> It is similar to a syringe except that it has a closed flexible
-> tube (like that typically used for toothpaste) instead of a rigid tube and piston.
-