diff --git a/libsaria/backup.py b/libsaria/path/backup.py
similarity index 88%
rename from libsaria/backup.py
rename to libsaria/path/backup.py
index f784ae8a..79e3b3f9 100644
--- a/libsaria/backup.py
+++ b/libsaria/path/backup.py
@@ -1,13 +1,18 @@
 # Bryan Schumaker (11/12/2010)
 
+import libsaria
 from libsaria import path
 from libsaria.sources import library
-import xm as xml
+import libsaria.xm as xml
 
 add_child = xml.add_child
 add_text  = xml.add_text
 get_attrs = library.get_attrs
-lib_file  = path.join(path.saria_dir(), "library.xml")
+lib_file  = "library"
+if libsaria.__dev__ == True:
+	lib_file = lib_file + "-dev"
+lib_file += ".xml"
+lib_file  = path.join(path.saria_dir(), lib_file)
 
 def encode_attr(doc, node, attr, value):
 	child = add_child(doc, node, attr)
diff --git a/ocarina/button.py b/ocarina/button.py
index 55b2bc65..85fa224c 100644
--- a/ocarina/button.py
+++ b/ocarina/button.py
@@ -106,7 +106,7 @@ class ExportButton(Button):
 	def __init__(self):
 		Button.__init__(self, gtk.STOCK_CONVERT, gtk.ICON_SIZE_BUTTON)
 	def clicked(self, button):
-		from libsaria import backup
+		from libsaria.path import backup
 		backup.backup()
 
 class RandomButton(gtk.ToggleButton):