diff --git a/DEVELOPERS.md b/DEVELOPERS.md
index dc0ef74..8163bb1 100644
--- a/DEVELOPERS.md
+++ b/DEVELOPERS.md
@@ -37,14 +37,14 @@ You need both the re-frame-10x project _and_ a test project to develop it agains
   :cljsbuild {:builds {:client {:source-paths ["checkouts/re-frame-10x/src"]}}}
   ```
 
-- re-frame-10x has a debug panel useful when developing it. You can enable it by adding the :closure-define `"day8.re_frame.trace.debug_QMARK_" true` to your compiler settings.
+- re-frame-10x has a debug panel useful when developing it. You can enable it by adding the :closure-define `"day8.re_frame_10x.trace.debug_QMARK_" true` to your compiler settings.
 
 - Now run your test project however you usually run it, and re-frame-10x should be in there. \o/
 
 
 ### Developing CSS
 
-The styles for the trace panel are defined both inline and in Garden styles in `day8.re-frame.trace.styles`.
+The styles for the trace panel are defined both inline and in Garden styles in `day8.re-frame-10x.styles`.
 
 We are using CSS preprocessing to isolate the panel styles, by namespacing the panel styles with the id `#--re-frame-10x--`.
 
diff --git a/README.md b/README.md
index d87f18a..477d6c8 100644
--- a/README.md
+++ b/README.md
@@ -135,7 +135,7 @@ If you are using leiningen, modify `project.clj` in the following ways. When puz
 - Locate the `:compiler` map under `:dev` and add:
 
   - `:closure-defines      {"re_frame.trace.trace_enabled_QMARK_" true}`
-  - `:preloads             [day8.re-frame.trace.preload]`
+  - `:preloads             [day8.re-frame-10x.preload]`
 
   For example:
 
