diff --git a/Cargo.toml b/Cargo.toml
index 26ced24cb..eb098313f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -69,3 +69,15 @@ rand = { version = "0.8.4", features = ["small_rng"] }
 tokio = { version = "1.16.1", features = ["full"] }
 reqwest = { version = "0.11.9", features = ["json"] }
 dioxus = { path = ".", features = ["desktop", "ssr", "router", "fermi"] }
+fern = { version = "0.6.0", features = ["colored"] }
+criterion = "0.3.5"
+thiserror = "1.0.30"
+
+
+[[bench]]
+name = "create"
+harness = false
+
+[[bench]]
+name = "jsframework"
+harness = false
diff --git a/packages/core/benches/create.rs b/benches/create.rs
similarity index 100%
rename from packages/core/benches/create.rs
rename to benches/create.rs
diff --git a/packages/core/benches/jsframework.rs b/benches/jsframework.rs
similarity index 100%
rename from packages/core/benches/jsframework.rs
rename to benches/jsframework.rs
diff --git a/packages/core/Cargo.toml b/packages/core/Cargo.toml
index 4126eb47f..f17dc6052 100644
--- a/packages/core/Cargo.toml
+++ b/packages/core/Cargo.toml
@@ -45,24 +45,8 @@ serde = { version = "1", features = ["derive"], optional = true }
 # todo: I want to get rid of this
 backtrace = "0.3"
 
-[dev-dependencies]
-anyhow = "1.0.42"
-fern = { version = "0.6.0", features = ["colored"] }
-rand = { version = "0.8.4", features = ["small_rng"] }
-dioxus-core-macro = { path = "../core-macro", version ="^0.1.6"}
-criterion = "0.3.5"
-thiserror = "1.0.30"
-dioxus-html = { path = "../html" }
-
 [features]
 default = []
 serialize = ["serde"]
 debug_vdom = []
 
