110 files changed, 315 insertions, 367 deletions

diff --git a/common.am b/common.am
index d40fc334..fd1f0586 100644
--- a/common.am
+++ b/common.am
@@ -19,6 +19,8 @@ bigicondir = $(shareddir)/icons/120x120
 
 rygeldir = $(top_srcdir)/src/rygel
 librygelcoredir = $(top_srcdir)/src/librygel-core
+librygelserverdir = $(top_srcdir)/src/librygel-server
+librygelrendererdir = $(top_srcdir)/src/librygel-renderer
 
 MAINTAINERCLEANFILES = Makefile.in
 
@@ -32,6 +34,8 @@ AM_CFLAGS = \
 	$(COVERAGE_CFLAGS) \
 	-I$(rygeldir) \
 	-I$(librygelcoredir) \
+	-I$(librygelserverdir) \
+	-I$(librygelrendererdir) \
 	-DDATA_DIR='"$(shareddir)"' -DSYS_CONFIG_DIR='"$(sysconfigdir)"'\
 	-DPLUGIN_DIR='"$(plugindir)"' -DDESKTOP_DIR='"$(desktopdir)"'\
 	-DPRESET_DIR='"$(presetdir)"'\
@@ -50,11 +54,31 @@ RYGEL_COMMON_LIBS = \
 	$(RYGEL_BASE_LIBS) \
 	$(top_builddir)/src/librygel-core/librygel-core-1.0.la
 
+RYGEL_COMMON_SERVER_LIBS = \
+	$(top_builddir)/src/librygel-server/librygel-server-1.0.la \
+	$(RYGEL_COMMON_LIBS) \
+	$(GST_PBU_LIBS) \
+	$(LIBGUPNP_DLNA_LIBS)
+
+RYGEL_COMMON_RENDERER_LIBS = \
+	$(top_builddir)/src/librygel-renderer/librygel-renderer-1.0.la \
+	$(RYGEL_COMMON_LIBS)
+
 # Note: the -g needs to be at the end of VALAFLAGS to not break make dist
 RYGEL_COMMON_PLUGIN_VALAFLAGS = \
 	--pkg rygel-core-1.0 \
 	$(RYGEL_COMMON_VALAFLAGS)
 
+RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS = \
+	--pkg rygel-server-1.0 \
+	--vapidir=$(top_builddir)/src/librygel-server \
+	$(RYGEL_COMMON_PLUGIN_VALAFLAGS)
+
+RYGEL_COMMON_RENDERER_PLUGIN_VALAFLAGS = \
+	--pkg rygel-renderer-1.0 \
+	--vapidir=$(top_builddir)/src/librygel-renderer \
+	$(RYGEL_COMMON_PLUGIN_VALAFLAGS)
+
 RYGEL_COMMON_VALAFLAGS_PKG = --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg gee-1.0
 
 RYGEL_COMMON_VALAFLAGS = \
diff --git a/doc/reference/librygel-core/Makefile.am b/doc/reference/librygel-core/Makefile.am
index 84bf831e..f0656bf9 100644
--- a/doc/reference/librygel-core/Makefile.am
+++ b/doc/reference/librygel-core/Makefile.am
@@ -17,6 +17,7 @@ VALADOC_FLAGS = --force \
 		$(RYGEL_COMMON_VALAFLAGS_PKG) \
 		$(LIBRYGEL_CORE_VALAFLAGS_PKG) \
 	        --pkg gstreamer-pbutils-0.10 \
+			--pkg gio-2.0 \
 	        --target-glib=2.32 \
 	        --vapidir=$(rygeldir) \
 	        --pkg rygel-build-config \
diff --git a/doc/reference/librygel-renderer/Makefile.am b/doc/reference/librygel-renderer/Makefile.am
index b4968301..ce960dea 100644
--- a/doc/reference/librygel-renderer/Makefile.am
+++ b/doc/reference/librygel-renderer/Makefile.am
@@ -5,8 +5,8 @@ include $(top_srcdir)/src/librygel-renderer/filelist.am
 
 # Note that LIBRYGEL_RENDERER_NONVAPI_SOURCE_FILES all (should) use the internal keyword
 # so they are not shown as part of the public API.
-VALA_SOURCE_FILES = $(LIBRYGEL_RENDERER_VAPI_SOURCE_FILES)
-# There are no LIBRYGEL_RENDERER_NONVAPI_SOURCE_FILES
+VALA_SOURCE_FILES = $(LIBRYGEL_RENDERER_VAPI_SOURCE_FILES) \
+	$(LIBRYGEL_RENDERER_NONVAPI_SOURCE_FILES)
 
 VALA_SOURCE_FILES_WITH_PATHS = $(addprefix $(top_srcdir)/src/librygel-renderer/, $(VALA_SOURCE_FILES))
 
@@ -40,6 +40,7 @@ gtkdoc: $(VALA_SOURCE_FILES_WITH_PATHS)
 	$(AM_V_GEN)$(VALADOC) \
 		-X $(top_builddir)/src/librygel-renderer/rygel-renderer.h \
 		-X -l -X $(top_builddir)/src/librygel-renderer/.libs/librygel-renderer-1.0.so \
+		-X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-1.0.so \
 		-o gtkdoc \
 		--doclet gtkdoc \
 		$(VALADOC_FLAGS) 2>/dev/null
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d69ed179..ca28c242 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -70,66 +70,19 @@ src/plugins/tracker/rygel-tracker-albums.vala
 src/plugins/tracker/rygel-tracker-artists.vala
 src/plugins/tracker/rygel-tracker-genre.vala
 src/plugins/tracker/rygel-tracker-titles.vala
-src/librygel-core/rygel-media-query-action.vala
-src/librygel-core/rygel-browse.vala
 src/librygel-core/rygel-cmdline-config.vala
 src/librygel-core/rygel-configuration.vala
 src/librygel-core/rygel-connection-manager.vala
-src/librygel-core/rygel-content-directory.vala
-src/librygel-core/rygel-gst-utils.vala
-src/librygel-core/rygel-http-byte-seek.vala
-src/librygel-core/rygel-http-get-handler.vala
-src/librygel-core/rygel-http-get.vala
-src/librygel-core/rygel-http-identity-handler.vala
-src/librygel-core/rygel-http-item-uri.vala
-src/librygel-core/rygel-http-post.vala
-src/librygel-core/rygel-http-request.vala
-src/librygel-core/rygel-http-response.vala
-src/librygel-core/rygel-http-seek.vala
-src/librygel-core/rygel-http-server.vala
-src/librygel-core/rygel-http-time-seek.vala
-src/librygel-core/rygel-http-transcode-handler.vala
 src/librygel-core/rygel-icon-info.vala
-src/librygel-core/rygel-import-resource.vala
-src/librygel-core/rygel-item-creator.vala
-src/librygel-core/rygel-item-destroyer.vala
-src/librygel-core/rygel-l16-transcoder.vala
 src/librygel-core/rygel-log-handler.vala
-src/librygel-core/rygel-logical-expression.vala
-src/librygel-core/rygel-media-container.vala
-src/librygel-core/rygel-media-item.vala
-src/librygel-core/rygel-music-item.vala
-src/librygel-core/rygel-audio-item.vala
-src/librygel-core/rygel-image-item.vala
-src/librygel-core/rygel-photo-item.vala
-src/librygel-core/rygel-video-item.vala
-src/librygel-core/rygel-visual-item.vala
-src/librygel-core/rygel-media-object.vala
-src/librygel-core/rygel-media-receiver-registrar.vala
 src/librygel-core/rygel-meta-config.vala
-src/librygel-core/rygel-mp2ts-transcoder.vala
-src/librygel-core/rygel-mp3-transcoder.vala
 src/librygel-core/rygel-plugin-loader.vala
 src/librygel-core/rygel-plugin.vala
-src/librygel-core/rygel-relational-expression.vala
 src/librygel-core/rygel-resource-info.vala
 src/librygel-core/rygel-root-device-factory.vala
 src/librygel-core/rygel-root-device.vala
-src/librygel-core/rygel-search-criteria-parser.vala
-src/librygel-core/rygel-search-expression.vala
-src/librygel-core/rygel-search.vala
-src/librygel-core/rygel-simple-container.vala
-src/librygel-core/rygel-source-connection-manager.vala
 src/librygel-core/rygel-state-machine.vala
-src/librygel-core/rygel-subtitle-manager.vala
-src/librygel-core/rygel-subtitle.vala
-src/librygel-core/rygel-thumbnailer.vala
-src/librygel-core/rygel-thumbnail.vala
-src/librygel-core/rygel-transcode-manager.vala
-src/librygel-core/rygel-transcoder.vala
 src/librygel-core/rygel-user-config.vala
-src/librygel-core/rygel-wmv-transcoder.vala
-src/librygel-core/rygel-xbox-hacks.vala
 src/librygel-renderer/rygel-av-transport.vala
 src/librygel-renderer/rygel-changelog.vala
 src/librygel-renderer/rygel-gst-utils.vala
@@ -137,6 +90,53 @@ src/librygel-renderer/rygel-playbin-player.vala
 src/librygel-renderer/rygel-playbin-plugin.vala
 src/librygel-renderer/rygel-rendering-control.vala
 src/librygel-renderer/rygel-sink-connection-manager.vala
