diff --git a/ocarina/label.py b/ocarina/components/label.py
similarity index 100%
rename from ocarina/label.py
rename to ocarina/components/label.py
diff --git a/ocarina/info.py b/ocarina/info.py
index ae02f97e..ca32dade 100644
--- a/ocarina/info.py
+++ b/ocarina/info.py
@@ -170,8 +170,8 @@ def init():
 	from components import button
 	from components import entry
 	from components import pbar
-	import label
-	import image
+	from components import label
+	from components import image
 
 	libsaria.init_pref("INFOPANEUP", False)
 	info   = TwoWayPane()
diff --git a/ocarina/list.py b/ocarina/list.py
index d99a2c7a..567e67b7 100644
--- a/ocarina/list.py
+++ b/ocarina/list.py
@@ -1,7 +1,7 @@
 # Bryan Schumaker (8/15/2010)
 
 import ocarina
-import image
+from components import image
 libsaria = ocarina.libsaria
 gtk      = ocarina.gtk
 gobject  = ocarina.gobject