diff --git a/build.xml b/build.xml
index fec3a1b27..e16f9a695 100644
--- a/build.xml
+++ b/build.xml
@@ -910,7 +910,9 @@
         bundle-callhistory, bundle-callhistory-slick, bundle-popupmessagehandler-slick,
         bundle-netaddr,bundle-netaddr-slick,bundle-slickless,
         bundle-slick-runner,bundle-sip,bundle-sip-slick,bundle-fileaccess,
-        bundle-fileaccess-slick,bundle-neomedia,bundle-hid,bundle-ldap,bundle-googlecontacts,
+        bundle-fileaccess-slick,bundle-neomedia,bundle-ldap,
+        bundle-googlecontacts-service,bundle-googlecontacts,
+        bundle-hid-service,bundle-hid,
         bundle-resource-manager,bundle-resources-defaultpack,
         bundle-protocol,bundle-protocol-media,bundle-icq,
         bundle-icq-slick,bundle-mock,bundle-smacklib,bundle-jmdnslib,
@@ -1189,7 +1191,6 @@
     <target name="bundle-hid">
         <jar compress="false" destfile="${bundles.dest}/hid.jar"
             manifest="${src}/net/java/sip/communicator/impl/hid/hid.manifest.mf">
-
             <zipfileset dir="${dest}/net/java/sip/communicator/service/hid"
                 prefix="net/java/sip/communicator/service/hid"/>
             <zipfileset dir="${dest}/net/java/sip/communicator/impl/hid"
@@ -1197,6 +1198,15 @@
         </jar>
     </target>
 
+    <!--BUNDLE-HID-SERVICE -->
+    <target name="bundle-hid-service">
+        <jar compress="false" destfile="${bundles.dest}/hid-service.jar"
+            manifest="${src}/net/java/sip/communicator/service/hid/hid.manifest.mf">
+            <zipfileset dir="${dest}/net/java/sip/communicator/service/hid"
+                prefix="net/java/sip/communicator/service/hid"/>
+        </jar>
+    </target>
+
     <!--BUNDLE-LDAP-->
     <target name="bundle-ldap">
         <jar compress="false" destfile="${bundles.dest}/ldap.jar"
@@ -1224,6 +1234,14 @@
             <zipfileset src="${lib.noinst}/gdata-client-meta-1.0.jar" prefix=""/>
         </jar>
     </target>
+    <!--BUNDLE-GOOGLECONTACTS-SERVICE-->
+    <target name="bundle-googlecontacts-service">
+        <jar compress="false" destfile="${bundles.dest}/googlecontacts-service.jar"
+            manifest="${src}/net/java/sip/communicator/service/googlecontacts/googlecontacts.manifest.mf">
+            <zipfileset dir="${dest}/net/java/sip/communicator/service/googlecontacts"
+                prefix="net/java/sip/communicator/service/googlecontacts"/>
+        </jar>
+    </target>
 
     <!--BUNDLE-SERVICEBINDER -->
     <target name="bundle-servicebinder">
@@ -1323,6 +1341,8 @@ javax.swing.event, javax.swing.border"/>
         <!-- Creates a bundle containing the protocol provider interfaces.-->
         <jar compress="false" destfile="${bundles.dest}/protocol.jar"
             manifest="${src}/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf">
+            <zipfileset dir="${dest}/net/java/sip/communicator/service/customavatar"
+                prefix="net/java/sip/communicator/service/customavatar" />
             <zipfileset dir="${dest}/net/java/sip/communicator/service/protocol"
                 prefix="net/java/sip/communicator/service/protocol"/>
             <zipfileset dir="${resources}/images"
@@ -2446,8 +2466,6 @@ javax.swing.event, javax.swing.border"/>
             manifest="${src}/net/java/sip/communicator/plugin/nimbuzzavatars/nimbuzzavatars.manifest.mf">
             <zipfileset dir="${dest}/net/java/sip/communicator/plugin/nimbuzzavatars"
                 prefix="net/java/sip/communicator/plugin/nimbuzzavatars" />