-[[bench]]
-name = "create"
-harness = false
-
-[[bench]]
-name = "jsframework"
-harness = false
diff --git a/packages/core/src/lib.rs b/packages/core/src/lib.rs
index 66b7a2884..f31e2e328 100644
--- a/packages/core/src/lib.rs
+++ b/packages/core/src/lib.rs
@@ -83,7 +83,7 @@ pub use crate::innerlude::{
 pub mod prelude {
     pub use crate::innerlude::{
         fc_to_builder, Attributes, Component, DioxusElement, Element, EventHandler, Fragment,
-        LazyNodes, NodeFactory, Properties, Scope, ScopeState, VNode, VirtualDom,
+        LazyNodes, NodeFactory, Properties, Scope, ScopeId, ScopeState, VNode, VirtualDom,
     };
 }
 
diff --git a/packages/router/.gitignore b/packages/router/.gitignore
new file mode 100644
index 000000000..849ddff3b
--- /dev/null
+++ b/packages/router/.gitignore
@@ -0,0 +1 @@
+dist/
diff --git a/packages/core/tests/.rustfmt.toml b/tests/.rustfmt.toml
similarity index 100%
rename from packages/core/tests/.rustfmt.toml
rename to tests/.rustfmt.toml
diff --git a/packages/core/tests/README.md b/tests/README.md
similarity index 100%
rename from packages/core/tests/README.md
rename to tests/README.md
diff --git a/packages/core/tests/borrowedstate.rs b/tests/borrowedstate.rs
similarity index 90%
rename from packages/core/tests/borrowedstate.rs
rename to tests/borrowedstate.rs
index b1583dc85..e65456f0b 100644
--- a/packages/core/tests/borrowedstate.rs
+++ b/tests/borrowedstate.rs
@@ -1,9 +1,6 @@
 #![allow(non_snake_case)]
 
 use dioxus::prelude::*;
-use dioxus_core as dioxus;
-use dioxus_core_macro::*;
-use dioxus_html as dioxus_elements;
 
 #[test]
 fn test_borrowed_state() {
diff --git a/packages/core/tests/create_dom.rs b/tests/create_dom.rs
similarity index 97%
rename from packages/core/tests/create_dom.rs
rename to tests/create_dom.rs
index 0cdc37c6d..f8b162e2b 100644
--- a/packages/core/tests/create_dom.rs
+++ b/tests/create_dom.rs
@@ -5,13 +5,10 @@
 //! This methods all use "rebuild" which completely bypasses the scheduler.
 //! Hard rebuilds don't consume any events from the event queue.
 
-use dioxus::{prelude::*, DomEdit};
-use dioxus_core as dioxus;
-use dioxus_core_macro::*;
-use dioxus_html as dioxus_elements;
+use dioxus::prelude::*;
 
 mod test_logging;
-use DomEdit::*;
+use dioxus_core::DomEdit::*;
 
 fn new_dom<P: 'static + Send>(app: Component<P>, props: P) -> VirtualDom {
     const IS_LOGGING_ENABLED: bool = false;
diff --git a/packages/core/tests/diffing.rs b/tests/diffing.rs
similarity index 99%
rename from packages/core/tests/diffing.rs
rename to tests/diffing.rs
index 9184d4e4a..f11f62c42 100644
--- a/packages/core/tests/diffing.rs
+++ b/tests/diffing.rs
@@ -6,10 +6,7 @@
 //!
 //! It does not validated that component lifecycles work properly. This is done in another test file.
 
-use dioxus::{prelude::*, DomEdit};
-use dioxus_core as dioxus;
-use dioxus_core_macro::*;
-use dioxus_html as dioxus_elements;
+use dioxus::prelude::*;
 
 mod test_logging;
 
@@ -19,7 +16,7 @@ fn new_dom() -> VirtualDom {
     VirtualDom::new(|cx| rsx!(cx, "hi"))
 }
 
-use DomEdit::*;
+use dioxus_core::DomEdit::*;
 
 /// Should push the text node onto the stack and modify it
 #[test]
diff --git a/packages/core/tests/earlyabort.rs b/tests/earlyabort.rs
similarity index 91%
rename from packages/core/tests/earlyabort.rs
rename to tests/earlyabort.rs
index 3999a7402..e0a698bb8 100644
--- a/packages/core/tests/earlyabort.rs
+++ b/tests/earlyabort.rs
@@ -5,13 +5,10 @@
 //! This methods all use "rebuild" which completely bypasses the scheduler.
 //! Hard rebuilds don't consume any events from the event queue.
 
-use dioxus::{prelude::*, DomEdit, ScopeId};
-use dioxus_core as dioxus;
-use dioxus_core_macro::*;
-use dioxus_html as dioxus_elements;
+use dioxus::prelude::*;
 
 mod test_logging;
-use DomEdit::*;
+use dioxus_core::{DomEdit::*, ScopeId};
 
 const IS_LOGGING_ENABLED: bool = false;
 
diff --git a/packages/core/tests/lifecycle.rs b/tests/lifecycle.rs
similarity index 98%
rename from packages/core/tests/lifecycle.rs
rename to tests/lifecycle.rs
index 35058d418..7c25f2a5e 100644
--- a/packages/core/tests/lifecycle.rs
+++ b/tests/lifecycle.rs
@@ -3,12 +3,7 @@
 
 //! Tests for the lifecycle of components.
 use dioxus::prelude::*;
-use dioxus_core as dioxus;
 use dioxus_core::DomEdit::*;
-use dioxus_core::ScopeId;
-
-use dioxus_core_macro::*;
-use dioxus_html as dioxus_elements;
 use std::sync::{Arc, Mutex};
 
 mod test_logging;
diff --git a/packages/core/tests/miri_stress.rs b/tests/miri_stress.rs
similarity index 98%
rename from packages/core/tests/miri_stress.rs
rename to tests/miri_stress.rs
index fe98c83ae..d6eaa6598 100644
--- a/packages/core/tests/miri_stress.rs
+++ b/tests/miri_stress.rs
@@ -10,10 +10,8 @@ Specifically:
 - [ ] Async isn't busted
 */
 
-use dioxus::{prelude::*, SchedulerMsg, ScopeId};
-use dioxus_core as dioxus;
-use dioxus_core_macro::*;
-use dioxus_html as dioxus_elements;
+use dioxus::prelude::*;
+use dioxus_core::SchedulerMsg;
 
 mod test_logging;
 
diff --git a/packages/core/tests/passthru.rs b/tests/passthru.rs
similarity index 94%
rename from packages/core/tests/passthru.rs
rename to tests/passthru.rs
index 948de8b67..ffe4648e2 100644
--- a/packages/core/tests/passthru.rs
+++ b/tests/passthru.rs
@@ -7,10 +7,7 @@
 //!
 //! It does not validated that component lifecycles work properly. This is done in another test file.
 
-use dioxus::{prelude::*, DomEdit, ScopeId};
-use dioxus_core as dioxus;
-use dioxus_core_macro::*;
-use dioxus_html as dioxus_elements;
+use dioxus::prelude::*;
 
 mod test_logging;
 
@@ -20,7 +17,7 @@ fn new_dom() -> VirtualDom {
     VirtualDom::new(|cx| rsx!(cx, "hi"))
 }
 
-use DomEdit::*;
+use dioxus_core::DomEdit::*;
 
 /// Should push the text node onto the stack and modify it
 #[test]
diff --git a/packages/core/tests/scheduler.rs b/tests/scheduler.rs
similarity index 100%
rename from packages/core/tests/scheduler.rs
rename to tests/scheduler.rs
diff --git a/packages/core/tests/sharedstate.rs b/tests/sharedstate.rs
similarity index 95%
rename from packages/core/tests/sharedstate.rs
rename to tests/sharedstate.rs
index 18d569914..a4eab6b10 100644
--- a/packages/core/tests/sharedstate.rs
+++ b/tests/sharedstate.rs
@@ -1,10 +1,7 @@
 #![allow(unused, non_upper_case_globals, non_snake_case)]
 
-use dioxus::{prelude::*, DomEdit, Mutations, SchedulerMsg, ScopeId};
-use dioxus_core as dioxus;
-use dioxus_core_macro::*;
-use dioxus_html as dioxus_elements;
-
+use dioxus::prelude::*;
+use dioxus_core::{DomEdit, Mutations, SchedulerMsg, ScopeId};
 use DomEdit::*;
 
 mod test_logging;
diff --git a/packages/core/tests/task.rs b/tests/task.rs
similarity index 100%
rename from packages/core/tests/task.rs
rename to tests/task.rs
diff --git a/packages/core/tests/test_logging.rs b/tests/test_logging.rs
similarity index 100%
rename from packages/core/tests/test_logging.rs
rename to tests/test_logging.rs
diff --git a/packages/core/tests/vdom_rebuild.rs b/tests/vdom_rebuild.rs
similarity index 94%
rename from packages/core/tests/vdom_rebuild.rs
rename to tests/vdom_rebuild.rs
index 83b4ff35f..63a57fc33 100644
--- a/packages/core/tests/vdom_rebuild.rs
+++ b/tests/vdom_rebuild.rs
@@ -11,11 +11,7 @@
 //! Don't have a good way to validate, everything is done manually ATM
 
 use dioxus::prelude::*;
-use dioxus::DomEdit;
-use dioxus_core as dioxus;
-use dioxus_core_macro::*;
-use dioxus_html as dioxus_elements;
-use DomEdit::*;
+use dioxus_core::DomEdit::*;
 
 #[test]
 fn app_runs() {