diff --git a/src/components/input/mod.rs b/src/components/audio/input/mod.rs
similarity index 100%
rename from src/components/input/mod.rs
rename to src/components/audio/input/mod.rs
diff --git a/src/components/input/output_stream_entry.rs b/src/components/audio/input/output_stream_entry.rs
similarity index 100%
rename from src/components/input/output_stream_entry.rs
rename to src/components/audio/input/output_stream_entry.rs
diff --git a/src/components/input/output_stream_entry_impl.rs b/src/components/audio/input/output_stream_entry_impl.rs
similarity index 96%
rename from src/components/input/output_stream_entry_impl.rs
rename to src/components/audio/input/output_stream_entry_impl.rs
index 2456508..fa368d2 100644
--- a/src/components/input/output_stream_entry_impl.rs
+++ b/src/components/audio/input/output_stream_entry_impl.rs
@@ -5,7 +5,7 @@ use std::cell::RefCell;
 use std::sync::Arc;
 use std::time::SystemTime;
 
-use crate::components::input::output_stream_entry;
+use crate::components::audio::input::output_stream_entry;
 use gtk::subclass::prelude::*;
 use gtk::{Button, CompositeTemplate, Label, Scale};
 
diff --git a/src/components/input/source_box.rs b/src/components/audio/input/source_box.rs
similarity index 99%
rename from src/components/input/source_box.rs
rename to src/components/audio/input/source_box.rs
index b39df38..aada686 100644
--- a/src/components/input/source_box.rs
+++ b/src/components/audio/input/source_box.rs
@@ -16,7 +16,7 @@ use gtk::prelude::ActionableExt;
 
 use crate::components::base::error::{self};
 use crate::components::base::error_impl::ReSetErrorImpl;
-use crate::components::input::source_box_impl;
+use crate::components::audio::input::source_box_impl;
 use crate::components::utils::{
     create_dropdown_label_factory, set_combo_row_ellipsis, BASE, DBUS_PATH,
 };
diff --git a/src/components/input/source_box_handlers.rs b/src/components/audio/input/source_box_handlers.rs
similarity index 100%
rename from src/components/input/source_box_handlers.rs
rename to src/components/audio/input/source_box_handlers.rs
diff --git a/src/components/input/source_box_impl.rs b/src/components/audio/input/source_box_impl.rs
similarity index 98%
rename from src/components/input/source_box_impl.rs
rename to src/components/audio/input/source_box_impl.rs
index d22d5ea..f941ce9 100644
--- a/src/components/input/source_box_impl.rs
+++ b/src/components/audio/input/source_box_impl.rs
@@ -7,7 +7,7 @@ use std::time::SystemTime;
 
 use crate::components::base::error::ReSetError;
 use crate::components::base::list_entry::ListEntry;
-use crate::components::input::source_box;
+use crate::components::audio::input::source_box;
 use gtk::subclass::prelude::*;
 use gtk::{prelude::*, Button, Label, Scale};
 use gtk::{CheckButton, CompositeTemplate, StringList};
diff --git a/src/components/input/source_box_utils.rs b/src/components/audio/input/source_box_utils.rs
similarity index 100%
rename from src/components/input/source_box_utils.rs
rename to src/components/audio/input/source_box_utils.rs
diff --git a/src/components/input/source_entry.rs b/src/components/audio/input/source_entry.rs
similarity index 100%
rename from src/components/input/source_entry.rs
rename to src/components/audio/input/source_entry.rs
diff --git a/src/components/input/source_entry_impl.rs b/src/components/audio/input/source_entry_impl.rs
similarity index 100%
rename from src/components/input/source_entry_impl.rs
rename to src/components/audio/input/source_entry_impl.rs
diff --git a/src/components/audio/mod.rs b/src/components/audio/mod.rs
new file mode 100644
index 0000000..de8428d
--- /dev/null
+++ b/src/components/audio/mod.rs
@@ -0,0 +1,2 @@
+pub mod output;
+pub mod input;
diff --git a/src/components/output/input_stream_entry.rs b/src/components/audio/output/input_stream_entry.rs
similarity index 100%
rename from src/components/output/input_stream_entry.rs
rename to src/components/audio/output/input_stream_entry.rs
diff --git a/src/components/output/input_stream_entry_impl.rs b/src/components/audio/output/input_stream_entry_impl.rs
similarity index 100%
rename from src/components/output/input_stream_entry_impl.rs
rename to src/components/audio/output/input_stream_entry_impl.rs
diff --git a/src/components/output/mod.rs b/src/components/audio/output/mod.rs
similarity index 100%
rename from src/components/output/mod.rs
rename to src/components/audio/output/mod.rs
diff --git a/src/components/output/sink_box.rs b/src/components/audio/output/sink_box.rs
similarity index 100%
rename from src/components/output/sink_box.rs
rename to src/components/audio/output/sink_box.rs
diff --git a/src/components/output/sink_box_handlers.rs b/src/components/audio/output/sink_box_handlers.rs
similarity index 100%
rename from src/components/output/sink_box_handlers.rs
rename to src/components/audio/output/sink_box_handlers.rs
diff --git a/src/components/output/sink_box_impl.rs b/src/components/audio/output/sink_box_impl.rs
similarity index 97%
rename from src/components/output/sink_box_impl.rs
rename to src/components/audio/output/sink_box_impl.rs
index 99c9b7d..dabdcc3 100644
--- a/src/components/output/sink_box_impl.rs
+++ b/src/components/audio/output/sink_box_impl.rs
@@ -7,7 +7,7 @@ use std::time::SystemTime;
 
 use crate::components::base::error::ReSetError;
 use crate::components::base::list_entry::ListEntry;
