diff --git a/crates/brk_computer/src/stateful/addresstype_to_addresscount.rs b/crates/brk_computer/src/stateful/addresstype/addresscount.rs
similarity index 94%
rename from crates/brk_computer/src/stateful/addresstype_to_addresscount.rs
rename to crates/brk_computer/src/stateful/addresstype/addresscount.rs
index 53212810c..c45dbbc97 100644
--- a/crates/brk_computer/src/stateful/addresstype_to_addresscount.rs
+++ b/crates/brk_computer/src/stateful/addresstype/addresscount.rs
@@ -2,7 +2,7 @@ use brk_structs::{ByAddressType, Height};
 use derive_deref::{Deref, DerefMut};
 use vecdb::VecIterator;
 
-use crate::stateful::addresstype_to_height_to_addresscount::AddressTypeToHeightToAddressCount;
+use super::AddressTypeToHeightToAddressCount;
 
 #[derive(Debug, Default, Deref, DerefMut)]
 pub struct AddressTypeToAddressCount(ByAddressType<u64>);
diff --git a/crates/brk_computer/src/stateful/addresstype_to_height_to_addresscount.rs b/crates/brk_computer/src/stateful/addresstype/height_to_addresscount.rs
similarity index 95%
rename from crates/brk_computer/src/stateful/addresstype_to_height_to_addresscount.rs
rename to crates/brk_computer/src/stateful/addresstype/height_to_addresscount.rs
index f5950c58e..dd264363c 100644
--- a/crates/brk_computer/src/stateful/addresstype_to_height_to_addresscount.rs
+++ b/crates/brk_computer/src/stateful/addresstype/height_to_addresscount.rs
@@ -1,9 +1,9 @@
 use brk_error::Result;
 use brk_structs::{ByAddressType, Height, StoredU64};
-use vecdb::{EagerVec, Exit, GenericStoredVec};
 use derive_deref::{Deref, DerefMut};
+use vecdb::{EagerVec, Exit, GenericStoredVec};
 
-use crate::stateful::addresstype_to_addresscount::AddressTypeToAddressCount;
+use super::AddressTypeToAddressCount;
 
 #[derive(Debug, Clone, Deref, DerefMut)]
 pub struct AddressTypeToHeightToAddressCount(ByAddressType<EagerVec<Height, StoredU64>>);
diff --git a/crates/brk_computer/src/stateful/height_to_addresstype_to_vec.rs b/crates/brk_computer/src/stateful/addresstype/height_to_vec.rs
similarity index 100%
rename from crates/brk_computer/src/stateful/height_to_addresstype_to_vec.rs
rename to crates/brk_computer/src/stateful/addresstype/height_to_vec.rs
diff --git a/crates/brk_computer/src/stateful/addresstype_to_indexes_to_addresscount.rs b/crates/brk_computer/src/stateful/addresstype/indexes_to_addresscount.rs
similarity index 93%
rename from crates/brk_computer/src/stateful/addresstype_to_indexes_to_addresscount.rs
rename to crates/brk_computer/src/stateful/addresstype/indexes_to_addresscount.rs
index df833a8e1..98076a67e 100644
--- a/crates/brk_computer/src/stateful/addresstype_to_indexes_to_addresscount.rs
+++ b/crates/brk_computer/src/stateful/addresstype/indexes_to_addresscount.rs
@@ -3,10 +3,9 @@ use brk_structs::{ByAddressType, StoredU64};
 use derive_deref::{Deref, DerefMut};
 use vecdb::{AnyCollectableVec, Exit};
 
-use crate::{
-    Indexes, grouped::ComputedVecsFromHeight, indexes,
-    stateful::addresstype_to_height_to_addresscount::AddressTypeToHeightToAddressCount,
-};
+use crate::{Indexes, grouped::ComputedVecsFromHeight, indexes};
+
+use super::AddressTypeToHeightToAddressCount;
 
 #[derive(Clone, Deref, DerefMut)]
 pub struct AddressTypeToIndexesToAddressCount(ByAddressType<ComputedVecsFromHeight<StoredU64>>);