+src/librygel-server/rygel-audio-item.vala
+src/librygel-server/rygel-browse.vala
+src/librygel-server/rygel-content-directory.vala
+src/librygel-server/rygel-gst-utils.vala
+src/librygel-server/rygel-http-byte-seek.vala
+src/librygel-server/rygel-http-get-handler.vala
+src/librygel-server/rygel-http-get.vala
+src/librygel-server/rygel-http-identity-handler.vala
+src/librygel-server/rygel-http-item-uri.vala
+src/librygel-server/rygel-http-post.vala
+src/librygel-server/rygel-http-request.vala
+src/librygel-server/rygel-http-response.vala
+src/librygel-server/rygel-http-seek.vala
+src/librygel-server/rygel-http-server.vala
+src/librygel-server/rygel-http-time-seek.vala
+src/librygel-server/rygel-http-transcode-handler.vala
+src/librygel-server/rygel-image-item.vala
+src/librygel-server/rygel-import-resource.vala
+src/librygel-server/rygel-item-creator.vala
+src/librygel-server/rygel-item-destroyer.vala
+src/librygel-server/rygel-l16-transcoder.vala
+src/librygel-server/rygel-logical-expression.vala
+src/librygel-server/rygel-media-container.vala
+src/librygel-server/rygel-media-item.vala
+src/librygel-server/rygel-media-object.vala
+src/librygel-server/rygel-media-query-action.vala
+src/librygel-server/rygel-media-receiver-registrar.vala
+src/librygel-server/rygel-mp2ts-transcoder.vala
+src/librygel-server/rygel-mp3-transcoder.vala
+src/librygel-server/rygel-music-item.vala
+src/librygel-server/rygel-photo-item.vala
+src/librygel-server/rygel-relational-expression.vala
+src/librygel-server/rygel-search-criteria-parser.vala
+src/librygel-server/rygel-search-expression.vala
+src/librygel-server/rygel-search.vala
+src/librygel-server/rygel-simple-container.vala
+src/librygel-server/rygel-source-connection-manager.vala
+src/librygel-server/rygel-subtitle-manager.vala
+src/librygel-server/rygel-subtitle.vala
+src/librygel-server/rygel-thumbnail.vala
+src/librygel-server/rygel-thumbnailer.vala
+src/librygel-server/rygel-transcode-manager.vala
+src/librygel-server/rygel-transcoder.vala
+src/librygel-server/rygel-video-item.vala
+src/librygel-server/rygel-visual-item.vala
+src/librygel-server/rygel-wmv-transcoder.vala
+src/librygel-server/rygel-xbox-hacks.vala
 src/rygel/rygel-dbus-service.vala
 src/rygel/rygel-main.vala
 src/ui/rygel-media-pref-section.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index be8398c6..7418927e 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -6,8 +6,6 @@ data/xml/ContentDirectory.xml
 data/xml/MediaRenderer2.xml
 data/xml/MediaServer2.xml
 data/xml/RenderingControl2.xml
-src/librygel-renderer/rygel-playbin-player.c
-src/librygel-renderer/rygel-playbin-plugin.c
 src/plugins/mediathek/rygel-mediathek-asx-playlist-parser.vala
 src/plugins/mediathek/rygel-mediathek-mov-playlist-parser.vala
 src/plugins/mediathek/rygel-mediathek-playlist-parser.vala
@@ -16,95 +14,24 @@ src/plugins/mediathek/rygel-mediathek-root-container.vala
 src/plugins/mediathek/rygel-mediathek-rss-container.vala
 src/plugins/mediathek/rygel-mediathek-soup-utils.vala
 src/plugins/mediathek/rygel-mediathek-video-item-factory.vala
-src/librygel-core/rygel-aac-transcoder.c
-src/librygel-core/rygel-audio-item.c
-src/librygel-core/rygel-audio-transcoder.c
-src/librygel-core/rygel-avc-transcoder.c
-src/librygel-core/rygel-av-transport.c
-src/librygel-core/rygel-browse.c
-src/librygel-core/rygel-changelog.c
-src/librygel-core/rygel-client-hacks.c
 src/librygel-core/rygel-cmdline-config.c
 src/librygel-core/rygel-configuration.c
 src/librygel-core/rygel-connection-manager.c
-src/librygel-core/rygel-content-directory.c
 src/librygel-core/rygel-dbus-interface.c
-src/librygel-core/rygel-dbus-thumbnailer.c
 src/librygel-core/rygel-description-file.c
 src/librygel-core/rygel-environment-config.c
 src/librygel-core/rygel-free-desktop-interfaces.c
-src/librygel-core/rygel-gst-utils.c
-src/librygel-core/rygel-http-byte-seek.c
-src/librygel-core/rygel-http-get.c
-src/librygel-core/rygel-http-get-handler.c
-src/librygel-core/rygel-http-gst-sink.c
-src/librygel-core/rygel-http-identity-handler.c
-src/librygel-core/rygel-http-item-uri.c
-src/librygel-core/rygel-http-post.c
-src/librygel-core/rygel-http-request.c
-src/librygel-core/rygel-http-response.c
-src/librygel-core/rygel-http-seek.c
-src/librygel-core/rygel-http-server.c
-src/librygel-core/rygel-http-time-seek.c
-src/librygel-core/rygel-http-transcode-handler.c
 src/librygel-core/rygel-icon-info.c
-src/librygel-core/rygel-image-item.c
-src/librygel-core/rygel-import-resource.c
-src/librygel-core/rygel-item-creator.c
-src/librygel-core/rygel-item-destroyer.c
-src/librygel-core/rygel-item-removal-queue.c
-src/librygel-core/rygel-l16-transcoder.c
 src/librygel-core/rygel-log-handler.c
-src/librygel-core/rygel-logical-expression.c
-src/librygel-core/rygel-media-art-store.c
-src/librygel-core/rygel-media-container.c
 src/librygel-core/rygel-media-device.c
-src/librygel-core/rygel-media-item.c
-src/librygel-core/rygel-media-object.c
-src/librygel-core/rygel-media-objects.c
-src/librygel-core/rygel-media-player.c
-src/librygel-core/rygel-media-query-action.c
-src/librygel-core/rygel-media-receiver-registrar.c
-src/librygel-core/rygel-media-renderer-plugin.c
-src/librygel-core/rygel-media-server-plugin.c
 src/librygel-core/rygel-meta-config.c
-src/librygel-core/rygel-mp2ts-transcoder.c
-src/librygel-core/rygel-mp3-transcoder.c
-src/librygel-core/rygel-music-item.c
-src/librygel-core/rygel-panasonic-hacks.c
-src/librygel-core/rygel-photo-item.c
 src/librygel-core/rygel-plugin.c
 src/librygel-core/rygel-plugin-loader.c
-src/librygel-core/rygel-relational-expression.c
-src/librygel-core/rygel-rendering-control.c
 src/librygel-core/rygel-resource-info.c
 src/librygel-core/rygel-root-device.c
 src/librygel-core/rygel-root-device-factory.c
-src/librygel-core/rygel-searchable-container.c
-src/librygel-core/rygel-search.c
-src/librygel-core/rygel-search-criteria-parser.c
-src/librygel-core/rygel-search-expression.c
-src/librygel-core/rygel-simple-container.c
-src/librygel-core/rygel-sink-connection-manager.c
-src/librygel-core/rygel-source-connection-manager.c
 src/librygel-core/rygel-state-machine.c
-src/librygel-core/rygel-subtitle.c
-src/librygel-core/rygel-subtitle-manager.c
-src/librygel-core/rygel-thumbnail.c
-src/librygel-core/rygel-thumbnailer.c
-src/librygel-core/rygel-transcode-manager.c
-src/librygel-core/rygel-transcoder.c
 src/librygel-core/rygel-user-config.c
-src/librygel-core/rygel-v1-hacks.c
-src/librygel-core/rygel-video-item.c
-src/librygel-core/rygel-video-transcoder.c
-src/librygel-core/rygel-visual-item.c
-src/librygel-core/rygel-volume.c
-src/librygel-core/rygel-wmp-hacks.c
-src/librygel-core/rygel-wmv-transcoder.c
-src/librygel-core/rygel-writable-container.c
-src/librygel-core/rygel-xbmc-hacks.c
-src/librygel-core/rygel-xbox-hacks.c
 src/librygel-core/rygel-xml-utils.c
 src/librygel-renderer/rygel-av-transport.c
 src/librygel-renderer/rygel-changelog.c
@@ -117,6 +44,71 @@ src/librygel-renderer/rygel-playbin-renderer.c
 src/librygel-renderer/rygel-rendering-control.c
 src/librygel-renderer/rygel-sink-connection-manager.c
 src/librygel-renderer/rygel-volume.c