-use crate::components::output::input_stream_entry::InputStreamEntry;
+use crate::components::audio::output::input_stream_entry::InputStreamEntry;
 use gtk::subclass::prelude::*;
 use gtk::{prelude::*, Scale};
 use gtk::{Box, Button, CheckButton, CompositeTemplate, Label, StringList};
diff --git a/src/components/output/sink_box_utils.rs b/src/components/audio/output/sink_box_utils.rs
similarity index 100%
rename from src/components/output/sink_box_utils.rs
rename to src/components/audio/output/sink_box_utils.rs
diff --git a/src/components/output/sink_entry.rs b/src/components/audio/output/sink_entry.rs
similarity index 100%
rename from src/components/output/sink_entry.rs
rename to src/components/audio/output/sink_entry.rs
diff --git a/src/components/output/sink_entry_impl.rs b/src/components/audio/output/sink_entry_impl.rs
similarity index 96%
rename from src/components/output/sink_entry_impl.rs
rename to src/components/audio/output/sink_entry_impl.rs
index 1b82529..84f75c6 100644
--- a/src/components/output/sink_entry_impl.rs
+++ b/src/components/audio/output/sink_entry_impl.rs
@@ -5,7 +5,7 @@ use std::cell::RefCell;
 use std::sync::Arc;
 use std::time::SystemTime;
 
-use crate::components::output::sink_entry;
+use crate::components::audio::output::sink_entry;
 use gtk::subclass::prelude::*;
 use gtk::{Button, CheckButton, CompositeTemplate, Label, Scale};
 
diff --git a/src/components/base/utils.rs b/src/components/base/utils.rs
index 4eb7fdb..1d20e76 100644
--- a/src/components/base/utils.rs
+++ b/src/components/base/utils.rs
@@ -11,8 +11,8 @@ use dbus::{blocking::Connection, Error};
 use gtk::gio;
 
 use crate::components::{
-    input::source_box::{start_source_box_listener, SourceBox},
-    output::sink_box::{start_sink_box_listener, SinkBox},
+    audio::input::source_box::{start_source_box_listener, SourceBox},
+    audio::output::sink_box::{start_sink_box_listener, SinkBox},
     utils::{BASE, DBUS_PATH, WIRELESS},
 };
 
diff --git a/src/components/mod.rs b/src/components/mod.rs
index 57b1485..2fd4b81 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -1,7 +1,6 @@
 pub mod base;
 pub mod bluetooth;
-mod input;
-pub mod output;
+pub mod audio;
 pub mod utils;
 pub mod wifi;
 pub mod window;
diff --git a/src/components/window/handle_sidebar_click.rs b/src/components/window/handle_sidebar_click.rs
index 54b97b5..9367ede 100644
--- a/src/components/window/handle_sidebar_click.rs
+++ b/src/components/window/handle_sidebar_click.rs
@@ -10,8 +10,8 @@ use crate::components::base::utils::{start_audio_listener, Listeners, Position};
 use crate::components::bluetooth::bluetooth_box::{
     populate_connected_bluetooth_devices, start_bluetooth_listener, BluetoothBox,
 };
-use crate::components::input::source_box::{populate_sources, SourceBox};
-use crate::components::output::sink_box::{populate_sinks, SinkBox};
+use crate::components::audio::input::source_box::{populate_sources, SourceBox};
+use crate::components::audio::output::sink_box::{populate_sinks, SinkBox};
 use crate::components::wifi::wifi_box::{
     scan_for_wifi, show_stored_connections, start_event_listener, WifiBox,
 };