diff --git a/libsaria/__init__.py b/libsaria/__init__.py
index 342ed47b..a7ad87cc 100644
--- a/libsaria/__init__.py
+++ b/libsaria/__init__.py
@@ -36,7 +36,7 @@ def init():
 	prefs = trees.get_pref_tree("preferences")
 	init_pref = prefs.init_pref
 	import audio
-	import lastfm
+	from path import lastfm
 
 	event.start("POSTINIT")
 
diff --git a/libsaria/lastfm.py b/libsaria/path/lastfm.py
similarity index 97%
rename from libsaria/lastfm.py
rename to libsaria/path/lastfm.py
index 1eaf60a4..ec409ced 100644
--- a/libsaria/lastfm.py
+++ b/libsaria/path/lastfm.py
@@ -2,8 +2,8 @@
 
 import libsaria
 from libsaria import sources
-import web
-import xm
+from libsaria import web
+from libsaria import xm
 
 file_to_id = libsaria.sources.file_to_id
 cache      = libsaria.cache