+src/librygel-server/rygel-aac-transcoder.c
+src/librygel-server/rygel-audio-item.c
+src/librygel-server/rygel-audio-transcoder.c
+src/librygel-server/rygel-avc-transcoder.c
+src/librygel-server/rygel-browse.c
+src/librygel-server/rygel-client-hacks.c
+src/librygel-server/rygel-content-directory.c
+src/librygel-server/rygel-dbus-thumbnailer.c
+src/librygel-server/rygel-gst-utils.c
+src/librygel-server/rygel-http-byte-seek.c
+src/librygel-server/rygel-http-get.c
+src/librygel-server/rygel-http-get-handler.c
+src/librygel-server/rygel-http-gst-sink.c
+src/librygel-server/rygel-http-identity-handler.c
+src/librygel-server/rygel-http-item-uri.c
+src/librygel-server/rygel-http-post.c
+src/librygel-server/rygel-http-request.c
+src/librygel-server/rygel-http-response.c
+src/librygel-server/rygel-http-seek.c
+src/librygel-server/rygel-http-server.c
+src/librygel-server/rygel-http-time-seek.c
+src/librygel-server/rygel-http-transcode-handler.c
+src/librygel-server/rygel-image-item.c
+src/librygel-server/rygel-import-resource.c
+src/librygel-server/rygel-item-creator.c
+src/librygel-server/rygel-item-destroyer.c
+src/librygel-server/rygel-item-removal-queue.c
+src/librygel-server/rygel-l16-transcoder.c
+src/librygel-server/rygel-logical-expression.c
+src/librygel-server/rygel-media-art-store.c
+src/librygel-server/rygel-media-container.c
+src/librygel-server/rygel-media-item.c
+src/librygel-server/rygel-media-object.c
+src/librygel-server/rygel-media-objects.c
+src/librygel-server/rygel-media-query-action.c
+src/librygel-server/rygel-media-receiver-registrar.c
+src/librygel-server/rygel-media-server.c
+src/librygel-server/rygel-media-server-plugin.c
+src/librygel-server/rygel-mp2ts-transcoder.c
+src/librygel-server/rygel-mp3-transcoder.c
+src/librygel-server/rygel-music-item.c
+src/librygel-server/rygel-panasonic-hacks.c
+src/librygel-server/rygel-photo-item.c
+src/librygel-server/rygel-relational-expression.c
+src/librygel-server/rygel-searchable-container.c
+src/librygel-server/rygel-search.c
+src/librygel-server/rygel-search-criteria-parser.c
+src/librygel-server/rygel-search-expression.c
+src/librygel-server/rygel-simple-container.c
+src/librygel-server/rygel-source-connection-manager.c
+src/librygel-server/rygel-subtitle.c
+src/librygel-server/rygel-subtitle-manager.c
+src/librygel-server/rygel-thumbnail.c
+src/librygel-server/rygel-thumbnailer.c
+src/librygel-server/rygel-transcode-manager.c
+src/librygel-server/rygel-transcoder.c
+src/librygel-server/rygel-v1-hacks.c
+src/librygel-server/rygel-video-item.c
+src/librygel-server/rygel-video-transcoder.c
+src/librygel-server/rygel-visual-item.c
+src/librygel-server/rygel-wmp-hacks.c
+src/librygel-server/rygel-wmv-transcoder.c
+src/librygel-server/rygel-writable-container.c
+src/librygel-server/rygel-xbmc-hacks.c
+src/librygel-server/rygel-xbox-hacks.c
 src/plugins/external/rygel-external-album-art-factory.c
 src/plugins/external/rygel-external-container.c
 src/plugins/external/rygel-external-dummy-container.c
@@ -126,11 +118,13 @@ src/plugins/external/rygel-external-item-factory.c
 src/plugins/external/rygel-external-plugin.c
 src/plugins/external/rygel-external-plugin-factory.c
 src/plugins/external/rygel-external-thumbnail-factory.c
+src/plugins/external/rygel-external-variant-util.c
 src/plugins/gst-launch/rygel-gst-launch-audio-item.c
 src/plugins/gst-launch/rygel-gst-launch-item.c
 src/plugins/gst-launch/rygel-gst-launch-plugin.c
 src/plugins/gst-launch/rygel-gst-launch-root-container.c
 src/plugins/gst-launch/rygel-gst-launch-video-item.c
+src/plugins/media-export/rygel-media-export-collate.c
 src/plugins/media-export/rygel-media-export-database.c
 src/plugins/media-export/rygel-media-export-database-cursor.c
 src/plugins/media-export/rygel-media-export-db-container.c
@@ -169,6 +163,7 @@ src/plugins/mpris/rygel-mpris-interfaces.c
 src/plugins/mpris/rygel-mpris-player.c
 src/plugins/mpris/rygel-mpris-plugin.c
 src/plugins/mpris/rygel-mpris-plugin-factory.c
+src/plugins/playbin/rygel-module.c
 src/plugins/test/rygel-test-audio-item.c
 src/plugins/test/rygel-test-plugin.c
 src/plugins/test/rygel-test-root-container.c
@@ -208,103 +203,13 @@ src/plugins/tracker/rygel-tracker-titles.c
 src/plugins/tracker/rygel-tracker-video-item-factory.c
 src/plugins/tracker/rygel-tracker-videos.c
 src/plugins/tracker/rygel-tracker-years.c
-src/librygel-core/rygel-aac-transcoder.c
-src/librygel-core/rygel-audio-item.c
-src/librygel-core/rygel-audio-transcoder.c
-src/librygel-core/rygel-avc-transcoder.c
-src/librygel-core/rygel-av-transport.c
-src/librygel-core/rygel-browse.c
-src/librygel-core/rygel-changelog.c
-src/librygel-core/rygel-client-hacks.c
-src/librygel-core/rygel-cmdline-config.c
-src/librygel-core/rygel-configuration.c
-src/librygel-core/rygel-connection-manager.c
-src/librygel-core/rygel-content-directory.c
-src/librygel-core/rygel-dbus-interface.c
-src/librygel-core/rygel-dbus-thumbnailer.c
-src/librygel-core/rygel-description-file.c
-src/librygel-core/rygel-environment-config.c
-src/librygel-core/rygel-free-desktop-interfaces.c
-src/librygel-core/rygel-gst-utils.c
-src/librygel-core/rygel-http-byte-seek.c
-src/librygel-core/rygel-http-get.c
-src/librygel-core/rygel-http-get-handler.c
-src/librygel-core/rygel-http-gst-sink.c
-src/librygel-core/rygel-http-identity-handler.c
-src/librygel-core/rygel-http-item-uri.c
-src/librygel-core/rygel-http-post.c
-src/librygel-core/rygel-http-request.c
-src/librygel-core/rygel-http-response.c
-src/librygel-core/rygel-http-seek.c
-src/librygel-core/rygel-http-server.c
-src/librygel-core/rygel-http-time-seek.c
-src/librygel-core/rygel-http-transcode-handler.c
-src/librygel-core/rygel-icon-info.c
-src/librygel-core/rygel-image-item.c
-src/librygel-core/rygel-import-resource.c
-src/librygel-core/rygel-item-creator.c
-src/librygel-core/rygel-item-destroyer.c
-src/librygel-core/rygel-item-removal-queue.c
-src/librygel-core/rygel-l16-transcoder.c
-src/librygel-core/rygel-log-handler.c
-src/librygel-core/rygel-logical-expression.c
-src/librygel-core/rygel-media-art-store.c
-src/librygel-core/rygel-media-container.c
-src/librygel-core/rygel-media-item.c
-src/librygel-core/rygel-media-object.c
-src/librygel-core/rygel-media-objects.c
-src/librygel-core/rygel-media-player.c
-src/librygel-core/rygel-media-query-action.c
-src/librygel-core/rygel-media-receiver-registrar.c
-src/librygel-core/rygel-media-renderer-plugin.c
-src/librygel-core/rygel-media-server-plugin.c
-src/librygel-core/rygel-meta-config.c
-src/librygel-core/rygel-mp2ts-transcoder.c
-src/librygel-core/rygel-mp3-transcoder.c
-src/librygel-core/rygel-music-item.c
-src/librygel-core/rygel-panasonic-hacks.c
-src/librygel-core/rygel-photo-item.c
-src/librygel-core/rygel-plugin.c
-src/librygel-core/rygel-plugin-loader.c
-src/librygel-core/rygel-relational-expression.c
-src/librygel-core/rygel-rendering-control.c
-src/librygel-core/rygel-resource-info.c
-src/librygel-core/rygel-root-device.c
-src/librygel-core/rygel-root-device-factory.c
-src/librygel-core/rygel-searchable-container.c
-src/librygel-core/rygel-search.c
-src/librygel-core/rygel-search-criteria-parser.c
-src/librygel-core/rygel-search-expression.c
-src/librygel-core/rygel-signal-handler.c
-src/librygel-core/rygel-simple-container.c
-src/librygel-core/rygel-sink-connection-manager.c
-src/librygel-core/rygel-source-connection-manager.c
-src/librygel-core/rygel-state-machine.c
-src/librygel-core/rygel-subtitle.c
-src/librygel-core/rygel-subtitle-manager.c
-src/librygel-core/rygel-thumbnail.c
-src/librygel-core/rygel-thumbnailer.c
-src/librygel-core/rygel-transcode-manager.c
-src/librygel-core/rygel-transcoder.c
-src/librygel-core/rygel-user-config.c
-src/librygel-core/rygel-v1-hacks.c
-src/librygel-core/rygel-video-item.c
-src/librygel-core/rygel-video-transcoder.c
-src/librygel-core/rygel-visual-item.c
-src/librygel-core/rygel-volume.c
-src/librygel-core/rygel-wmp-hacks.c
-src/librygel-core/rygel-wmv-transcoder.c
-src/librygel-core/rygel-writable-container.c
-src/librygel-core/rygel-xbmc-hacks.c
-src/librygel-core/rygel-xbox-hacks.c
-src/librygel-core/rygel-xml-utils.c
+src/rygel/rygel-dbus-service.c
+src/rygel/rygel-main.c
 src/ui/rygel-media-pref-section.c
 src/ui/rygel-network-pref-section.c
 src/ui/rygel-preferences-dialog.c
 src/ui/rygel-preferences-section.c
 src/ui/rygel-writable-user-config.c
-src/rygel/rygel-dbus-service.c
-src/rygel/rygel-main.c
 tests/rygel-album-art-spec-test.c
 tests/rygel-gst-utils.c
 tests/rygel-http-byte-seek.c
diff --git a/src/librygel-core/filelist.am b/src/librygel-core/filelist.am
index 9506a054..d98cb746 100644
--- a/src/librygel-core/filelist.am
+++ b/src/librygel-core/filelist.am
@@ -1,91 +1,29 @@
 LIBRYGEL_CORE_VAPI_SOURCE_FILES = \
 	rygel-cmdline-config.vala \
 	rygel-connection-manager.vala \
+	rygel-description-file.vala \
 	rygel-root-device.vala \
 	rygel-root-device-factory.vala \
-	rygel-audio-item.vala \
 	rygel-dbus-interface.vala \
-	rygel-icon-info.vala \
-	rygel-image-item.vala \
 	rygel-log-handler.vala \
-	rygel-logical-expression.vala \
-	rygel-media-art-store.vala \
-	rygel-media-objects.vala \
 	rygel-meta-config.vala \
-	rygel-music-item.vala \
-	rygel-photo-item.vala \
 	rygel-plugin-loader.vala \
 	rygel-plugin.vala \
-	rygel-relational-expression.vala \
 	rygel-resource-info.vala \