diff --git a/crates/brk_computer/src/stateful/addresstype/mod.rs b/crates/brk_computer/src/stateful/addresstype/mod.rs
new file mode 100644
index 000000000..ddb86896b
--- /dev/null
+++ b/crates/brk_computer/src/stateful/addresstype/mod.rs
@@ -0,0 +1,13 @@
+mod addresscount;
+mod height_to_addresscount;
+mod height_to_vec;
+mod indexes_to_addresscount;
+mod typeindex_tree;
+mod vec;
+
+pub use addresscount::*;
+pub use height_to_addresscount::*;
+pub use height_to_vec::*;
+pub use indexes_to_addresscount::*;
+pub use typeindex_tree::*;
+pub use vec::*;
diff --git a/crates/brk_computer/src/stateful/addresstype_to_typeindex_tree.rs b/crates/brk_computer/src/stateful/addresstype/typeindex_tree.rs
similarity index 96%
rename from crates/brk_computer/src/stateful/addresstype_to_typeindex_tree.rs
rename to crates/brk_computer/src/stateful/addresstype/typeindex_tree.rs
index c2ba8d35f..939fd2c13 100644
--- a/crates/brk_computer/src/stateful/addresstype_to_typeindex_tree.rs
+++ b/crates/brk_computer/src/stateful/addresstype/typeindex_tree.rs
@@ -1,10 +1,8 @@
 use std::{collections::BTreeMap, mem};
 
-use brk_structs::TypeIndex;
+use brk_structs::{ByAddressType, TypeIndex};
 use derive_deref::{Deref, DerefMut};
 
-use super::ByAddressType;
-
 #[derive(Debug, Deref, DerefMut)]
 pub struct AddressTypeToTypeIndexTree<T>(ByAddressType<BTreeMap<TypeIndex, T>>);
 
diff --git a/crates/brk_computer/src/stateful/addresstype_to_vec.rs b/crates/brk_computer/src/stateful/addresstype/vec.rs
similarity index 98%
rename from crates/brk_computer/src/stateful/addresstype_to_vec.rs
rename to crates/brk_computer/src/stateful/addresstype/vec.rs
index 2bc15f5e5..1693e5535 100644
--- a/crates/brk_computer/src/stateful/addresstype_to_vec.rs
+++ b/crates/brk_computer/src/stateful/addresstype/vec.rs
@@ -1,9 +1,8 @@
 use std::mem;
 
+use brk_structs::ByAddressType;
 use derive_deref::{Deref, DerefMut};
 
-use super::ByAddressType;
-
 #[derive(Debug, Deref, DerefMut)]
 pub struct AddressTypeToVec<T>(ByAddressType<Vec<T>>);
 
diff --git a/crates/brk_computer/src/stateful/mod.rs b/crates/brk_computer/src/stateful/mod.rs
index 31ad15ef1..1ae40f6fa 100644
--- a/crates/brk_computer/src/stateful/mod.rs
+++ b/crates/brk_computer/src/stateful/mod.rs
@@ -25,28 +25,18 @@ use crate::{
 
 mod address_cohort;
 mod address_cohorts;
-mod addresstype_to_addresscount;
-mod addresstype_to_height_to_addresscount;
-mod addresstype_to_indexes_to_addresscount;
-mod addresstype_to_typeindex_tree;
-mod addresstype_to_vec;
+mod addresstype;
 mod common;
-mod height_to_addresstype_to_vec;
 mod range_map;
 mod r#trait;
 mod utxo_cohort;
 mod utxo_cohorts;
 mod withaddressdatasource;
 
-use addresstype_to_addresscount::*;
-use addresstype_to_height_to_addresscount::*;
-use addresstype_to_indexes_to_addresscount::*;
-pub use addresstype_to_typeindex_tree::*;
-pub use addresstype_to_vec::*;
-use height_to_addresstype_to_vec::*;
+use addresstype::*;
 use range_map::*;
 use r#trait::*;
-pub use withaddressdatasource::WithAddressDataSource;
+use withaddressdatasource::*;
 
 const VERSION: Version = Version::new(21);
 
diff --git a/crates/brk_server/src/api/interface.rs b/crates/brk_server/src/api/interface.rs
index bcf1101d0..5482df1e3 100644
--- a/crates/brk_server/src/api/interface.rs
+++ b/crates/brk_server/src/api/interface.rs
@@ -82,7 +82,7 @@ fn req_to_response_res(
 
     let guard_res = cache.get_value_or_guard(
         &format!("{}{}{etag}", uri.path(), uri.query().unwrap_or("")),
-        Some(Duration::from_millis(500)),
+        Some(Duration::from_millis(50)),
     );
 
     let mut response = if let GuardResult::Value(v) = guard_res {
diff --git a/crates/brk_server/src/files/file.rs b/crates/brk_server/src/files/file.rs
index 12686cdb3..40aee3426 100644
--- a/crates/brk_server/src/files/file.rs
+++ b/crates/brk_server/src/files/file.rs
@@ -88,7 +88,7 @@ fn path_to_response_(headers: &HeaderMap, app_state: &AppState, path: &Path) ->
     let guard_res = if !must_revalidate {
         Some(app_state.cache.get_value_or_guard(
             &path.to_str().unwrap().to_owned(),
-            Some(Duration::from_millis(500)),
+            Some(Duration::from_millis(50)),
         ))
     } else {
         None