diff --git a/src/components/commit.rs b/src/components/commit.rs
index 487a85ce..a26c7d02 100644
--- a/src/components/commit.rs
+++ b/src/components/commit.rs
@@ -1,5 +1,5 @@
 use super::{CommandInfo, Component};
-use crate::{clear::Clear, git_utils, strings, tui_utils};
+use crate::{git_utils, strings, ui};
 use crossterm::event::{Event, KeyCode};
 use std::borrow::Cow;
 use tui::{
@@ -29,7 +29,7 @@ impl Component for CommitComponent {
                 )]
             };
 
-            Clear::new(
+            ui::Clear::new(
                 Paragraph::new(txt.iter())
                     .block(
                         Block::default()
@@ -38,7 +38,7 @@ impl Component for CommitComponent {
                     )
                     .alignment(Alignment::Left),
             )
-            .render(f, tui_utils::centered_rect(60, 20, f.size()));
+            .render(f, ui::centered_rect(60, 20, f.size()));
         }
     }
 
diff --git a/src/components/index.rs b/src/components/index.rs
index acef03fe..6e063557 100644
--- a/src/components/index.rs
+++ b/src/components/index.rs
@@ -1,7 +1,7 @@
 use crate::components::{CommandInfo, Component};
 use crate::{
     git_status::{self, StatusItem, StatusItemType},
-    tui_utils,
+    ui,
 };
 use crossterm::event::{Event, KeyCode};
 use git2::StatusShow;
@@ -111,7 +111,7 @@ impl Component for IndexComponent {
             Text::Styled(Cow::from(txt), style)
         };
 
-        tui_utils::draw_list(
+        ui::draw_list(
             f,
             r,
             &self.title.to_string(),
diff --git a/src/main.rs b/src/main.rs
index 1146ee3c..b379fc6c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,13 +1,11 @@
 mod app;
-mod clear;
 mod components;
 mod git_status;
 mod git_utils;
 mod keys;
 mod poll;
 mod strings;
-mod tui_scrolllist;
-mod tui_utils;
+mod ui;
 
 use crate::{app::App, poll::QueueEvent};
 use crossterm::{
diff --git a/src/clear.rs b/src/ui/clear.rs
similarity index 100%
rename from src/clear.rs
rename to src/ui/clear.rs
diff --git a/src/tui_utils.rs b/src/ui/mod.rs
similarity index 95%
rename from src/tui_utils.rs
rename to src/ui/mod.rs
index c83fb7b6..772e71bc 100644
--- a/src/tui_utils.rs
+++ b/src/ui/mod.rs
@@ -1,4 +1,8 @@
-use crate::tui_scrolllist;
+mod clear;
+mod scrolllist;
+
+pub use clear::Clear;
+use scrolllist::ScrollableList;
 use tui::backend::Backend;
 use tui::layout::{Constraint, Direction, Layout, Rect};
 use tui::{
@@ -6,7 +10,6 @@ use tui::{
     widgets::{Block, Borders, Text, Widget},
     Frame,
 };
-use tui_scrolllist::ScrollableList;
 
 /// use layouts to create a rects that
 /// centers inside `r` and sizes `percent_x`/`percent_x` of `r`
diff --git a/src/tui_scrolllist.rs b/src/ui/scrolllist.rs
similarity index 100%
rename from src/tui_scrolllist.rs
rename to src/ui/scrolllist.rs