diff --git a/src/application.rs b/src/application.rs
index de5d361..5a07299 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -25,7 +25,7 @@ use adw::subclass::prelude::*;
 
 use crate::config;
 use crate::deps::*;
-use crate::window::LpWindow;
+use crate::widgets::LpWindow;
 
 mod imp {
     use super::*;
diff --git a/src/lib.rs b/src/lib.rs
index bfd9497..f6efdfe 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -59,7 +59,6 @@ pub mod file_model;
 pub mod metadata;
 pub mod util;
 pub mod widgets;
-pub mod window;
 
 mod deps {
     pub use gtk::{cairo, gdk, gio, glib, graphene, gsk};
diff --git a/src/widgets.rs b/src/widgets.rs
index c422f8e..5f5d21c 100644
--- a/src/widgets.rs
+++ b/src/widgets.rs
@@ -18,29 +18,31 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 mod drag_overlay;
+mod edit_window;
 mod error_details;
 mod image;
 mod image_page;
 mod image_view;
+mod image_window;
 mod print;
 mod print_preview;
 mod properties_view;
 mod shy_bin;
 mod sliding_view;
+mod window;
 mod window_content;
-mod edit_window;
-mod image_window;
 
 pub use drag_overlay::LpDragOverlay;
+pub use edit_window::LpImageEdit;
 pub use error_details::LpErrorDetails;
 pub use image::LpImage;
 pub use image_page::LpImagePage;
 pub use image_view::LpImageView;
+pub use image_window::LpImageWindow;
 pub use print::LpPrint;
 pub use print_preview::LpPrintPreview;
 pub use properties_view::LpPropertiesView;
 pub use shy_bin::LpShyBin;
 pub use sliding_view::LpSlidingView;
+pub use window::LpWindow;
 pub use window_content::LpWindowContent;
-pub use edit_window::LpImageEdit;
-pub use image_window::LpImageWindow;
diff --git a/src/widgets/image_window.rs b/src/widgets/image_window.rs
index 856e742..1a60bae 100644
--- a/src/widgets/image_window.rs
+++ b/src/widgets/image_window.rs
@@ -43,8 +43,9 @@ use crate::config;
 use crate::deps::*;
 use crate::util::gettext::*;
 use crate::util::Direction;
-use crate::widgets::{LpDragOverlay, LpImage, LpImageView, LpPropertiesView, LpWindowContent};
-use crate::window::LpWindow;
+use crate::widgets::{
+    LpDragOverlay, LpImage, LpImageView, LpPropertiesView, LpWindow, LpWindowContent,
+};
 
 /// Animation duration for showing overlay buttons in milliseconds
 const SHOW_CONTROLS_ANIMATION_DURATION: u32 = 200;
diff --git a/src/window.rs b/src/widgets/window.rs
similarity index 99%
rename from src/window.rs
rename to src/widgets/window.rs
index 82cae99..ca7fd2d 100644
--- a/src/window.rs
+++ b/src/widgets/window.rs
@@ -22,7 +22,7 @@ use gtk::CompositeTemplate;
 
 use crate::config;
 use crate::deps::*;
-use crate::widgets::{LpImageView, LpImageEdit, LpImageWindow};
+use crate::widgets::{LpImageEdit, LpImageView, LpImageWindow};
 
 /// Show window after X milliseconds even if image dimensions are not known yet
 const SHOW_WINDOW_AFTER: u64 = 2000;
diff --git a/src/window.ui b/src/widgets/window.ui
similarity index 100%
rename from src/window.ui
rename to src/widgets/window.ui