-	rygel-simple-container.vala \
-	rygel-subtitle.vala \
-	rygel-thumbnail.vala \
 	rygel-user-config.vala \
-	rygel-video-item.vala \
-	rygel-media-container.vala \
 	rygel-media-device.vala \
-	rygel-media-item.vala \
-	rygel-media-object.vala \
-	rygel-media-server-plugin.vala \
-	rygel-search-expression.vala \
 	rygel-configuration.vala \
 	rygel-free-desktop-interfaces.vala \
-	rygel-searchable-container.vala \
-	rygel-state-machine.vala \
-	rygel-visual-item.vala \
-	rygel-writable-container.vala \
-	rygel-xml-utils.vala
+	rygel-state-machine.vala
 
 LIBRYGEL_CORE_NONVAPI_SOURCE_FILES = \
-	rygel-http-item-uri.vala \
-	rygel-environment-config.vala \
-	rygel-content-directory.vala \
-	rygel-source-connection-manager.vala \
-	rygel-transcode-manager.vala \
-	rygel-http-server.vala \
-	rygel-http-request.vala \
-	rygel-http-get-handler.vala \
-	rygel-http-get.vala \
-	rygel-http-post.vala \
-	rygel-http-identity-handler.vala \
-	rygel-http-transcode-handler.vala \
-	rygel-http-seek.vala \
-	rygel-http-byte-seek.vala \
-	rygel-http-time-seek.vala \
-	rygel-http-response.vala \
-	rygel-http-gst-sink.vala \
-	rygel-thumbnailer.vala \
-	rygel-dbus-thumbnailer.vala \
-	rygel-subtitle-manager.vala \
-	rygel-media-query-action.vala \
-	rygel-browse.vala \
-	rygel-search.vala \
-	rygel-client-hacks.vala \
-	rygel-xbox-hacks.vala \
-	rygel-panasonic-hacks.vala \
-	rygel-xbmc-hacks.vala \
-	rygel-wmp-hacks.vala \
-	rygel-v1-hacks.vala \
-	rygel-import-resource.vala \
-	rygel-item-creator.vala \
-	rygel-item-destroyer.vala \
-	rygel-item-removal-queue.vala \
-	rygel-search-criteria-parser.vala \
-	rygel-transcoder.vala \
-	rygel-audio-transcoder.vala \
-	rygel-video-transcoder.vala \
-	rygel-mp2ts-transcoder.vala \
-	rygel-mp3-transcoder.vala \
-	rygel-l16-transcoder.vala \
-	rygel-wmv-transcoder.vala \
-	rygel-aac-transcoder.vala \
-	rygel-avc-transcoder.vala \
-	rygel-gst-utils.vala \
-	rygel-media-receiver-registrar.vala \
-	rygel-description-file.vala
+	rygel-icon-info.vala \
+	rygel-xml-utils.vala \
+	rygel-environment-config.vala
 
 LIBRYGEL_CORE_VALAFLAGS_PKG = \
+	--pkg gio-2.0 \
 	--pkg gstreamer-0.10 \
 	--pkg gstreamer-base-0.10 \
-	--pkg gupnp-dlna-1.0
+	--pkg gupnp-dlna-1.0 \
+	--pkg uuid
diff --git a/src/librygel-core/rygel-description-file.vala b/src/librygel-core/rygel-description-file.vala
index ee3e3305..27b0fd0c 100644
--- a/src/librygel-core/rygel-description-file.vala
+++ b/src/librygel-core/rygel-description-file.vala
@@ -27,7 +27,7 @@ using Xml;
  * Represents a device description document and offers methods for easy
  * manipulation of those.
  */
