12 files changed, 21 insertions, 19 deletions
diff --git a/schist_core/schist_queries/src/account_transfers.rs b/schist_core/schist_queries/src/account_transfers.rs
index 070bdc3..798344b 100644
--- a/schist_core/schist_queries/src/account_transfers.rs
+++ b/schist_core/schist_queries/src/account_transfers.rs
@@ -1,6 +1,6 @@
 use anyhow::{Context, Result};
 use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection};
-use schist_models::account_transfer::AccountTransfer;
+use schist_models::AccountTransfer;
 use schist_schema::schema::account_transfers::dsl::account_transfers as account_transfers_table;
 
 pub fn delete_all_account_transfers(connection: &mut SqliteConnection) -> Result<usize> {
@@ -10,8 +10,11 @@ pub fn delete_all_account_transfers(connection: &mut SqliteConnection) -> Result
     Ok(num_rows_deleted)
 }
 
-pub fn get_all_account_transfers(connection: &mut SqliteConnection) -> Result<Vec<AccountTransfer>> {
-    let all_account_transfers = account_transfers_table.select(AccountTransfer::as_select())
+pub fn get_all_account_transfers(
+    connection: &mut SqliteConnection,
+) -> Result<Vec<AccountTransfer>> {
+    let all_account_transfers = account_transfers_table
+        .select(AccountTransfer::as_select())
         .load(connection)
         .with_context(|| "failed to get all account transfers")?;
     Ok(all_account_transfers)
diff --git a/schist_core/schist_queries/src/accounts.rs b/schist_core/schist_queries/src/accounts.rs
index 289faf6..7b9b834 100644
--- a/schist_core/schist_queries/src/accounts.rs
+++ b/schist_core/schist_queries/src/accounts.rs
@@ -1,6 +1,6 @@
 use anyhow::{Context, Result};
 use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection};
-use schist_models::account::Account;
+use schist_models::Account;
 use schist_schema::schema::accounts::dsl::accounts as accounts_table;
 
 pub fn delete_all_accounts(connection: &mut SqliteConnection) -> Result<usize> {
diff --git a/schist_core/schist_queries/src/bucket_transfers.rs b/schist_core/schist_queries/src/bucket_transfers.rs
index 923867f..652c8e0 100644
--- a/schist_core/schist_queries/src/bucket_transfers.rs
+++ b/schist_core/schist_queries/src/bucket_transfers.rs
@@ -1,6 +1,6 @@
 use anyhow::{Context, Result};
 use diesel::{dsl::sum, QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection};
-use schist_models::bucket_transfer::BucketTransfer;
+use schist_models::BucketTransfer;
 use schist_schema::schema::bucket_transfers::{
     self as bucket_transfers_schema, dsl::bucket_transfers as bucket_transfers_table,
 };
diff --git a/schist_core/schist_queries/src/buckets.rs b/schist_core/schist_queries/src/buckets.rs
index 29270af..aedfd10 100644
--- a/schist_core/schist_queries/src/buckets.rs
+++ b/schist_core/schist_queries/src/buckets.rs
@@ -1,6 +1,6 @@
 use anyhow::{Context, Result};
 use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection};
-use schist_models::bucket::Bucket;
+use schist_models::Bucket;
 use schist_schema::schema::buckets::{self as buckets_schema, dsl::buckets as buckets_table};
 
 pub fn delete_all_buckets(connection: &mut SqliteConnection) -> Result<usize> {
diff --git a/schist_core/schist_queries/src/drips.rs b/schist_core/schist_queries/src/drips.rs
index d9e33a8..e87491f 100644
--- a/schist_core/schist_queries/src/drips.rs
+++ b/schist_core/schist_queries/src/drips.rs
@@ -1,6 +1,6 @@
 use anyhow::{Context, Result};
 use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection};
-use schist_models::drip::Drip;
+use schist_models::Drip;
 use schist_schema::schema::drips::dsl::drips as drips_table;
 
 pub fn delete_all_drips(connection: &mut SqliteConnection) -> Result<usize> {
diff --git a/schist_core/schist_queries/src/pipes.rs b/schist_core/schist_queries/src/pipes.rs
index 188d193..b471a42 100644
--- a/schist_core/schist_queries/src/pipes.rs
+++ b/schist_core/schist_queries/src/pipes.rs
@@ -1,6 +1,6 @@
 use anyhow::{Context, Result};
 use diesel::{dsl::sum, QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection};
-use schist_models::pipe::Pipe;
+use schist_models::Pipe;
 use schist_schema::schema::pipes::{self as pipes_schema, dsl::pipes as pipes_table};
 
 pub fn delete_all_pipes(connection: &mut SqliteConnection) -> Result<usize> {
@@ -18,10 +18,7 @@ pub fn get_all_pipes(connection: &mut SqliteConnection) -> Result<Vec<Pipe>> {
     Ok(all_pipes)
 }
 
-pub fn insert_pipes(
-    pipes: &[Pipe],
-    connection: &mut SqliteConnection,
-) -> Result<usize> {
+pub fn insert_pipes(pipes: &[Pipe], connection: &mut SqliteConnection) -> Result<usize> {
     let num_rows_inserted = diesel::insert_into(pipes_table)
         .values(pipes)
         .execute(connection)
diff --git a/schist_core/schist_queries/src/transactions.rs b/schist_core/schist_queries/src/transactions.rs
index 3abacfb..c4c060a 100644
--- a/schist_core/schist_queries/src/transactions.rs
+++ b/schist_core/schist_queries/src/transactions.rs
@@ -1,6 +1,6 @@
 use anyhow::{Context, Result};
 use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection};
-use schist_models::transaction::Transaction;
+use schist_models::Transaction;
 use schist_schema::schema::transactions::dsl::transactions as transactions_table;
 
 pub fn delete_all_transactions(connection: &mut SqliteConnection) -> Result<usize> {
diff --git a/schist_core/schist_queries/src/utils/calculate_bucket_balance.rs b/schist_core/schist_queries/src/utils/calculate_bucket_balance.rs
index e238613..e76a919 100644
--- a/schist_core/schist_queries/src/utils/calculate_bucket_balance.rs
+++ b/schist_core/schist_queries/src/utils/calculate_bucket_balance.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use schist_models::{bucket::Bucket, drip::Drip};
+use schist_models::{Bucket, Drip};
 
 use super::{find_by_id_or, sum_drips_for_bucket};
 
diff --git a/schist_core/schist_queries/src/utils/sum_drips_for_bucket.rs b/schist_core/schist_queries/src/utils/sum_drips_for_bucket.rs
index 76f7988..20d05a0 100644
--- a/schist_core/schist_queries/src/utils/sum_drips_for_bucket.rs
+++ b/schist_core/schist_queries/src/utils/sum_drips_for_bucket.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use schist_models::{bucket::Bucket, drip::Drip};
+use schist_models::{Bucket, Drip};
 
 pub fn sum_drips_for_bucket(bucket: &Bucket, budget_drips: &[Drip]) -> Result<i64> {
     Ok(budget_drips
diff --git a/schist_core/schist_queries/tests/categories.rs b/schist_core/schist_queries/tests/categories.rs
index 5ef6552..72dd4c7 100644
--- a/schist_core/schist_queries/tests/categories.rs
+++ b/schist_core/schist_queries/tests/categories.rs
@@ -3,7 +3,7 @@ mod common;
 use common::test_context::TestContext;
 use diesel::{Connection, SqliteConnection};
 use schist_fakes::bucket::make_fake_bucket;
-use schist_models::bucket::Bucket;
+use schist_models::Bucket;
 use schist_queries as queries;
 
 fn given_buckets(connection: &mut SqliteConnection) -> Vec<Bucket> {
@@ -33,7 +33,9 @@ fn given_buckets_when_get_all_buckets_then_return_buckets() {
 
     assert_eq!(buckets_in_db.len(), buckets.len());
     for bucket in &buckets {
-        assert!(buckets_in_db.iter().any(|bucket_in_db| bucket_in_db.eq(&bucket)));
+        assert!(buckets_in_db
+            .iter()
+            .any(|bucket_in_db| bucket_in_db.eq(&bucket)));
     }
     for bucket_in_db in buckets_in_db {
         assert!(buckets.iter().any(|bucket| bucket.eq(&bucket_in_db)));
diff --git a/schist_core/schist_queries/tests/drips.rs b/schist_core/schist_queries/tests/drips.rs
index dccdbf4..571ceb3 100644
--- a/schist_core/schist_queries/tests/drips.rs
+++ b/schist_core/schist_queries/tests/drips.rs
@@ -3,7 +3,7 @@ mod common;
 use common::test_context::TestContext;
 use diesel::{Connection, SqliteConnection};
 use schist_fakes::{bucket::make_fake_bucket, drip::make_fake_drip_builder};
-use schist_models::{bucket::Bucket, date_utc::DateUtc};
+use schist_models::{Bucket, DateUtc};
 use schist_queries as queries;
 
 fn given_buckets(connection: &mut SqliteConnection) -> Vec<Bucket> {
diff --git a/schist_core/schist_queries/tests/pipes.rs b/schist_core/schist_queries/tests/pipes.rs
index abd5a5e..9203aa3 100644
--- a/schist_core/schist_queries/tests/pipes.rs
+++ b/schist_core/schist_queries/tests/pipes.rs
@@ -6,7 +6,7 @@ use schist_fakes::{
     account::make_fake_account, bucket::make_fake_bucket, pipe::make_fake_pipe_builder,
     transaction::make_fake_transaction_builder,
 };
-use schist_models::{account::Account, bucket::Bucket, transaction::Transaction};
+use schist_models::{Account, Bucket, Transaction};
 use schist_queries as queries;
 
 fn given_accounts(connection: &mut SqliteConnection) -> Vec<Account> {