@@ -145,7 +145,7 @@ If you are using leiningen, modify `project.clj` in the following ways. When puz
        :source-paths ["src" "dev"]
        :compiler     {...
                       :closure-defines      {"re_frame.trace.trace_enabled_QMARK_" true}
-                      :preloads             [day8.re-frame.trace.preload]
+                      :preloads             [day8.re-frame-10x.preload]
                       }}]}
   ```
 
@@ -182,7 +182,7 @@ If you are using leiningen, modify `project.clj` in the following ways. When puz
 ### If re-frame-10x throws an exception on startup
 
 * Reset the settings to factory defaults in the settings panel
-* If you can't load the settings panel, run `day8.re_frame.trace.factory_reset_BANG_()` in the JavaScript console.
+* If you can't load the settings panel, run `day8.re_frame_10x.trace.factory_reset_BANG_()` in the JavaScript console.
 * If neither of those work, remove all of the keys with the prefix `day8.re-frame.trace` from your browser's Local Storage.
 
 ## How does it work?
@@ -193,7 +193,7 @@ re-frame is instrumented - all important activity generates trace data.
 
 By default, re-frame tracing is "compiled out", so it won't impose a performance cost in production. The trade-off here is that you need to explicitly enable it in development.
 
-The [preloads](https://github.com/clojure/clojurescript/wiki/Compiler-Options#preloads) option (`:preloads [day8.re-frame.trace.preload]`) has to be set in order to automatically monkeypatch Reagent to add appropriate lifecycle hooks. Yes this is gross, and yes we will [make a PR to reagent to add proper hooks](https://github.com/Day8/re-frame-10x/issues/115), once we know exactly what we need. The preload namespace also injects a div containing the devtools panel into the DOM.
+The [preloads](https://github.com/clojure/clojurescript/wiki/Compiler-Options#preloads) option (`:preloads [day8.re-frame-10x.preload]`) has to be set in order to automatically monkeypatch Reagent to add appropriate lifecycle hooks. Yes this is gross, and yes we will [make a PR to reagent to add proper hooks](https://github.com/Day8/re-frame-10x/issues/115), once we know exactly what we need. The preload namespace also injects a div containing the devtools panel into the DOM.
 
 ## Developing/Contributing
 
diff --git a/project.clj b/project.clj
index 3b9225f..e3e2546 100644
--- a/project.clj
+++ b/project.clj
@@ -27,10 +27,10 @@
                   ["vcs" "commit"]
                   ["vcs" "push"]]
 
-  :figwheel {:css-dirs ["resources/day8/re_frame/trace"]}
+  :figwheel {:css-dirs ["resources/day8/re_frame_10x/trace"]}
 
-  :less {:source-paths ["resources/day8/re_frame/trace"]
-         :target-path  "resources/day8/re_frame/trace"}
+  :less {:source-paths ["resources/day8/re_frame_10x/trace"]
+         :target-path  "resources/day8/re_frame_10x/trace"}
 
   :profiles {:dev        {:dependencies [[binaryage/dirac "RELEASE"]]}
              :mranderson {:dependencies ^:replace [^:source-dep [re-frame "0.10.2"
diff --git a/src/day8/re_frame/trace/view/views.cljs b/src/day8/re_frame/trace/view/views.cljs
deleted file mode 100644
index 645ba0f..0000000
--- a/src/day8/re_frame/trace/view/views.cljs
+++ /dev/null
@@ -1,3 +0,0 @@
-(ns day8.re-frame.trace.view.views)
-
-(defn render [])
diff --git a/src/day8/re_frame/trace.cljs b/src/day8/re_frame_10x.cljs
similarity index 97%
rename from src/day8/re_frame/trace.cljs
rename to src/day8/re_frame_10x.cljs
index c2291ac..d7dcf59 100644
--- a/src/day8/re_frame/trace.cljs
+++ b/src/day8/re_frame_10x.cljs
@@ -1,9 +1,9 @@
-(ns day8.re-frame.trace
-  (:require [day8.re-frame.trace.styles :as styles]
-            [day8.re-frame.trace.view.container :as container]
-            [day8.re-frame.trace.subs]
-            [day8.re-frame.trace.events]
-            [day8.re-frame.trace.db :as trace.db]
+(ns day8.re-frame-10x
+  (:require [day8.re-frame-10x.styles :as styles]
+            [day8.re-frame-10x.view.container :as container]
+            [day8.re-frame-10x.subs]
+            [day8.re-frame-10x.events]
+            [day8.re-frame-10x.db :as trace.db]
             [re-frame.trace :as trace :include-macros true]
             [clojure.string :as str]
             [reagent.interop :refer-macros [$ $!]]
diff --git a/src/day8/re_frame/trace/common_styles.cljs b/src/day8/re_frame_10x/common_styles.cljs
similarity index 99%
rename from src/day8/re_frame/trace/common_styles.cljs
rename to src/day8/re_frame_10x/common_styles.cljs
index 1557f5d..f0edc4b 100644
--- a/src/day8/re_frame/trace/common_styles.cljs
+++ b/src/day8/re_frame_10x/common_styles.cljs
@@ -1,4 +1,4 @@
-(ns day8.re-frame.trace.common-styles
+(ns day8.re-frame-10x.common-styles
   (:require [mranderson047.garden.v1v3v3.garden.units :refer [px em]]
             [mranderson047.garden.v1v3v3.garden.compiler :refer [render-css]]))
 
diff --git a/src/day8/re_frame/trace/db.cljs b/src/day8/re_frame_10x/db.cljs
similarity index 96%
rename from src/day8/re_frame/trace/db.cljs
rename to src/day8/re_frame_10x/db.cljs
index 3840cf6..e1b4827 100644
--- a/src/day8/re_frame/trace/db.cljs
+++ b/src/day8/re_frame_10x/db.cljs
@@ -1,6 +1,6 @@
-(ns day8.re-frame.trace.db
+(ns day8.re-frame-10x.db
   (:require [mranderson047.re-frame.v0v10v2.re-frame.core :as rf]
-            [day8.re-frame.trace.utils.localstorage :as localstorage]))
+            [day8.re-frame-10x.utils.localstorage :as localstorage]))
 
 (defn init-db [debug?]
   (let [panel-width% (localstorage/get "panel-width-ratio" 0.35)
diff --git a/src/day8/re_frame/trace/events.cljs b/src/day8/re_frame_10x/events.cljs
similarity index 98%
rename from src/day8/re_frame/trace/events.cljs
rename to src/day8/re_frame_10x/events.cljs
index f9199b0..a85dbdd 100644
--- a/src/day8/re_frame/trace/events.cljs
+++ b/src/day8/re_frame_10x/events.cljs
@@ -1,17 +1,17 @@
-(ns day8.re-frame.trace.events
+(ns day8.re-frame-10x.events
   (:require [mranderson047.re-frame.v0v10v2.re-frame.core :as rf]
             [mranderson047.reagent.v0v7v0.reagent.core :as r]
             [cljs.tools.reader.edn]
-            [day8.re-frame.trace.utils.utils :as utils :refer [spy]]
-            [day8.re-frame.trace.utils.localstorage :as localstorage]
+            [day8.re-frame-10x.utils.utils :as utils :refer [spy]]
+            [day8.re-frame-10x.utils.localstorage :as localstorage]
             [clojure.string :as str]
             [goog.object]
             [re-frame.db]
             [re-frame.interop]
-            [day8.re-frame.trace.view.container :as container]
-            [day8.re-frame.trace.styles :as styles]
+            [day8.re-frame-10x.view.container :as container]
+            [day8.re-frame-10x.styles :as styles]
             [clojure.set :as set]
-            [day8.re-frame.trace.metamorphic :as metam]
+            [day8.re-frame-10x.metamorphic :as metam]
             [re-frame.trace]))
 
 (defn fixed-after
diff --git a/src/day8/re_frame/trace/metamorphic.cljc b/src/day8/re_frame_10x/metamorphic.cljc
similarity index 99%
rename from src/day8/re_frame/trace/metamorphic.cljc
rename to src/day8/re_frame_10x/metamorphic.cljc
index cec91a9..76462d2 100644
--- a/src/day8/re_frame/trace/metamorphic.cljc
+++ b/src/day8/re_frame_10x/metamorphic.cljc
@@ -1,4 +1,4 @@
-(ns day8.re-frame.trace.metamorphic)
+(ns day8.re-frame-10x.metamorphic)
 
 (defn id-between-xf
   ;; Copied here because I got undeclared Var warnings from figwheel when requiring a CLJC utils ns.
diff --git a/src/day8/re_frame/trace/preload.cljs b/src/day8/re_frame_10x/preload.cljs
similarity index 67%
rename from src/day8/re_frame/trace/preload.cljs
rename to src/day8/re_frame_10x/preload.cljs
index 68d37d9..fa9b3b1 100644
--- a/src/day8/re_frame/trace/preload.cljs
+++ b/src/day8/re_frame_10x/preload.cljs
@@ -1,10 +1,10 @@
-(ns day8.re-frame.trace.preload
-  (:require [day8.re-frame.trace :as trace]
+(ns day8.re-frame-10x.preload
+  (:require [day8.re-frame-10x :as trace]
             [mranderson047.re-frame.v0v10v2.re-frame.core :as rf]))
 
 
 ;; Use this namespace with the :preloads compiler option to perform the necessary setup for enabling tracing:
-;; {:compiler {:preloads [day8.re-frame.trace.preload] ...}}
+;; {:compiler {:preloads [day8.re-frame-10x.preload] ...}}
 (rf/clear-subscription-cache!)
 (trace/init-db!)
 (defonce _ (trace/init-tracing!))
diff --git a/src/day8/re_frame/trace/styles.cljs b/src/day8/re_frame_10x/styles.cljs
similarity index 97%
rename from src/day8/re_frame/trace/styles.cljs
rename to src/day8/re_frame_10x/styles.cljs
index 3ce9083..f8b6aa8 100644
--- a/src/day8/re_frame/trace/styles.cljs
+++ b/src/day8/re_frame_10x/styles.cljs
@@ -1,14 +1,14 @@
-(ns day8.re-frame.trace.styles
+(ns day8.re-frame-10x.styles
   (:require [mranderson047.garden.v1v3v3.garden.core :as garden]
             [mranderson047.garden.v1v3v3.garden.units :as units :refer [em px percent]]
             [mranderson047.garden.v1v3v3.garden.color :as color]
             [mranderson047.garden.v1v3v3.garden.selectors :as s]
-            [day8.re-frame.trace.common-styles :as common]
-            [day8.re-frame.trace.utils.re-com :as rc]
-            [day8.re-frame.trace.view.app-db :as app-db]
-            [day8.re-frame.trace.view.timing :as timing]
-            [day8.re-frame.trace.view.settings :as settings]
-            [day8.re-frame.trace.view.event :as event]))
+            [day8.re-frame-10x.common-styles :as common]
+            [day8.re-frame-10x.utils.re-com :as rc]
+            [day8.re-frame-10x.view.app-db :as app-db]
+            [day8.re-frame-10x.view.timing :as timing]
+            [day8.re-frame-10x.view.settings :as settings]
+            [day8.re-frame-10x.view.event :as event]))
 
 (def background-gray common/background-gray)
 (def background-gray-hint common/background-gray-hint)
diff --git a/src/day8/re_frame/trace/subs.cljs b/src/day8/re_frame_10x/subs.cljs
similarity index 99%
rename from src/day8/re_frame/trace/subs.cljs
rename to src/day8/re_frame_10x/subs.cljs
index e82417e..2f3c2c9 100644
--- a/src/day8/re_frame/trace/subs.cljs
+++ b/src/day8/re_frame_10x/subs.cljs
@@ -1,7 +1,7 @@
-(ns day8.re-frame.trace.subs
+(ns day8.re-frame-10x.subs
   (:require [mranderson047.re-frame.v0v10v2.re-frame.core :as rf]
-            [day8.re-frame.trace.metamorphic :as metam]
-            [day8.re-frame.trace.utils.utils :as utils]
+            [day8.re-frame-10x.metamorphic :as metam]
+            [day8.re-frame-10x.utils.utils :as utils]
             [clojure.string :as str]
             [cljs.spec.alpha :as s]))
 
diff --git a/src/day8/re_frame/trace/utils/animated.cljs b/src/day8/re_frame_10x/utils/animated.cljs
similarity index 98%
rename from src/day8/re_frame/trace/utils/animated.cljs
rename to src/day8/re_frame_10x/utils/animated.cljs
index 1d70a2f..eea3d13 100644
--- a/src/day8/re_frame/trace/utils/animated.cljs
+++ b/src/day8/re_frame_10x/utils/animated.cljs
@@ -1,4 +1,4 @@
-(ns day8.re-frame.trace.utils.animated
+(ns day8.re-frame-10x.utils.animated
   "Provides animation support for Regent components
 
    Depends on react-flip-move via cljsjs/react-flip-move
diff --git a/src/day8/re_frame/trace/utils/localstorage.cljs b/src/day8/re_frame_10x/utils/localstorage.cljs
similarity index 92%
rename from src/day8/re_frame/trace/utils/localstorage.cljs
rename to src/day8/re_frame_10x/utils/localstorage.cljs
index e763c2f..b30a319 100644
--- a/src/day8/re_frame/trace/utils/localstorage.cljs
+++ b/src/day8/re_frame_10x/utils/localstorage.cljs
@@ -1,4 +1,4 @@
-(ns day8.re-frame.trace.utils.localstorage
+(ns day8.re-frame-10x.utils.localstorage
   (:require [goog.storage.Storage]
             [goog.storage.mechanism.HTML5LocalStorage]
             [cljs.reader :as reader]
@@ -7,7 +7,7 @@
 
 (def storage (goog.storage.Storage. (goog.storage.mechanism.HTML5LocalStorage.)))
 
-(def safe-prefix "day8.re-frame.trace.")
+(def safe-prefix "day8.re-frame-10x.")
 
 (defn- safe-key [key]
   "Adds a unique prefix to local storage keys to ensure they don't collide with the host application"
diff --git a/src/day8/re_frame/trace/utils/macros.clj b/src/day8/re_frame_10x/utils/macros.clj
similarity index 96%
rename from src/day8/re_frame/trace/utils/macros.clj
rename to src/day8/re_frame_10x/utils/macros.clj
index 569340a..268f8a1 100644
--- a/src/day8/re_frame/trace/utils/macros.clj
+++ b/src/day8/re_frame_10x/utils/macros.clj
@@ -1,4 +1,4 @@
-(ns day8.re-frame.trace.utils.macros
+(ns day8.re-frame-10x.utils.macros
   (:require [clojure.java.io :as io]
             [clojure.string :as str]))
 
diff --git a/src/day8/re_frame/trace/utils/pretty_print_condensed.cljs b/src/day8/re_frame_10x/utils/pretty_print_condensed.cljs
similarity index 99%
rename from src/day8/re_frame/trace/utils/pretty_print_condensed.cljs
rename to src/day8/re_frame_10x/utils/pretty_print_condensed.cljs
index 352bbd9..835e288 100644
--- a/src/day8/re_frame/trace/utils/pretty_print_condensed.cljs
+++ b/src/day8/re_frame_10x/utils/pretty_print_condensed.cljs
@@ -1,6 +1,6 @@
 (ns ^{:doc    "Utilities for pretty-printing abbreviated Clojure forms"
       :author "Matthew Huebert"}
-day8.re-frame.trace.utils.pretty-print-condensed
+day8.re-frame-10x.utils.pretty-print-condensed
   (:require [clojure.string :as str]))
 
 
diff --git a/src/day8/re_frame/trace/utils/re_com.clj b/src/day8/re_frame_10x/utils/re_com.clj
similarity index 96%
rename from src/day8/re_frame/trace/utils/re_com.clj
rename to src/day8/re_frame_10x/utils/re_com.clj
index 841cb15..d4277b2 100644
--- a/src/day8/re_frame/trace/utils/re_com.clj
+++ b/src/day8/re_frame_10x/utils/re_com.clj
@@ -1,4 +1,4 @@
-(ns day8.re-frame.trace.utils.re-com)
+(ns day8.re-frame-10x.utils.re-com)
 
 ;; There is a trap when writing DOM event handlers.  This looks innocent enough:
 ;;
diff --git a/src/day8/re_frame/trace/utils/re_com.cljs b/src/day8/re_frame_10x/utils/re_com.cljs
similarity index 99%
rename from src/day8/re_frame/trace/utils/re_com.cljs
rename to src/day8/re_frame_10x/utils/re_com.cljs
index 2b71f43..21b79e7 100644
--- a/src/day8/re_frame/trace/utils/re_com.cljs
+++ b/src/day8/re_frame_10x/utils/re_com.cljs
@@ -1,6 +1,6 @@
-(ns day8.re-frame.trace.utils.re-com
+(ns day8.re-frame-10x.utils.re-com
   "Shameless pilfered from re-com."
-  (:require-macros [day8.re-frame.trace.utils.re-com :refer [handler-fn]])
+  (:require-macros [day8.re-frame-10x.utils.re-com :refer [handler-fn]])
   (:require [mranderson047.reagent.v0v7v0.reagent.ratom :as reagent :refer [RAtom Reaction RCursor Track Wrapper]]
             [clojure.string :as string]))
 
diff --git a/src/day8/re_frame/trace/utils/utils.cljs b/src/day8/re_frame_10x/utils/utils.cljs
similarity index 97%
rename from src/day8/re_frame/trace/utils/utils.cljs
rename to src/day8/re_frame_10x/utils/utils.cljs
index e99a7ff..173bb89 100644
--- a/src/day8/re_frame/trace/utils/utils.cljs
+++ b/src/day8/re_frame_10x/utils/utils.cljs
@@ -1,4 +1,4 @@
-(ns day8.re-frame.trace.utils.utils)
+(ns day8.re-frame-10x.utils.utils)
 
 (def diff-link "https://github.com/Day8/re-frame-10x/blob/master/docs/HyperlinkedInformation/Diffs.md")
 
diff --git a/src/day8/re_frame/trace/view/app_db.cljs b/src/day8/re_frame_10x/view/app_db.cljs
similarity index 93%
rename from src/day8/re_frame/trace/view/app_db.cljs
rename to src/day8/re_frame_10x/view/app_db.cljs
index 494aa40..6a7d5e4 100644
--- a/src/day8/re_frame/trace/view/app_db.cljs
+++ b/src/day8/re_frame_10x/view/app_db.cljs
@@ -1,25 +1,25 @@
-(ns day8.re-frame.trace.view.app-db
+(ns day8.re-frame-10x.view.app-db
   (:require [devtools.prefs]
             [devtools.formatters.core]
-            [day8.re-frame.trace.utils.utils :as utils]
-            [day8.re-frame.trace.utils.animated :as animated]
-            [day8.re-frame.trace.view.components :as components]
+            [day8.re-frame-10x.utils.utils :as utils]
+            [day8.re-frame-10x.utils.animated :as animated]
+            [day8.re-frame-10x.view.components :as components]
             [mranderson047.re-frame.v0v10v2.re-frame.core :as rf]
             [mranderson047.reagent.v0v7v0.reagent.core :as r]
-            [day8.re-frame.trace.utils.re-com :as rc :refer [css-join]]
-            [day8.re-frame.trace.common-styles :as common]
+            [day8.re-frame-10x.utils.re-com :as rc :refer [css-join]]
+            [day8.re-frame-10x.common-styles :as common]
             [clojure.data])
-  (:require-macros [day8.re-frame.trace.utils.macros :as macros]))
+  (:require-macros [day8.re-frame-10x.utils.macros :as macros]))
 
-(def delete (macros/slurp-macro "day8/re_frame/trace/images/delete.svg"))
-(def reload (macros/slurp-macro "day8/re_frame/trace/images/reload.svg"))
-(def reload-disabled (macros/slurp-macro "day8/re_frame/trace/images/reload-disabled.svg"))
-(def snapshot (macros/slurp-macro "day8/re_frame/trace/images/snapshot.svg"))
-(def snapshot-ready (macros/slurp-macro "day8/re_frame/trace/images/snapshot-ready.svg"))
-(def round-arrow (macros/slurp-macro "day8/re_frame/trace/images/round-arrow.svg"))
-(def arrow-right (macros/slurp-macro "day8/re_frame/trace/images/arrow-right.svg"))
-(def copy (macros/slurp-macro "day8/re_frame/trace/images/copy.svg"))
-(def trash (macros/slurp-macro "day8/re_frame/trace/images/trash.svg"))
+(def delete (macros/slurp-macro "day8/re_frame_10x/trace/images/delete.svg"))
+(def reload (macros/slurp-macro "day8/re_frame_10x/trace/images/reload.svg"))
+(def reload-disabled (macros/slurp-macro "day8/re_frame_10x/trace/images/reload-disabled.svg"))
+(def snapshot (macros/slurp-macro "day8/re_frame_10x/trace/images/snapshot.svg"))
+(def snapshot-ready (macros/slurp-macro "day8/re_frame_10x/trace/images/snapshot-ready.svg"))
+(def round-arrow (macros/slurp-macro "day8/re_frame_10x/trace/images/round-arrow.svg"))
+(def arrow-right (macros/slurp-macro "day8/re_frame_10x/trace/images/arrow-right.svg"))
+(def copy (macros/slurp-macro "day8/re_frame_10x/trace/images/copy.svg"))
+(def trash (macros/slurp-macro "day8/re_frame_10x/trace/images/trash.svg"))
 
 (def cljs-dev-tools-background "#e8ffe8")
 (def pod-gap common/gs-19s)
diff --git a/src/day8/re_frame/trace/view/code.cljs b/src/day8/re_frame_10x/view/code.cljs
similarity index 69%
rename from src/day8/re_frame/trace/view/code.cljs
rename to src/day8/re_frame_10x/view/code.cljs
index 2803f99..03a2a78 100644
--- a/src/day8/re_frame/trace/view/code.cljs
+++ b/src/day8/re_frame_10x/view/code.cljs
@@ -1,5 +1,5 @@
-(ns day8.re-frame.trace.view.code
-  (:require [day8.re-frame.trace.utils.re-com :as rc]
+(ns day8.re-frame-10x.view.code
+  (:require [day8.re-frame-10x.utils.re-com :as rc]
             [mranderson047.re-frame.v0v10v2.re-frame.core :as rf]))
 
 (defn render []
diff --git a/src/day8/re_frame/trace/view/components.cljs b/src/day8/re_frame_10x/view/components.cljs
similarity index 98%
rename from src/day8/re_frame/trace/view/components.cljs
rename to src/day8/re_frame_10x/view/components.cljs
index 4932d14..29a3abc 100644
--- a/src/day8/re_frame/trace/view/components.cljs
+++ b/src/day8/re_frame_10x/view/components.cljs
@@ -1,11 +1,11 @@
-(ns day8.re-frame.trace.view.components
+(ns day8.re-frame-10x.view.components
   (:require [clojure.string :as str]
             [goog.fx.dom :as fx]
             [mranderson047.re-frame.v0v10v2.re-frame.core :as rf]
             [clojure.string :as str]
-            [day8.re-frame.trace.utils.re-com :as rc]
+            [day8.re-frame-10x.utils.re-com :as rc]
             [mranderson047.reagent.v0v7v0.reagent.core :as r])
-  (:require-macros [day8.re-frame.trace.utils.macros :refer [with-cljs-devtools-prefs]]))
+  (:require-macros [day8.re-frame-10x.utils.macros :refer [with-cljs-devtools-prefs]]))
 
 (defn search-input [{:keys [title placeholder on-save on-change on-stop]}]
   (let [val  (r/atom title)
diff --git a/src/day8/re_frame/trace/view/container.cljs b/src/day8/re_frame_10x/view/container.cljs
similarity index 84%
rename from src/day8/re_frame/trace/view/container.cljs
rename to src/day8/re_frame_10x/view/container.cljs
index f1380bd..b698186 100644
--- a/src/day8/re_frame/trace/view/container.cljs
+++ b/src/day8/re_frame_10x/view/container.cljs
@@ -1,24 +1,24 @@
-(ns day8.re-frame.trace.view.container
-  (:require-macros [day8.re-frame.trace.utils.macros :as macros])
+(ns day8.re-frame-10x.view.container
+  (:require-macros [day8.re-frame-10x.utils.macros :as macros])
   (:require [mranderson047.re-frame.v0v10v2.re-frame.core :as rf]
             [re-frame.db :as db]
-            [day8.re-frame.trace.view.event :as event]
-            [day8.re-frame.trace.view.app-db :as app-db]
-            [day8.re-frame.trace.view.subs :as subs]
-            [day8.re-frame.trace.view.views :as views]
-            [day8.re-frame.trace.view.traces :as traces]
-            [day8.re-frame.trace.view.code :as code]
-            [day8.re-frame.trace.view.parts :as parts]
-            [day8.re-frame.trace.view.timing :as timing]
-            [day8.re-frame.trace.view.debug :as debug]
-            [day8.re-frame.trace.view.settings :as settings]
+            [day8.re-frame-10x.view.event :as event]
+            [day8.re-frame-10x.view.app-db :as app-db]
+            [day8.re-frame-10x.view.subs :as subs]
+            [day8.re-frame-10x.view.views :as views]
+            [day8.re-frame-10x.view.traces :as traces]
+            [day8.re-frame-10x.view.code :as code]
+            [day8.re-frame-10x.view.parts :as parts]
+            [day8.re-frame-10x.view.timing :as timing]
+            [day8.re-frame-10x.view.debug :as debug]
+            [day8.re-frame-10x.view.settings :as settings]
             [mranderson047.garden.v1v3v3.garden.core :refer [css style]]
             [mranderson047.garden.v1v3v3.garden.units :refer [px]]
             [re-frame.trace]
-            [day8.re-frame.trace.utils.re-com :as rc]
-            [day8.re-frame.trace.common-styles :as common]))
+            [day8.re-frame-10x.utils.re-com :as rc]
+            [day8.re-frame-10x.common-styles :as common]))
 
-(def triangle-down (macros/slurp-macro "day8/re_frame/trace/images/triangle-down.svg"))
+(def triangle-down (macros/slurp-macro "day8/re_frame_10x/trace/images/triangle-down.svg"))
 (defn tab-button [panel-id title]
   (let [selected-tab @(rf/subscribe [:settings/selected-tab])]
     [rc/v-box
@@ -29,11 +29,11 @@
                 [:img {:src   (str "data:image/svg+xml;utf8," triangle-down)
                        :style {:opacity (if (= selected-tab panel-id) "1" "0")}}]]]))
 
-(def open-external (macros/slurp-macro "day8/re_frame/trace/images/logout.svg"))
-(def settings-svg (macros/slurp-macro "day8/re_frame/trace/images/wrench.svg"))
-(def orange-settings-svg (macros/slurp-macro "day8/re_frame/trace/images/orange-wrench.svg"))
-(def pause-svg (macros/slurp-macro "day8/re_frame/trace/images/pause.svg"))
-(def play-svg (macros/slurp-macro "day8/re_frame/trace/images/play.svg"))
+(def open-external (macros/slurp-macro "day8/re_frame_10x/trace/images/logout.svg"))
+(def settings-svg (macros/slurp-macro "day8/re_frame_10x/trace/images/wrench.svg"))
+(def orange-settings-svg (macros/slurp-macro "day8/re_frame_10x/trace/images/orange-wrench.svg"))
+(def pause-svg (macros/slurp-macro "day8/re_frame_10x/trace/images/pause.svg"))
+(def play-svg (macros/slurp-macro "day8/re_frame_10x/trace/images/play.svg"))
 
 (def outer-margins {:margin (str "0px " common/gs-19s)})
 
@@ -155,7 +155,7 @@
      (when (and external-window? @unloading?)
        [:h1.host-closed "Host window has closed. Reopen external window to continue tracing."])
      (when-not (re-frame.trace/is-trace-enabled?)
-       [:h1.host-closed {:style {:word-wrap "break-word"}} "Tracing is not enabled. Please set " [:pre "{\"re_frame.trace.trace_enabled_QMARK_\" true}"] " in " [:pre ":closure-defines"]])
+       [:h1.host-closed {:style {:word-wrap "break-word"}} "Tracing is not enabled. Please set " [:pre "{\"re_frame_10x.trace.trace_enabled_QMARK_\" true}"] " in " [:pre ":closure-defines"]])
      [rc/v-box
       :size "auto"
       :style {:margin-left common/gs-19s
diff --git a/src/day8/re_frame/trace/view/debug.cljs b/src/day8/re_frame_10x/view/debug.cljs
similarity index 87%
rename from src/day8/re_frame/trace/view/debug.cljs
rename to src/day8/re_frame_10x/view/debug.cljs
index 46d2615..ba3d761 100644
--- a/src/day8/re_frame/trace/view/debug.cljs
+++ b/src/day8/re_frame_10x/view/debug.cljs
@@ -1,8 +1,8 @@
-(ns day8.re-frame.trace.view.debug
-  (:require [day8.re-frame.trace.utils.re-com :as rc]
-            [day8.re-frame.trace.view.components :as components]
+(ns day8.re-frame-10x.view.debug
+  (:require [day8.re-frame-10x.utils.re-com :as rc]
+            [day8.re-frame-10x.view.components :as components]
             [mranderson047.re-frame.v0v10v2.re-frame.core :as rf]
-            [day8.re-frame.trace.metamorphic :as metam]))
+            [day8.re-frame-10x.metamorphic :as metam]))
 
 (defn render []
   [rc/v-box
diff --git a/src/day8/re_frame/trace/view/event.cljs b/src/day8/re_frame_10x/view/event.cljs
similarity index 83%
rename from src/day8/re_frame/trace/view/event.cljs
rename to src/day8/re_frame_10x/view/event.cljs
index 14126ad..94f6633 100644
--- a/src/day8/re_frame/trace/view/event.cljs
+++ b/src/day8/re_frame_10x/view/event.cljs
@@ -1,10 +1,10 @@
-(ns day8.re-frame.trace.view.event
-  (:require [day8.re-frame.trace.utils.re-com :as rc]
-            [day8.re-frame.trace.view.components :as components]
-            [day8.re-frame.trace.common-styles :as common]
+(ns day8.re-frame-10x.view.event
+  (:require [day8.re-frame-10x.utils.re-com :as rc]
+            [day8.re-frame-10x.view.components :as components]
+            [day8.re-frame-10x.common-styles :as common]
             [mranderson047.garden.v1v3v3.garden.units :as units]
             [mranderson047.re-frame.v0v10v2.re-frame.core :as rf])
-  (:require-macros [day8.re-frame.trace.utils.macros :refer [with-cljs-devtools-prefs]]))
+  (:require-macros [day8.re-frame-10x.utils.macros :refer [with-cljs-devtools-prefs]]))
 
 (def pod-border-color "#daddde")
 (def pod-border-edge (str "1px solid " pod-border-color))
diff --git a/src/day8/re_frame/trace/view/parts.cljs b/src/day8/re_frame_10x/view/parts.cljs
similarity index 91%
rename from src/day8/re_frame/trace/view/parts.cljs
rename to src/day8/re_frame_10x/view/parts.cljs
index c10cc7a..aa0d581 100644
--- a/src/day8/re_frame/trace/view/parts.cljs
+++ b/src/day8/re_frame_10x/view/parts.cljs
@@ -1,5 +1,5 @@
-(ns day8.re-frame.trace.view.parts
-  (:require [day8.re-frame.trace.utils.re-com :as rc]
+(ns day8.re-frame-10x.view.parts
+  (:require [day8.re-frame-10x.utils.re-com :as rc]
             [re-frame.registrar]
             [re-frame.events]))
 
diff --git a/src/day8/re_frame/trace/view/settings.cljs b/src/day8/re_frame_10x/view/settings.cljs
similarity index 98%
rename from src/day8/re_frame/trace/view/settings.cljs
rename to src/day8/re_frame_10x/view/settings.cljs
index 5fb6305..19a5fb5 100644
--- a/src/day8/re_frame/trace/view/settings.cljs
+++ b/src/day8/re_frame_10x/view/settings.cljs
@@ -1,7 +1,7 @@
-(ns day8.re-frame.trace.view.settings
+(ns day8.re-frame-10x.view.settings
   (:require [mranderson047.re-frame.v0v10v2.re-frame.core :as rf]
-            [day8.re-frame.trace.utils.re-com :as rc :refer [css-join]]
-            [day8.re-frame.trace.common-styles :as common]
+            [day8.re-frame-10x.utils.re-com :as rc :refer [css-join]]
+            [day8.re-frame-10x.common-styles :as common]
             [mranderson047.garden.v1v3v3.garden.units :as units]
             [mranderson047.garden.v1v3v3.garden.compiler :refer [render-css]]))
 
diff --git a/src/day8/re_frame/trace/view/subs.cljs b/src/day8/re_frame_10x/view/subs.cljs
similarity index 96%
rename from src/day8/re_frame/trace/view/subs.cljs
rename to src/day8/re_frame_10x/view/subs.cljs
index 8c72f12..4e12be8 100644
--- a/src/day8/re_frame/trace/view/subs.cljs
+++ b/src/day8/re_frame_10x/view/subs.cljs
@@ -1,14 +1,14 @@
-(ns day8.re-frame.trace.view.subs
-  (:require [day8.re-frame.trace.view.app-db :refer [pod-gap pod-padding border-radius]]
-            [day8.re-frame.trace.utils.utils :as utils]
-            [day8.re-frame.trace.utils.animated :as animated]
+(ns day8.re-frame-10x.view.subs
+  (:require [day8.re-frame-10x.view.app-db :refer [pod-gap pod-padding border-radius]]
+            [day8.re-frame-10x.utils.utils :as utils]
+            [day8.re-frame-10x.utils.animated :as animated]
             [mranderson047.re-frame.v0v10v2.re-frame.core :as rf]
             [mranderson047.reagent.v0v7v0.reagent.core :as r]
-            [day8.re-frame.trace.utils.re-com :as rc :refer [css-join]]
-            [day8.re-frame.trace.common-styles :as common]
-            [day8.re-frame.trace.view.components :as components]
+            [day8.re-frame-10x.utils.re-com :as rc :refer [css-join]]
+            [day8.re-frame-10x.common-styles :as common]
+            [day8.re-frame-10x.view.components :as components]
             [mranderson047.garden.v1v3v3.garden.units :as units])
-  (:require-macros [day8.re-frame.trace.utils.macros :as macros]))
+  (:require-macros [day8.re-frame-10x.utils.macros :as macros]))
 
 ;(s/def ::query-v any?)
 ;(s/def ::dyn-v any?)
@@ -17,7 +17,7 @@
 ;(s/def ::query-cache (s/map-of ::query-cache-params ::deref))
 ;(assert (s/valid? ::query-cache (rc/deref-or-value-peek subs/query->reaction)))
 
-(def copy (macros/slurp-macro "day8/re_frame/trace/images/copy.svg"))
+(def copy (macros/slurp-macro "day8/re_frame_10x/trace/images/copy.svg"))
 
 (defn sub-tag-class [type]
   (case type
diff --git a/src/day8/re_frame/trace/view/timing.cljs b/src/day8/re_frame_10x/view/timing.cljs
similarity index 95%
rename from src/day8/re_frame/trace/view/timing.cljs
rename to src/day8/re_frame_10x/view/timing.cljs
index 850eaa5..7283dc4 100644
--- a/src/day8/re_frame/trace/view/timing.cljs
+++ b/src/day8/re_frame_10x/view/timing.cljs
@@ -1,10 +1,10 @@
-(ns day8.re-frame.trace.view.timing
+(ns day8.re-frame-10x.view.timing
   (:require [devtools.prefs]
             [devtools.formatters.core]
             [mranderson047.re-frame.v0v10v2.re-frame.core :as rf]
-            [day8.re-frame.trace.utils.re-com :as rc]
-            [day8.re-frame.trace.common-styles :as common]
-            [day8.re-frame.trace.view.components :as components]))
+            [day8.re-frame-10x.utils.re-com :as rc]
+            [day8.re-frame-10x.common-styles :as common]
+            [day8.re-frame-10x.view.components :as components]))
 
 (def timing-styles
   [:#--re-frame-10x--
diff --git a/src/day8/re_frame/trace/view/traces.cljs b/src/day8/re_frame_10x/view/traces.cljs
similarity index 97%
rename from src/day8/re_frame/trace/view/traces.cljs
rename to src/day8/re_frame_10x/view/traces.cljs
index b17a4ce..deaadf1 100644
--- a/src/day8/re_frame/trace/view/traces.cljs
+++ b/src/day8/re_frame_10x/view/traces.cljs
@@ -1,10 +1,10 @@
-(ns day8.re-frame.trace.view.traces
-  (:require [day8.re-frame.trace.view.components :as components]
-            [day8.re-frame.trace.utils.pretty-print-condensed :as pp]
+(ns day8.re-frame-10x.view.traces
+  (:require [day8.re-frame-10x.view.components :as components]
+            [day8.re-frame-10x.utils.pretty-print-condensed :as pp]
             [clojure.string :as str]
             [mranderson047.reagent.v0v7v0.reagent.core :as r]
             [mranderson047.re-frame.v0v10v2.re-frame.core :as rf]
-            [day8.re-frame.trace.utils.re-com :as rc]))
+            [day8.re-frame-10x.utils.re-com :as rc]))
 
 (defn query->fn [query]
   (if (= :contains (:filter-type query))
diff --git a/src/day8/re_frame_10x/view/views.cljs b/src/day8/re_frame_10x/view/views.cljs
new file mode 100644
index 0000000..0a9ca8d
--- /dev/null
+++ b/src/day8/re_frame_10x/view/views.cljs
@@ -0,0 +1,3 @@
+(ns day8.re-frame-10x.view.views)
+
+(defn render [])
diff --git a/test/day8/re_frame/trace/metamorphic_test.clj b/test/day8/re_frame_10x/metamorphic_test.clj
similarity index 96%
rename from test/day8/re_frame/trace/metamorphic_test.clj
rename to test/day8/re_frame_10x/metamorphic_test.clj
index e18e3ab..7db3a5f 100644
--- a/test/day8/re_frame/trace/metamorphic_test.clj
+++ b/test/day8/re_frame_10x/metamorphic_test.clj
@@ -1,6 +1,6 @@
-(ns day8.re-frame.trace.metamorphic-test
+(ns day8.re-frame-10x.metamorphic-test
   (:require [clojure.test :refer :all])
-  (:require [day8.re-frame.trace.metamorphic :as m]))
+  (:require [day8.re-frame-10x.metamorphic :as m]))
 
 (defn trace-events [file]
   (->> (slurp (str "test-resources/" file))