diff --git a/src/main.rs b/src/main.rs
index bb49235..48cabd7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -16,8 +16,8 @@ pub use playbin_song::Song as PlaybinSong;
 
 pub mod subsonic;
 
-pub mod playbin2;
-pub type Playbin = playbin2::Playbin<PlaybinSong>;
+pub mod playbin;
+pub type Playbin = playbin::Playbin<PlaybinSong>;
 
 mod signal;
 pub use signal::{Signal, SignalEmitter, SignalHandler};
diff --git a/src/playbin2.rs b/src/playbin.rs
similarity index 100%
rename from src/playbin2.rs
rename to src/playbin.rs
diff --git a/src/playbin_song.rs b/src/playbin_song.rs
index 251e742..3f154f0 100644
--- a/src/playbin_song.rs
+++ b/src/playbin_song.rs
@@ -98,3 +98,9 @@ impl Song {
             .build()
     }
 }
+
+impl crate::playbin::PlaybinEntry for Song {
+    fn url(&self) -> url::Url {
+        self.stream_url()
+    }
+}
diff --git a/src/ui/window.rs b/src/ui/window.rs
index 5ed2d8c..f37a102 100644
--- a/src/ui/window.rs
+++ b/src/ui/window.rs
@@ -7,12 +7,6 @@ mod imp {
     use std::cell::{Cell, RefCell};
     use std::rc::Rc;
 
-    impl crate::playbin2::PlaybinEntry for PlaybinSong {
-        fn url(&self) -> url::Url {
-            self.stream_url()
-        }
-    }
-
     #[derive(gtk::CompositeTemplate, glib::Properties, Default)]
     #[template(resource = "/eu/callcc/audrey/window.ui")]
     #[properties(wrapper_type = super::Window)]