First pass on reorganizing the backend.

This is primarily renames and repackagings.

5 files changed, 10 insertions, 13 deletions

diff --git a/src/test/fixtures/channel.rs b/src/test/fixtures/channel.rs
index 8744470..b678717 100644
--- a/src/test/fixtures/channel.rs
+++ b/src/test/fixtures/channel.rs
@@ -4,7 +4,7 @@ use faker_rand::{
 };
 use rand;
 
-use crate::{app::App, clock::RequestedAt, repo::channel::Channel};
+use crate::{app::App, channel::Channel, clock::RequestedAt};
 
 pub async fn create(app: &App, created_at: &RequestedAt) -> Channel {
     let name = propose();
diff --git a/src/test/fixtures/filter.rs b/src/test/fixtures/filter.rs
index c31fa58..d1939a5 100644
--- a/src/test/fixtures/filter.rs
+++ b/src/test/fixtures/filter.rs
@@ -1,6 +1,6 @@
 use futures::future;
 
-use crate::events::types;
+use crate::event::types;
 
 pub fn messages() -> impl FnMut(&types::ChannelEvent) -> future::Ready<bool> {
     |event| future::ready(matches!(event.data, types::ChannelEventData::Message(_)))
diff --git a/src/test/fixtures/identity.rs b/src/test/fixtures/identity.rs
index 633fb8a..9e8e403 100644
--- a/src/test/fixtures/identity.rs
+++ b/src/test/fixtures/identity.rs
@@ -3,8 +3,11 @@ use uuid::Uuid;
 use crate::{
     app::App,
     clock::RequestedAt,
-    login::extract::{Identity, IdentitySecret, IdentityToken},
-    password::Password,
+    login::Password,
+    token::{
+        extract::{Identity, IdentityToken},
+        Secret,
+    },
 };
 
 pub fn not_logged_in() -> IdentityToken {
@@ -38,7 +41,7 @@ pub async fn identity(app: &App, login: &(String, Password), issued_at: &Request
     from_token(app, &secret, issued_at).await
 }
 
-pub fn secret(identity: &IdentityToken) -> IdentitySecret {
+pub fn secret(identity: &IdentityToken) -> Secret {
     identity.secret().expect("identity contained a secret")
 }
 
diff --git a/src/test/fixtures/login.rs b/src/test/fixtures/login.rs
index d6a321b..00c2789 100644
--- a/src/test/fixtures/login.rs
+++ b/src/test/fixtures/login.rs
@@ -3,8 +3,7 @@ use uuid::Uuid;
 
 use crate::{
     app::App,
-    password::Password,
-    repo::login::{self, Login},
+    login::{self, Login, Password},
 };
 
 pub async fn create_with_password(app: &App) -> (String, Password) {
diff --git a/src/test/fixtures/message.rs b/src/test/fixtures/message.rs
index bfca8cd..fd50887 100644
--- a/src/test/fixtures/message.rs
+++ b/src/test/fixtures/message.rs
@@ -1,11 +1,6 @@
 use faker_rand::lorem::Paragraphs;
 
-use crate::{
-    app::App,
-    clock::RequestedAt,
-    events::types,
-    repo::{channel::Channel, login::Login},
-};
+use crate::{app::App, channel::Channel, clock::RequestedAt, event::types, login::Login};
 
 pub async fn send(
     app: &App,