-            <zipfileset dir="${dest}/net/java/sip/communicator/service/customavatar"
-                prefix="net/java/sip/communicator/service/customavatar" />
         </jar>
     </target>
 
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index 42cd65434..aaab0e1c2 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -85,6 +85,7 @@ felix.auto.start.45= \
  reference:file:sc-bundles/branding.jar \
  reference:file:sc-bundles/provdisc-dhcp.jar \
  reference:file:sc-bundles/provdisc-mdns.jar \
+ reference:file:sc-bundles/googlecontacts-service.jar \
  reference:file:sc-bundles/googlecontacts.jar \
  reference:file:sc-bundles/certificate.jar
 
@@ -94,6 +95,7 @@ felix.auto.start.49= \
  reference:file:sc-bundles/sdes4j.jar \
  reference:file:sc-bundles/protocol.jar \
  reference:file:sc-bundles/protocol-media.jar \
+ reference:file:sc-bundles/hid-service.jar \
  reference:file:sc-bundles/hid.jar \
  reference:file:sc-bundles/globalproxyconfig.jar
 
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf b/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
index 9e2845b07..9940d116a 100644
--- a/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
+++ b/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
@@ -8,6 +8,7 @@ Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  net.java.sip.communicator.service.credentialsstorage,
  net.java.sip.communicator.service.contactsource,
+ net.java.sip.communicator.service.googlecontacts,
  net.java.sip.communicator.service.gui,
  org.jitsi.service.resources, net.java.sip.communicator.service.resources,
  net.java.sip.communicator.service.protocol,
@@ -23,4 +24,3 @@ Import-Package: org.osgi.framework,
  javax.swing.table,
  javax.swing.tree,
  javax.swing.text
-Export-Package: net.java.sip.communicator.service.googlecontacts
diff --git a/src/net/java/sip/communicator/plugin/nimbuzzavatars/nimbuzzavatars.manifest.mf b/src/net/java/sip/communicator/plugin/nimbuzzavatars/nimbuzzavatars.manifest.mf
index 6c84be4cf..da86327ef 100644
--- a/src/net/java/sip/communicator/plugin/nimbuzzavatars/nimbuzzavatars.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/nimbuzzavatars/nimbuzzavatars.manifest.mf
@@ -4,5 +4,5 @@ Bundle-Description: Custom Nimbuzz Avatars plugin
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
 System-Bundle: yes
-Export-Package: net.java.sip.communicator.service.customavatar
-Import-Package: org.osgi.framework
+Import-Package: org.osgi.framework,
+ net.java.sip.communicator.service.customavatar
diff --git a/src/net/java/sip/communicator/service/googlecontacts/googlecontacts.manifest.mf b/src/net/java/sip/communicator/service/googlecontacts/googlecontacts.manifest.mf
new file mode 100644
index 000000000..74dde8d61
--- /dev/null
+++ b/src/net/java/sip/communicator/service/googlecontacts/googlecontacts.manifest.mf
@@ -0,0 +1,6 @@
+Bundle-Name: Google Contacts Service
+Bundle-Description: A service accessing Google Contacts
+Bundle-Vendor: jitsi.org
+Bundle-Version: 0.0.1
+System-Bundle: yes
+Export-Package: net.java.sip.communicator.service.googlecontacts
diff --git a/src/net/java/sip/communicator/service/hid/hid.manifest.mf b/src/net/java/sip/communicator/service/hid/hid.manifest.mf
new file mode 100644
index 000000000..98ed346d3
--- /dev/null
+++ b/src/net/java/sip/communicator/service/hid/hid.manifest.mf
@@ -0,0 +1,6 @@
+Bundle-Name: HID Service
+Bundle-Description: A bundle that offers Human Interaction service features.
+Bundle-Vendor: jitsi.org
+Bundle-Version: 0.0.1
+System-Bundle: yes
+Export-Package: net.java.sip.communicator.service.hid
diff --git a/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf b/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf
index ba437d8c3..42b53ebef 100644
--- a/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf
+++ b/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf
@@ -16,6 +16,7 @@ Import-Package: net.java.sip.communicator.service.credentialsstorage,
  org.osgi.framework
 Export-Package: net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.protocol.aimconstants,
+ net.java.sip.communicator.service.customavatar,
  net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.protocol.globalstatus,
  net.java.sip.communicator.service.protocol.icqconstants,