-internal class DescriptionFile : Object {
+public class DescriptionFile : Object {
     /// XML doc wrapper representing the description document
     private XMLDoc doc;
 
@@ -75,7 +75,7 @@ internal class DescriptionFile : Object {
      *
      * Usually the name of the software implementing this device.
      *
-     * @param device_type is the new model name.
+     * @param model_name is the new model name.
      */
     public void set_model_name (string model_name) {
         this.set_device_element ("modelName", model_name);
@@ -150,7 +150,7 @@ internal class DescriptionFile : Object {
      * If a file with the same name exists it will be overwritten.
      *
      * @param path is a path to a file.
-     * @throws IOError.FAILED if anything fails while creating the XML dump.
+     * @throws GLib.Error if anything fails while creating the XML dump.
      */
     public void save (string path) throws GLib.Error {
         var file = FileStream.open (path, "w+");
diff --git a/src/librygel-core/rygel-plugin.vala b/src/librygel-core/rygel-plugin.vala
index 3d0b6e11..f170a798 100644
--- a/src/librygel-core/rygel-plugin.vala
+++ b/src/librygel-core/rygel-plugin.vala
@@ -127,6 +127,11 @@ public class Rygel.Plugin : GUPnP.ResourceFactory {
         this.icon_infos.add (icon_info);
     }
 
+    public virtual void apply_hacks (RootDevice device,
+                                     string     description_path)
+                                     throws Error {
+    }
+
     private void add_default_icon (string mime_type,
                                    string file_extension,
                                    string uri,
diff --git a/src/librygel-core/rygel-root-device-factory.vala b/src/librygel-core/rygel-root-device-factory.vala
index 73633edb..a9a304f3 100644
--- a/src/librygel-core/rygel-root-device-factory.vala
+++ b/src/librygel-core/rygel-root-device-factory.vala
@@ -28,15 +28,6 @@
 
 using GUPnP;
 
-[CCode (cname = "uuid_generate", cheader_filename = "uuid/uuid.h")]
-internal extern static void uuid_generate ([CCode (array_length = false)]
-                                           uchar[] uuid);
-[CCode (cname = "uuid_unparse", cheader_filename = "uuid/uuid.h")]
-internal extern static void uuid_unparse ([CCode (array_length = false)]
-                                          uchar[] uuid,
-                                          [CCode (array_length = false)]
-                                          uchar[] output);
-
 public errordomain RootDeviceFactoryError {
     XML_PARSE,
 }
@@ -77,13 +68,7 @@ public class Rygel.RootDeviceFactory {
                                      doc,
                                      desc_path,
                                      BuildConfig.DATA_DIR);
-        // Apply V1 downgrades
-        var v1_hacks = new V1Hacks ();
-        v1_hacks.apply_on_device (device, desc_path);
-
-        // Apply XBox hacks on top of that
-        var xbox_hacks = new XBoxHacks ();
-        xbox_hacks.apply_on_device (device, v1_hacks.description_path);
+        plugin.apply_hacks (device, desc_path);
 
         return device;
     }
@@ -359,8 +344,8 @@ public class Rygel.RootDeviceFactory {
         var id = new uchar[16];
 
         /* Generate new UUID */
-        uuid_generate (id);
-        uuid_unparse (id, udn);
+        UUID.generate (id);
+        UUID.unparse (id, udn);
 
         return "uuid:" + (string) udn;
     }
diff --git a/src/librygel-core/rygel-root-device.vala b/src/librygel-core/rygel-root-device.vala
index 4adf28d1..d07b8ce9 100644
--- a/src/librygel-core/rygel-root-device.vala
+++ b/src/librygel-core/rygel-root-device.vala
@@ -30,7 +30,7 @@ using Gee;
  * Represents a Root device.
  */
 public class Rygel.RootDevice: GUPnP.RootDevice {
-    internal ArrayList<ServiceInfo> services;   /* Services we implement */
+    public ArrayList<ServiceInfo> services { get; internal set; }   /* Services we implement */
 
     public RootDevice (GUPnP.Context context,
                        Plugin        plugin,
diff --git a/src/librygel-core/uuid.vapi b/src/librygel-core/uuid.vapi
new file mode 100644
index 00000000..1279ccc4
--- /dev/null
+++ b/src/librygel-core/uuid.vapi
@@ -0,0 +1,7 @@
+[CCode (cheader_filename = "uuid/uuid.h")]
+namespace UUID {
+    public static void generate ([CCode (array_length = false)] uchar[] uuid);
+    public static void unparse ([CCode (array_length = false)] uchar[] uuid,
+                                [CCode (array_length = false)] uchar[] output);
+
+}
diff --git a/src/librygel-server/Makefile.am b/src/librygel-server/Makefile.am
index a35ce56a..70ce5736 100644
--- a/src/librygel-server/Makefile.am
+++ b/src/librygel-server/Makefile.am
@@ -5,14 +5,20 @@ lib_LTLIBRARIES = librygel-server-1.0.la
 
 LIBRYGEL_SERVER_VERSION=0:0:0
 
+AM_CFLAGS += -DG_LOG_DOMAIN=\"Rygel\" \
+	$(LIBGUPNP_DLNA_CFLAGS)
+
 librygel_server_1_0_la_SOURCES = \
 	$(LIBRYGEL_SERVER_VAPI_SOURCE_FILES) \
 	$(LIBRYGEL_SERVER_NONVAPI_SOURCE_FILES)
 
 librygel_server_1_0_la_VALAFLAGS = \
 	-H rygel-server.h --library=rygel-server-1.0 \
+	$(LIBRYGEL_SERVER_VALAFLAGS_PKG) \
 	$(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_server_1_0_la_LIBADD = $(RYGEL_COMMON_LIBS)
+librygel_server_1_0_la_LIBADD = $(RYGEL_COMMON_LIBS) \
+	$(LIBGUPNP_DLNA_LIBS) \
+	$(GST_PBU_LIBS)
 librygel_server_1_0_la_LDFLAGS = -version-info $(LIBRYGEL_SERVER_VERSION)
 
 rygel-server.h rygel-server-1.0.vapi: librygel_server_1_0_la_vala.stamp
diff --git a/src/librygel-server/filelist.am b/src/librygel-server/filelist.am
index 16ead912..7e01d856 100644
--- a/src/librygel-server/filelist.am
+++ b/src/librygel-server/filelist.am
@@ -1,6 +1,76 @@
+
 LIBRYGEL_SERVER_VAPI_SOURCE_FILES = \
-    rygel-media-server.vala
+	rygel-audio-item.vala \
+	rygel-image-item.vala \
+	rygel-logical-expression.vala \
+	rygel-media-art-store.vala \
+	rygel-media-objects.vala \
+	rygel-music-item.vala \
+	rygel-photo-item.vala \
+	rygel-relational-expression.vala \
+	rygel-simple-container.vala \
+	rygel-subtitle.vala \
+	rygel-thumbnail.vala \
+	rygel-video-item.vala \
+	rygel-media-container.vala \
+	rygel-media-item.vala \
+	rygel-media-object.vala \
+	rygel-media-server-plugin.vala \
+	rygel-search-expression.vala \
+	rygel-searchable-container.vala \
+	rygel-visual-item.vala \
+	rygel-writable-container.vala \
+	rygel-media-server.vala
 
-LIBRYGEL_SERVER_NONVAPI_SOURCE_FILES =
+LIBRYGEL_SERVER_NONVAPI_SOURCE_FILES = \
+	rygel-aac-transcoder.vala \
+	rygel-audio-transcoder.vala \
+	rygel-avc-transcoder.vala \
+	rygel-browse.vala \
+	rygel-client-hacks.vala \
+	rygel-content-directory.vala \
+	rygel-dbus-thumbnailer.vala \
+	rygel-gst-utils.vala \
+	rygel-http-byte-seek.vala \
+	rygel-http-get-handler.vala \
+	rygel-http-get.vala \
+	rygel-http-gst-sink.vala \
+	rygel-http-identity-handler.vala \
+	rygel-http-item-uri.vala \
+	rygel-http-post.vala \
+	rygel-http-request.vala \
+	rygel-http-response.vala \
+	rygel-http-seek.vala \
+	rygel-http-server.vala \
+	rygel-http-time-seek.vala \
+	rygel-http-transcode-handler.vala \
+	rygel-import-resource.vala \
+	rygel-item-creator.vala \
+	rygel-item-destroyer.vala \
+	rygel-item-removal-queue.vala \
+	rygel-l16-transcoder.vala \
+	rygel-media-query-action.vala \
+	rygel-media-receiver-registrar.vala \
+	rygel-mp2ts-transcoder.vala \
+	rygel-mp3-transcoder.vala \
+	rygel-panasonic-hacks.vala \
+	rygel-search-criteria-parser.vala \
+	rygel-search.vala \
+	rygel-source-connection-manager.vala \
+	rygel-subtitle-manager.vala \
+	rygel-thumbnailer.vala \
+	rygel-transcode-manager.vala \
+	rygel-transcoder.vala \
+	rygel-v1-hacks.vala \
+	rygel-video-transcoder.vala \
+	rygel-wmp-hacks.vala \
+	rygel-wmv-transcoder.vala \
+	rygel-xbmc-hacks.vala \
+	rygel-xbox-hacks.vala
 
-LIBRYGEL_SERVER_VALAFLAGS_PKG =
+LIBRYGEL_SERVER_VALAFLAGS_PKG = \
+	--pkg gstreamer-0.10 \
+	--pkg gstreamer-base-0.10 \
+	--pkg gstreamer-pbutils-0.10 \
+	--pkg gupnp-dlna-1.0 \
+	--pkg uuid
diff --git a/src/librygel-core/rygel-aac-transcoder.vala b/src/librygel-server/rygel-aac-transcoder.vala
index c92df8a0..c92df8a0 100644
--- a/src/librygel-core/rygel-aac-transcoder.vala
+++ b/src/librygel-server/rygel-aac-transcoder.vala
diff --git a/src/librygel-core/rygel-audio-item.vala b/src/librygel-server/rygel-audio-item.vala
index 04f87090..04f87090 100644
--- a/src/librygel-core/rygel-audio-item.vala
+++ b/src/librygel-server/rygel-audio-item.vala
diff --git a/src/librygel-core/rygel-audio-transcoder.vala b/src/librygel-server/rygel-audio-transcoder.vala
index 8ff88a45..8ff88a45 100644
--- a/src/librygel-core/rygel-audio-transcoder.vala
+++ b/src/librygel-server/rygel-audio-transcoder.vala
diff --git a/src/librygel-core/rygel-avc-transcoder.vala b/src/librygel-server/rygel-avc-transcoder.vala
index d1a4e615..d1a4e615 100644
--- a/src/librygel-core/rygel-avc-transcoder.vala
+++ b/src/librygel-server/rygel-avc-transcoder.vala
diff --git a/src/librygel-core/rygel-browse.vala b/src/librygel-server/rygel-browse.vala
index a4b61196..a4b61196 100644
--- a/src/librygel-core/rygel-browse.vala
+++ b/src/librygel-server/rygel-browse.vala
diff --git a/src/librygel-core/rygel-client-hacks.vala b/src/librygel-server/rygel-client-hacks.vala
index 2f6f72ab..2f6f72ab 100644
--- a/src/librygel-core/rygel-client-hacks.vala
+++ b/src/librygel-server/rygel-client-hacks.vala
diff --git a/src/librygel-core/rygel-content-directory.vala b/src/librygel-server/rygel-content-directory.vala
index dea1b872..dea1b872 100644
--- a/src/librygel-core/rygel-content-directory.vala
+++ b/src/librygel-server/rygel-content-directory.vala
diff --git a/src/librygel-core/rygel-dbus-thumbnailer.vala b/src/librygel-server/rygel-dbus-thumbnailer.vala
index 64b9c0e3..64b9c0e3 100644
--- a/src/librygel-core/rygel-dbus-thumbnailer.vala
+++ b/src/librygel-server/rygel-dbus-thumbnailer.vala
diff --git a/src/librygel-core/rygel-gst-utils.vala b/src/librygel-server/rygel-gst-utils.vala
index bbef78b1..bbef78b1 100644
--- a/src/librygel-core/rygel-gst-utils.vala
+++ b/src/librygel-server/rygel-gst-utils.vala
diff --git a/src/librygel-core/rygel-http-byte-seek.vala b/src/librygel-server/rygel-http-byte-seek.vala
index 556ef754..556ef754 100644
--- a/src/librygel-core/rygel-http-byte-seek.vala
+++ b/src/librygel-server/rygel-http-byte-seek.vala
diff --git a/src/librygel-core/rygel-http-get-handler.vala b/src/librygel-server/rygel-http-get-handler.vala
index 243fa7c6..243fa7c6 100644
--- a/src/librygel-core/rygel-http-get-handler.vala
+++ b/src/librygel-server/rygel-http-get-handler.vala
diff --git a/src/librygel-core/rygel-http-get.vala b/src/librygel-server/rygel-http-get.vala
index 8d464c60..8d464c60 100644
--- a/src/librygel-core/rygel-http-get.vala
+++ b/src/librygel-server/rygel-http-get.vala
diff --git a/src/librygel-core/rygel-http-gst-sink.vala b/src/librygel-server/rygel-http-gst-sink.vala
index 67a3271e..67a3271e 100644
--- a/src/librygel-core/rygel-http-gst-sink.vala
+++ b/src/librygel-server/rygel-http-gst-sink.vala
diff --git a/src/librygel-core/rygel-http-identity-handler.vala b/src/librygel-server/rygel-http-identity-handler.vala
index 845fe323..845fe323 100644
--- a/src/librygel-core/rygel-http-identity-handler.vala
+++ b/src/librygel-server/rygel-http-identity-handler.vala
diff --git a/src/librygel-core/rygel-http-item-uri.vala b/src/librygel-server/rygel-http-item-uri.vala
index 9f8fa4c2..9f8fa4c2 100644
--- a/src/librygel-core/rygel-http-item-uri.vala
+++ b/src/librygel-server/rygel-http-item-uri.vala
diff --git a/src/librygel-core/rygel-http-post.vala b/src/librygel-server/rygel-http-post.vala
index 54756ee7..54756ee7 100644
--- a/src/librygel-core/rygel-http-post.vala
+++ b/src/librygel-server/rygel-http-post.vala
diff --git a/src/librygel-core/rygel-http-request.vala b/src/librygel-server/rygel-http-request.vala
index 92d3c109..92d3c109 100644
--- a/src/librygel-core/rygel-http-request.vala
+++ b/src/librygel-server/rygel-http-request.vala
diff --git a/src/librygel-core/rygel-http-response.vala b/src/librygel-server/rygel-http-response.vala
index bbcf6550..bbcf6550 100644
--- a/src/librygel-core/rygel-http-response.vala
+++ b/src/librygel-server/rygel-http-response.vala
diff --git a/src/librygel-core/rygel-http-seek.vala b/src/librygel-server/rygel-http-seek.vala
index a8577349..a8577349 100644
--- a/src/librygel-core/rygel-http-seek.vala
+++ b/src/librygel-server/rygel-http-seek.vala
diff --git a/src/librygel-core/rygel-http-server.vala b/src/librygel-server/rygel-http-server.vala
index c4c67ff1..c4c67ff1 100644
--- a/src/librygel-core/rygel-http-server.vala
+++ b/src/librygel-server/rygel-http-server.vala
diff --git a/src/librygel-core/rygel-http-time-seek.vala b/src/librygel-server/rygel-http-time-seek.vala
index 85979776..85979776 100644
--- a/src/librygel-core/rygel-http-time-seek.vala
+++ b/src/librygel-server/rygel-http-time-seek.vala
diff --git a/src/librygel-core/rygel-http-transcode-handler.vala b/src/librygel-server/rygel-http-transcode-handler.vala
index b4746e70..b4746e70 100644
--- a/src/librygel-core/rygel-http-transcode-handler.vala
+++ b/src/librygel-server/rygel-http-transcode-handler.vala
diff --git a/src/librygel-core/rygel-image-item.vala b/src/librygel-server/rygel-image-item.vala
index c1972ff2..c1972ff2 100644
--- a/src/librygel-core/rygel-image-item.vala
+++ b/src/librygel-server/rygel-image-item.vala
diff --git a/src/librygel-core/rygel-import-resource.vala b/src/librygel-server/rygel-import-resource.vala
index 1653fdb8..1653fdb8 100644
--- a/src/librygel-core/rygel-import-resource.vala
+++ b/src/librygel-server/rygel-import-resource.vala
diff --git a/src/librygel-core/rygel-item-creator.vala b/src/librygel-server/rygel-item-creator.vala
index 836a9760..ad29cc16 100644
--- a/src/librygel-core/rygel-item-creator.vala
+++ b/src/librygel-server/rygel-item-creator.vala
@@ -524,8 +524,8 @@ internal class Rygel.ItemCreator: GLib.Object, Rygel.StateMachine {
         var udn = new uchar[50];
         var id = new uchar[16];
 
-        uuid_generate (id);
-        uuid_unparse (id, udn);
+        UUID.generate (id);
+        UUID.unparse (id, udn);
 
         return file.get_uri () + (string) udn;
     }
diff --git a/src/librygel-core/rygel-item-destroyer.vala b/src/librygel-server/rygel-item-destroyer.vala
index 90203cb2..90203cb2 100644
--- a/src/librygel-core/rygel-item-destroyer.vala
+++ b/src/librygel-server/rygel-item-destroyer.vala
diff --git a/src/librygel-core/rygel-item-removal-queue.vala b/src/librygel-server/rygel-item-removal-queue.vala
index 540fa008..540fa008 100644
--- a/src/librygel-core/rygel-item-removal-queue.vala
+++ b/src/librygel-server/rygel-item-removal-queue.vala
diff --git a/src/librygel-core/rygel-l16-transcoder.vala b/src/librygel-server/rygel-l16-transcoder.vala
index 54516f5f..54516f5f 100644
--- a/src/librygel-core/rygel-l16-transcoder.vala
+++ b/src/librygel-server/rygel-l16-transcoder.vala
diff --git a/src/librygel-core/rygel-logical-expression.vala b/src/librygel-server/rygel-logical-expression.vala
index dbf64921..dbf64921 100644
--- a/src/librygel-core/rygel-logical-expression.vala
+++ b/src/librygel-server/rygel-logical-expression.vala
diff --git a/src/librygel-core/rygel-media-art-store.vala b/src/librygel-server/rygel-media-art-store.vala
index 7ba0487a..7ba0487a 100644
--- a/src/librygel-core/rygel-media-art-store.vala
+++ b/src/librygel-server/rygel-media-art-store.vala
diff --git a/src/librygel-core/rygel-media-container.vala b/src/librygel-server/rygel-media-container.vala
index 8e6f420b..8e6f420b 100644
--- a/src/librygel-core/rygel-media-container.vala
+++ b/src/librygel-server/rygel-media-container.vala
diff --git a/src/librygel-core/rygel-media-item.vala b/src/librygel-server/rygel-media-item.vala
index 2e0584ed..2e0584ed 100644
--- a/src/librygel-core/rygel-media-item.vala
+++ b/src/librygel-server/rygel-media-item.vala
diff --git a/src/librygel-core/rygel-media-object.vala b/src/librygel-server/rygel-media-object.vala
index b5ffcfea..b5ffcfea 100644
--- a/src/librygel-core/rygel-media-object.vala
+++ b/src/librygel-server/rygel-media-object.vala
diff --git a/src/librygel-core/rygel-media-objects.vala b/src/librygel-server/rygel-media-objects.vala
index e91316c3..e91316c3 100644
--- a/src/librygel-core/rygel-media-objects.vala
+++ b/src/librygel-server/rygel-media-objects.vala
diff --git a/src/librygel-core/rygel-media-query-action.vala b/src/librygel-server/rygel-media-query-action.vala
index 24b1acfe..24b1acfe 100644
--- a/src/librygel-core/rygel-media-query-action.vala
+++ b/src/librygel-server/rygel-media-query-action.vala
diff --git a/src/librygel-core/rygel-media-receiver-registrar.vala b/src/librygel-server/rygel-media-receiver-registrar.vala
index cc007fce..cc007fce 100644
--- a/src/librygel-core/rygel-media-receiver-registrar.vala
+++ b/src/librygel-server/rygel-media-receiver-registrar.vala
diff --git a/src/librygel-core/rygel-media-server-plugin.vala b/src/librygel-server/rygel-media-server-plugin.vala
index 13293aed..28a4e848 100644
--- a/src/librygel-core/rygel-media-server-plugin.vala
+++ b/src/librygel-server/rygel-media-server-plugin.vala
@@ -68,6 +68,18 @@ public abstract class Rygel.MediaServerPlugin : Rygel.Plugin {
         }
     }
 
+    public override void apply_hacks (RootDevice device,
+                                     string     description_path)
+                                     throws Error {
+        // Apply V1 downgrades
+        var v1_hacks = new V1Hacks ();
+        v1_hacks.apply_on_device (device, description_path);
+
+        // Apply XBox hacks on top of that
+        var xbox_hacks = new XBoxHacks ();
+        xbox_hacks.apply_on_device (device, v1_hacks.description_path);
+    }
+
     private void on_container_updated (MediaContainer root_container,
                                        MediaContainer updated) {
         if (updated != root_container || updated.child_count == 0) {
diff --git a/src/librygel-core/rygel-mp2ts-transcoder.vala b/src/librygel-server/rygel-mp2ts-transcoder.vala
index b3ffd70b..b3ffd70b 100644
--- a/src/librygel-core/rygel-mp2ts-transcoder.vala
+++ b/src/librygel-server/rygel-mp2ts-transcoder.vala
diff --git a/src/librygel-core/rygel-mp3-transcoder.vala b/src/librygel-server/rygel-mp3-transcoder.vala
index ecbdd455..ecbdd455 100644
--- a/src/librygel-core/rygel-mp3-transcoder.vala
+++ b/src/librygel-server/rygel-mp3-transcoder.vala
diff --git a/src/librygel-core/rygel-music-item.vala b/src/librygel-server/rygel-music-item.vala
index 6c997c30..6c997c30 100644
--- a/src/librygel-core/rygel-music-item.vala
+++ b/src/librygel-server/rygel-music-item.vala
diff --git a/src/librygel-core/rygel-panasonic-hacks.vala b/src/librygel-server/rygel-panasonic-hacks.vala
index f77a14de..f77a14de 100644
--- a/src/librygel-core/rygel-panasonic-hacks.vala
+++ b/src/librygel-server/rygel-panasonic-hacks.vala
diff --git a/src/librygel-core/rygel-photo-item.vala b/src/librygel-server/rygel-photo-item.vala
index 99dd0b3a..99dd0b3a 100644
--- a/src/librygel-core/rygel-photo-item.vala
+++ b/src/librygel-server/rygel-photo-item.vala
diff --git a/src/librygel-core/rygel-relational-expression.vala b/src/librygel-server/rygel-relational-expression.vala
index 8b1295e5..8b1295e5 100644
--- a/src/librygel-core/rygel-relational-expression.vala
+++ b/src/librygel-server/rygel-relational-expression.vala
diff --git a/src/librygel-core/rygel-search-criteria-parser.vala b/src/librygel-server/rygel-search-criteria-parser.vala
index 99d1f8f4..99d1f8f4 100644
--- a/src/librygel-core/rygel-search-criteria-parser.vala
+++ b/src/librygel-server/rygel-search-criteria-parser.vala
diff --git a/src/librygel-core/rygel-search-expression.vala b/src/librygel-server/rygel-search-expression.vala
index 16e4f489..16e4f489 100644
--- a/src/librygel-core/rygel-search-expression.vala
+++ b/src/librygel-server/rygel-search-expression.vala
diff --git a/src/librygel-core/rygel-search.vala b/src/librygel-server/rygel-search.vala
index b050eff0..b050eff0 100644
--- a/src/librygel-core/rygel-search.vala
+++ b/src/librygel-server/rygel-search.vala
diff --git a/src/librygel-core/rygel-searchable-container.vala b/src/librygel-server/rygel-searchable-container.vala
index faf28683..faf28683 100644
--- a/src/librygel-core/rygel-searchable-container.vala
+++ b/src/librygel-server/rygel-searchable-container.vala
diff --git a/src/librygel-core/rygel-simple-container.vala b/src/librygel-server/rygel-simple-container.vala
index 4b82bb40..4b82bb40 100644
--- a/src/librygel-core/rygel-simple-container.vala
+++ b/src/librygel-server/rygel-simple-container.vala
diff --git a/src/librygel-core/rygel-source-connection-manager.vala b/src/librygel-server/rygel-source-connection-manager.vala
index 9903c6ff..9903c6ff 100644
--- a/src/librygel-core/rygel-source-connection-manager.vala
+++ b/src/librygel-server/rygel-source-connection-manager.vala
diff --git a/src/librygel-core/rygel-subtitle-manager.vala b/src/librygel-server/rygel-subtitle-manager.vala
index cb0cf092..cb0cf092 100644
--- a/src/librygel-core/rygel-subtitle-manager.vala
+++ b/src/librygel-server/rygel-subtitle-manager.vala
diff --git a/src/librygel-core/rygel-subtitle.vala b/src/librygel-server/rygel-subtitle.vala
index 0e4ff4f1..0e4ff4f1 100644
--- a/src/librygel-core/rygel-subtitle.vala
+++ b/src/librygel-server/rygel-subtitle.vala
diff --git a/src/librygel-core/rygel-thumbnail.vala b/src/librygel-server/rygel-thumbnail.vala
index e4f3a9cd..e4f3a9cd 100644
--- a/src/librygel-core/rygel-thumbnail.vala
+++ b/src/librygel-server/rygel-thumbnail.vala
diff --git a/src/librygel-core/rygel-thumbnailer.vala b/src/librygel-server/rygel-thumbnailer.vala
index e4f13da6..e4f13da6 100644
--- a/src/librygel-core/rygel-thumbnailer.vala
+++ b/src/librygel-server/rygel-thumbnailer.vala
diff --git a/src/librygel-core/rygel-transcode-manager.vala b/src/librygel-server/rygel-transcode-manager.vala
index 69e1f484..69e1f484 100644
--- a/src/librygel-core/rygel-transcode-manager.vala
+++ b/src/librygel-server/rygel-transcode-manager.vala
diff --git a/src/librygel-core/rygel-transcoder.vala b/src/librygel-server/rygel-transcoder.vala
index 2071bfb0..2071bfb0 100644
--- a/src/librygel-core/rygel-transcoder.vala
+++ b/src/librygel-server/rygel-transcoder.vala
diff --git a/src/librygel-core/rygel-v1-hacks.vala b/src/librygel-server/rygel-v1-hacks.vala
index 3e1a6bcd..3e1a6bcd 100644
--- a/src/librygel-core/rygel-v1-hacks.vala
+++ b/src/librygel-server/rygel-v1-hacks.vala
diff --git a/src/librygel-core/rygel-video-item.vala b/src/librygel-server/rygel-video-item.vala
index 36dbd04f..36dbd04f 100644
--- a/src/librygel-core/rygel-video-item.vala
+++ b/src/librygel-server/rygel-video-item.vala
diff --git a/src/librygel-core/rygel-video-transcoder.vala b/src/librygel-server/rygel-video-transcoder.vala
index f01da21b..f01da21b 100644
--- a/src/librygel-core/rygel-video-transcoder.vala
+++ b/src/librygel-server/rygel-video-transcoder.vala
diff --git a/src/librygel-core/rygel-visual-item.vala b/src/librygel-server/rygel-visual-item.vala
index 0352f65f..0352f65f 100644
--- a/src/librygel-core/rygel-visual-item.vala
+++ b/src/librygel-server/rygel-visual-item.vala
diff --git a/src/librygel-core/rygel-wmp-hacks.vala b/src/librygel-server/rygel-wmp-hacks.vala
index 7e9d23dc..7e9d23dc 100644
--- a/src/librygel-core/rygel-wmp-hacks.vala
+++ b/src/librygel-server/rygel-wmp-hacks.vala
diff --git a/src/librygel-core/rygel-wmv-transcoder.vala b/src/librygel-server/rygel-wmv-transcoder.vala
index 947ee04d..947ee04d 100644
--- a/src/librygel-core/rygel-wmv-transcoder.vala
+++ b/src/librygel-server/rygel-wmv-transcoder.vala
diff --git a/src/librygel-core/rygel-writable-container.vala b/src/librygel-server/rygel-writable-container.vala
index 17703d57..17703d57 100644
--- a/src/librygel-core/rygel-writable-container.vala
+++ b/src/librygel-server/rygel-writable-container.vala
diff --git a/src/librygel-core/rygel-xbmc-hacks.vala b/src/librygel-server/rygel-xbmc-hacks.vala
index 8659c9bb..8659c9bb 100644
--- a/src/librygel-core/rygel-xbmc-hacks.vala
+++ b/src/librygel-server/rygel-xbmc-hacks.vala
diff --git a/src/librygel-core/rygel-xbox-hacks.vala b/src/librygel-server/rygel-xbox-hacks.vala
index b2f046cd..b2f046cd 100644
--- a/src/librygel-core/rygel-xbox-hacks.vala
+++ b/src/librygel-server/rygel-xbox-hacks.vala
diff --git a/src/plugins/external/Makefile.am b/src/plugins/external/Makefile.am
index 0cc7dc1f..644e7229 100644
--- a/src/plugins/external/Makefile.am
+++ b/src/plugins/external/Makefile.am
@@ -16,6 +16,6 @@ librygel_external_la_SOURCES = \
 	rygel-external-icon-factory.vala \
 	rygel-external-variant-util.vala
 
-librygel_external_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_external_la_LIBADD = $(RYGEL_COMMON_LIBS)
+librygel_external_la_VALAFLAGS = $(RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS)
+librygel_external_la_LIBADD = $(RYGEL_COMMON_SERVER_LIBS)
 librygel_external_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/gst-launch/Makefile.am b/src/plugins/gst-launch/Makefile.am
index 39922cf8..e5fc0cf8 100644
--- a/src/plugins/gst-launch/Makefile.am
+++ b/src/plugins/gst-launch/Makefile.am
@@ -11,6 +11,6 @@ librygel_gst_launch_la_SOURCES = \
 	rygel-gst-launch-audio-item.vala \
 	rygel-gst-launch-video-item.vala
 
-librygel_gst_launch_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_gst_launch_la_LIBADD = $(RYGEL_COMMON_LIBS)
+librygel_gst_launch_la_VALAFLAGS = $(RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS)
+librygel_gst_launch_la_LIBADD = $(RYGEL_COMMON_SERVER_LIBS)
 librygel_gst_launch_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/media-export/Makefile.am b/src/plugins/media-export/Makefile.am
index 75c9561f..e4f8f4d8 100644
--- a/src/plugins/media-export/Makefile.am
+++ b/src/plugins/media-export/Makefile.am
@@ -43,10 +43,10 @@ librygel_media_export_la_VALAFLAGS = \
 	--pkg gstreamer-tag-0.10 \
 	--pkg gstreamer-app-0.10 \
 	--pkg sqlite3 \
-	$(RYGEL_COMMON_PLUGIN_VALAFLAGS)
+	$(RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS)
 
 librygel_media_export_la_LIBADD = \
-	$(RYGEL_COMMON_LIBS) \
+	$(RYGEL_COMMON_SERVER_LIBS) \
 	$(LIBGUPNP_DLNA_LIBS) \
 	$(GSTREAMER_TAG_LIBS) \
 	$(GSTREAMER_APP_LIBS) \
diff --git a/src/plugins/mediathek/Makefile.am b/src/plugins/mediathek/Makefile.am
index 4dcb6f60..50ee615a 100644
--- a/src/plugins/mediathek/Makefile.am
+++ b/src/plugins/mediathek/Makefile.am
@@ -14,6 +14,6 @@ librygel_mediathek_la_SOURCES = \
 	rygel-mediathek-rss-container.vala \
 	rygel-mediathek-soup-utils.vala
 
-librygel_mediathek_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_mediathek_la_LIBADD = $(RYGEL_COMMON_LIBS)
+librygel_mediathek_la_VALAFLAGS = $(RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS)
+librygel_mediathek_la_LIBADD = $(RYGEL_COMMON_SERVER_LIBS)
 librygel_mediathek_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/mpris/Makefile.am b/src/plugins/mpris/Makefile.am
index 49120943..4b609de7 100644
--- a/src/plugins/mpris/Makefile.am
+++ b/src/plugins/mpris/Makefile.am
@@ -2,17 +2,14 @@ include ../../../common.am
 
 plugin_LTLIBRARIES = librygel-mpris.la
 
-AM_CFLAGS += -DG_LOG_DOMAIN='"MPRIS"' \
-	-I$(top_builddir)/src/librygel-renderer
+AM_CFLAGS += -DG_LOG_DOMAIN='"MPRIS"'
 
 librygel_mpris_la_SOURCES = \
 	rygel-mpris-player.vala \
 	rygel-mpris-plugin.vala \
 	rygel-mpris-plugin-factory.vala \
-	rygel-mpris-interfaces.vala \
-	$(top_builddir)/src/librygel-renderer/rygel-renderer-1.0.vapi
+	rygel-mpris-interfaces.vala
 
-librygel_mpris_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_mpris_la_LIBADD = $(RYGEL_COMMON_LIBS) \
-	$(top_builddir)/src/librygel-renderer/librygel-renderer-1.0.la
+librygel_mpris_la_VALAFLAGS = $(RYGEL_COMMON_RENDERER_PLUGIN_VALAFLAGS)
+librygel_mpris_la_LIBADD = $(RYGEL_COMMON_RENDERER_LIBS)
 librygel_mpris_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/playbin/Makefile.am b/src/plugins/playbin/Makefile.am
index 91cf9b87..734056c7 100644
--- a/src/plugins/playbin/Makefile.am
+++ b/src/plugins/playbin/Makefile.am
@@ -2,15 +2,10 @@ include ../../../common.am
 
 plugin_LTLIBRARIES = librygel-playbin.la
 
-librygel_playbin_la_SOURCES = rygel-module.vala \
-                              $(top_builddir)/src/librygel-renderer/rygel-renderer-1.0.vapi
-
-librygel_playbin_la_CFLAGS = $(AM_CFLAGS) \
-                             -I$(top_srcdir)/src/librygel-renderer \
-                             -DG_LOG_DOMAIN='"Playbin"'
-
-librygel_playbin_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_playbin_la_LIBADD = $(RYGEL_COMMON_LIBS) \
-                             $(top_builddir)/src/librygel-renderer/librygel-renderer-1.0.la
+AM_CFLAGS += -DG_LOG_DOMAIN='"Playbin"'
 
+librygel_playbin_la_SOURCES = rygel-module.vala
+librygel_playbin_la_CFLAGS = $(AM_CFLAGS)
+librygel_playbin_la_VALAFLAGS = $(RYGEL_COMMON_RENDERER_PLUGIN_VALAFLAGS)
+librygel_playbin_la_LIBADD = $(RYGEL_COMMON_RENDERER_LIBS)
 librygel_playbin_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/test/Makefile.am b/src/plugins/test/Makefile.am
index e482b661..628b3cbf 100644
--- a/src/plugins/test/Makefile.am
+++ b/src/plugins/test/Makefile.am
@@ -10,6 +10,6 @@ librygel_test_la_SOURCES = \
 	rygel-test-video-item.vala \
 	rygel-test-plugin.vala
 
-librygel_test_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_test_la_LIBADD = $(RYGEL_COMMON_LIBS)
+librygel_test_la_VALAFLAGS = $(RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS)
+librygel_test_la_LIBADD = $(RYGEL_COMMON_SERVER_LIBS)
 librygel_test_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am
index 21c34a21..889d15a0 100644
--- a/src/plugins/tracker/Makefile.am
+++ b/src/plugins/tracker/Makefile.am
@@ -42,7 +42,7 @@ librygel_tracker_la_SOURCES = \
 	rygel-tracker-interfaces.vala
 
 librygel_tracker_la_VALAFLAGS = --pkg posix \
-				--pkg gupnp-dlna-1.0 \
-				$(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_tracker_la_LIBADD = $(RYGEL_COMMON_LIBS) $(LIBGUPNP_DLNA_LIBS)
+	--pkg gupnp-dlna-1.0 \
+	$(RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS)
+librygel_tracker_la_LIBADD = $(RYGEL_COMMON_SERVER_LIBS) $(LIBGUPNP_DLNA_LIBS)
 librygel_tracker_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 90acdded..338ce57b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -30,7 +30,7 @@ AM_VALAFLAGS = --disable-warnings --thread \
 	       --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 \
                --pkg gconf-2.0 --pkg gstreamer-0.10 --pkg gstreamer-base-0.10 \
                --pkg gio-2.0 --pkg gee-1.0 --pkg gstreamer-pbutils-0.10 \
-               --pkg gupnp-dlna-1.0 -g
+               --pkg gupnp-dlna-1.0 --pkg uuid --vapidir=$(top_srcdir)/src/librygel-core -g
 	       $(COVERAGE_VALAFLAGS)
 
 check_PROGRAMS = rygel-http-item-uri-test \
@@ -79,8 +79,8 @@ rygel_http_post_test_SOURCES = rygel-http-post-test.vala \
 
 rygel_album_art_spec_test_SOURCES = rygel-album-art-spec-test.vala \
 			       rygel-media-art-store.vala \
-				   $(top_srcdir)/src/librygel-core/rygel-thumbnail.vala \
-				   $(top_srcdir)/src/librygel-core/rygel-icon-info.vala
+				   rygel-thumbnail.vala \
+				   rygel-icon-info.vala
 
 rygel_searchable_container_test_SOURCES = \
 	rygel-searchable-container.vala \
diff --git a/tests/rygel-gst-utils.vala b/tests/rygel-gst-utils.vala
index 6b609846..b3ca447a 120000
--- a/tests/rygel-gst-utils.vala
+++ b/tests/rygel-gst-utils.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-gst-utils.vala
\ No newline at end of file
+../src/librygel-server/rygel-gst-utils.vala
\ No newline at end of file
diff --git a/tests/rygel-http-byte-seek.vala b/tests/rygel-http-byte-seek.vala
index 74119d57..84e6fe96 120000
--- a/tests/rygel-http-byte-seek.vala
+++ b/tests/rygel-http-byte-seek.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-byte-seek.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-byte-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-byte-seek_http-get.vala b/tests/rygel-http-byte-seek_http-get.vala
index 74119d57..84e6fe96 120000
--- a/tests/rygel-http-byte-seek_http-get.vala
+++ b/tests/rygel-http-byte-seek_http-get.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-byte-seek.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-byte-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-get.vala b/tests/rygel-http-get.vala
index 4e52f8e7..e4bac4e8 120000
--- a/tests/rygel-http-get.vala
+++ b/tests/rygel-http-get.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-get.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-get.vala
\ No newline at end of file
diff --git a/tests/rygel-http-gst-sink.vala b/tests/rygel-http-gst-sink.vala
index 23b7d24e..85c3c763 120000
--- a/tests/rygel-http-gst-sink.vala
+++ b/tests/rygel-http-gst-sink.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-gst-sink.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-gst-sink.vala
\ No newline at end of file
diff --git a/tests/rygel-http-item-uri.vala b/tests/rygel-http-item-uri.vala
index 88bc91b1..b82155c2 120000
--- a/tests/rygel-http-item-uri.vala
+++ b/tests/rygel-http-item-uri.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-item-uri.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-item-uri.vala
\ No newline at end of file
diff --git a/tests/rygel-http-item-uri_http-get.vala b/tests/rygel-http-item-uri_http-get.vala
index 88bc91b1..b82155c2 120000
--- a/tests/rygel-http-item-uri_http-get.vala
+++ b/tests/rygel-http-item-uri_http-get.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-item-uri.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-item-uri.vala
\ No newline at end of file
diff --git a/tests/rygel-http-item-uri_http-post.vala b/tests/rygel-http-item-uri_http-post.vala
index 88bc91b1..b82155c2 120000
--- a/tests/rygel-http-item-uri_http-post.vala
+++ b/tests/rygel-http-item-uri_http-post.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-item-uri.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-item-uri.vala
\ No newline at end of file
diff --git a/tests/rygel-http-post.vala b/tests/rygel-http-post.vala
index 2f1ca708..80bea5f1 120000
--- a/tests/rygel-http-post.vala
+++ b/tests/rygel-http-post.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-post.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-post.vala
\ No newline at end of file
diff --git a/tests/rygel-http-request_http-get.vala b/tests/rygel-http-request_http-get.vala
index 38f0509c..60d2e75e 120000
--- a/tests/rygel-http-request_http-get.vala
+++ b/tests/rygel-http-request_http-get.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-request.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-request.vala
\ No newline at end of file
diff --git a/tests/rygel-http-request_http-post.vala b/tests/rygel-http-request_http-post.vala
index 38f0509c..60d2e75e 120000
--- a/tests/rygel-http-request_http-post.vala
+++ b/tests/rygel-http-request_http-post.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-request.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-request.vala
\ No newline at end of file
diff --git a/tests/rygel-http-response.vala b/tests/rygel-http-response.vala
index fc06488f..7e6c2d5a 120000
--- a/tests/rygel-http-response.vala
+++ b/tests/rygel-http-response.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-response.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-response.vala
\ No newline at end of file
diff --git a/tests/rygel-http-seek.vala b/tests/rygel-http-seek.vala
index 681442af..33966006 120000
--- a/tests/rygel-http-seek.vala
+++ b/tests/rygel-http-seek.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-seek.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-seek_http-get.vala b/tests/rygel-http-seek_http-get.vala
index 681442af..33966006 120000
--- a/tests/rygel-http-seek_http-get.vala
+++ b/tests/rygel-http-seek_http-get.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-seek.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-seek_time-seek.vala b/tests/rygel-http-seek_time-seek.vala
index 681442af..33966006 120000
--- a/tests/rygel-http-seek_time-seek.vala
+++ b/tests/rygel-http-seek_time-seek.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-seek.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-time-seek.vala b/tests/rygel-http-time-seek.vala
index e5ea5618..7ea8eb48 120000
--- a/tests/rygel-http-time-seek.vala
+++ b/tests/rygel-http-time-seek.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-time-seek.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-time-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-time-seek_http-get.vala b/tests/rygel-http-time-seek_http-get.vala
index e5ea5618..7ea8eb48 120000
--- a/tests/rygel-http-time-seek_http-get.vala
+++ b/tests/rygel-http-time-seek_http-get.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-time-seek.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-time-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-icon-info.vala b/tests/rygel-icon-info.vala
new file mode 120000
index 00000000..84f4417d
--- /dev/null
+++ b/tests/rygel-icon-info.vala
@@ -0,0 +1 @@
+../src/librygel-core/rygel-icon-info.vala
\ No newline at end of file
diff --git a/tests/rygel-item-creator.vala b/tests/rygel-item-creator.vala
index 39e7ca38..9e11abe3 120000
--- a/tests/rygel-item-creator.vala
+++ b/tests/rygel-item-creator.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-item-creator.vala
\ No newline at end of file
+../src/librygel-server/rygel-item-creator.vala
\ No newline at end of file
diff --git a/tests/rygel-media-art-store.vala b/tests/rygel-media-art-store.vala
index 107e3f0d..fe11e0f2 120000
--- a/tests/rygel-media-art-store.vala
+++ b/tests/rygel-media-art-store.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-media-art-store.vala
\ No newline at end of file
+../src/librygel-server/rygel-media-art-store.vala
\ No newline at end of file
diff --git a/tests/rygel-relational-expression.vala b/tests/rygel-relational-expression.vala
index 9b8040aa..40edca9e 120000
--- a/tests/rygel-relational-expression.vala
+++ b/tests/rygel-relational-expression.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-relational-expression.vala
\ No newline at end of file
+../src/librygel-server/rygel-relational-expression.vala
\ No newline at end of file
diff --git a/tests/rygel-search-expression.vala b/tests/rygel-search-expression.vala
index 237ceaa7..a0fd6b5b 120000
--- a/tests/rygel-search-expression.vala
+++ b/tests/rygel-search-expression.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-search-expression.vala
\ No newline at end of file
+../src/librygel-server/rygel-search-expression.vala
\ No newline at end of file
diff --git a/tests/rygel-searchable-container.vala b/tests/rygel-searchable-container.vala
index aa5485e7..034cdfa6 120000
--- a/tests/rygel-searchable-container.vala
+++ b/tests/rygel-searchable-container.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-searchable-container.vala
\ No newline at end of file
+../src/librygel-server/rygel-searchable-container.vala
\ No newline at end of file
diff --git a/tests/rygel-thumbnail.vala b/tests/rygel-thumbnail.vala
new file mode 120000
index 00000000..0b0ee8de
--- /dev/null
+++ b/tests/rygel-thumbnail.vala
@@ -0,0 +1 @@
+../src/librygel-server/rygel-thumbnail.vala
\ No newline at end of file