diff --git a/lib/README b/backend_xmmsclient++/README
similarity index 100%
rename from lib/README
rename to backend_xmmsclient++/README
diff --git a/lib/compat.h b/backend_xmmsclient++/compat.h
similarity index 100%
rename from lib/compat.h
rename to backend_xmmsclient++/compat.h
diff --git a/lib/debug.h b/backend_xmmsclient++/debug.h
similarity index 100%
rename from lib/debug.h
rename to backend_xmmsclient++/debug.h
diff --git a/lib/playlistmodel.cpp b/backend_xmmsclient++/playlistmodel.cpp
similarity index 100%
rename from lib/playlistmodel.cpp
rename to backend_xmmsclient++/playlistmodel.cpp
diff --git a/lib/playlistmodel.h b/backend_xmmsclient++/playlistmodel.h
similarity index 100%
rename from lib/playlistmodel.h
rename to backend_xmmsclient++/playlistmodel.h
diff --git a/lib/sourcepref.h b/backend_xmmsclient++/sourcepref.h
similarity index 100%
rename from lib/sourcepref.h
rename to backend_xmmsclient++/sourcepref.h
diff --git a/lib/wscript b/backend_xmmsclient++/wscript
similarity index 98%
rename from lib/wscript
rename to backend_xmmsclient++/wscript
index 0a3ccbe..892bae3 100644
--- a/lib/wscript
+++ b/backend_xmmsclient++/wscript
@@ -50,7 +50,7 @@ def configure(conf):
     pass
 def build(bld):
     obj                 = bld.new_task_gen('qt4', 'cstaticlib', 'cxx')
-    obj.target          = 'promoe_lib'
+    obj.target          = 'backend_lib'
     obj.install_path    = 0 # Don't install
     obj.includes        = '.'
     obj.source          = lib_source
diff --git a/lib/xclient.cpp b/backend_xmmsclient++/xclient.cpp
similarity index 100%
rename from lib/xclient.cpp
rename to backend_xmmsclient++/xclient.cpp
diff --git a/lib/xclient.h b/backend_xmmsclient++/xclient.h
similarity index 100%
rename from lib/xclient.h
rename to backend_xmmsclient++/xclient.h
diff --git a/lib/xclientcache.cpp b/backend_xmmsclient++/xclientcache.cpp
similarity index 100%
rename from lib/xclientcache.cpp
rename to backend_xmmsclient++/xclientcache.cpp
diff --git a/lib/xclientcache.h b/backend_xmmsclient++/xclientcache.h
similarity index 100%
rename from lib/xclientcache.h
rename to backend_xmmsclient++/xclientcache.h
diff --git a/lib/xcollection.cpp b/backend_xmmsclient++/xcollection.cpp
similarity index 100%
rename from lib/xcollection.cpp
rename to backend_xmmsclient++/xcollection.cpp
diff --git a/lib/xcollection.h b/backend_xmmsclient++/xcollection.h
similarity index 100%
rename from lib/xcollection.h
rename to backend_xmmsclient++/xcollection.h
diff --git a/lib/xcollection_p.h b/backend_xmmsclient++/xcollection_p.h
similarity index 100%
rename from lib/xcollection_p.h
rename to backend_xmmsclient++/xcollection_p.h
diff --git a/lib/xconfig.cpp b/backend_xmmsclient++/xconfig.cpp
similarity index 100%
rename from lib/xconfig.cpp
rename to backend_xmmsclient++/xconfig.cpp
diff --git a/lib/xconfig.h b/backend_xmmsclient++/xconfig.h
similarity index 100%
rename from lib/xconfig.h
rename to backend_xmmsclient++/xconfig.h
diff --git a/lib/xmmsqt4.cpp b/backend_xmmsclient++/xmmsqt4.cpp
similarity index 100%
rename from lib/xmmsqt4.cpp
rename to backend_xmmsclient++/xmmsqt4.cpp
diff --git a/lib/xmmsqt4.h b/backend_xmmsclient++/xmmsqt4.h
similarity index 100%
rename from lib/xmmsqt4.h
rename to backend_xmmsclient++/xmmsqt4.h
diff --git a/lib/xplayback.cpp b/backend_xmmsclient++/xplayback.cpp
similarity index 100%
rename from lib/xplayback.cpp
rename to backend_xmmsclient++/xplayback.cpp
diff --git a/lib/xplayback.h b/backend_xmmsclient++/xplayback.h
similarity index 100%
rename from lib/xplayback.h
rename to backend_xmmsclient++/xplayback.h
diff --git a/src/wscript b/src/wscript
index 8983f8e..e86ba32 100644
--- a/src/wscript
+++ b/src/wscript
@@ -98,7 +98,7 @@ def build(bld):
     obj.target       = 'promoe'
     obj.includes     = incdirs
     obj.source       = sources
-    obj.uselib_local = 'promoe_lib'
+    obj.uselib_local = 'backend_lib'
     obj.add_objects  = 'promoe_data'
     obj.uselib       = 'QTCORE QTGUI AVAHI-CLIENT AVAHI-QT4'
     pass
diff --git a/wscript b/wscript
index ee8711b..604aab4 100644
--- a/wscript
+++ b/wscript
@@ -45,7 +45,7 @@ def set_options(opt):
     opt.tool_options('gnu_dirs')
     opt.tool_options('qt4')
 
-    opt.sub_options('lib')
+    opt.sub_options('backend_xmmsclient++')
     opt.sub_options('data')
     opt.sub_options('src')
 
@@ -66,7 +66,7 @@ def configure(conf):
                 os.path.join(conf.env['PROMOE_DATADIR'], 'skins'))
 
 
-    conf.sub_config('lib')
+    conf.sub_config('backend_xmmsclient++')
     conf.sub_config('data')
     conf.sub_config('src')
 
@@ -76,7 +76,7 @@ def configure(conf):
     conf.env.append_value('CPPPATH', os.path.join(conf.blddir, conf.envname))
 
 def build(bld):
-    bld.add_subdirs('lib')
+    bld.add_subdirs('backend_xmmsclient++')
     bld.add_subdirs('data')
     bld.add_subdirs('src')