diff --git a/ocarina/components/__init__.py b/ocarina/components/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/ocarina/button.py b/ocarina/components/button.py
similarity index 100%
rename from ocarina/button.py
rename to ocarina/components/button.py
diff --git a/ocarina/image.py b/ocarina/components/image.py
similarity index 100%
rename from ocarina/image.py
rename to ocarina/components/image.py
diff --git a/ocarina/info.py b/ocarina/info.py
index fcfe910c..32869034 100644
--- a/ocarina/info.py
+++ b/ocarina/info.py
@@ -167,7 +167,7 @@ def init():
 	global label
 	global image
 
-	import button
+	from components import button
 	import entry
 	import pbar
 	import label