diff --git a/src/tui/app/app.rs b/src/tui/app/app.rs
index 4664fff..4d0c7ec 100644
--- a/src/tui/app/app.rs
+++ b/src/tui/app/app.rs
@@ -3,7 +3,7 @@
 
 use crate::tui::{
     app::{
-        state::{
+        machine::{
             browse::AppBrowse, critical::AppCritical, error::AppError, info::AppInfo,
             reload::AppReload, search::AppSearch, AppInner, AppMachine,
         },
diff --git a/src/tui/app/state/browse.rs b/src/tui/app/machine/browse.rs
similarity index 97%
rename from src/tui/app/state/browse.rs
rename to src/tui/app/machine/browse.rs
index e4c950d..d7ad5c7 100644
--- a/src/tui/app/state/browse.rs
+++ b/src/tui/app/machine/browse.rs
@@ -1,8 +1,8 @@
 use crate::tui::{
     app::{
         app::App,
+        machine::{AppInner, AppMachine},
         selection::{Delta, ListSelection},
-        state::{AppInner, AppMachine},
         AppPublic, AppState, IAppInteractBrowse,
     },
     lib::IMusicHoard,
@@ -95,7 +95,7 @@ impl<MH: IMusicHoard> IAppInteractBrowse for AppMachine<MH, AppBrowse> {
 #[cfg(test)]
 mod tests {
     use crate::tui::app::{
-        state::tests::{inner, music_hoard},
+        machine::tests::{inner, music_hoard},
         IAppInteract,
     };
 
diff --git a/src/tui/app/state/critical.rs b/src/tui/app/machine/critical.rs
similarity index 92%
rename from src/tui/app/state/critical.rs
rename to src/tui/app/machine/critical.rs
index 690584a..a02d7f2 100644
--- a/src/tui/app/state/critical.rs
+++ b/src/tui/app/machine/critical.rs
@@ -1,7 +1,7 @@
 use crate::tui::{
     app::{
         app::App,
-        state::{AppInner, AppMachine},
+        machine::{AppInner, AppMachine},
         AppPublic, AppState, IAppInteractCritical,
     },
     lib::IMusicHoard,
@@ -47,7 +47,7 @@ impl<MH: IMusicHoard> IAppInteractCritical for AppMachine<MH, AppCritical> {
 
 #[cfg(test)]
 mod tests {
-    use crate::tui::app::state::tests::{music_hoard, inner};
+    use crate::tui::app::machine::tests::{music_hoard, inner};
 
     use super::*;
 
diff --git a/src/tui/app/state/error.rs b/src/tui/app/machine/error.rs
similarity index 92%
rename from src/tui/app/state/error.rs
rename to src/tui/app/machine/error.rs
index 271f020..006d4cf 100644
--- a/src/tui/app/state/error.rs
+++ b/src/tui/app/machine/error.rs
@@ -1,7 +1,7 @@
 use crate::tui::{
     app::{
         app::App,
-        state::{AppInner, AppMachine},
+        machine::{AppInner, AppMachine},
         AppPublic, AppState, IAppInteractError,
     },
     lib::IMusicHoard,
@@ -47,7 +47,7 @@ impl<MH: IMusicHoard> IAppInteractError for AppMachine<MH, AppError> {
 
 #[cfg(test)]
 mod tests {
-    use crate::tui::app::state::tests::{inner, music_hoard};
+    use crate::tui::app::machine::tests::{inner, music_hoard};
 
     use super::*;
 
diff --git a/src/tui/app/state/info.rs b/src/tui/app/machine/info.rs
similarity index 92%
rename from src/tui/app/state/info.rs
rename to src/tui/app/machine/info.rs
index f9676be..0b82292 100644
--- a/src/tui/app/state/info.rs
+++ b/src/tui/app/machine/info.rs
@@ -1,7 +1,7 @@
 use crate::tui::{
     app::{
         app::App,
-        state::{AppInner, AppMachine},
+        machine::{AppInner, AppMachine},
         AppPublic, AppState, IAppInteractInfo,
     },
     lib::IMusicHoard,
@@ -47,7 +47,7 @@ impl<MH: IMusicHoard> IAppInteractInfo for AppMachine<MH, AppInfo> {
 
 #[cfg(test)]
 mod tests {
-    use crate::tui::app::state::tests::{music_hoard, inner};
+    use crate::tui::app::machine::tests::{music_hoard, inner};
 
     use super::*;
 
diff --git a/src/tui/app/state/mod.rs b/src/tui/app/machine/mod.rs
similarity index 100%
rename from src/tui/app/state/mod.rs
rename to src/tui/app/machine/mod.rs
diff --git a/src/tui/app/state/reload.rs b/src/tui/app/machine/reload.rs
similarity index 97%
rename from src/tui/app/state/reload.rs
rename to src/tui/app/machine/reload.rs
index 5b17684..55d276d 100644
--- a/src/tui/app/state/reload.rs
+++ b/src/tui/app/machine/reload.rs
@@ -2,7 +2,7 @@ use crate::tui::{
     app::{
         app::App,
         selection::IdSelection,
-        state::{AppInner, AppMachine},
+        machine::{AppInner, AppMachine},
         AppPublic, AppState, IAppInteractReload,
     },
     lib::IMusicHoard,
@@ -83,7 +83,7 @@ impl<MH: IMusicHoard> IAppInteractReloadPrivate<MH> for AppMachine<MH, AppReload
 
 #[cfg(test)]
 mod tests {
-    use crate::tui::app::state::tests::{inner, music_hoard};
+    use crate::tui::app::machine::tests::{inner, music_hoard};
 
     use super::*;
 
diff --git a/src/tui/app/state/search.rs b/src/tui/app/machine/search.rs
similarity index 99%
rename from src/tui/app/state/search.rs
rename to src/tui/app/machine/search.rs
index 931f412..6273799 100644
--- a/src/tui/app/state/search.rs
+++ b/src/tui/app/machine/search.rs
@@ -4,7 +4,7 @@ use crate::tui::{
     app::{
         app::App,
         selection::ListSelection,
-        state::{AppInner, AppMachine},
+        machine::{AppInner, AppMachine},
         AppPublic, AppState, IAppInteractSearch,
     },
     lib::IMusicHoard,
@@ -196,7 +196,7 @@ mod tests {
     use ratatui::widgets::ListState;
 
     use crate::tui::{
-        app::state::tests::{inner, music_hoard},
+        app::machine::tests::{inner, music_hoard},
         testmod::COLLECTION,
     };
 
diff --git a/src/tui/app/mod.rs b/src/tui/app/mod.rs
index 87474d5..59fc2bb 100644
--- a/src/tui/app/mod.rs
+++ b/src/tui/app/mod.rs
@@ -1,6 +1,6 @@
 pub mod app;
 pub mod selection;
-mod state;
+mod machine;
 
 use musichoard::collection::Collection;